diff --git a/Domoticz.py b/Domoticz.py
index 29b2947..2a48b76 100644
--- a/Domoticz.py
+++ b/Domoticz.py
@@ -27,10 +27,10 @@ class DeviceObj(object):
     nValue = 0
     Image = None
     Name=None
+    Type=None
+    SubType=None
 
     __unit=None
-    __type=None
-    __subtype=None
     __switchtype=None
     __options=None
     __image=None
@@ -39,11 +39,11 @@ class DeviceObj(object):
     def __init__(self, Unit=None, Name=None, Type=None, TypeName=None, Subtype=None, Switchtype=None, Options=None, Image=None, Used=None):
         self.Name = Name
         self.Image = Image
+        self.Type = Type
+        self.SubType = Subtype
 
         self.__unit = Unit
-        self.__type = Type
         self.__typename = TypeName
-        self.__subtype = Subtype
         self.__switchtype = Switchtype
         self.__options = Options
         self.__used = Used