diff --git a/system/i2c/i2c_bus.c b/system/i2c/i2c_bus.c
index 6669ede77..735bfab18 100644
--- a/system/i2c/i2c_bus.c
+++ b/system/i2c/i2c_bus.c
@@ -77,7 +77,7 @@
 
 int i2ccmd_bus(FAR struct i2ctool_s *i2ctool, int argc, char **argv)
 {
-  FAR struct i2c_dev_s *dev;
+  FAR struct i2c_master_s *dev;
   int i;
 
   i2ctool_printf(i2ctool, " BUS   EXISTS?\n");
diff --git a/system/i2c/i2c_dev.c b/system/i2c/i2c_dev.c
index 839099db0..e01d68892 100644
--- a/system/i2c/i2c_dev.c
+++ b/system/i2c/i2c_dev.c
@@ -79,7 +79,7 @@
 
 int i2ccmd_dev(FAR struct i2ctool_s *i2ctool, int argc, char **argv)
 {
-  FAR struct i2c_dev_s *dev;
+  FAR struct i2c_master_s *dev;
   struct i2c_msg_s msg[2];
   FAR char *ptr;
   union
diff --git a/system/i2c/i2c_get.c b/system/i2c/i2c_get.c
index e848f0a67..11ced453e 100644
--- a/system/i2c/i2c_get.c
+++ b/system/i2c/i2c_get.c
@@ -79,7 +79,7 @@
 
 int i2ccmd_get(FAR struct i2ctool_s *i2ctool, int argc, FAR char **argv)
 {
-  FAR struct i2c_dev_s *dev;
+  FAR struct i2c_master_s *dev;
   FAR char *ptr;
   uint16_t result;
   uint8_t regaddr;
@@ -198,7 +198,7 @@ int i2ccmd_get(FAR struct i2ctool_s *i2ctool, int argc, FAR char **argv)
  * Name: i2ctool_get
  ****************************************************************************/
 
-int i2ctool_get(FAR struct i2ctool_s *i2ctool, FAR struct i2c_dev_s *dev,
+int i2ctool_get(FAR struct i2ctool_s *i2ctool, FAR struct i2c_master_s *dev,
                 uint8_t regaddr, uint16_t *result)
 {
   struct i2c_msg_s msg[2];
diff --git a/system/i2c/i2c_set.c b/system/i2c/i2c_set.c
index 0fa790bf6..16cdebae8 100644
--- a/system/i2c/i2c_set.c
+++ b/system/i2c/i2c_set.c
@@ -79,7 +79,7 @@
 
 int i2ccmd_set(FAR struct i2ctool_s *i2ctool, int argc, FAR char **argv)
 {
-  FAR struct i2c_dev_s *dev;
+  FAR struct i2c_master_s *dev;
   FAR char *ptr;
   uint8_t regaddr;
   long value;
@@ -225,7 +225,7 @@ int i2ccmd_set(FAR struct i2ctool_s *i2ctool, int argc, FAR char **argv)
  * Name: i2ctool_set
  ****************************************************************************/
 
-int i2ctool_set(FAR struct i2ctool_s *i2ctool, FAR struct i2c_dev_s *dev,
+int i2ctool_set(FAR struct i2ctool_s *i2ctool, FAR struct i2c_master_s *dev,
                 uint8_t regaddr, uint16_t value)
 {
   struct i2c_msg_s msg[2];
diff --git a/system/i2c/i2c_verf.c b/system/i2c/i2c_verf.c
index bf538ebe4..a964a4cbe 100644
--- a/system/i2c/i2c_verf.c
+++ b/system/i2c/i2c_verf.c
@@ -79,7 +79,7 @@
 
 int i2ccmd_verf(FAR struct i2ctool_s *i2ctool, int argc, FAR char **argv)
 {
-  FAR struct i2c_dev_s *dev;
+  FAR struct i2c_master_s *dev;
   FAR char *ptr;
   uint16_t rdvalue;
   uint8_t regaddr;
diff --git a/system/i2c/i2ctool.h b/system/i2c/i2ctool.h
index 4b4c84a56..dd380e2f0 100644
--- a/system/i2c/i2ctool.h
+++ b/system/i2c/i2ctool.h
@@ -196,9 +196,9 @@ int i2ccmd_verf(FAR struct i2ctool_s *i2ctool, int argc, FAR char **argv);
 
 /* I2C access functions */
 
-int i2ctool_get(FAR struct i2ctool_s *i2ctool, FAR struct i2c_dev_s *dev,
+int i2ctool_get(FAR struct i2ctool_s *i2ctool, FAR struct i2c_master_s *dev,
                 uint8_t addr, uint16_t *result);
-int i2ctool_set(FAR struct i2ctool_s *i2ctool, FAR struct i2c_dev_s *dev,
+int i2ctool_set(FAR struct i2ctool_s *i2ctool, FAR struct i2c_master_s *dev,
                 uint8_t regaddr, uint16_t value);
 
 /* Common logic */