diff --git a/src/devices/bus/bbc/modem/scsiaiv.cpp b/src/devices/bus/bbc/modem/scsiaiv.cpp
index b3979acb9f9..deb75196810 100644
--- a/src/devices/bus/bbc/modem/scsiaiv.cpp
+++ b/src/devices/bus/bbc/modem/scsiaiv.cpp
@@ -24,7 +24,7 @@ DEFINE_DEVICE_TYPE(BBC_SCSIAIV, bbc_scsiaiv_device, "bbc_scsiaiv", "Acorn AIV SC
 //  device_add_mconfig - add device configuration
 //-------------------------------------------------
 
-void bbc_scsiaiv_device::device_add_mconfig(machine_config& config)
+void bbc_scsiaiv_device::device_add_mconfig(machine_config &config)
 {
 	NSCSI_BUS(config, "scsi");
 	NSCSI_CONNECTOR(config, "scsi:0", default_scsi_devices, nullptr);
@@ -36,7 +36,7 @@ void bbc_scsiaiv_device::device_add_mconfig(machine_config& config)
 		});
 }
 
-//void bbc_vp415_device::device_add_mconfig(machine_config& config)
+//void bbc_vp415_device::device_add_mconfig(machine_config &config)
 //{
 //  bbc_scsiaiv_device::device_add_mconfig(config);
 //
@@ -54,19 +54,19 @@ void bbc_scsiaiv_device::device_add_mconfig(machine_config& config)
 //  bbc_scsiaiv_device - constructor
 //-------------------------------------------------
 
-bbc_scsiaiv_device::bbc_scsiaiv_device(const machine_config& mconfig, device_type type, const char* tag, device_t* owner, uint32_t clock)
+bbc_scsiaiv_device::bbc_scsiaiv_device(const machine_config &mconfig, device_type type, const char* tag, device_t* owner, uint32_t clock)
 	: device_t(mconfig, type, tag, owner, clock)
 	, device_bbc_modem_interface(mconfig, *this)
 	, m_scsi(*this, "scsi:7:scsicb")
 {
 }
 
-bbc_scsiaiv_device::bbc_scsiaiv_device(const machine_config& mconfig, const char* tag, device_t* owner, uint32_t clock)
+bbc_scsiaiv_device::bbc_scsiaiv_device(const machine_config &mconfig, const char* tag, device_t* owner, uint32_t clock)
 	: bbc_scsiaiv_device(mconfig, BBC_SCSIAIV, tag, owner, clock)
 {
 }
 
-//bbc_vp415_device::bbc_vp415_device(const machine_config& mconfig, const char* tag, device_t* owner, uint32_t clock)
+//bbc_vp415_device::bbc_vp415_device(const machine_config &mconfig, const char* tag, device_t* owner, uint32_t clock)
 //  : bbc_scsiaiv_device(mconfig, BBC_VP415, tag, owner, clock)
 //{
 //}
diff --git a/src/devices/bus/bbc/modem/scsiaiv.h b/src/devices/bus/bbc/modem/scsiaiv.h
index 81f73f8c369..5c194c655b4 100644
--- a/src/devices/bus/bbc/modem/scsiaiv.h
+++ b/src/devices/bus/bbc/modem/scsiaiv.h
@@ -7,8 +7,8 @@
 **********************************************************************/
 
 
-#ifndef MAME_BUS_BBC_1MHZBUS_SCSIAIV_H
-#define MAME_BUS_BBC_1MHZBUS_SCSIAIV_H
+#ifndef MAME_BUS_BBC_MODEM_SCSIAIV_H
+#define MAME_BUS_BBC_MODEM_SCSIAIV_H
 
 #include "modem.h"
 #include "machine/nscsi_cb.h"
@@ -24,19 +24,19 @@ class bbc_scsiaiv_device:
 {
 public:
 	// construction/destruction
-	bbc_scsiaiv_device(const machine_config& mconfig, const char* tag, device_t* owner, uint32_t clock);
+	bbc_scsiaiv_device(const machine_config &mconfig, const char* tag, device_t* owner, uint32_t clock);
 
 	void bsy_w(int state);
 	void req_w(int state);
 
 protected:
-	bbc_scsiaiv_device(const machine_config& mconfig, device_type type, const char* tag, device_t* owner, uint32_t clock);
+	bbc_scsiaiv_device(const machine_config &mconfig, device_type type, const char* tag, device_t* owner, uint32_t clock);
 
 	// device-level overrides
 	virtual void device_start() override;
 
 	// optional information overrides
-	virtual void device_add_mconfig(machine_config& config) override;
+	virtual void device_add_mconfig(machine_config &config) override;
 
 	virtual uint8_t read(offs_t offset) override;
 	virtual void write(offs_t offset, uint8_t data) override;
@@ -55,11 +55,11 @@ private:
 //{
 //public:
 //  // construction/destruction
-//  bbc_vp415_device(const machine_config& mconfig, const char* tag, device_t* owner, uint32_t clock);
+//  bbc_vp415_device(const machine_config &mconfig, const char* tag, device_t* owner, uint32_t clock);
 //
 //protected:
 //  // optional information overrides
-//  virtual void device_add_mconfig(machine_config& config) override;
+//  virtual void device_add_mconfig(machine_config &config) override;
 //};
 
 
@@ -68,4 +68,4 @@ DECLARE_DEVICE_TYPE(BBC_SCSIAIV, bbc_scsiaiv_device);
 //DECLARE_DEVICE_TYPE(BBC_VP415, bbc_vp415_device);
 
 
-#endif /* MAME_BUS_BBC_1MHZBUS_SCSIAIV_H */
+#endif /* MAME_BUS_BBC_MODEM_SCSIAIV_H */