diff --git a/examples/delegated-routing/package.json b/examples/delegated-routing/package.json
index acdbb035..22cd66fb 100644
--- a/examples/delegated-routing/package.json
+++ b/examples/delegated-routing/package.json
@@ -3,15 +3,15 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
-    "@chainsafe/libp2p-noise": "^6.0.1",
+    "@chainsafe/libp2p-noise": "^6.1.1",
     "ipfs-core": "^0.14.1",
     "libp2p": "../../",
     "@libp2p/delegated-content-routing": "^1.0.1",
     "@libp2p/delegated-peer-routing": "^1.0.1",
-    "@libp2p/kad-dht": "^1.0.1",
-    "@libp2p/mplex": "^1.0.2",
-    "@libp2p/webrtc-star": "^1.0.6",
-    "@libp2p/websockets": "^1.0.3",
+    "@libp2p/kad-dht": "^1.0.9",
+    "@libp2p/mplex": "^1.0.4",
+    "@libp2p/webrtc-star": "^1.0.8",
+    "@libp2p/websockets": "^1.0.7",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
     "react-scripts": "5.0.0"
diff --git a/examples/libp2p-in-the-browser/package.json b/examples/libp2p-in-the-browser/package.json
index f8ee1eef..c182fea0 100644
--- a/examples/libp2p-in-the-browser/package.json
+++ b/examples/libp2p-in-the-browser/package.json
@@ -9,11 +9,11 @@
   },
   "license": "ISC",
   "dependencies": {
-    "@chainsafe/libp2p-noise": "^6.0.1",
-    "@libp2p/bootstrap": "^1.0.1",
-    "@libp2p/mplex": "^1.0.2",
-    "@libp2p/webrtc-star": "^1.0.6",
-    "@libp2p/websockets": "^1.0.3",
+    "@chainsafe/libp2p-noise": "^6.1.1",
+    "@libp2p/bootstrap": "^1.0.4",
+    "@libp2p/mplex": "^1.0.4",
+    "@libp2p/webrtc-star": "^1.0.8",
+    "@libp2p/websockets": "^1.0.7",
     "libp2p": "../../"
   },
   "devDependencies": {
diff --git a/examples/package.json b/examples/package.json
index c94da14d..ddeef8ea 100644
--- a/examples/package.json
+++ b/examples/package.json
@@ -9,7 +9,7 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@libp2p/pubsub-peer-discovery": "^5.0.1",
+    "@libp2p/pubsub-peer-discovery": "^5.0.2",
     "@libp2p/floodsub": "^1.0.6",
     "execa": "^2.1.0",
     "fs-extra": "^8.1.0",
diff --git a/examples/webrtc-direct/package.json b/examples/webrtc-direct/package.json
index 57e79c6e..a888ea7f 100644
--- a/examples/webrtc-direct/package.json
+++ b/examples/webrtc-direct/package.json
@@ -9,10 +9,10 @@
   },
   "license": "ISC",
   "dependencies": {
-    "@libp2p/webrtc-direct": "^1.0.0",
-    "@chainsafe/libp2p-noise": "^6.0.1",
-    "@libp2p/bootstrap": "^1.0.1",
-    "@libp2p/mplex": "^1.0.2",
+    "@libp2p/webrtc-direct": "^1.0.1",
+    "@chainsafe/libp2p-noise": "^6.1.1",
+    "@libp2p/bootstrap": "^1.0.4",
+    "@libp2p/mplex": "^1.0.4",
     "libp2p": "../../",
     "wrtc": "^0.4.7"
   },
diff --git a/package.json b/package.json
index 07f344c8..b4be4f38 100644
--- a/package.json
+++ b/package.json
@@ -98,7 +98,7 @@
     "@achingbrain/nat-port-mapper": "^1.0.0",
     "@libp2p/connection": "^1.1.5",
     "@libp2p/crypto": "^0.22.11",
-    "@libp2p/interfaces": "^1.3.30",
+    "@libp2p/interfaces": "^1.3.31",
     "@libp2p/logger": "^1.1.4",
     "@libp2p/multistream-select": "^1.0.4",
     "@libp2p/peer-collections": "^1.0.2",
