diff --git a/src/lib/server/services/key.ts b/src/lib/server/services/client.ts
similarity index 91%
rename from src/lib/server/services/key.ts
rename to src/lib/server/services/client.ts
index 96cacbf..0d3448b 100644
--- a/src/lib/server/services/key.ts
+++ b/src/lib/server/services/client.ts
@@ -26,7 +26,7 @@ const generateChallenge = async (userId: number, ip: string, clientId: number, p
   return challenge.toString("base64");
 };
 
-export const registerPubKey = async (userId: number, ip: string, pubKey: string) => {
+export const registerUserClient = async (userId: number, ip: string, pubKey: string) => {
   const client = await getClientByPubKey(pubKey);
   let clientId;
 
@@ -54,7 +54,7 @@ export const registerPubKey = async (userId: number, ip: string, pubKey: string)
   return await generateChallenge(userId, ip, clientId, pubKey);
 };
 
-export const verifyPubKey = async (userId: number, ip: string, answer: string) => {
+export const verifyUserClient = async (userId: number, ip: string, answer: string) => {
   const challenge = await getUserClientChallenge(answer, ip);
   if (!challenge) {
     error(401, "Invalid challenge answer");
diff --git a/src/routes/(fullscreen)/key/export/service.ts b/src/routes/(fullscreen)/key/export/service.ts
index 11b6d53..09031c4 100644
--- a/src/routes/(fullscreen)/key/export/service.ts
+++ b/src/routes/(fullscreen)/key/export/service.ts
@@ -15,7 +15,7 @@ export const createBlobFromKeyPairBase64 = (pubKeyBase64: string, privKeyBase64:
 };
 
 export const requestPubKeyRegistration = async (pubKeyBase64: string, privateKey: CryptoKey) => {
-  let res = await callAPI("/api/key/register", {
+  let res = await callAPI("/api/client/register", {
     method: "POST",
     headers: {
       "Content-Type": "application/json",
@@ -28,7 +28,7 @@ export const requestPubKeyRegistration = async (pubKeyBase64: string, privateKey
   const challenge = data.challenge as string;
   const answer = await decryptRSACiphertext(challenge, privateKey);
 
-  res = await callAPI("/api/key/verify", {
+  res = await callAPI("/api/client/verify", {
     method: "POST",
     headers: {
       "Content-Type": "application/json",
diff --git a/src/routes/api/key/register/+server.ts b/src/routes/api/client/register/+server.ts
similarity index 80%
rename from src/routes/api/key/register/+server.ts
rename to src/routes/api/client/register/+server.ts
index 2be9f3b..c4040bf 100644
--- a/src/routes/api/key/register/+server.ts
+++ b/src/routes/api/client/register/+server.ts
@@ -1,7 +1,7 @@
 import { error, json } from "@sveltejs/kit";
 import { z } from "zod";
 import { authenticate } from "$lib/server/modules/auth";
-import { registerPubKey } from "$lib/server/services/key";
+import { registerUserClient } from "$lib/server/services/client";
 import type { RequestHandler } from "./$types";
 
 export const POST: RequestHandler = async ({ request, cookies, getClientAddress }) => {
@@ -18,6 +18,6 @@ export const POST: RequestHandler = async ({ request, cookies, getClientAddress
   }
 
   const { pubKey } = zodRes.data;
-  const challenge = await registerPubKey(userId, getClientAddress(), pubKey.trim());
+  const challenge = await registerUserClient(userId, getClientAddress(), pubKey.trim());
   return json({ challenge });
 };
diff --git a/src/routes/api/key/verify/+server.ts b/src/routes/api/client/verify/+server.ts
similarity index 73%
rename from src/routes/api/key/verify/+server.ts
rename to src/routes/api/client/verify/+server.ts
index 45301e8..8a39dac 100644
--- a/src/routes/api/key/verify/+server.ts
+++ b/src/routes/api/client/verify/+server.ts
@@ -1,7 +1,7 @@
 import { error, text } from "@sveltejs/kit";
 import { z } from "zod";
 import { authenticate } from "$lib/server/modules/auth";
-import { verifyPubKey } from "$lib/server/services/key";
+import { verifyUserClient } from "$lib/server/services/client";
 import type { RequestHandler } from "./$types";
 
 export const POST: RequestHandler = async ({ request, cookies, getClientAddress }) => {
@@ -18,6 +18,6 @@ export const POST: RequestHandler = async ({ request, cookies, getClientAddress
   }
 
   const { answer } = zodRes.data;
-  await verifyPubKey(userId, getClientAddress(), answer.trim());
-  return text("Key verified", { headers: { "Content-Type": "text/plain" } });
+  await verifyUserClient(userId, getClientAddress(), answer.trim());
+  return text("Client verified", { headers: { "Content-Type": "text/plain" } });
 };