diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ButtonDimmer.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ButtonDimmer.java
index fc91c22..da9af1c 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ButtonDimmer.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ButtonDimmer.java
@@ -13,7 +13,7 @@ public class ButtonDimmer extends Dimmer {
     private static final int DIM_INCREMENT = 10;
 
     public ButtonDimmer() {
-        super("button-dimmer");
+        super("buttonDimmer");
     }
 
     /** Increases the current intensity level of the dimmable light by DIM_INCREMENT */
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/DimmableLight.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/DimmableLight.java
index 9a75471..7a59f7b 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/DimmableLight.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/DimmableLight.java
@@ -21,7 +21,7 @@ public class DimmableLight extends Switchable {
             Connector.basic(KnobDimmer::getOutputs, DimmableLight::setDimmerId);
 
     public DimmableLight() {
-        super("light");
+        super("dimmableLight");
     }
 
     @ManyToOne
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/KnobDimmer.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/KnobDimmer.java
index ce3745c..c116165 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/KnobDimmer.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/KnobDimmer.java
@@ -10,7 +10,7 @@ import javax.persistence.Entity;
 public class KnobDimmer extends Dimmer {
 
     public KnobDimmer() {
-        super("knob-dimmer");
+        super("knobDimmer");
     }
 
     /**
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/MotionSensor.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/MotionSensor.java
index 50d2206..6c5baf7 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/MotionSensor.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/MotionSensor.java
@@ -19,6 +19,6 @@ public class MotionSensor extends InputDevice {
     }
 
     public MotionSensor() {
-        super("motion-sensor");
+        super("motionSensor");
     }
 }
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/RegularLight.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/RegularLight.java
index de9c10a..2dcff1b 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/RegularLight.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/RegularLight.java
@@ -14,7 +14,7 @@ public class RegularLight extends Switchable {
     boolean on;
 
     public RegularLight() {
-        super("regular-light");
+        super("regularLight");
         this.on = false;
     }
 
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SmartPlug.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SmartPlug.java
index 4411dc3..9b07e69 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SmartPlug.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SmartPlug.java
@@ -42,6 +42,6 @@ public class SmartPlug extends Switchable {
     }
 
     public SmartPlug() {
-        super("smart-plug");
+        super("smartPlug");
     }
 }