diff --git a/src/devices/cpu/z180/z180.cpp b/src/devices/cpu/z180/z180.cpp
index 510075b041d..32b0fab76df 100644
--- a/src/devices/cpu/z180/z180.cpp
+++ b/src/devices/cpu/z180/z180.cpp
@@ -123,7 +123,7 @@ hd64180rp_device::hd64180rp_device(const machine_config &mconfig, const char *ta
 	: z180_device(mconfig, HD64180RP, tag, owner, clock, false, address_map_constructor())
 {
 	// 64-pin DIP versions omit A19
-	set_data_width(19);
+	set_address_width(19);
 }
 
 z8s180_device::z8s180_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
@@ -451,10 +451,10 @@ static std::unique_ptr<uint8_t[]> SZHVC_sub;
 #include "z180op.hxx"
 
 
-void z180_device::set_data_width(int bits)
+void z180_device::set_address_width(int bits)
 {
-	m_program_config.m_data_width = bits;
-	m_decrypted_opcodes_config.m_data_width = bits;
+	m_program_config.m_addr_width = bits;
+	m_decrypted_opcodes_config.m_addr_width = bits;
 }
 
 device_memory_interface::space_config_vector z180_device::memory_space_config() const
diff --git a/src/devices/cpu/z180/z180.h b/src/devices/cpu/z180/z180.h
index 25b93f8a07e..a19fcd821a8 100644
--- a/src/devices/cpu/z180/z180.h
+++ b/src/devices/cpu/z180/z180.h
@@ -147,7 +147,7 @@ protected:
 	address_space_config m_io_config;
 	address_space_config m_decrypted_opcodes_config;
 
-	void set_data_width(int bits);
+	void set_address_width(int bits);
 
 private:
 	int memory_wait_states() const { return (m_dcntl & 0xc0) >> 6; }