diff --git a/core/math/src/math.ts b/core/math/src/math.ts
index 0adafd040..bf6a9acd4 100644
--- a/core/math/src/math.ts
+++ b/core/math/src/math.ts
@@ -253,11 +253,11 @@ export const hex = (bytes: Uint8Array): string => {
   return str;
 };
 
-export const getDeviceUuid = (): string => {
-  let uuid = localStorage.getItem('device-uuid');
+export const getClientId = (): string => {
+  let uuid = localStorage.getItem('client-id');
   if (uuid == null) {
     uuid = random.uuid;
-    localStorage.setItem('device-uuid', uuid);
+    localStorage.setItem('client-id', uuid);
   }
   return uuid;
 };
diff --git a/demo/math/translate-unicode-digits.ts b/demo/math/translate-unicode-digits.ts
index 1712fc8f1..cc4f2719f 100644
--- a/demo/math/translate-unicode-digits.ts
+++ b/demo/math/translate-unicode-digits.ts
@@ -1,4 +1,4 @@
-import {UnicodeDigits, getDeviceUuid} from '@alwatr/math';
+import {UnicodeDigits, getClientId} from '@alwatr/math';
 
 const unicodeDigits = new UnicodeDigits('fa', 'all');
 
@@ -28,5 +28,5 @@ for (let i = count; i > 0; i--) {
 
 console.log((count / (Date.now() - start)) * 1000);
 
-console.log('device-uuid', getDeviceUuid());
-console.log('device-uuid', getDeviceUuid());
+console.log('client-id', getClientId());
+console.log('client-id', getClientId());
diff --git a/services/form-registration/src/route/put.ts b/services/form-registration/src/route/put.ts
index 555f06231..62648c312 100644
--- a/services/form-registration/src/route/put.ts
+++ b/services/form-registration/src/route/put.ts
@@ -12,9 +12,9 @@ async function setForm(connection: AlwatrConnection): Promise<AlwatrServiceRespo
   connection.requireToken(config.nanoServer.accessToken);
   const params = connection.requireQueryParams<{form: string}>({form: 'string'});
   const remoteAddress = connection.incomingMessage.socket.remoteAddress ?? 'unknown';
-  const deviceId = connection.incomingMessage.headers['device-id'];
+  const clientId = connection.incomingMessage.headers['client-id'] ?? 'unknown';
 
-  if (!(typeof deviceId === 'string' && deviceId !== '')) {
+  if (!(typeof clientId === 'string' && clientId !== '')) {
     return {
       ok: false,
       statusCode: 401,
@@ -33,7 +33,7 @@ async function setForm(connection: AlwatrConnection): Promise<AlwatrServiceRespo
   const bodyJson = await connection.requireJsonBody<Form>();
   bodyJson.id = 'auto_increment';
   bodyJson.remoteAddress = remoteAddress;
-  bodyJson.deviceId = deviceId;
+  bodyJson.clientId = clientId;
 
   await storageClient.set(bodyJson, 'form-' + params.form);
 
diff --git a/services/form-registration/src/type.ts b/services/form-registration/src/type.ts
index 5542763a7..2d77d5762 100644
--- a/services/form-registration/src/type.ts
+++ b/services/form-registration/src/type.ts
@@ -1,6 +1,6 @@
 import {AlwatrDocumentObject} from '@alwatr/type';
 
 export type Form = AlwatrDocumentObject & {
-  deviceId: string;
+  clientId: string;
   remoteAddress: string;
 }