diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/RegularLightSaveRequest.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/RegularLightSaveRequest.java
index 99211e5..be9cd13 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/RegularLightSaveRequest.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/RegularLightSaveRequest.java
@@ -7,7 +7,7 @@ public class RegularLightSaveRequest {
     private boolean on;
 
     /** Device identifier */
-    private long id;
+    private Long id;
 
     /**
      * The room this device belongs in, as a foreign key id. To use when updating and inserting from
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SecurityCameraSaveRequest.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SecurityCameraSaveRequest.java
index ee1e873..639a85c 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SecurityCameraSaveRequest.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/SecurityCameraSaveRequest.java
@@ -4,11 +4,11 @@ import javax.validation.constraints.NotNull;
 
 public class SecurityCameraSaveRequest {
 
-    /** The state of this switch */
+    /** The state of this Security Camera */
     private boolean on;
 
     /** Device identifier */
-    private long id;
+    private Long id;
 
     /**
      * The room this device belongs in, as a foreign key id. To use when updating and inserting from
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SecurityCamera.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SecurityCamera.java
index b638150..1ee04ff 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SecurityCamera.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/SecurityCamera.java
@@ -13,7 +13,7 @@ public class SecurityCamera extends Switchable {
         this.on = false;
     }
 
-    @Column(name = "camera", nullable = false)
+    @Column(name = "camera_on", nullable = false)
     @NotNull
     private boolean on;