diff --git a/homeassistant/components/light/vera.py b/homeassistant/components/light/vera.py
index 322ff97c38a..9211577f825 100644
--- a/homeassistant/components/light/vera.py
+++ b/homeassistant/components/light/vera.py
@@ -125,13 +125,14 @@ class VeraLight(ToggleDevice):
     def __init__(self, vera_device, extra_data=None):
         self.vera_device = vera_device
         self.extra_data = extra_data
+        if self.extra_data and self.extra_data.get('name'):
+            self._name = self.extra_data.get('name')
+        self._name = self.vera_device.name
 
     @property
     def name(self):
         """ Get the mame of the light. """
-        if self.extra_data and self.extra_data.get('name'):
-            return self.extra_data.get('name')
-        return self.vera_device.name
+        return self._name
 
     @property
     def state_attributes(self):
diff --git a/homeassistant/components/sensor/vera.py b/homeassistant/components/sensor/vera.py
index 63584f85025..bd36ad16bff 100644
--- a/homeassistant/components/sensor/vera.py
+++ b/homeassistant/components/sensor/vera.py
@@ -125,6 +125,9 @@ class VeraSensor(Device):
     def __init__(self, vera_device, extra_data=None):
         self.vera_device = vera_device
         self.extra_data = extra_data
+        if self.extra_data and self.extra_data.get('name'):
+            self._name = self.extra_data.get('name')
+        self._name = self.vera_device.name
 
     def __str__(self):
         return "%s %s %s" % (self.name, self.vera_device.deviceId, self.state)
@@ -136,9 +139,7 @@ class VeraSensor(Device):
     @property
     def name(self):
         """ Get the mame of the sensor. """
-        if self.extra_data and self.extra_data.get('name'):
-            return self.extra_data.get('name')
-        return self.vera_device.name
+        return self._name
 
     @property
     def state_attributes(self):
diff --git a/homeassistant/components/switch/vera.py b/homeassistant/components/switch/vera.py
index e6cbe613ad6..70865b84fa5 100644
--- a/homeassistant/components/switch/vera.py
+++ b/homeassistant/components/switch/vera.py
@@ -126,13 +126,14 @@ class VeraSwitch(ToggleDevice):
     def __init__(self, vera_device, extra_data=None):
         self.vera_device = vera_device
         self.extra_data = extra_data
+        if self.extra_data and self.extra_data.get('name'):
+            self._name = self.extra_data.get('name')
+        self._name = self.vera_device.name
 
     @property
     def name(self):
         """ Get the mame of the switch. """
-        if self.extra_data and self.extra_data.get('name'):
-            return self.extra_data.get('name')
-        return self.vera_device.name
+        return self._name
 
     @property
     def state_attributes(self):