diff --git a/control/noise/conn.go b/control/controlbase/conn.go
similarity index 99%
rename from control/noise/conn.go
rename to control/controlbase/conn.go
index 928de5ff3..0e28f4d08 100644
--- a/control/noise/conn.go
+++ b/control/controlbase/conn.go
@@ -7,7 +7,7 @@
 //
 // The base transport implements Noise IK, instantiated with
 // Curve25519, ChaCha20Poly1305 and BLAKE2s.
-package noise
+package controlbase
 
 import (
 	"crypto/cipher"
diff --git a/control/noise/conn_test.go b/control/controlbase/conn_test.go
similarity index 99%
rename from control/noise/conn_test.go
rename to control/controlbase/conn_test.go
index e87e4e159..a8328bd0b 100644
--- a/control/noise/conn_test.go
+++ b/control/controlbase/conn_test.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-package noise
+package controlbase
 
 import (
 	"bufio"
diff --git a/control/noise/handshake.go b/control/controlbase/handshake.go
similarity index 99%
rename from control/noise/handshake.go
rename to control/controlbase/handshake.go
index 79419f62b..57606581c 100644
--- a/control/noise/handshake.go
+++ b/control/controlbase/handshake.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-package noise
+package controlbase
 
 import (
 	"context"
diff --git a/control/noise/handshake_test.go b/control/controlbase/handshake_test.go
similarity index 99%
rename from control/noise/handshake_test.go
rename to control/controlbase/handshake_test.go
index 6ef228552..a5664c11a 100644
--- a/control/noise/handshake_test.go
+++ b/control/controlbase/handshake_test.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-package noise
+package controlbase
 
 import (
 	"bytes"
diff --git a/control/noise/interop_test.go b/control/controlbase/interop_test.go
similarity index 99%
rename from control/noise/interop_test.go
rename to control/controlbase/interop_test.go
index cb2b8ae3b..04bd7f41d 100644
--- a/control/noise/interop_test.go
+++ b/control/controlbase/interop_test.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-package noise
+package controlbase
 
 import (
 	"context"
diff --git a/control/noise/messages.go b/control/controlbase/messages.go
similarity index 99%
rename from control/noise/messages.go
rename to control/controlbase/messages.go
index 658cec314..2a64d4585 100644
--- a/control/noise/messages.go
+++ b/control/controlbase/messages.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-package noise
+package controlbase
 
 import "encoding/binary"
 
diff --git a/control/noise/noiseexplorer_test.go b/control/controlbase/noiseexplorer_test.go
similarity index 99%
rename from control/noise/noiseexplorer_test.go
rename to control/controlbase/noiseexplorer_test.go
index cd70be713..7407ae533 100644
--- a/control/noise/noiseexplorer_test.go
+++ b/control/controlbase/noiseexplorer_test.go
@@ -24,7 +24,7 @@
  * PARAMETERS                                                       *
  * ---------------------------------------------------------------- */
 
-package noise
+package controlbase
 
 import (
 	"crypto/rand"
diff --git a/scripts/check_license_headers.sh b/scripts/check_license_headers.sh
index e3558efa7..3d6eb20e1 100755
--- a/scripts/check_license_headers.sh
+++ b/scripts/check_license_headers.sh
@@ -41,7 +41,7 @@ for file in $(find $1 -name '*.go' -not -path '*/.git/*'); do
 		*_string.go)
 			# Generated file from go:generate stringer
 		;;
-		$1/control/noise/noiseexplorer_test.go)
+		$1/control/controlbase/noiseexplorer_test.go)
 			# Noiseexplorer.com copyright.
 		;;
         *)