diff --git a/include/bridgingcommands.hpp b/include/bridgingcommands.hpp
index b771bfd..73b4486 100644
--- a/include/bridgingcommands.hpp
+++ b/include/bridgingcommands.hpp
@@ -28,7 +28,7 @@
  */
 constexpr uint8_t ipmbLunMask = 0x03;
 constexpr uint8_t ipmbSeqMask = 0x3F;
-constexpr uint8_t ipmbMeSlaveAddress = 0x2C;
+constexpr uint8_t ipmbMeTargetAddress = 0x2C;
 constexpr uint8_t ipmbMeChannelNum = 1;
 
 /**
diff --git a/include/multinodecommands.hpp b/include/multinodecommands.hpp
index b704912..ae8f3ef 100644
--- a/include/multinodecommands.hpp
+++ b/include/multinodecommands.hpp
@@ -24,7 +24,7 @@
 enum class NodeRole : uint8_t
 {
     single,
-    master,
-    slave,
+    controller,
+    target,
     arbitrating
 };
diff --git a/include/oemcommands.hpp b/include/oemcommands.hpp
index 0047517..4f8166f 100644
--- a/include/oemcommands.hpp
+++ b/include/oemcommands.hpp
@@ -43,7 +43,7 @@
 static constexpr Cmd cmdDisableBMCSystemReset = 0x42;
 static constexpr Cmd cmdGetBMCResetDisables = 0x43;
 static constexpr Cmd cmdSendEmbeddedFWUpdStatus = 0x44;
-static constexpr Cmd cmdSlotI2CMasterWriteRead = 0x52;
+static constexpr Cmd cmdSlotI2CControllerWriteRead = 0x52;
 static constexpr Cmd cmdSetPowerRestoreDelay = 0x54;
 static constexpr Cmd cmdGetPowerRestoreDelay = 0x55;
 static constexpr Cmd cmdSetFaultIndication = 0x57;
diff --git a/include/storagecommands.hpp b/include/storagecommands.hpp
index 42cc85b..7fb5ce7 100644
--- a/include/storagecommands.hpp
+++ b/include/storagecommands.hpp
@@ -99,7 +99,7 @@
 struct Type12Record
 {
     get_sdr::SensorDataRecordHeader header;
-    uint8_t slaveAddress;
+    uint8_t targetAddress;
     uint8_t channelNumber;
     uint8_t powerStateNotification;
     uint8_t deviceCapabilities;
@@ -116,7 +116,7 @@
                  uint8_t pwrStateNotification, uint8_t capabilities,
                  uint8_t eid, uint8_t entityInst, uint8_t mfrDefined,
                  const std::string& sensorname) :
-        slaveAddress(address),
+        targetAddress(address),
         channelNumber(chNumber), powerStateNotification(pwrStateNotification),
         deviceCapabilities(capabilities), reserved{}, entityID(eid),
         entityInstance(entityInst), oem(mfrDefined)
@@ -143,7 +143,7 @@
     uint8_t oemID2;
     uint8_t subType;
     uint8_t version;
-    uint8_t slaveAddress;
+    uint8_t targetAddress;
     uint8_t channelNumber;
     uint8_t healthEventSensor;
     uint8_t exceptionEventSensor;