diff --git a/dist/nodes/gateway-subdevices/GatewaySubdevice.js b/dist/nodes/gateway-subdevices/GatewaySubdevice.js
index 3fad8ea..6ddd2f0 100644
--- a/dist/nodes/gateway-subdevices/GatewaySubdevice.js
+++ b/dist/nodes/gateway-subdevices/GatewaySubdevice.js
@@ -41,5 +41,5 @@ exports.default = (RED, type) => {
             }
         }
     }
-    RED.nodes.registerType(`${constants_1.Constants.NODES_PREFIX}-${type}`, GatewayDevice);
+    RED.nodes.registerType(`${constants_1.Constants.NODES_PREFIX}-mi.${type}`, GatewayDevice);
 };
diff --git a/dist/nodes/gateway-subdevices/index.html b/dist/nodes/gateway-subdevices/index.html
index 7f2db42..cd39928 100644
--- a/dist/nodes/gateway-subdevices/index.html
+++ b/dist/nodes/gateway-subdevices/index.html
@@ -253,7 +253,7 @@
 
 
 <script type="text/javascript">
-    RED.nodes.registerType('mi-devices-magnet', {
+    RED.nodes.registerType('mi-devices-mi.magnet', {
         category: 'xiaomi',
         color: '#3FADB5',
         defaults: {
@@ -266,7 +266,7 @@
         paletteLabel: "magnet",
         icon: "door-icon.png",
         label: function () {
-            return this.name || "mi-devices magnet";
+            return this.name || "mi-devices mi.magnet";
         },
         oneditprepare: function() {
             var node = this;
@@ -310,7 +310,7 @@
     });
 </script>
 
-<script type="text/x-red" data-template-name="mi-devices-magnet">
+<script type="text/x-red" data-template-name="mi-devices-mi.magnet">
     <div class="form-row">
         <label for="node-input-gateway"><i class="icon-tag"></i> Gateway</label>
         <input type="text" id="node-input-gateway" placeholder="xiaomi gateway">
@@ -325,7 +325,7 @@
     </div>
 </script>
 
-<script type="text/x-red" data-help-name="mi-devices-magnet">
+<script type="text/x-red" data-help-name="mi-devices-mi.magnet">
     <p>The Xiaomi contact sensor node</p>
 
     <h3>Inputs</h3>
diff --git a/src/nodes/gateway-subdevices/GatewaySubdevice.ts b/src/nodes/gateway-subdevices/GatewaySubdevice.ts
index aff2a2b..179c0c3 100644
--- a/src/nodes/gateway-subdevices/GatewaySubdevice.ts
+++ b/src/nodes/gateway-subdevices/GatewaySubdevice.ts
@@ -48,6 +48,5 @@ export default (RED:Red, type:string) => {
             }
         }
     }
-    
-    RED.nodes.registerType(`${Constants.NODES_PREFIX}-${type}`, <any> GatewayDevice);
+    RED.nodes.registerType(`${Constants.NODES_PREFIX}-mi.${type}`, <any> GatewayDevice);
 };
\ No newline at end of file
diff --git a/src/nodes/gateway-subdevices/index.ejs b/src/nodes/gateway-subdevices/index.ejs
index 5305aee..94b3672 100644
--- a/src/nodes/gateway-subdevices/index.ejs
+++ b/src/nodes/gateway-subdevices/index.ejs
@@ -3,7 +3,7 @@
 
 <%# ---------------------------------- Magnet ----------------------------------  %>
 <%- include('./GatewaySubdevice', { 
-    type: "magnet",
+    type: "mi.magnet",
     label: "magnet",
     icon: "door-icon",
     filterType: "mi.magnet",