diff --git a/configs/dk-tm4c129x/src/tm4c_tmp100.c b/configs/dk-tm4c129x/src/tm4c_tmp100.c
index e494479b16..63694a696d 100644
--- a/configs/dk-tm4c129x/src/tm4c_tmp100.c
+++ b/configs/dk-tm4c129x/src/tm4c_tmp100.c
@@ -78,7 +78,7 @@
 
 int tiva_tmp100_initialize(FAR const char *devpath)
 {
-  FAR struct i2c_dev_s *i2c;
+  FAR struct i2c_master_s *i2c;
   int ret;
 
   /* Get an instance of the I2C6 interface */
diff --git a/configs/sama5d3x-ek/src/sam_at24.c b/configs/sama5d3x-ek/src/sam_at24.c
index 5a5b1b8382..cd6658fa81 100644
--- a/configs/sama5d3x-ek/src/sam_at24.c
+++ b/configs/sama5d3x-ek/src/sam_at24.c
@@ -90,7 +90,7 @@
 
 int sam_at24_automount(int minor)
 {
-  FAR struct i2c_dev_s *i2c;
+  FAR struct i2c_master_s *i2c;
   FAR struct mtd_dev_s *mtd;
   static bool initialized = false;
   int ret;
diff --git a/configs/sama5d3x-ek/src/sam_ov2640.c b/configs/sama5d3x-ek/src/sam_ov2640.c
index ff9e9da827..d7875dab38 100644
--- a/configs/sama5d3x-ek/src/sam_ov2640.c
+++ b/configs/sama5d3x-ek/src/sam_ov2640.c
@@ -151,7 +151,7 @@ static inline FAR struct fb_vtable_s *ov2640_lcd_initialize(void)
 
 static inline int ov2640_camera_initialize(void)
 {
-  FAR struct i2c_dev_s *i2c;
+  FAR struct i2c_master_s *i2c;
   uint32_t actual;
   int ret;
 
diff --git a/configs/sama5d3x-ek/src/sam_wm8904.c b/configs/sama5d3x-ek/src/sam_wm8904.c
index b77b09ba50..eadec99877 100644
--- a/configs/sama5d3x-ek/src/sam_wm8904.c
+++ b/configs/sama5d3x-ek/src/sam_wm8904.c
@@ -246,7 +246,7 @@ int sam_wm8904_initialize(int minor)
 {
   FAR struct audio_lowerhalf_s *wm8904;
   FAR struct audio_lowerhalf_s *pcm;
-  FAR struct i2c_dev_s *i2c;
+  FAR struct i2c_master_s *i2c;
   FAR struct i2s_dev_s *i2s;
   static bool initialized = false;
   char devname[12];
diff --git a/configs/sama5d4-ek/src/sam_maxtouch.c b/configs/sama5d4-ek/src/sam_maxtouch.c
index 70ac9a6a7c..0e14325db3 100644
--- a/configs/sama5d4-ek/src/sam_maxtouch.c
+++ b/configs/sama5d4-ek/src/sam_maxtouch.c
@@ -238,7 +238,7 @@ static int mxt_interrupt(int irq, FAR void *context)
 
 int board_tsc_setup(int minor)
 {
-  FAR struct i2c_dev_s *i2c;
+  FAR struct i2c_master_s *i2c;
   static bool initialized = false;
   int ret;
 
diff --git a/configs/sama5d4-ek/src/sam_pmic.c b/configs/sama5d4-ek/src/sam_pmic.c
index cadfdfd0c6..54228e5bd3 100644
--- a/configs/sama5d4-ek/src/sam_pmic.c
+++ b/configs/sama5d4-ek/src/sam_pmic.c
@@ -87,7 +87,7 @@
 
 void sam_pmic_initialize(void)
 {
-  FAR struct i2c_dev_s *i2c;
+  FAR struct i2c_master_s *i2c;
   uint8_t buffer[2];
 
   /* Get an instance of the I2C interface for the PMIC */
diff --git a/configs/sama5d4-ek/src/sam_wm8904.c b/configs/sama5d4-ek/src/sam_wm8904.c
index a2ef539d75..5561d88f76 100644
--- a/configs/sama5d4-ek/src/sam_wm8904.c
+++ b/configs/sama5d4-ek/src/sam_wm8904.c
@@ -246,7 +246,7 @@ int sam_wm8904_initialize(int minor)
 {
   FAR struct audio_lowerhalf_s *wm8904;
   FAR struct audio_lowerhalf_s *pcm;
-  FAR struct i2c_dev_s *i2c;
+  FAR struct i2c_master_s *i2c;
   FAR struct i2s_dev_s *i2s;
   static bool initialized = false;
   char devname[12];
diff --git a/configs/same70-xplained/src/sam_at24config.c b/configs/same70-xplained/src/sam_at24config.c
index 1a34e8fc42..e9857cfcd0 100644
--- a/configs/same70-xplained/src/sam_at24config.c
+++ b/configs/same70-xplained/src/sam_at24config.c
@@ -66,7 +66,7 @@
 
 int sam_at24config(void)
 {
-  struct i2c_dev_s *i2c;
+  struct i2c_master_s *i2c;
   struct mtd_dev_s *at24;
   int ret;
 
diff --git a/configs/same70-xplained/src/sam_ethernet.c b/configs/same70-xplained/src/sam_ethernet.c
index fbdc711db8..ed504709a3 100644
--- a/configs/same70-xplained/src/sam_ethernet.c
+++ b/configs/same70-xplained/src/sam_ethernet.c
@@ -154,7 +154,7 @@ void weak_function sam_netinitialize(void)
 #ifdef HAVE_MACADDR
 int sam_emac0_setmac(void)
 {
-  struct i2c_dev_s *i2c;
+  struct i2c_master_s *i2c;
   struct mtd_dev_s *at24;
   uint8_t mac[6];
   ssize_t nread;
diff --git a/configs/samv71-xult/src/sam_at24config.c b/configs/samv71-xult/src/sam_at24config.c
index 9cd35418c4..2cf9d75442 100644
--- a/configs/samv71-xult/src/sam_at24config.c
+++ b/configs/samv71-xult/src/sam_at24config.c
@@ -66,7 +66,7 @@
 
 int sam_at24config(void)
 {
-  struct i2c_dev_s *i2c;
+  struct i2c_master_s *i2c;
   struct mtd_dev_s *at24;
   int ret;
 
diff --git a/configs/samv71-xult/src/sam_bringup.c b/configs/samv71-xult/src/sam_bringup.c
index 8f5eac7eb6..a5b6c9b08e 100644
--- a/configs/samv71-xult/src/sam_bringup.c
+++ b/configs/samv71-xult/src/sam_bringup.c
@@ -122,7 +122,7 @@ int sam_bringup(void)
   FAR struct mtd_dev_s *mtd;
 #endif
 #if defined(HAVE_RTC_DSXXXX) || defined(HAVE_RTC_PCF85263)
-  FAR struct i2c_dev_s *i2c;
+  FAR struct i2c_master_s *i2c;
 #endif
 #if defined(HAVE_S25FL1_CHARDEV) || defined(HAVE_PROGMEM_CHARDEV)
   char blockdev[18];
diff --git a/configs/samv71-xult/src/sam_ethernet.c b/configs/samv71-xult/src/sam_ethernet.c
index dd22294d4a..15c8a5dd54 100644
--- a/configs/samv71-xult/src/sam_ethernet.c
+++ b/configs/samv71-xult/src/sam_ethernet.c
@@ -158,7 +158,7 @@ void weak_function sam_netinitialize(void)
 #ifdef HAVE_MACADDR
 int sam_emac0_setmac(void)
 {
-  struct i2c_dev_s *i2c;
+  struct i2c_master_s *i2c;
   struct mtd_dev_s *at24;
   uint8_t mac[6];
   ssize_t nread;
diff --git a/configs/samv71-xult/src/sam_maxtouch.c b/configs/samv71-xult/src/sam_maxtouch.c
index 68fc3b2602..bf769a2958 100644
--- a/configs/samv71-xult/src/sam_maxtouch.c
+++ b/configs/samv71-xult/src/sam_maxtouch.c
@@ -237,7 +237,7 @@ static int mxt_interrupt(int irq, FAR void *context)
 
 int board_tsc_setup(int minor)
 {
-  FAR struct i2c_dev_s *i2c;
+  FAR struct i2c_master_s *i2c;
   static bool initialized = false;
   int ret;
 
diff --git a/configs/samv71-xult/src/sam_wm8904.c b/configs/samv71-xult/src/sam_wm8904.c
index 028874ba08..fd6477fa77 100644
--- a/configs/samv71-xult/src/sam_wm8904.c
+++ b/configs/samv71-xult/src/sam_wm8904.c
@@ -246,7 +246,7 @@ int sam_wm8904_initialize(int minor)
 {
   FAR struct audio_lowerhalf_s *wm8904;
   FAR struct audio_lowerhalf_s *pcm;
-  FAR struct i2c_dev_s *i2c;
+  FAR struct i2c_master_s *i2c;
   FAR struct i2s_dev_s *i2s;
   static bool initialized = false;
   char devname[12];
diff --git a/configs/stm3210e-eval/src/stm32_lm75.c b/configs/stm3210e-eval/src/stm32_lm75.c
index aae873e0f2..fc60692984 100644
--- a/configs/stm3210e-eval/src/stm32_lm75.c
+++ b/configs/stm3210e-eval/src/stm32_lm75.c
@@ -78,7 +78,7 @@
 
 int stm32_lm75initialize(FAR const char *devpath)
 {
-  FAR struct i2c_dev_s *i2c;
+  FAR struct i2c_master_s *i2c;
   int ret;
 
   /* Configure PB.5 as Input pull-up.  This pin can be used as a temperature
diff --git a/configs/stm3220g-eval/src/stm32_stmpe811.c b/configs/stm3220g-eval/src/stm32_stmpe811.c
index 6bf2f4b484..09c1b46273 100644
--- a/configs/stm3220g-eval/src/stm32_stmpe811.c
+++ b/configs/stm3220g-eval/src/stm32_stmpe811.c
@@ -276,7 +276,7 @@ static void stmpe811_clear(FAR struct stmpe811_config_s *state)
 int board_tsc_setup(int minor)
 {
 #ifndef CONFIG_STMPE811_TSC_DISABLE
-  FAR struct i2c_dev_s *dev;
+  FAR struct i2c_master_s *dev;
   int ret;
 
   idbg("minor %d\n", minor);
diff --git a/configs/stm3240g-eval/src/stm32_stmpe811.c b/configs/stm3240g-eval/src/stm32_stmpe811.c
index 83a1e5109a..47dd04d7e8 100644
--- a/configs/stm3240g-eval/src/stm32_stmpe811.c
+++ b/configs/stm3240g-eval/src/stm32_stmpe811.c
@@ -276,7 +276,7 @@ static void stmpe811_clear(FAR struct stmpe811_config_s *state)
 int board_tsc_setup(int minor)
 {
 #ifndef CONFIG_STMPE811_TSC_DISABLE
-  FAR struct i2c_dev_s *dev;
+  FAR struct i2c_master_s *dev;
   int ret;
 
   idbg("minor %d\n", minor);
diff --git a/configs/stm32f4discovery/src/stm32_bmp180.c b/configs/stm32f4discovery/src/stm32_bmp180.c
index 620e91e67d..6a9a695cbb 100644
--- a/configs/stm32f4discovery/src/stm32_bmp180.c
+++ b/configs/stm32f4discovery/src/stm32_bmp180.c
@@ -76,7 +76,7 @@
 
 int stm32_bmp180initialize(FAR const char *devpath)
 {
-  FAR struct i2c_dev_s *i2c;
+  FAR struct i2c_master_s *i2c;
   int ret;
 
   sndbg("Initializing BMP180!\n");
diff --git a/configs/stm32f4discovery/src/stm32_pca9635.c b/configs/stm32f4discovery/src/stm32_pca9635.c
index c7dd52d403..d335c520d9 100644
--- a/configs/stm32f4discovery/src/stm32_pca9635.c
+++ b/configs/stm32f4discovery/src/stm32_pca9635.c
@@ -77,7 +77,7 @@
 int stm32_pca9635_initialize(void)
 {
 
-  FAR struct i2c_dev_s *i2c;
+  FAR struct i2c_master_s *i2c;
   int ret;
 
   /* Get the I2C driver that interfaces with the pca9635 (PCA9635_I2CBUS)*/
diff --git a/configs/tm4c123g-launchpad/src/tm4c_at24.c b/configs/tm4c123g-launchpad/src/tm4c_at24.c
index 5541940368..bb5ef16a01 100644
--- a/configs/tm4c123g-launchpad/src/tm4c_at24.c
+++ b/configs/tm4c123g-launchpad/src/tm4c_at24.c
@@ -87,7 +87,7 @@
 
 int tm4c_at24_automount(int minor)
 {
-  FAR struct i2c_dev_s *i2c;
+  FAR struct i2c_master_s *i2c;
   FAR struct mtd_dev_s *mtd;
   static bool initialized = false;
   int ret;
diff --git a/configs/vsn/src/sif.c b/configs/vsn/src/sif.c
index 146a01d27a..aaf3692d45 100644
--- a/configs/vsn/src/sif.c
+++ b/configs/vsn/src/sif.c
@@ -158,35 +158,36 @@ typedef unsigned char vsn_sif_gpio_t;
 #define VSN_SIF_ANIN_OVERSMP16
 
 
-struct vsn_sif_s {
-    vsn_sif_state_t     state;              // activity
-    unsigned char       opencnt;            // open count
+struct vsn_sif_s
+{
+  vsn_sif_state_t     state;              /* Activity */
+  unsigned char       opencnt;            /* Open count */
 
-    vsn_sif_gpio_t      gpio[2];
+  vsn_sif_gpio_t      gpio[2];
 
-    unsigned char       anout_opts;
-    unsigned short int  anout_width;
-    unsigned short int  anout_period;       // setting it to 0, disables PWM
-    unsigned short int  anout_samplerate;   // as written by write()
+  unsigned char       anout_opts;
+  unsigned short int  anout_width;
+  unsigned short int  anout_period;       /* Setting it to 0, disables PWM */
+  unsigned short int  anout_samplerate;   /* As written by write() */
 
-    unsigned short int  anref_width;
-    unsigned short int  anref_period;       // setting it to 0, disables PWM
-    unsigned short int  anref_samplerate;   // as written by write()
+  unsigned short int  anref_width;
+  unsigned short int  anref_period;       /* Setting it to 0, disables PWM */
+  unsigned short int  anref_samplerate;   /* As written by write() */
 
-    unsigned char       anin_opts;
-    unsigned int        anin_samplerate;    // returned on read() as 16-bit results
+  unsigned char       anin_opts;
+  unsigned int        anin_samplerate;    /* Returned on read() as 16-bit results */
 
-        /*--- Private Data ---*/
+  /*--- Private Data ---*/
 
-    struct stm32_tim_dev_s * tim3;          // Timer3 is used for PWM, and Analog RefTap
-    struct stm32_tim_dev_s * tim8;          // Timer8 is used for Power Switch
+  struct stm32_tim_dev_s *tim3;           /* Timer3 is used for PWM, and Analog RefTap */
+  struct stm32_tim_dev_s *tim8;           /* Timer8 is used for Power Switch */
 
-    struct i2c_dev_s    * i2c1;
-    struct i2c_dev_s    * i2c2;
+  struct i2c_master_s *i2c1;
+  struct i2c_master_s *i2c2;
 
-    struct spi_dev_s    * spi2;
+  struct spi_dev_s    *spi2;
 
-    sem_t               exclusive_access;
+  sem_t               exclusive_access;
 };
 
 /****************************************************************************