diff --git a/diylc/diylc-library/src/org/diylc/components/electromechanical/MiniToggleSwitch.java b/diylc/diylc-library/src/org/diylc/components/electromechanical/MiniToggleSwitch.java
index 3b4aa79d..6a186ea4 100644
--- a/diylc/diylc-library/src/org/diylc/components/electromechanical/MiniToggleSwitch.java
+++ b/diylc/diylc-library/src/org/diylc/components/electromechanical/MiniToggleSwitch.java
@@ -76,7 +76,10 @@ public class MiniToggleSwitch extends AbstractTransparentComponent<ToggleSwitchT
   private Size spacing = SPACING;
 
   private Color bodyColor = BODY_COLOR;
-  private Color borderColor = BORDER_COLOR;
+  private Color borderColor = BORDER_COLOR;
+  
+  @Deprecated
+  protected String name;
 
   public MiniToggleSwitch() {
     super();
@@ -202,10 +205,11 @@ public class MiniToggleSwitch extends AbstractTransparentComponent<ToggleSwitchT
   @EditableProperty(defaultable = false)
   @Override
   public String getName() {
-    if (super.name != null) {
-      return super.name;
-    }
-    return name;
+    if (super.name == null || super.name.trim().isEmpty()) {
+      super.name = name;
+      name = null;
+    }    
+    return super.name;
   }
 
   @Override