diff --git a/chainntnfs/bitcoindnotify/bitcoind_debug.go b/chainntnfs/bitcoindnotify/bitcoind_dev.go
similarity index 99%
rename from chainntnfs/bitcoindnotify/bitcoind_debug.go
rename to chainntnfs/bitcoindnotify/bitcoind_dev.go
index 04cd030c6..f45cda091 100644
--- a/chainntnfs/bitcoindnotify/bitcoind_debug.go
+++ b/chainntnfs/bitcoindnotify/bitcoind_dev.go
@@ -1,4 +1,4 @@
-// +build debug
+// +build dev
 
 package bitcoindnotify
 
diff --git a/chainntnfs/bitcoindnotify/bitcoind_test.go b/chainntnfs/bitcoindnotify/bitcoind_test.go
index e65945b0e..8f731f382 100644
--- a/chainntnfs/bitcoindnotify/bitcoind_test.go
+++ b/chainntnfs/bitcoindnotify/bitcoind_test.go
@@ -1,4 +1,4 @@
-// +build debug
+// +build dev
 
 package bitcoindnotify
 
diff --git a/chainntnfs/btcdnotify/btcd_debug.go b/chainntnfs/btcdnotify/btcd_dev.go
similarity index 99%
rename from chainntnfs/btcdnotify/btcd_debug.go
rename to chainntnfs/btcdnotify/btcd_dev.go
index 1c91d3f69..af64dad81 100644
--- a/chainntnfs/btcdnotify/btcd_debug.go
+++ b/chainntnfs/btcdnotify/btcd_dev.go
@@ -1,4 +1,4 @@
-// +build debug
+// +build dev
 
 package btcdnotify
 
diff --git a/chainntnfs/btcdnotify/btcd_test.go b/chainntnfs/btcdnotify/btcd_test.go
index 239e0d9d6..6ef564d0e 100644
--- a/chainntnfs/btcdnotify/btcd_test.go
+++ b/chainntnfs/btcdnotify/btcd_test.go
@@ -1,4 +1,4 @@
-// +build debug
+// +build dev
 
 package btcdnotify
 
diff --git a/chainntnfs/interface_debug.go b/chainntnfs/interface_dev.go
similarity index 96%
rename from chainntnfs/interface_debug.go
rename to chainntnfs/interface_dev.go
index aeb3461ba..ac00fa8db 100644
--- a/chainntnfs/interface_debug.go
+++ b/chainntnfs/interface_dev.go
@@ -1,4 +1,4 @@
-// +build debug
+// +build dev
 
 package chainntnfs
 
diff --git a/chainntnfs/interface_test.go b/chainntnfs/interface_test.go
index f51d912b3..36006dcca 100644
--- a/chainntnfs/interface_test.go
+++ b/chainntnfs/interface_test.go
@@ -1,4 +1,4 @@
-// +build debug
+// +build dev
 
 package chainntnfs_test
 
diff --git a/chainntnfs/neutrinonotify/neutrino_debug.go b/chainntnfs/neutrinonotify/neutrino_dev.go
similarity index 99%
rename from chainntnfs/neutrinonotify/neutrino_debug.go
rename to chainntnfs/neutrinonotify/neutrino_dev.go
index 19085c38c..635f0d954 100644
--- a/chainntnfs/neutrinonotify/neutrino_debug.go
+++ b/chainntnfs/neutrinonotify/neutrino_dev.go
@@ -1,4 +1,4 @@
-// +build debug
+// +build dev
 
 package neutrinonotify
 
diff --git a/chainntnfs/test_utils.go b/chainntnfs/test_utils.go
index 44c844d09..bc3dae05c 100644
--- a/chainntnfs/test_utils.go
+++ b/chainntnfs/test_utils.go
@@ -1,4 +1,4 @@
-// +build debug
+// +build dev
 
 package chainntnfs