diff --git a/netadapter/netadaptermock/log.go b/netadapter/standalone/log.go
similarity index 89%
rename from netadapter/netadaptermock/log.go
rename to netadapter/standalone/log.go
index 3c684c772..722c0ec3c 100644
--- a/netadapter/netadaptermock/log.go
+++ b/netadapter/standalone/log.go
@@ -1,4 +1,4 @@
-package netadaptermock
+package standalone
 
 import (
 	"github.com/kaspanet/kaspad/logger"
diff --git a/netadapter/netadaptermock/net_adapter_mock.go b/netadapter/standalone/net_adapter.go
similarity index 90%
rename from netadapter/netadaptermock/net_adapter_mock.go
rename to netadapter/standalone/net_adapter.go
index c0fb73817..226ccd120 100644
--- a/netadapter/netadaptermock/net_adapter_mock.go
+++ b/netadapter/standalone/net_adapter.go
@@ -1,4 +1,4 @@
-package netadaptermock
+package standalone
 
 import (
 	"sync"
@@ -17,16 +17,16 @@ import (
 	"github.com/pkg/errors"
 )
 
-// NetAdapterMock allows tests and other tools to mockup a simple network adapter without implementing all the required
-// supporting structures.
-type NetAdapterMock struct {
+// MinimalNetAdapter allows tests and other tools to use a simple network adapter without implementing
+// all the required supporting structures.
+type MinimalNetAdapter struct {
 	lock       sync.Mutex
 	netAdapter *netadapter.NetAdapter
 	routesChan <-chan *Routes
 }
 
-// New creates a new instance of a NetAdapterMock
-func New(cfg *config.Config) (*NetAdapterMock, error) {
+// NewMinimalNetAdapter creates a new instance of a MinimalNetAdapter
+func NewMinimalNetAdapter(cfg *config.Config) (*MinimalNetAdapter, error) {
 	netAdapter, err := netadapter.NewNetAdapter(cfg)
 	if err != nil {
 		return nil, errors.Wrap(err, "Error starting netAdapter")
@@ -40,7 +40,7 @@ func New(cfg *config.Config) (*NetAdapterMock, error) {
 		return nil, errors.Wrap(err, "Error starting netAdapter")
 	}
 
-	return &NetAdapterMock{
+	return &MinimalNetAdapter{
 		lock:       sync.Mutex{},
 		netAdapter: netAdapter,
 		routesChan: routesChan,
@@ -51,7 +51,7 @@ func New(cfg *config.Config) (*NetAdapterMock, error) {
 // To simplify usage the return type contains only two routes:
 // OutgoingRoute - for all outgoing messages
 // IncomingRoute - for all incoming messages (excluding handshake messages)
-func (nam *NetAdapterMock) Connect(address string) (*Routes, error) {
+func (nam *MinimalNetAdapter) Connect(address string) (*Routes, error) {
 	nam.lock.Lock()
 	defer nam.lock.Unlock()
 
diff --git a/netadapter/netadaptermock/routes.go b/netadapter/standalone/routes.go
similarity index 92%
rename from netadapter/netadaptermock/routes.go
rename to netadapter/standalone/routes.go
index 1c65fe22d..bca16ed69 100644
--- a/netadapter/netadaptermock/routes.go
+++ b/netadapter/standalone/routes.go
@@ -1,4 +1,4 @@
-package netadaptermock
+package standalone
 
 import (
 	"time"
@@ -11,7 +11,7 @@ import (
 	"github.com/kaspanet/kaspad/wire"
 )
 
-// Routes holds the incoming and outgoing routes of a connection created by NetAdapterMock
+// Routes holds the incoming and outgoing routes of a connection created by MinimalNetAdapter
 type Routes struct {
 	netConnection                *netadapter.NetConnection
 	IncomingRoute, OutgoingRoute *router.Route
@@ -48,7 +48,7 @@ func (r *Routes) WaitForDisconnect(timeout time.Duration) error {
 	}
 }
 
-// Close closes all the routes in this Routes object
+// Disconnect closes the connection behind the routes, thus closing all routes
 func (r *Routes) Disconnect() {
 	r.netConnection.Disconnect()
 }