diff --git a/scripts/src/cpu.lua b/scripts/src/cpu.lua
index eb2b3a6caca..21946964984 100644
--- a/scripts/src/cpu.lua
+++ b/scripts/src/cpu.lua
@@ -3418,13 +3418,13 @@ if CPUS["NS32000"] then
 	files {
 		MAME_DIR .. "src/devices/cpu/ns32000/ns32000.cpp",
 		MAME_DIR .. "src/devices/cpu/ns32000/ns32000.h",
-		MAME_DIR .. "src/devices/cpu/ns32000/slave.h",
+		MAME_DIR .. "src/devices/cpu/ns32000/common.h",
 	}
 end
 
 if opt_tool(CPUS, "NS32000") then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/ns32000/ns32000dasm.cpp")
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/ns32000/ns32000dasm.h")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/ns32000/ns32000d.cpp")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/ns32000/ns32000d.h")
 end
 
 --------------------------------------------------
diff --git a/src/devices/cpu/ns32000/slave.h b/src/devices/cpu/ns32000/common.h
similarity index 94%
rename from src/devices/cpu/ns32000/slave.h
rename to src/devices/cpu/ns32000/common.h
index 576689f2c04..dfea595cb58 100644
--- a/src/devices/cpu/ns32000/slave.h
+++ b/src/devices/cpu/ns32000/common.h
@@ -1,8 +1,8 @@
 // license:BSD-3-Clause
 // copyright-holders:Patrick Mackinlay
 
-#ifndef MAME_CPU_NS32000_SLAVE_H
-#define MAME_CPU_NS32000_SLAVE_H
+#ifndef MAME_CPU_NS32000_COMMON_H
+#define MAME_CPU_NS32000_COMMON_H
 
 #pragma once
 
@@ -80,4 +80,4 @@ protected:
 	}
 };
 
-#endif // MAME_CPU_NS32000_SLAVE_H
+#endif // MAME_CPU_NS32000_COMMON_H
diff --git a/src/devices/cpu/ns32000/ns32000.cpp b/src/devices/cpu/ns32000/ns32000.cpp
index b4076283c3c..10b2fbf330c 100644
--- a/src/devices/cpu/ns32000/ns32000.cpp
+++ b/src/devices/cpu/ns32000/ns32000.cpp
@@ -4,7 +4,7 @@
 #include "emu.h"
 
 #include "ns32000.h"
-#include "ns32000dasm.h"
+#include "ns32000d.h"
 #include "debug/debugcpu.h"
 
 DEFINE_DEVICE_TYPE(NS32008, ns32008_device, "ns32008", "National Semiconductor NS32008")
diff --git a/src/devices/cpu/ns32000/ns32000.h b/src/devices/cpu/ns32000/ns32000.h
index 763751700ff..fe41fadee7a 100644
--- a/src/devices/cpu/ns32000/ns32000.h
+++ b/src/devices/cpu/ns32000/ns32000.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "slave.h"
+#include "common.h"
 
 template <int Width>
 class ns32000_device : public cpu_device
diff --git a/src/devices/cpu/ns32000/ns32000dasm.cpp b/src/devices/cpu/ns32000/ns32000d.cpp
similarity index 99%
rename from src/devices/cpu/ns32000/ns32000dasm.cpp
rename to src/devices/cpu/ns32000/ns32000d.cpp
index d269a27b7ef..560c36e07e7 100644
--- a/src/devices/cpu/ns32000/ns32000dasm.cpp
+++ b/src/devices/cpu/ns32000/ns32000d.cpp
@@ -3,7 +3,7 @@
 
 #include "emu.h"
 
-#include "ns32000dasm.h"
+#include "ns32000d.h"
 
 char const *const cond_code[] = { "EQ", "NE", "CS", "CC", "HI", "LS", "GT", "LE", "FS", "FC", "LO", "HS", "LT", "GE", "R", "N" };
 char const size_char[] = { 'B','W',' ','D' };
diff --git a/src/devices/cpu/ns32000/ns32000dasm.h b/src/devices/cpu/ns32000/ns32000d.h
similarity index 90%
rename from src/devices/cpu/ns32000/ns32000dasm.h
rename to src/devices/cpu/ns32000/ns32000d.h
index 7b29504cb88..299c22bf04d 100644
--- a/src/devices/cpu/ns32000/ns32000dasm.h
+++ b/src/devices/cpu/ns32000/ns32000d.h
@@ -1,8 +1,8 @@
 // license:BSD-3-Clause
 // copyright-holders:Patrick Mackinlay
 
-#ifndef MAME_CPU_NS32000_NS32000DASM_H
-#define MAME_CPU_NS32000_NS32000DASM_H
+#ifndef MAME_CPU_NS32000_NS32000D_H
+#define MAME_CPU_NS32000_NS32000D_H
 
 #pragma once
 
