diff --git a/src/vl6180x_class.h b/src/vl6180x_class.h
index 11994dd..e00abd2 100644
--- a/src/vl6180x_class.h
+++ b/src/vl6180x_class.h
@@ -93,7 +93,7 @@ class VL6180X : public RangeSensor, public LightSensor
 	VL6180X(TwoWire *i2c, int pin) : RangeSensor(), LightSensor(), dev_i2c(i2c), gpio0(pin) 
     {
        Device=&MyDevice;
-       memset((void *)Device, 0x0, sizeof(struct MyVL6180Dev_t));
+       memset((void *)Device, 0x0, sizeof(struct MyVL6180xDev_t));
        MyDevice.I2cAddr=VL6180x_DEFAULT_DEVICE_ADDRESS;		 
        MyDevice.Present=0;
        MyDevice.Ready=0;
@@ -1146,7 +1146,7 @@ class VL6180X : public RangeSensor, public LightSensor
     /* Digital out pin */
 	int gpio0;
     /* Device data */
-    MyVL6180Dev_t MyDevice;
+    struct MyVL6180xDev_t MyDevice;
     VL6180xDev_t Device;  
 };
 
diff --git a/src/vl6180x_platform.h b/src/vl6180x_platform.h
index 64fb57f..f1f436c 100644
--- a/src/vl6180x_platform.h
+++ b/src/vl6180x_platform.h
@@ -87,7 +87,7 @@ extern volatile uint32_t g_TickCnt;
     #error "VL6180x_SINGLE_DEVICE_DRIVER must be set"
 #endif
 		
-struct MyVL6180Dev_t {
+struct MyVL6180xDev_t {
     struct VL6180xDevData_t Data;
     uint8_t I2cAddr;
     //uint8_t DevID;
@@ -96,7 +96,7 @@ struct MyVL6180Dev_t {
     unsigned Present:1;
     unsigned Ready:1;
 };
-typedef struct MyVL6180Dev_t *VL6180xDev_t;
+typedef struct MyVL6180xDev_t *VL6180xDev_t;
 
 #define VL6180xDevDataGet(dev, field) (dev->Data.field)
 #define VL6180xDevDataSet(dev, field, data) (dev->Data.field)=(data)