diff --git a/mqtt_sensord/sensorlib/base.py b/mqtt_sensord/sensorlib/base.py
index cb8ddec..d4225d0 100644
--- a/mqtt_sensord/sensorlib/base.py
+++ b/mqtt_sensord/sensorlib/base.py
@@ -17,10 +17,10 @@ class Sensor(object):
     _mqtt_callbacks = {}
     HAS_SENSOR_DATA = True
 
-    def __init__(self, id, name, type, pin, description, **sensor_conf):
-        self.id = id
+    def __init__(self, sensor_id, name, sensor_type, pin, description, **sensor_conf):
+        self.id = sensor_id
         self.name = name
-        self.type = type
+        self.type = sensor_type
         self.pin = pin
         self.description = description