@@ -157,23 +157,23 @@
     "xsalsa20": "^1.1.0"
   },
   "devDependencies": {
-    "@chainsafe/libp2p-noise": "^6.0.1",
-    "@libp2p/bootstrap": "^1.0.3",
+    "@chainsafe/libp2p-noise": "^6.1.1",
+    "@libp2p/bootstrap": "^1.0.4",
     "@libp2p/daemon-client": "^1.0.2",
     "@libp2p/daemon-server": "^1.0.2",
     "@libp2p/delegated-content-routing": "^1.0.2",
     "@libp2p/delegated-peer-routing": "^1.0.2",
     "@libp2p/floodsub": "^1.0.6",
-    "@libp2p/interface-compliance-tests": "^1.1.31",
+    "@libp2p/interface-compliance-tests": "^1.1.32",
     "@libp2p/interop": "^1.0.3",
-    "@libp2p/kad-dht": "^1.0.8",
-    "@libp2p/mdns": "^1.0.4",
-    "@libp2p/mplex": "^1.0.3",
+    "@libp2p/kad-dht": "^1.0.9",
+    "@libp2p/mdns": "^1.0.5",
+    "@libp2p/mplex": "^1.0.4",
     "@libp2p/pubsub": "^1.2.18",
-    "@libp2p/tcp": "^1.0.8",
+    "@libp2p/tcp": "^1.0.9",
     "@libp2p/topology": "^1.1.7",
-    "@libp2p/webrtc-star": "^1.0.7",
-    "@libp2p/websockets": "^1.0.6",
+    "@libp2p/webrtc-star": "^1.0.8",
+    "@libp2p/websockets": "^1.0.7",
     "@nodeutils/defaults-deep": "^1.1.0",
     "@types/node": "^16.11.26",
     "@types/node-forge": "^1.0.0",
diff --git a/src/address-manager/index.ts b/src/address-manager/index.ts
index d5ccdd02..00634a21 100644
--- a/src/address-manager/index.ts
+++ b/src/address-manager/index.ts
@@ -1,4 +1,5 @@
-import { AddressManagerEvents, CustomEvent, EventEmitter } from '@libp2p/interfaces'
+import type { AddressManagerEvents } from '@libp2p/interfaces/address-manager'
+import { CustomEvent, EventEmitter } from '@libp2p/interfaces/events'
 import { Multiaddr } from '@multiformats/multiaddr'
 import { peerIdFromString } from '@libp2p/peer-id'
 import type { Components } from '@libp2p/interfaces/components'
diff --git a/src/circuit/index.ts b/src/circuit/index.ts
index 8bd66808..0771a398 100644
--- a/src/circuit/index.ts
+++ b/src/circuit/index.ts
@@ -11,7 +11,7 @@ import {
   RELAY_RENDEZVOUS_NS
 } from './constants.js'
 import type { AddressSorter } from '@libp2p/interfaces/peer-store'
-import type { Startable } from '@libp2p/interfaces'
+import type { Startable } from '@libp2p/interfaces/startable'
 import type { Components } from '@libp2p/interfaces/components'
 
 const log = logger('libp2p:relay')
diff --git a/src/circuit/listener.ts b/src/circuit/listener.ts
index 49545877..e70ef863 100644
--- a/src/circuit/listener.ts
+++ b/src/circuit/listener.ts
@@ -1,4 +1,4 @@
-import { CustomEvent, EventEmitter } from '@libp2p/interfaces'
+import { CustomEvent, EventEmitter } from '@libp2p/interfaces/events'
 import type { ConnectionManager } from '@libp2p/interfaces/connection-manager'
 import type { PeerStore } from '@libp2p/interfaces/peer-store'
 import type { Listener } from '@libp2p/interfaces/transport'
diff --git a/src/connection-manager/auto-dialler.ts b/src/connection-manager/auto-dialler.ts
index 523a7104..8a4e646e 100644
--- a/src/connection-manager/auto-dialler.ts
+++ b/src/connection-manager/auto-dialler.ts
@@ -6,7 +6,7 @@ import all from 'it-all'
 import { pipe } from 'it-pipe'
 import filter from 'it-filter'
 import sort from 'it-sort'
-import type { Startable } from '@libp2p/interfaces'
+import type { Startable } from '@libp2p/interfaces/startable'
 import type { Components } from '@libp2p/interfaces/components'
 
 const log = logger('libp2p:connection-manager:auto-dialler')
diff --git a/src/connection-manager/dialer/index.ts b/src/connection-manager/dialer/index.ts
index 1e54f184..e0688534 100644
--- a/src/connection-manager/dialer/index.ts
+++ b/src/connection-manager/dialer/index.ts
@@ -20,7 +20,8 @@ import {
   MAX_ADDRS_TO_DIAL
 } from '../../constants.js'
 import type { Connection } from '@libp2p/interfaces/connection'
-import type { AbortOptions, Startable } from '@libp2p/interfaces'
+import type { AbortOptions } from '@libp2p/interfaces'
+import type { Startable } from '@libp2p/interfaces/startable'
 import type { PeerId } from '@libp2p/interfaces/peer-id'
 import { getPeer } from '../../get-peer.js'
 import sort from 'it-sort'
diff --git a/src/connection-manager/index.ts b/src/connection-manager/index.ts
index b6ca8364..3c207bc4 100644
--- a/src/connection-manager/index.ts
+++ b/src/connection-manager/index.ts
@@ -4,7 +4,9 @@ import mergeOptions from 'merge-options'
 import { LatencyMonitor, SummaryObject } from './latency-monitor.js'
 // @ts-expect-error retimer does not have types
 import retimer from 'retimer'
-import { AbortOptions, CustomEvent, EventEmitter, Startable } from '@libp2p/interfaces'
+import type { AbortOptions } from '@libp2p/interfaces'
+import { CustomEvent, EventEmitter } from '@libp2p/interfaces/events'
+import type { Startable } from '@libp2p/interfaces/startable'
 import { trackedMap } from '@libp2p/tracked-map'
 import { codes } from '../errors.js'
 import { isPeerId, PeerId } from '@libp2p/interfaces/peer-id'
diff --git a/src/connection-manager/latency-monitor.ts b/src/connection-manager/latency-monitor.ts
index bb7ce626..3d975cc8 100644
--- a/src/connection-manager/latency-monitor.ts
+++ b/src/connection-manager/latency-monitor.ts
@@ -2,7 +2,7 @@
  * This code is based on `latency-monitor` (https://github.com/mlucool/latency-monitor) by `mlucool` (https://github.com/mlucool), available under Apache License 2.0 (https://github.com/mlucool/latency-monitor/blob/master/LICENSE)
  */
 
-import { CustomEvent, EventEmitter } from '@libp2p/interfaces'
+import { CustomEvent, EventEmitter } from '@libp2p/interfaces/events'
 import { VisibilityChangeEmitter } from './visibility-change-emitter.js'
 import { logger } from '@libp2p/logger'
 
diff --git a/src/connection-manager/visibility-change-emitter.ts b/src/connection-manager/visibility-change-emitter.ts
index 0eddbf39..1e0d2ab6 100644
--- a/src/connection-manager/visibility-change-emitter.ts
+++ b/src/connection-manager/visibility-change-emitter.ts
@@ -2,7 +2,7 @@
  * This code is based on `latency-monitor` (https://github.com/mlucool/latency-monitor) by `mlucool` (https://github.com/mlucool), available under Apache License 2.0 (https://github.com/mlucool/latency-monitor/blob/master/LICENSE)
  */
 
-import { CustomEvent, EventEmitter } from '@libp2p/interfaces'
+import { CustomEvent, EventEmitter } from '@libp2p/interfaces/events'
 import { logger } from '@libp2p/logger'
 
 const log = logger('libp2p:connection-manager:latency-monitor:visibility-change-emitter')
diff --git a/src/content-routing/index.ts b/src/content-routing/index.ts
index a52450c9..b8406984 100644
--- a/src/content-routing/index.ts
+++ b/src/content-routing/index.ts
@@ -9,7 +9,8 @@ import drain from 'it-drain'
 import merge from 'it-merge'
 import { pipe } from 'it-pipe'
 import type { ContentRouting } from '@libp2p/interfaces/content-routing'
-import type { AbortOptions, Startable } from '@libp2p/interfaces'
+import type { AbortOptions } from '@libp2p/interfaces'
+import type { Startable } from '@libp2p/interfaces/startable'
 import type { CID } from 'multiformats/cid'
 import type { Components } from '@libp2p/interfaces/components'
 
diff --git a/src/dht/dummy-dht.ts b/src/dht/dummy-dht.ts
index 77a9c4a3..6fd899f5 100644
--- a/src/dht/dummy-dht.ts
+++ b/src/dht/dummy-dht.ts
@@ -2,7 +2,7 @@ import type { DualDHT, QueryEvent, SingleDHT } from '@libp2p/interfaces/dht'
 import type { PeerDiscoveryEvents } from '@libp2p/interfaces/peer-discovery'
 import errCode from 'err-code'
 import { messages, codes } from '../errors.js'
-import { EventEmitter } from '@libp2p/interfaces'
+import { EventEmitter } from '@libp2p/interfaces/events'
 
 export class DummyDHT extends EventEmitter<PeerDiscoveryEvents> implements DualDHT {
   get wan (): SingleDHT {
diff --git a/src/fetch/index.ts b/src/fetch/index.ts
index 4e4e54fd..5ae9b67c 100644
--- a/src/fetch/index.ts
+++ b/src/fetch/index.ts
@@ -6,7 +6,7 @@ import { FetchRequest, FetchResponse } from './pb/proto.js'
 import { handshake } from 'it-handshake'
 import { PROTOCOL } from './constants.js'
 import type { PeerId } from '@libp2p/interfaces/peer-id'
-import type { Startable } from '@libp2p/interfaces'
+import type { Startable } from '@libp2p/interfaces/startable'
 import type { Stream } from '@libp2p/interfaces/connection'
 import type { IncomingStreamData } from '@libp2p/interfaces/registrar'
 import type { Components } from '@libp2p/interfaces/components'
diff --git a/src/identify/index.ts b/src/identify/index.ts
index 879b9ca6..023c289c 100644
--- a/src/identify/index.ts
+++ b/src/identify/index.ts
@@ -22,7 +22,7 @@ import {
 import { codes } from '../errors.js'
 import type { IncomingStreamData } from '@libp2p/interfaces/registrar'
 import type { Connection } from '@libp2p/interfaces/connection'
-import type { Startable } from '@libp2p/interfaces'
+import type { Startable } from '@libp2p/interfaces/startable'
 import { peerIdFromKeys } from '@libp2p/peer-id'
 import type { Components } from '@libp2p/interfaces/components'
 
diff --git a/src/index.ts b/src/index.ts
index 94e236f1..7d411bed 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -1,5 +1,7 @@
 import { createLibp2pNode } from './libp2p.js'
-import type { AbortOptions, EventEmitter, RecursivePartial, Startable } from '@libp2p/interfaces'
+import type { AbortOptions, RecursivePartial } from '@libp2p/interfaces'
+import type { EventEmitter } from '@libp2p/interfaces/events'
+import type { Startable } from '@libp2p/interfaces/startable'
 import type { Multiaddr } from '@multiformats/multiaddr'
 import type { FaultTolerance } from './transport-manager.js'
 import type { HostProperties } from './identify/index.js'
diff --git a/src/libp2p.ts b/src/libp2p.ts
index 1f4e23eb..611dbe10 100644
--- a/src/libp2p.ts
+++ b/src/libp2p.ts
@@ -1,5 +1,7 @@
 import { logger } from '@libp2p/logger'
-import { AbortOptions, EventEmitter, Startable, CustomEvent, isStartable } from '@libp2p/interfaces'
+import type { AbortOptions } from '@libp2p/interfaces'
+import { EventEmitter, CustomEvent } from '@libp2p/interfaces/events'
+import { Startable, isStartable } from '@libp2p/interfaces/startable'
 import type { Multiaddr } from '@multiformats/multiaddr'
 import { MemoryDatastore } from 'datastore-core/memory'
 import { DefaultPeerRouting } from './peer-routing.js'
diff --git a/src/metrics/index.ts b/src/metrics/index.ts
index bf632fa2..47b560c2 100644
--- a/src/metrics/index.ts
+++ b/src/metrics/index.ts
@@ -5,7 +5,7 @@ import { METRICS as defaultOptions } from '../constants.js'
 import { DefaultStats, StatsInit } from './stats.js'
 import type { ComponentMetricsUpdate, Metrics, Stats, TrackStreamOptions } from '@libp2p/interfaces/metrics'
 import type { PeerId } from '@libp2p/interfaces/peer-id'
-import type { Startable } from '@libp2p/interfaces'
+import type { Startable } from '@libp2p/interfaces/startable'
 import type { Duplex } from 'it-stream-types'
 
 const initialCounters: ['dataReceived', 'dataSent'] = [
diff --git a/src/metrics/stats.ts b/src/metrics/stats.ts
index 9806ab61..2e50bff8 100644
--- a/src/metrics/stats.ts
+++ b/src/metrics/stats.ts
@@ -1,4 +1,4 @@
-import { CustomEvent, EventEmitter } from '@libp2p/interfaces'
+import { CustomEvent, EventEmitter } from '@libp2p/interfaces/events'
 import { createMovingAverage } from './moving-average.js'
 // @ts-expect-error no types
 import retimer from 'retimer'
diff --git a/src/nat-manager.ts b/src/nat-manager.ts
index 978efa64..0d53fdfe 100644
--- a/src/nat-manager.ts
+++ b/src/nat-manager.ts
@@ -7,7 +7,7 @@ import * as pkg from './version.js'
 import errCode from 'err-code'
 import { codes } from './errors.js'
 import { isLoopback } from '@libp2p/utils/multiaddr/is-loopback'
-import type { Startable } from '@libp2p/interfaces'
+import type { Startable } from '@libp2p/interfaces/startable'
 import type { Components } from '@libp2p/interfaces/components'
 
 const log = logger('libp2p:nat')
diff --git a/src/peer-record-updater.ts b/src/peer-record-updater.ts
index 340508a6..9a38db8b 100644
--- a/src/peer-record-updater.ts
+++ b/src/peer-record-updater.ts
@@ -1,6 +1,6 @@
 import { RecordEnvelope, PeerRecord } from '@libp2p/peer-record'
 import type { Components } from '@libp2p/interfaces/components'
-import type { Startable } from '@libp2p/interfaces'
+import type { Startable } from '@libp2p/interfaces/startable'
 import { logger } from '@libp2p/logger'
 import { protocols } from '@multiformats/multiaddr'
 
diff --git a/src/peer-routing.ts b/src/peer-routing.ts
index 4e95ff5c..7f0b4591 100644
--- a/src/peer-routing.ts
+++ b/src/peer-routing.ts
@@ -21,7 +21,8 @@ import {
 import { setMaxListeners } from 'events'
 import type { PeerId } from '@libp2p/interfaces/peer-id'
 import type { PeerRouting } from '@libp2p/interfaces/peer-routing'
-import type { AbortOptions, Startable } from '@libp2p/interfaces'
+import type { AbortOptions } from '@libp2p/interfaces'
+import type { Startable } from '@libp2p/interfaces/startable'
 import type { PeerInfo } from '@libp2p/interfaces/peer-info'
 import type { Components } from '@libp2p/interfaces/components'
 
diff --git a/src/ping/index.ts b/src/ping/index.ts
index 72c909b7..03cceffe 100644
--- a/src/ping/index.ts
+++ b/src/ping/index.ts
@@ -8,7 +8,7 @@ import { equals as uint8ArrayEquals } from 'uint8arrays/equals'
 import { PROTOCOL_NAME, PING_LENGTH, PROTOCOL_VERSION } from './constants.js'
 import type { IncomingStreamData } from '@libp2p/interfaces/registrar'
 import type { PeerId } from '@libp2p/interfaces/peer-id'
-import type { Startable } from '@libp2p/interfaces'
+import type { Startable } from '@libp2p/interfaces/startable'
 import type { Components } from '@libp2p/interfaces/components'
 
 const log = logger('libp2p:ping')
diff --git a/src/pubsub/dummy-pubsub.ts b/src/pubsub/dummy-pubsub.ts
index 15fe0536..b44efcb5 100644
--- a/src/pubsub/dummy-pubsub.ts
+++ b/src/pubsub/dummy-pubsub.ts
@@ -1,4 +1,4 @@
-import { EventEmitter } from '@libp2p/interfaces'
+import { EventEmitter } from '@libp2p/interfaces/events'
 import type { PeerId } from '@libp2p/interfaces/peer-id'
 import type { PublishResult, PubSub, PubSubEvents, StrictNoSign, StrictSign } from '@libp2p/interfaces/pubsub'
 import errCode from 'err-code'
diff --git a/src/transport-manager.ts b/src/transport-manager.ts
index 2eab5cb7..ba76aa78 100644
--- a/src/transport-manager.ts
+++ b/src/transport-manager.ts
@@ -5,7 +5,9 @@ import errCode from 'err-code'
 import type { Listener, Transport, TransportManager, TransportManagerEvents } from '@libp2p/interfaces/transport'
 import type { Multiaddr } from '@multiformats/multiaddr'
 import type { Connection } from '@libp2p/interfaces/connection'
-import { AbortOptions, CustomEvent, EventEmitter, Startable } from '@libp2p/interfaces'
+import type { AbortOptions } from '@libp2p/interfaces'
+import { CustomEvent, EventEmitter } from '@libp2p/interfaces/events'
+import type { Startable } from '@libp2p/interfaces/startable'
 import type { Components } from '@libp2p/interfaces/components'
 import { trackedMap } from '@libp2p/tracked-map'
 
diff --git a/src/upgrader.ts b/src/upgrader.ts
index 12e6ee77..109f2c2e 100644
--- a/src/upgrader.ts
+++ b/src/upgrader.ts
@@ -6,7 +6,7 @@ import { pipe } from 'it-pipe'
 import mutableProxy from 'mutable-proxy'
 import { codes } from './errors.js'
 import { createConnection } from '@libp2p/connection'
-import { CustomEvent, EventEmitter } from '@libp2p/interfaces'
+import { CustomEvent, EventEmitter } from '@libp2p/interfaces/events'
 import { peerIdFromString } from '@libp2p/peer-id'
 import type { Connection, ProtocolStream, Stream } from '@libp2p/interfaces/connection'
 import type { ConnectionEncrypter, SecuredConnection } from '@libp2p/interfaces/connection-encrypter'
diff --git a/test/connection-manager/index.node.ts b/test/connection-manager/index.node.ts
index 5aaa18c5..9c053b0e 100644
--- a/test/connection-manager/index.node.ts
+++ b/test/connection-manager/index.node.ts
@@ -8,7 +8,7 @@ import type { Libp2p } from '../../src/index.js'
 import type { PeerId } from '@libp2p/interfaces/peer-id'
 import { DefaultConnectionManager } from '../../src/connection-manager/index.js'
 import { Components } from '@libp2p/interfaces/components'
-import { CustomEvent } from '@libp2p/interfaces'
+import { CustomEvent } from '@libp2p/interfaces/events'
 import * as STATUS from '@libp2p/interfaces/connection/status'
 import { stubInterface } from 'ts-sinon'
 import type { KeyBook, PeerStore } from '@libp2p/interfaces/peer-store'
@@ -18,7 +18,7 @@ import type { Connection } from '@libp2p/interfaces/connection'
 import delay from 'delay'
 import type { Libp2pNode } from '../../src/libp2p.js'
 import { codes } from '../../src/errors.js'
-import { start } from '@libp2p/interface-compliance-tests'
+import { start } from '@libp2p/interfaces/startable'
 
 describe('Connection Manager', () => {
   let libp2p: Libp2p
diff --git a/test/connection-manager/index.spec.ts b/test/connection-manager/index.spec.ts
index 10cd669e..83a520f7 100644
--- a/test/connection-manager/index.spec.ts
+++ b/test/connection-manager/index.spec.ts
@@ -8,7 +8,7 @@ import type { Libp2pNode } from '../../src/libp2p.js'
 import type { DefaultConnectionManager } from '../../src/connection-manager/index.js'
 import { mockConnection, mockDuplex, mockMultiaddrConnection } from '@libp2p/interface-compliance-tests/mocks'
 import { createEd25519PeerId } from '@libp2p/peer-id-factory'
-import { CustomEvent } from '@libp2p/interfaces'
+import { CustomEvent } from '@libp2p/interfaces/events'
 
 describe('Connection Manager', () => {
   let libp2p: Libp2pNode
diff --git a/test/content-routing/dht/operation.node.ts b/test/content-routing/dht/operation.node.ts
index e57a06f9..65bee28f 100644
--- a/test/content-routing/dht/operation.node.ts
+++ b/test/content-routing/dht/operation.node.ts
@@ -8,7 +8,7 @@ import { subsystemMulticodecs, createSubsystemOptions } from './utils.js'
 import { createPeerId } from '../../utils/creators/peer.js'
 import type { PeerId } from '@libp2p/interfaces/peer-id'
 import { createLibp2pNode, Libp2pNode } from '../../../src/libp2p.js'
-import { start } from '@libp2p/interface-compliance-tests'
+import { start } from '@libp2p/interfaces/startable'
 
 const listenAddr = new Multiaddr('/ip4/127.0.0.1/tcp/8000')
 const remoteListenAddr = new Multiaddr('/ip4/127.0.0.1/tcp/8001')
diff --git a/test/identify/index.spec.ts b/test/identify/index.spec.ts
index 228d6a6f..df47bc58 100644
--- a/test/identify/index.spec.ts
+++ b/test/identify/index.spec.ts
@@ -27,14 +27,14 @@ import {
 } from '../../src/identify/consts.js'
 import { DefaultConnectionManager } from '../../src/connection-manager/index.js'
 import { DefaultTransportManager } from '../../src/transport-manager.js'
-import { CustomEvent } from '@libp2p/interfaces'
+import { CustomEvent } from '@libp2p/interfaces/events'
 import delay from 'delay'
 import pWaitFor from 'p-wait-for'
 import { peerIdFromString } from '@libp2p/peer-id'
 import type { PeerId } from '@libp2p/interfaces/peer-id'
 import type { Libp2pNode } from '../../src/libp2p.js'
 import { pEvent } from 'p-event'
-import { start, stop } from '@libp2p/interface-compliance-tests'
+import { start, stop } from '@libp2p/interfaces/startable'
 
 const listenMaddrs = [new Multiaddr('/ip4/127.0.0.1/tcp/15002/ws')]
 
diff --git a/test/peer-discovery/index.node.ts b/test/peer-discovery/index.node.ts
index 7701b470..f3325075 100644
--- a/test/peer-discovery/index.node.ts
+++ b/test/peer-discovery/index.node.ts
@@ -13,7 +13,7 @@ import { createBaseOptions } from '../utils/base-options.js'
 import { createPeerId } from '../utils/creators/peer.js'
 import type { PeerId } from '@libp2p/interfaces/peer-id'
 import { createLibp2pNode, Libp2pNode } from '../../src/libp2p.js'
-import { CustomEvent } from '@libp2p/interfaces'
+import { CustomEvent } from '@libp2p/interfaces/events'
 import type { PeerInfo } from '@libp2p/interfaces/peer-info'
 
 const listenAddr = new Multiaddr('/ip4/127.0.0.1/tcp/0')
diff --git a/test/peer-discovery/index.spec.ts b/test/peer-discovery/index.spec.ts
index 83e81cfa..6e453c5c 100644
--- a/test/peer-discovery/index.spec.ts
+++ b/test/peer-discovery/index.spec.ts
@@ -9,7 +9,7 @@ import { createPeerId } from '../utils/creators/peer.js'
 import { isPeerId, PeerId } from '@libp2p/interfaces/peer-id'
 import { createLibp2pNode, Libp2pNode } from '../../src/libp2p.js'
 import { mockConnection, mockDuplex, mockMultiaddrConnection } from '@libp2p/interface-compliance-tests/mocks'
-import type { Startable } from '@libp2p/interfaces'
+import type { Startable } from '@libp2p/interfaces/startable'
 
 describe('peer discovery', () => {
   describe('basic functions', () => {
diff --git a/test/registrar/registrar.spec.ts b/test/registrar/registrar.spec.ts
index a4837b7f..6b49bec8 100644
--- a/test/registrar/registrar.spec.ts
+++ b/test/registrar/registrar.spec.ts
@@ -14,7 +14,7 @@ import type { PeerId } from '@libp2p/interfaces/peer-id'
 import { Components } from '@libp2p/interfaces/components'
 import { createLibp2pNode, Libp2pNode } from '../../src/libp2p.js'
 import { createEd25519PeerId } from '@libp2p/peer-id-factory'
-import { CustomEvent } from '@libp2p/interfaces'
+import { CustomEvent } from '@libp2p/interfaces/events'
 import type { Connection } from '@libp2p/interfaces/connection'
 import { DefaultConnectionManager } from '../../src/connection-manager/index.js'
 import { Plaintext } from '../../src/insecure/index.js'