@@ -49,4 +49,4 @@ protected:
 	std::string config(u8 imm);
 };
 
-#endif // MAME_CPU_NS32000_NS32000DASM_H
+#endif // MAME_CPU_NS32000_NS32000D_H
diff --git a/src/devices/machine/ns32081.cpp b/src/devices/machine/ns32081.cpp
index d6f00c2a0b7..34c39a3e5a9 100644
--- a/src/devices/machine/ns32081.cpp
+++ b/src/devices/machine/ns32081.cpp
@@ -5,7 +5,7 @@
  * National Semiconductor 32081 Floating-Point Unit.
  *
  * Sources:
- *   - http://bitsavers.org/components/national/_dataBooks/1989_National_Microprocessor_Databook_32000_NSC800.pdf
+ *   - Microrprocessor Databook, Series 32000, NSC800, 1989 Edition, National Semiconductor
  *
  * TODO:
  *   - testing
diff --git a/src/devices/machine/ns32081.h b/src/devices/machine/ns32081.h
index e73fa8013f6..b7de5cbab92 100644
--- a/src/devices/machine/ns32081.h
+++ b/src/devices/machine/ns32081.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "cpu/ns32000/slave.h"
+#include "cpu/ns32000/common.h"
 
 class ns32081_device
 	: public device_t
diff --git a/src/devices/machine/ns32082.cpp b/src/devices/machine/ns32082.cpp
index 2fe2469420f..24e9e77ae6b 100644
--- a/src/devices/machine/ns32082.cpp
+++ b/src/devices/machine/ns32082.cpp
@@ -5,7 +5,7 @@
  * National Semiconductor 32082 Memory Management Unit.
  *
  * Sources:
- *   - http://bitsavers.org/components/national/_dataBooks/1988_National_Series_32000_Microprocessors_Databook.pdf
+ *   - Microrprocessor Databook, Series 32000, NSC800, 1989 Edition, National Semiconductor
  *
  * TODO:
  *   - tlb
diff --git a/src/devices/machine/ns32082.h b/src/devices/machine/ns32082.h
index 83238529e6b..d3ad63c8a60 100644
--- a/src/devices/machine/ns32082.h
+++ b/src/devices/machine/ns32082.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "cpu/ns32000/slave.h"
+#include "cpu/ns32000/common.h"
 
 class ns32082_device
 	: public device_t
diff --git a/src/devices/machine/ns32202.cpp b/src/devices/machine/ns32202.cpp
index 008c2c855dc..1bf288c2cbd 100644
--- a/src/devices/machine/ns32202.cpp
+++ b/src/devices/machine/ns32202.cpp
@@ -6,7 +6,7 @@
  *
  * Sources:
  *
- *  http://bitsavers.org/components/national/_dataBooks/1989_National_Microprocessor_Databook_32000_NSC800.pdf
+ *  Microrprocessor Databook, Series 32000, NSC800, 1989 Edition, National Semiconductor
  *
  * TODO
  *   - timer/counter
diff --git a/src/devices/machine/ns32382.cpp b/src/devices/machine/ns32382.cpp
index 464f9d9fa50..2994811d2d8 100644
--- a/src/devices/machine/ns32382.cpp
+++ b/src/devices/machine/ns32382.cpp
@@ -5,7 +5,7 @@
  * National Semiconductor 32382 Memory Management Unit.
  *
  * Sources:
- *   - http://bitsavers.org/components/national/_dataBooks/1988_National_Series_32000_Microprocessors_Databook.pdf
+ *   - Microrprocessor Databook, Series 32000, NSC800, 1989 Edition, National Semiconductor
  *
  * TODO:
  *   - tlb
diff --git a/src/devices/machine/ns32382.h b/src/devices/machine/ns32382.h
index d7730a70d68..f1862c83fe0 100644
--- a/src/devices/machine/ns32382.h
+++ b/src/devices/machine/ns32382.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "cpu/ns32000/slave.h"
+#include "cpu/ns32000/common.h"
 
 class ns32382_device
 	: public device_t
diff --git a/src/tools/unidasm.cpp b/src/tools/unidasm.cpp
index f1b5a34b4ad..798b6e3a108 100644
--- a/src/tools/unidasm.cpp
+++ b/src/tools/unidasm.cpp
@@ -132,7 +132,7 @@ using util::BIT;
 #include "cpu/nec/necdasm.h"
 #include "cpu/nios2/nios2dasm.h"
 #include "cpu/nova/novadasm.h"
-#include "cpu/ns32000/ns32000dasm.h"
+#include "cpu/ns32000/ns32000d.h"
 #include "cpu/nuon/nuondasm.h"
 #include "cpu/pace/pacedasm.h"
 #include "cpu/patinhofeio/patinho_feio_dasm.h"