diff --git a/homeassistant/components/group.py b/homeassistant/components/group.py
index badd5ac66fe..5c1e8268865 100644
--- a/homeassistant/components/group.py
+++ b/homeassistant/components/group.py
@@ -113,6 +113,7 @@ def setup(hass, config):
 
 class Group(object):
     """ Tracks a group of entity ids. """
+    # pylint: disable=too-many-instance-attributes
 
     visibility = Entity.visibility
     _hidden = False
diff --git a/homeassistant/components/light/isy994.py b/homeassistant/components/light/isy994.py
index 60a4faafe13..ae0225a1e3c 100644
--- a/homeassistant/components/light/isy994.py
+++ b/homeassistant/components/light/isy994.py
@@ -3,7 +3,8 @@
 import logging
 
 # homeassistant imports
-from homeassistant.components.isy994 import ISYDeviceABC, ISY, SENSOR_STRING
+from homeassistant.components.isy994 import (ISYDeviceABC, ISY, SENSOR_STRING,
+                                             HIDDEN_STRING)
 from homeassistant.components.light import ATTR_BRIGHTNESS
 from homeassistant.const import STATE_ON, STATE_OFF
 
@@ -18,8 +19,10 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         return False
 
     # import dimmable nodes
-    for node in ISY.nodes:
+    for (path, node) in ISY.nodes:
         if node.dimmable and SENSOR_STRING not in node.name:
+            if HIDDEN_STRING in path:
+                node.name += HIDDEN_STRING
             devs.append(ISYLightDevice(node))
 
     add_devices(devs)
diff --git a/homeassistant/components/sensor/isy994.py b/homeassistant/components/sensor/isy994.py
index 9b58a574527..739a058d24d 100644
--- a/homeassistant/components/sensor/isy994.py
+++ b/homeassistant/components/sensor/isy994.py
@@ -37,15 +37,18 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     if ISY.climate is not None:
         for prop in ISY.climate._id2name:
             if prop is not None:
-                prefix = HIDDEN_STRING if prop in DEFAULT_HIDDEN_WEATHER else ''
+                prefix = HIDDEN_STRING \
+                    if prop in DEFAULT_HIDDEN_WEATHER else ''
                 node = WeatherPseudoNode('ISY.weather.' + prop, prefix + prop,
                                          getattr(ISY.climate, prop),
                                          getattr(ISY.climate, prop + '_units'))
                 devs.append(ISYSensorDevice(node))
 
     # import sensor nodes
-    for node in ISY.nodes:
+    for (path, node) in ISY.nodes:
         if SENSOR_STRING in node.name:
+            if HIDDEN_STRING in path:
+                node.name += HIDDEN_STRING
             devs.append(ISYSensorDevice(node, [STATE_ON, STATE_OFF]))
 
     # import sensor programs
diff --git a/homeassistant/components/switch/isy994.py b/homeassistant/components/switch/isy994.py
index 1ea87e3fc2e..e6432173fc9 100644
--- a/homeassistant/components/switch/isy994.py
+++ b/homeassistant/components/switch/isy994.py
@@ -3,7 +3,8 @@
 import logging
 
 # homeassistant imports
-from homeassistant.components.isy994 import ISY, ISYDeviceABC, SENSOR_STRING
+from homeassistant.components.isy994 import (ISY, ISYDeviceABC, SENSOR_STRING,
+                                             HIDDEN_STRING)
 from homeassistant.const import STATE_ON, STATE_OFF  # STATE_OPEN, STATE_CLOSED
 # The frontend doesn't seem to fully support the open and closed states yet.
 # Once it does, the HA.doors programs should report open and closed instead of
@@ -20,8 +21,10 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         return False
 
     # import not dimmable nodes and groups
-    for node in ISY.nodes:
+    for (path, node) in ISY.nodes:
         if not node.dimmable and SENSOR_STRING not in node.name:
+            if HIDDEN_STRING in path:
+                node.name += HIDDEN_STRING
             devs.append(ISYSwitchDevice(node))
 
     # import ISY doors programs