diff --git a/homeassistant/components/light/zwave.py b/homeassistant/components/light/zwave.py
index 02664ed896c..0dac1f37b37 100644
--- a/homeassistant/components/light/zwave.py
+++ b/homeassistant/components/light/zwave.py
@@ -94,9 +94,10 @@ class ZwaveDimmer(Light):
     @property
     def name(self):
         """ Returns the name of the device if any. """
-        name = self._node.name or "{}".format(self._node.product_name)
+        name = self._node.name or "{} {}".format(
+            self._node.manufacturer_name, self._node.product_name)
 
-        return "{}".format(name or self._value.label)
+        return "{} {} {}".format(name, self._node.node_id, self._value.label)
 
     @property
     def brightness(self):
diff --git a/homeassistant/components/sensor/zwave.py b/homeassistant/components/sensor/zwave.py
index 869f4dbe810..f1d3e00e69f 100644
--- a/homeassistant/components/sensor/zwave.py
+++ b/homeassistant/components/sensor/zwave.py
@@ -107,7 +107,7 @@ class ZWaveSensor(Entity):
         name = self._node.name or "{} {}".format(
             self._node.manufacturer_name, self._node.product_name)
 
-        return "{} {}".format(name, self._value.label)
+        return "{} {} {}".format(name, self._node.node_id, self._value.label)
 
     @property
     def state(self):
diff --git a/homeassistant/components/switch/zwave.py b/homeassistant/components/switch/zwave.py
index f4777340445..ab5c0bcd9f0 100644
--- a/homeassistant/components/switch/zwave.py
+++ b/homeassistant/components/switch/zwave.py
@@ -58,9 +58,10 @@ class ZwaveSwitch(SwitchDevice):
     @property
     def name(self):
         """ Returns the name of the device if any. """
-        name = self._node.name or "{}".format(self._node.product_name)
+        name = self._node.name or "{} {}".format(
+            self._node.manufacturer_name, self._node.product_name)
 
-        return "{}".format(name or self._value.label)
+        return "{} {} {}".format(name, self._node.node_id, self._value.label)
 
     @property
     def is_on(self):