diff --git a/jams-common/src/main/java/net/jami/jams/common/objects/requests/EnrollementRequest.java b/jams-common/src/main/java/net/jami/jams/common/objects/requests/DeviceServletRequest.java
similarity index 76%
rename from jams-common/src/main/java/net/jami/jams/common/objects/requests/EnrollementRequest.java
rename to jams-common/src/main/java/net/jami/jams/common/objects/requests/DeviceServletRequest.java
index dda3da98550be76885288c60203fbc0ed45255e8..9063ea033efc3ce74e18f9090eea363f3fab66c2 100644
--- a/jams-common/src/main/java/net/jami/jams/common/objects/requests/EnrollementRequest.java
+++ b/jams-common/src/main/java/net/jami/jams/common/objects/requests/DeviceServletRequest.java
@@ -6,8 +6,9 @@ import org.bouncycastle.pkcs.PKCS10CertificationRequest;
 
 @Getter
 @Setter
-public class EnrollementRequest {
+public class DeviceServletRequest {
 
     private PKCS10CertificationRequest csr;
+    private String deviceName;
 
 }
diff --git a/jams-common/src/main/java/net/jami/jams/common/objects/responses/DeviceServletResponse.java b/jams-common/src/main/java/net/jami/jams/common/objects/responses/DeviceServletResponse.java
new file mode 100644
index 0000000000000000000000000000000000000000..55818c161a500ec397c4d2c9ef53745cfd392e74
--- /dev/null
+++ b/jams-common/src/main/java/net/jami/jams/common/objects/responses/DeviceServletResponse.java
@@ -0,0 +1,17 @@
+package net.jami.jams.common.objects.responses;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class DeviceServletResponse {
+
+    private String certificateChain;
+    private String displayName;
+    private String nameServer;
+    private String deviceReceipt;
+    private String receiptSignature;
+    private String userPhoto;
+
+}
diff --git a/jams-common/src/test/java/net/jami/jams/common/serialization/JsoniterRegistryTest.java b/jams-common/src/test/java/net/jami/jams/common/serialization/JsoniterRegistryTest.java
index a11bfb67c72f4eb8deeb91fe1b5e52d2a6a84abf..4f142d1bdd361e842228012e8a0fca52e505efb7 100644
--- a/jams-common/src/test/java/net/jami/jams/common/serialization/JsoniterRegistryTest.java
+++ b/jams-common/src/test/java/net/jami/jams/common/serialization/JsoniterRegistryTest.java
@@ -2,7 +2,7 @@ package net.jami.jams.common.serialization;
 
 import com.jsoniter.JsonIterator;
 import com.jsoniter.output.JsonStream;
-import net.jami.jams.common.objects.requests.EnrollementRequest;
+import net.jami.jams.common.objects.requests.DeviceServletRequest;
 import net.jami.jams.common.objects.roots.X509Entity;
 import net.jami.jams.common.utils.X509Utils;
 import org.junit.jupiter.api.Assertions;
@@ -53,7 +53,7 @@ class JsoniterRegistryTest {
     @Test
     void CSRDeserializeTest(){
         String input = "{\"csr\":\"" + strPkcs10Request + "\"}";
-        EnrollementRequest request = JsonIterator.deserialize(input,EnrollementRequest.class);
+        DeviceServletRequest request = JsonIterator.deserialize(input, DeviceServletRequest.class);
         Assertions.assertNotNull(request.getCsr(),"CSR Should not have been null!");
     }