diff --git a/master/cdev.c b/master/cdev.c
index b2f2bc399f9b55358c8b788f4c12baaf20034bd2..164d9215a47463d27eda8475e7eba4c95576cb01 100644
--- a/master/cdev.c
+++ b/master/cdev.c
@@ -190,7 +190,7 @@ int ec_cdev_ioctl_slave(
     data.coe_details = slave->sii.coe_details;
     data.general_flags = slave->sii.general_flags;
     data.current_on_ebus = slave->sii.current_on_ebus;
-    data.state = slave->current_state;
+    data.al_state = slave->current_state;
     data.error_flag = slave->error_flag;
 
     data.sync_count = slave->sii.sync_count;
diff --git a/master/ioctl.h b/master/ioctl.h
index 067181cbac7b0ac2a77d126253e8713465182b2b..ce10058882f034caf1baff42ae940da2b6beb1a6 100644
--- a/master/ioctl.h
+++ b/master/ioctl.h
@@ -115,7 +115,7 @@ typedef struct {
     ec_sii_coe_details_t coe_details;
     ec_sii_general_flags_t general_flags;
     int16_t current_on_ebus;
-    uint8_t state;
+    uint8_t al_state;
     uint8_t error_flag;
     uint8_t sync_count;
     uint16_t sdo_count;
@@ -216,7 +216,7 @@ typedef struct {
 typedef struct {
     // inputs
 	uint16_t slave_position;
-    uint8_t requested_state;
+    uint8_t al_state;
 } ec_ioctl_slave_state_t;
 
 /*****************************************************************************/
diff --git a/tool/CommandConfig.cpp b/tool/CommandConfig.cpp
index bbadde821b6daf2d05ccb8616c81a1e6d5817047..5280c47170e4aa0daded990294f238a65eeced9e 100644
--- a/tool/CommandConfig.cpp
+++ b/tool/CommandConfig.cpp
@@ -128,7 +128,7 @@ void CommandConfig::showDetailedConfigs(
         if (configIter->slave_position != -1) {
             m.getSlave(&slave, configIter->slave_position);
             cout << configIter->slave_position
-                << " (" << alStateString(slave.state) << ")" << endl;
+                << " (" << alStateString(slave.al_state) << ")" << endl;
         } else {
             cout << "none" << endl;
         }
@@ -245,7 +245,7 @@ void CommandConfig::listConfigs(
             str.clear();
             str.str("");
 
-            str << alStateString(slave.state);
+            str << alStateString(slave.al_state);
             info.state = str.str();
             str.clear();
             str.str("");
diff --git a/tool/CommandSlaves.cpp b/tool/CommandSlaves.cpp
index 5ef5113e3ab725b3ff3655b4cec0550171a98a2b..0179cefaf801d2ec1bcd9762fb355dac98cb88ce 100644
--- a/tool/CommandSlaves.cpp
+++ b/tool/CommandSlaves.cpp
@@ -126,7 +126,7 @@ void CommandSlaves::listSlaves(
             info.relPos = str.str();
             str.str("");
 
-            info.state = alStateString(slave.state);
+            info.state = alStateString(slave.al_state);
             info.flag = (slave.error_flag ? 'E' : '+');
 
             if (strlen(slave.name)) {
@@ -186,7 +186,7 @@ void CommandSlaves::showSlave(
         cout << "Alias: " << slave.alias << endl;
 
     cout
-        << "State: " << alStateString(slave.state) << endl
+        << "State: " << alStateString(slave.al_state) << endl
         << "Flag: " << (slave.error_flag ? 'E' : '+') << endl
         << "Identity:" << endl
         << "  Vendor Id:       0x"
diff --git a/tool/MasterDevice.cpp b/tool/MasterDevice.cpp
index 270702b4591cfad2de21ad61b79884607ad85290..1a19594829d86cc08c5481518443faf7bf882358 100644
--- a/tool/MasterDevice.cpp
+++ b/tool/MasterDevice.cpp
@@ -407,7 +407,7 @@ void MasterDevice::requestState(
     ec_ioctl_slave_state_t data;
 
     data.slave_position = slavePosition;
-    data.requested_state = state;
+    data.al_state = state;
     
     if (ioctl(fd, EC_IOCTL_SLAVE_STATE, &data)) {
         stringstream err;