From ee5955fc753648198df62ef8fd0e4b71498be91c Mon Sep 17 00:00:00 2001
From: Alois <aloisianer@proton.me>
Date: Fri, 3 Jul 2026 10:56:42 +0200
Subject: [PATCH 1/2] (wip): migrate ttp to mtp (feat): migrate tauth to mtp
 (qol): update todo (qol): add direnv

---
 .envrc                         |  1 +
 .gitignore                     |  3 +-
 bun.lock                       |  4 +--
 flake.nix                      |  3 +-
 package.json                   |  2 +-
 packages/mtp/src/context.tsx   | 63 ++++++++++++++++++++--------------
 packages/tauth/src/context.tsx | 58 +++++++++++++++++++++++++++----
 todo.md                        |  1 +
 8 files changed, 97 insertions(+), 38 deletions(-)
 create mode 100644 .envrc

diff --git a/.envrc b/.envrc
new file mode 100644
index 0000000..3550a30
--- /dev/null
+++ b/.envrc
@@ -0,0 +1 @@
+use flake
diff --git a/.gitignore b/.gitignore
index 87d0fc3..c0e6a9b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 node_modules
 releases
-.fallow/
+.fallow
+.direnv
diff --git a/bun.lock b/bun.lock
index 0af5854..376d438 100644
--- a/bun.lock
+++ b/bun.lock
@@ -347,7 +347,7 @@
   },
   "overrides": {
     "@tensamin/ui": "https://git.methanium.net/tensamin/ui/releases/download/latest/tensamin-ui.tgz",
-    "mtp": "https://git.methanium.net/methanium/mtp/releases/download/0.1.0-dev-8ae8377/mtp-0.1.0.tgz",
+    "mtp": "https://git.methanium.net/methanium/mtp/releases/download/0.1.0-dev-c3fbeb2/mtp-0.1.0.tgz",
   },
   "packages": {
     "@babel/code-frame": ["@babel/code-frame@7.29.7", "", { "dependencies": { "@babel/helper-validator-identifier": "^7.29.7", "js-tokens": "^4.0.0", "picocolors": "^1.1.1" } }, "sha512-Aup7aUOfpbAUg2ROOJN6Iw5f9DMBlzu0mIkm/malLQFN/YQgO48wCj0Kxa3sEHJvPVFg7siR+qRInwXd2qhQKw=="],
@@ -1540,7 +1540,7 @@
 
     "ms": ["ms@2.1.3", "", {}, "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="],
 
-    "mtp": ["mtp@https://git.methanium.net/methanium/mtp/releases/download/0.1.0-dev-8ae8377/mtp-0.1.0.tgz", {}, "sha512-W0l7Jc+1XI8BdrmRP9rlY/di6kZ5a/srv4mQvzwyJd+Tfg7BWZ9IUYUXIPze6ayx9dLY1f9Y71OgbhjstMzYjA=="],
+    "mtp": ["mtp@https://git.methanium.net/methanium/mtp/releases/download/0.1.0-dev-c3fbeb2/mtp-0.1.0.tgz", {}, "sha512-j/RGQY9/3NXzZptXbY44Kv7YnGr38CQQOehRAzPPFvnEVj+kxCwzVLgSImT765+vfgl2L+bkAE9aI2PWwOBTow=="],
 
     "nanoid": ["nanoid@3.3.15", "", { "bin": { "nanoid": "bin/nanoid.cjs" } }, "sha512-y7Wygv/7mEOvxTuEQDB8StXdMRBWf1kR/tlhAzBRUFkB2jfcLOAxO/SHmOO2zgz1pVgK29/kyupn059/bCHdjA=="],
 
diff --git a/flake.nix b/flake.nix
index 8cd7777..55990bb 100644
--- a/flake.nix
+++ b/flake.nix
@@ -206,7 +206,7 @@
         ];
       };
 
-      commonDeps = [pkgs.wasm-pack pkgs.lld];
+      commonDeps = [rustToolchain pkgs.wasm-pack pkgs.lld];
     in rec {
       default = electron;
 
@@ -256,7 +256,6 @@
         buildInputs = with pkgs;
           [
             jdk17
-            rustToolchain
             gradle
             bun
             nodejs
diff --git a/package.json b/package.json
index c673b1a..4b90957 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,7 @@
   },
   "overrides": {
     "@tensamin/ui": "https://git.methanium.net/tensamin/ui/releases/download/latest/tensamin-ui.tgz",
-    "mtp": "https://git.methanium.net/methanium/mtp/releases/download/0.1.0-dev-8ae8377/mtp-0.1.0.tgz"
+    "mtp": "https://git.methanium.net/methanium/mtp/releases/download/0.1.0-dev-c3fbeb2/mtp-0.1.0.tgz"
   },
   "dependencies": {
     "@tensamin/ui": "*",
diff --git a/packages/mtp/src/context.tsx b/packages/mtp/src/context.tsx
index b6da558..bcdcbaa 100644
--- a/packages/mtp/src/context.tsx
+++ b/packages/mtp/src/context.tsx
@@ -10,7 +10,7 @@ import {
 } from "react";
 import { isTauri } from "@tauri-apps/api/core";
 import { onResume } from "tauri-plugin-app-events-api";
-import { MTPClient } from "mtp";
+import { ConnectionState, MTPClient } from "mtp";
 import type { z } from "zod";
 
 import {
@@ -31,12 +31,6 @@ import {
   RETRY_INTERVAL,
 } from "./values";
 
-const READY_STATE = {
-  CLOSED: 0,
-  CONNECTING: 1,
-  OPEN: 2,
-} as const;
-
 const PUSH_TYPES = [
   "message_live",
   "message_state",
@@ -153,6 +147,7 @@ function mapDataKeys(value: unknown, mapKey: (key: string) => string): unknown {
   );
 }
 
+// Zod schema validation
 function validateResponse<T extends keyof Schemas & string>(
   type: T,
   message: { id?: number; type: string; data: unknown },
@@ -189,8 +184,9 @@ export function Provider(props: {
 }) {
   const { load } = useStorage();
 
-  const [readyState, setReadyState] = useState<number>(READY_STATE.CLOSED);
-  const [connected, setConnected] = useState<boolean>(false);
+  const [readyState, setReadyState] = useState<number>(
+    ConnectionState.Disconnected,
+  );
   const [identified, setIdentified] = useState<boolean>(false);
   const [identifying, setIdentifying] = useState<boolean>(false);
 
@@ -208,11 +204,15 @@ export function Provider(props: {
     null,
   );
 
+  const connected = readyState === ConnectionState.Connected;
+
+  // MTP url
   const [mtpUrl, setMtpUrl] = useState<string | null>(null);
   useEffect(() => {
     load("mtp_url").then(setMtpUrl);
   }, [load]);
 
+  // Validation override functions
   const send: BoundSendFn = useMemo(
     () => async (type, data, options) => {
       const client = clientRef.current;
@@ -259,6 +259,7 @@ export function Provider(props: {
     };
   }, []);
 
+  // No Iota check
   useEffect(() => {
     if (!connected) return;
 
@@ -272,6 +273,7 @@ export function Provider(props: {
     });
   }, [connected, subscribe]);
 
+  // Custom Pings
   useEffect(() => {
     if (!connected || !identified) {
       return;
@@ -297,11 +299,9 @@ export function Provider(props: {
     };
   }, [connected, identified, send]);
 
+  // Reconnect stuff
   useEffect(() => {
-    if (!mtpUrl) {
-      return;
-    }
-    const url = mtpUrl;
+    if (!mtpUrl) return;
 
     let attempts = 0;
     let reconnectTimer: ReturnType<typeof setTimeout> | null = null;
@@ -358,17 +358,28 @@ export function Provider(props: {
       }
 
       try {
-        setReadyState(READY_STATE.CONNECTING);
-        setConnected(false);
         setIdentified(false);
         setIdentifying(false);
 
         await MTPClient.init();
         const client = await MTPClient.create({
-          url,
+          url: mtpUrl ?? "",
+          descriptor: "client",
           pings: true,
           logger: (event) => {
-            log(2, "mtp", event.type === "state" ? "cyan" : "blue", event.type === "state" ? event.data : event.type, event);
+            if (event.type === "state") {
+              setReadyState(
+                clientRef.current?.state ?? ConnectionState.Disconnected,
+              );
+            }
+
+            log(
+              2,
+              "mtp",
+              event.type === "state" ? "cyan" : "blue",
+              event.type === "state" ? event.data : event.type,
+              event,
+            );
           },
         });
 
@@ -378,6 +389,7 @@ export function Provider(props: {
         }
 
         clientRef.current = client;
+        setReadyState(client.state);
         await client.connect();
 
         if (disposed) {
@@ -401,8 +413,7 @@ export function Provider(props: {
 
         clearReconnectTimer();
         scheduleReconnectReset();
-        setReadyState(READY_STATE.OPEN);
-        setConnected(true);
+        setReadyState(client.state);
         setIdentifying(true);
         setError("");
         setErrorDescription("");
@@ -425,8 +436,7 @@ export function Provider(props: {
         clientRef.current?.disconnect();
         clientRef.current = null;
         clearReconnectResetTimer();
-        setReadyState(READY_STATE.CLOSED);
-        setConnected(false);
+        setReadyState(ConnectionState.Disconnected);
         setIdentified(false);
         setIdentifying(false);
         log(
@@ -475,16 +485,16 @@ export function Provider(props: {
 
       clientRef.current?.disconnect();
       clientRef.current = null;
-      setReadyState(READY_STATE.CLOSED);
-      setConnected(false);
+      setReadyState(ConnectionState.Disconnected);
       setIdentified(false);
       setIdentifying(false);
     };
   }, [mtpUrl, props.blockConnection]);
 
+  // Loading bar
   const progress = useMemo(() => {
     if (!mtpUrl) return 10;
-    if (readyState === READY_STATE.CONNECTING) return 30;
+    if (readyState === ConnectionState.Connecting) return 30;
     if (!connected) return 45;
     if (identifying) return 75;
     if (!identified) return 90;
@@ -493,7 +503,7 @@ export function Provider(props: {
 
   const loadingTitle = useMemo(() => {
     if (!mtpUrl) return "Looking up configuration";
-    if (readyState === READY_STATE.CONNECTING || !connected)
+    if (readyState === ConnectionState.Connecting || !connected)
       return "Connecting to Tensamin";
     if (identifying || !identified) return "Identifying secure session";
     return "Loading";
@@ -501,13 +511,14 @@ export function Provider(props: {
 
   const loadingDescription = useMemo(() => {
     if (!mtpUrl) return "Loading connection details";
-    if (readyState === READY_STATE.CONNECTING || !connected) {
+    if (readyState === ConnectionState.Connecting || !connected) {
       return "Establishing transport channel";
     }
     if (identifying || !identified) return "Waiting for authenticated session";
     return undefined;
   }, [connected, identified, identifying, readyState, mtpUrl]);
 
+  // Return
   if (error !== "" && errorDescription !== "") {
     return <ErrorScreen error={error} description={errorDescription} />;
   }
diff --git a/packages/tauth/src/context.tsx b/packages/tauth/src/context.tsx
index 641a278..31ca22a 100644
--- a/packages/tauth/src/context.tsx
+++ b/packages/tauth/src/context.tsx
@@ -11,7 +11,7 @@ import {
   DialogHeader,
   DialogTitle,
 } from "@tensamin/ui";
-import { useLocation } from "@tanstack/react-router";
+import { useLocation, useNavigate } from "@tanstack/react-router";
 import { useDeeplinks } from "@tensamin/tauri/deeplinkHandler";
 import { useMTP } from "@tensamin/mtp";
 import { log, toast } from "@tensamin/shared/log";
@@ -25,28 +25,40 @@ export default function Wrapper({ children }: { children: ReactNode }) {
   const { send } = useMTP();
   const { getSharedSecret } = useCrypto();
   const { searchStr } = useLocation();
+  const navigate = useNavigate();
   const [dialogOpen, setDialogOpen] = useState(false);
   const [loading, setLoading] = useState(false);
 
   const [identifier, setIdentifier] = useState<string | null>(null);
   const [redirect, setRedirect] = useState<string | null>(null);
   const [challenge, setChallenge] = useState<string | null>(null);
+  const [appPublicKey, setAppPublicKey] = useState<string | null>(null);
   const [allowChildern, setAllowChildern] = useState(false);
 
   const { deeplinks } = useDeeplinks();
 
   const authorizeApp = async () => {
-    if (!identifier || !redirect || !challenge) return;
+    if (!identifier || !redirect || !challenge || !appPublicKey) return;
 
     try {
       // Get Data
       const user = await get(await load("user_id"));
       const {
-        data: { content: appPublicKey },
+        data: { content: appPublicKeyHash },
       } = await send("load_txt_record", {
         path: "tauth." + identifier,
       });
 
+      const verifiedAppPublicKeyHash = await sha256Hex(appPublicKey);
+      if (normalizeHash(appPublicKeyHash) !== verifiedAppPublicKeyHash) {
+        log(1, "tauth", "red", "App public key hash mismatch", undefined, {
+          appPublicKey,
+          appPublicKeyHash,
+          verifiedAppPublicKeyHash,
+        });
+        throw new Error("App public key hash mismatch");
+      }
+
       // Get Shared Secret
       const sharedSecret = await getSharedSecret(
         await load("private_key"),
@@ -75,7 +87,7 @@ export default function Wrapper({ children }: { children: ReactNode }) {
       finalUrl.searchParams.set("challenge", solvedChallenge);
       finalUrl.searchParams.set("originalChallenge", challenge);
 
-      const session = Date.now();
+      const session = new Date().getTime();
       finalUrl.searchParams.set("sessionId", String(session));
 
       // Save Session
@@ -92,11 +104,14 @@ export default function Wrapper({ children }: { children: ReactNode }) {
         setIdentifier(null);
         setRedirect(null);
         setChallenge(null);
+        setAppPublicKey(null);
 
         toast("success", "App authorized successfully");
         return;
       } else {
-        window.location.href = finalUrl.toString();
+        navigate({
+          to: finalUrl.toString(),
+        });
         return;
       }
     } catch (err) {
@@ -108,9 +123,27 @@ export default function Wrapper({ children }: { children: ReactNode }) {
       setIdentifier(null);
       setRedirect(null);
       setChallenge(null);
+      setAppPublicKey(null);
     }
   };
 
+  async function sha256Hex(value: string): Promise<string> {
+    const hash = await crypto.subtle.digest(
+      "SHA-256",
+      new TextEncoder().encode(value),
+    );
+    return [...new Uint8Array(hash)]
+      .map((byte) => byte.toString(16).padStart(2, "0"))
+      .join("");
+  }
+
+  function normalizeHash(value: string): string {
+    return value
+      .trim()
+      .toLowerCase()
+      .replace(/^sha256[:=]/, "");
+  }
+
   function hexToBase64(hex: string): string {
     const bytes = hex.match(/.{2}/g)?.map((byte) => parseInt(byte, 16)) ?? [];
     const binaryString = String.fromCharCode(...bytes);
@@ -122,6 +155,7 @@ export default function Wrapper({ children }: { children: ReactNode }) {
     const identifier = params.get("identifier");
     const redirect = params.get("redirect");
     const challenge = params.get("challenge");
+    const appPublicKey = params.get("public_key");
     if (!identifier || !redirect) {
       setAllowChildern(true);
       return;
@@ -135,10 +169,18 @@ export default function Wrapper({ children }: { children: ReactNode }) {
         return;
       }
 
+      if (!appPublicKey) {
+        toast("error", "Missing app public key");
+        log(1, "tauth", "red", "Missing app public key");
+        setAllowChildern(true);
+        return;
+      }
+
       setAllowChildern(true);
       setIdentifier(identifier);
       setRedirect(redirect);
       setChallenge(hexToBase64(challenge || ""));
+      setAppPublicKey(appPublicKey);
       setDialogOpen(true);
     });
   }, [searchStr, load]);
@@ -149,11 +191,13 @@ export default function Wrapper({ children }: { children: ReactNode }) {
         const url = new URL(link);
         const identifier = url.searchParams.get("identifier");
         const redirect = url.searchParams.get("redirect");
+        const appPublicKey = url.searchParams.get("public_key");
 
-        if (identifier && redirect) {
+        if (identifier && redirect && appPublicKey) {
           setIdentifier(identifier);
           setRedirect(redirect);
           setChallenge(hexToBase64(url.searchParams.get("challenge") || ""));
+          setAppPublicKey(appPublicKey);
           setDialogOpen(true);
         }
       }
@@ -170,6 +214,7 @@ export default function Wrapper({ children }: { children: ReactNode }) {
             setIdentifier(null);
             setRedirect(null);
             setChallenge(null);
+            setAppPublicKey(null);
           }
         }}
       >
@@ -205,6 +250,7 @@ export default function Wrapper({ children }: { children: ReactNode }) {
                 setIdentifier(null);
                 setRedirect(null);
                 setChallenge(null);
+                setAppPublicKey(null);
               }}
             >
               Deny
diff --git a/todo.md b/todo.md
index 837b847..d3665c2 100644
--- a/todo.md
+++ b/todo.md
@@ -1 +1,2 @@
 - Move legal to extra onboarding package
+- Add a bunch of tests

From 7f75a36d73159ca6e2e96ecf612c1505ec32461f Mon Sep 17 00:00:00 2001
From: Alois <aloisianer@proton.me>
Date: Fri, 3 Jul 2026 11:08:38 +0200
Subject: [PATCH 2/2] (wip): migrate ttp to mtp -> snake case to pascal case

---
 apps/web/src/components/modals/basic.tsx      |   5 +-
 apps/web/src/components/modals/profile.tsx    |  12 +-
 apps/web/src/components/navbar.tsx            |  14 +--
 apps/web/src/components/sidebar.tsx           |  10 +-
 .../src/features/conversation/list/body.tsx   |   2 +-
 apps/web/src/routes/app/home.tsx              |   8 +-
 .../call/src/components/buttons/invite.tsx    |   6 +-
 packages/call/src/components/modals/base.tsx  |  19 ++-
 .../src/components/modals/contextMenu.tsx     |   4 +-
 packages/call/src/components/top.tsx          |   2 +-
 packages/call/src/store.tsx                   |  42 +++----
 packages/call/src/views/preview.tsx           |   4 +-
 packages/chat/src/behaviour/conversation.ts   |   6 +-
 packages/chat/src/components/input.tsx        |  16 +--
 packages/chat/src/components/message.tsx      |  46 +++----
 packages/chat/src/context.tsx                 |  50 ++++----
 packages/chat/src/screen.tsx                  |  18 +--
 packages/mtp/src/context.tsx                  |  42 +------
 packages/notifications/src/context.tsx        |  22 ++--
 packages/shared/src/data.ts                   | 112 +++++++++---------
 packages/storage/src/session.tsx              |  14 +--
 packages/tauth/src/context.tsx                |   6 +-
 packages/user/src/context.tsx                 |   2 +-
 23 files changed, 214 insertions(+), 248 deletions(-)

diff --git a/apps/web/src/components/modals/basic.tsx b/apps/web/src/components/modals/basic.tsx
index 2d5a3d8..eb9a27b 100644
--- a/apps/web/src/components/modals/basic.tsx
+++ b/apps/web/src/components/modals/basic.tsx
@@ -34,7 +34,7 @@ export function Basic({
                 <div className="absolute -bottom-0.5 -right-0.5 z-10 flex h-3.5 w-3.5 items-center justify-center rounded-full bg-card">
                   <div
                     style={{
-                      backgroundColor: getStatusColor(user.online_status),
+                      backgroundColor: getStatusColor(user.OnlineStatus),
                     }}
                     className="h-2.25 w-2.25 rounded-full"
                   />
@@ -42,8 +42,7 @@ export function Basic({
               }
             />
             <TooltipContent>
-              {user.online_status
-                .split("_")
+              {user.OnlineStatus.split("_")
                 .map((word) => word.charAt(0).toUpperCase() + word.slice(1))
                 .join(" ")}
             </TooltipContent>
diff --git a/apps/web/src/components/modals/profile.tsx b/apps/web/src/components/modals/profile.tsx
index c46e4ef..e34a9ac 100644
--- a/apps/web/src/components/modals/profile.tsx
+++ b/apps/web/src/components/modals/profile.tsx
@@ -34,8 +34,8 @@ export default function Profile({ user }: { user: User }) {
         const ownData = await get(ownId);
         const secret = await getSharedSecret(
           privateKey,
-          ownData.public_key,
-          user.public_key,
+          ownData.PublicKey,
+          user.PublicKey,
         );
 
         if (active) {
@@ -51,7 +51,7 @@ export default function Profile({ user }: { user: User }) {
     return () => {
       active = false;
     };
-  }, [get, getSharedSecret, load, user.public_key]);
+  }, [get, getSharedSecret, load, user.PublicKey]);
 
   const sharedSecretCode = sharedSecret
     ? toLossySixDigitCode(sharedSecret)
@@ -98,13 +98,13 @@ export default function Profile({ user }: { user: User }) {
             </Tooltip>
           </p>
           <p className="text-muted-foreground text-xs overflow-hidden text-ellipsis whitespace-nowrap">
-            Iota ID: <code>{user.iota_id}</code>
+            Iota ID: <code>{user.IotaId}</code>
           </p>
           <p className="text-muted-foreground text-xs overflow-hidden text-ellipsis whitespace-nowrap">
-            User ID: <code>{user.user_id}</code>
+            User ID: <code>{user.UserId}</code>
           </p>
           <p className="text-muted-foreground text-xs overflow-hidden text-ellipsis whitespace-nowrap">
-            Public Key: <code>{user.public_key}</code>
+            Public Key: <code>{user.PublicKey}</code>
           </p>
         </div>
       )}
diff --git a/apps/web/src/components/navbar.tsx b/apps/web/src/components/navbar.tsx
index 7550b28..0d396c6 100644
--- a/apps/web/src/components/navbar.tsx
+++ b/apps/web/src/components/navbar.tsx
@@ -28,7 +28,7 @@ export default function Navbar({ forMobile }: { forMobile: boolean }) {
   const { id } = useSearch({ strict: false });
 
   const currentCalls = calls.filter((call) =>
-    call.call_members.some((member) => member === id),
+    call.CallMembers.some((member) => member === id),
   );
 
   const isMobile = useIsMobile();
@@ -121,8 +121,8 @@ export default function Navbar({ forMobile }: { forMobile: boolean }) {
                 onClick={() => {
                   void joinCall(
                     id,
-                    currentCalls[0].call_secret,
-                    currentCalls[0].call_id,
+                    currentCalls[0].CallSecret,
+                    currentCalls[0].CallId,
                   );
                 }}
                 className="w-9 h-9 aspect-square rounded-lg"
@@ -147,13 +147,13 @@ export default function Navbar({ forMobile }: { forMobile: boolean }) {
                   <SelectContent className="p-1">
                     {currentCalls.map((call) => (
                       <SelectItem
-                        value={call.call_id}
-                        key={call.call_id}
+                        value={call.CallId}
+                        key={call.CallId}
                         onSelect={() => {
-                          void joinCall(id, call.call_secret, call.call_id);
+                          void joinCall(id, call.CallSecret, call.CallId);
                         }}
                       >
-                        {displayCallId(call.call_id)}
+                        {displayCallId(call.CallId)}
                       </SelectItem>
                     ))}
                   </SelectContent>
diff --git a/apps/web/src/components/sidebar.tsx b/apps/web/src/components/sidebar.tsx
index 4dc94d4..95fcd51 100644
--- a/apps/web/src/components/sidebar.tsx
+++ b/apps/web/src/components/sidebar.tsx
@@ -41,7 +41,7 @@ import { mtp } from "@tensamin/shared/data";
 import { useMTP } from "@tensamin/mtp";
 
 type OnlineStatus = z.infer<
-  typeof mtp.get_user_data.response.shape.online_status
+  typeof mtp.get_user_data.response.shape.OnlineStatus
 >;
 
 const onlineStatusLabels: Record<OnlineStatus, string> = {
@@ -89,7 +89,7 @@ function StatusDialog({
       onOpenChange={(nextOpen) => {
         if (!nextOpen) {
           setDraftStatus(user.status ?? "");
-          setDraftOnlineStatus(user.online_status);
+          setDraftOnlineStatus(user.OnlineStatus);
           setErrorMessage("");
           setSaveSucceeded(false);
         }
@@ -144,7 +144,7 @@ function StatusDialog({
             onClick={async () => {
               const payload = {
                 ...(draftStatus && { status: draftStatus }),
-                online_status: draftOnlineStatus,
+                OnlineStatus: draftOnlineStatus,
               };
 
               const validation =
@@ -230,7 +230,7 @@ export default function Sidebar() {
                             <DropdownMenuItem
                               onClick={() => {
                                 setDraftStatus(user.status ?? "");
-                                setDraftOnlineStatus(user.online_status);
+                                setDraftOnlineStatus(user.OnlineStatus);
                                 setStatusErrorMessage("");
                                 setStatusSaveSucceeded(false);
                                 setDialogOpen(true);
@@ -249,7 +249,7 @@ export default function Sidebar() {
                     onOpenChange={(nextOpen) => {
                       if (!nextOpen) {
                         setDraftStatus(user.status ?? "");
-                        setDraftOnlineStatus(user.online_status);
+                        setDraftOnlineStatus(user.OnlineStatus);
                         setStatusErrorMessage("");
                         setStatusSaveSucceeded(false);
                       }
diff --git a/apps/web/src/features/conversation/list/body.tsx b/apps/web/src/features/conversation/list/body.tsx
index d240655..36399e9 100644
--- a/apps/web/src/features/conversation/list/body.tsx
+++ b/apps/web/src/features/conversation/list/body.tsx
@@ -65,7 +65,7 @@ export default function List() {
                   {category === "conversations" ? (
                     contacts?.[virtualItem.index] ? (
                       <ConversationModal
-                        userId={contacts[virtualItem.index].user_id}
+                        userId={contacts[virtualItem.index].UserId}
                       />
                     ) : null
                   ) : communities?.[virtualItem.index] ? (
diff --git a/apps/web/src/routes/app/home.tsx b/apps/web/src/routes/app/home.tsx
index 0add511..832d498 100644
--- a/apps/web/src/routes/app/home.tsx
+++ b/apps/web/src/routes/app/home.tsx
@@ -59,7 +59,7 @@ function AddConversationButton() {
       username: result.data,
     })
       .then((data) => {
-        if (data.data.user_id === 0) {
+        if (data.data.UserId === 0) {
           throw new Error();
         }
 
@@ -72,7 +72,7 @@ function AddConversationButton() {
     if (!user) return;
 
     // alrady added check
-    if (contacts.some((contact) => contact.user_id === user.data.user_id)) {
+    if (contacts.some((contact) => contact.UserId === user.data.UserId)) {
       setError("Conversation already exists");
       return;
     }
@@ -81,10 +81,10 @@ function AddConversationButton() {
     const timeout = setTimeout(() => setLoading(true), 500);
 
     send("add_conversation", {
-      chat_partner_name: result.data,
+      ChatPartnerName: result.data,
     })
       .then(() => {
-        insertContact(user.data.user_id);
+        insertContact(user.data.UserId);
         setOpen(false);
       })
       .catch((error) => {
diff --git a/packages/call/src/components/buttons/invite.tsx b/packages/call/src/components/buttons/invite.tsx
index d3a6d8e..d7ccf82 100644
--- a/packages/call/src/components/buttons/invite.tsx
+++ b/packages/call/src/components/buttons/invite.tsx
@@ -61,15 +61,15 @@ export default function InviteButton({
         >
           {contacts.map((contact) => (
             <Wrapper
-              key={contact.user_id}
-              userId={contact.user_id}
+              key={contact.UserId}
+              userId={contact.UserId}
               loading={<div>Loading...</div>}
               component={(user) => (
                 <Button
                   className="w-full justify-start"
                   variant="ghost"
                   onClick={() => {
-                    void sendCallInvite(contact.user_id).catch((err) => {
+                    void sendCallInvite(contact.UserId).catch((err) => {
                       toast(
                         "error",
                         "Failed to send call invite. Check console for details.",
diff --git a/packages/call/src/components/modals/base.tsx b/packages/call/src/components/modals/base.tsx
index 936765b..ebb903d 100644
--- a/packages/call/src/components/modals/base.tsx
+++ b/packages/call/src/components/modals/base.tsx
@@ -115,7 +115,7 @@ function Overlay({
   user: User;
   participant: Participant;
 }) {
-  const isAdmin = getRoomMetadata()?.admins.includes(user.user_id) === true;
+  const isAdmin = getRoomMetadata()?.admins.includes(user.UserId) === true;
   const isDeafened = participant.attributes["deafened"] === "true";
 
   return (
@@ -171,7 +171,7 @@ export default function Base({
   const [avatarBackgroundColor, setAvatarBackgroundColor] = useState<
     string | undefined
   >(undefined);
-  const isSpeaking = useIsSpeaking(user?.user_id ?? -1);
+  const isSpeaking = useIsSpeaking(user?.UserId ?? -1);
   const screenSharePublication = getTrackPublicationBySource(
     participant,
     Track.Source.ScreenShare,
@@ -242,12 +242,12 @@ export default function Base({
 
   const onClick = () => {
     if (view === "grid") {
-      focusParticipant(user.user_id, type);
+      focusParticipant(user.UserId, type);
     } else {
-      if (user.user_id === focusedParticipantId) {
+      if (user.UserId === focusedParticipantId) {
         setCallView("grid");
       } else {
-        focusParticipant(user.user_id, type);
+        focusParticipant(user.UserId, type);
       }
     }
   };
@@ -256,7 +256,7 @@ export default function Base({
     screenSharePublication?.isSubscribed && screenSharePublication.track;
 
   const isFocusedInFocusedView =
-    view === "focused" && user.user_id === focusedParticipantId;
+    view === "focused" && user.UserId === focusedParticipantId;
 
   return (
     <UIContextMenu>
@@ -276,7 +276,7 @@ export default function Base({
                       variant="outline"
                       onClick={(event) => {
                         if (isFocusedInFocusedView) event.stopPropagation();
-                        startWatchingStream(user.user_id);
+                        startWatchingStream(user.UserId);
                       }}
                     >
                       Watch Stream
@@ -286,7 +286,7 @@ export default function Base({
                         variant="outline"
                         onClick={(event) => {
                           event.stopPropagation();
-                          startWatchingStream(user.user_id);
+                          startWatchingStream(user.UserId);
                         }}
                       >
                         <Plus className="w-8 h-8" />
@@ -295,8 +295,7 @@ export default function Base({
                   </div>
                 )}
                 {view === "grid" ||
-                (view === "focused" &&
-                  user.user_id !== focusedParticipantId) ? (
+                (view === "focused" && user.UserId !== focusedParticipantId) ? (
                   <Overlay type={type} user={user} participant={participant} />
                 ) : null}
               </>
diff --git a/packages/call/src/components/modals/contextMenu.tsx b/packages/call/src/components/modals/contextMenu.tsx
index 82f79c8..a3d2261 100644
--- a/packages/call/src/components/modals/contextMenu.tsx
+++ b/packages/call/src/components/modals/contextMenu.tsx
@@ -36,8 +36,8 @@ export default function ContextMenu({
 
   return (
     <ContextMenuContent className="p-1">
-      {watchedStreamParticipantIds.includes(user.user_id) &&
-      user.user_id !== ownId ? (
+      {watchedStreamParticipantIds.includes(user.UserId) &&
+      user.UserId !== ownId ? (
         <ContextMenuItem variant="destructive">Stop Watching</ContextMenuItem>
       ) : null}
       <ContextMenuItem>Profile</ContextMenuItem>
diff --git a/packages/call/src/components/top.tsx b/packages/call/src/components/top.tsx
index 4da11db..ce5b7cf 100644
--- a/packages/call/src/components/top.tsx
+++ b/packages/call/src/components/top.tsx
@@ -70,7 +70,7 @@ export default function TopBar() {
     <div className="w-full flex justify-between h-12">
       <div className="flex gap-1 m-3 ml-7">
         {users.map((user) => (
-          <div key={user.user_id} className="-ml-4">
+          <div key={user.UserId} className="-ml-4">
             <Tooltip>
               <TooltipTrigger
                 render={
diff --git a/packages/call/src/store.tsx b/packages/call/src/store.tsx
index 251071a..2412b99 100644
--- a/packages/call/src/store.tsx
+++ b/packages/call/src/store.tsx
@@ -70,7 +70,7 @@ type GetSharedSecretFn = (
 type DecryptTextFn = (sharedSecret: string, text: string) => Promise<string>;
 type EncryptTextFn = (sharedSecret: string, text: string) => Promise<string>;
 type LoadFn = (key: string) => Promise<unknown>;
-type GetUserFn = (userId: number) => Promise<{ public_key: string }>;
+type GetUserFn = (userId: number) => Promise<{ PublicKey: string }>;
 type RemoteVideoTrackSelector = Track.Kind | Track.Source;
 
 type Runtime = {
@@ -605,15 +605,15 @@ export async function openCallPage(callId: string) {
 export async function getCallToken(callId: string): Promise<string> {
   const response = await requireRuntime(useCall.getState().runtime)
     .send("call_token", {
-      call_id: callId,
+      CallId: callId,
     })
     .catch((err) => {
       log(1, "call", "red", "Failed to get call secret", err);
       throw err;
     });
 
-  const data = response.data as { call_token: string };
-  return data.call_token;
+  const data = response.data as { CallToken: string };
+  return data.CallToken;
 }
 
 // Encrypt the active call secret for a recipient and send the call invite.
@@ -629,10 +629,10 @@ export async function sendCallInvite(userId: number) {
   const privateKey = await runtime.load("private_key");
   const ownPublicKey = await runtime
     .getUser(ownUserId)
-    .then((data) => data.public_key);
+    .then((data) => data.PublicKey);
   const remotePublicKey = await runtime
     .getUser(userId)
-    .then((data) => data.public_key);
+    .then((data) => data.PublicKey);
   const sharedSecret = await runtime.getSharedSecret(
     privateKey,
     ownPublicKey,
@@ -644,9 +644,9 @@ export async function sendCallInvite(userId: number) {
   );
 
   await runtime.send("call_invite", {
-    receiver_id: userId,
-    call_id: callId,
-    call_secret: encryptedCallSecret,
+    ReceiverId: userId,
+    CallId: callId,
+    CallSecret: encryptedCallSecret,
   });
 }
 
@@ -900,8 +900,8 @@ export async function joinCall(
         await runtime.load("private_key"),
         await runtime
           .getUser((await runtime.load("user_id")) as number)
-          .then((res) => res.public_key),
-        await runtime.getUser(userId).then((res) => res.public_key),
+          .then((res) => res.PublicKey),
+        await runtime.getUser(userId).then((res) => res.PublicKey),
       );
       const decryptedSecret = await runtime.decryptText(
         sharedSecret,
@@ -1150,9 +1150,9 @@ export function useInitializeCall() {
       }
 
       insertCall({
-        call_id: invite.callId,
-        call_secret: invite.callSecret,
-        call_members: [invite.senderId],
+        CallId: invite.callId,
+        CallSecret: invite.callSecret,
+        CallMembers: [invite.senderId],
       });
 
       if (accepted) {
@@ -1180,13 +1180,13 @@ export function useInitializeCall() {
     subscribePush(async (message) => {
       if (message.type !== "call_invite") return;
 
-      const { call_id, call_secret, sender_id } = message.data as {
-        call_id: string;
-        call_secret: string;
-        sender_id: number;
+      const { CallId, CallSecret, SenderId } = message.data as {
+        CallId: string;
+        CallSecret: string;
+        SenderId: number;
       };
 
-      showCallingScreen(call_id, call_secret, sender_id);
+      showCallingScreen(CallId, CallSecret, SenderId);
     });
   }, [subscribePush, showCallingScreen]);
 
@@ -1500,7 +1500,7 @@ export function useInitializeCall() {
       return;
     }
 
-    send("call_data", { call_id: callId })
+    send("call_data", { CallId: callId })
       .then((data) => {
         setCurrentCallData({
           ...(data.data as z.infer<typeof mtp.call_data.response>),
@@ -1513,7 +1513,7 @@ export function useInitializeCall() {
           error: err,
         });
         setCurrentCallData({
-          user_ids: [],
+          UserIds: [],
           exists: false,
         });
       });
diff --git a/packages/call/src/views/preview.tsx b/packages/call/src/views/preview.tsx
index bc4b574..d489dba 100644
--- a/packages/call/src/views/preview.tsx
+++ b/packages/call/src/views/preview.tsx
@@ -17,7 +17,7 @@ export default function Preview() {
       };
     }
 
-    void Promise.all(currentCallData.user_ids.map((id) => get(id)))
+    void Promise.all(currentCallData.UserIds.map((id) => get(id)))
       .then((users) => {
         if (!active) {
           return;
@@ -44,7 +44,7 @@ export default function Preview() {
         <div className="flex flex-col gap-2">
           {data.map((user) => {
             return (
-              <p key={user.user_id} className="text-2xl">
+              <p key={user.UserId} className="text-2xl">
                 User: {user.display}
               </p>
             );
diff --git a/packages/chat/src/behaviour/conversation.ts b/packages/chat/src/behaviour/conversation.ts
index cf0ea55..4081b72 100644
--- a/packages/chat/src/behaviour/conversation.ts
+++ b/packages/chat/src/behaviour/conversation.ts
@@ -6,19 +6,19 @@ import type { RawMessages } from "../values";
  * @param send Parameter send.
  * @param amount Parameter amount.
  * @param offset Parameter offset.
- * @param user_id Parameter user_id.
+ * @param UserId Parameter UserId.
  * @returns Promise<RawMessages>.
  */
 export async function getMessages(
   send: BoundSendFn,
   amount: number,
   offset: number,
-  user_id: number,
+  UserId: number,
 ): Promise<RawMessages> {
   const messages = await send("messages_get", {
     amount: amount,
     offset: offset,
-    user_id: user_id,
+    UserId,
   });
 
   if (messages.type.startsWith("error")) {
diff --git a/packages/chat/src/components/input.tsx b/packages/chat/src/components/input.tsx
index da7575c..49600f3 100644
--- a/packages/chat/src/components/input.tsx
+++ b/packages/chat/src/components/input.tsx
@@ -73,11 +73,11 @@ export default function InputComponent({
 
     const reference = addLiveMessage({
       height: 0,
-      not_encrypted: true,
-      send_time: time,
+      NotEncrypted: true,
+      SendTime: time,
       content: currentValue,
-      sent_by_self: true,
-      message_state: "awaiting",
+      SentBySelf: true,
+      MessageState: "awaiting",
     });
 
     log(3, "chat", "purple", "Live message added, encrypting...");
@@ -97,14 +97,14 @@ export default function InputComponent({
     send("message_send", {
       height: 0,
       content: encryptedContext,
-      receiver_id: userId,
-      send_time: time,
+      ReceiverId: userId,
+      SendTime: time,
     }).catch((e) => {
       log(0, "Chat", "red", "Failed to send message", e, {
         content: currentValue,
         encryptedContext,
-        receiver_id: userId,
-        send_time: time,
+        ReceiverId: userId,
+        SendTime: time,
       });
       reference.setFailed(true);
       toast("error", "Failed to send message");
diff --git a/packages/chat/src/components/message.tsx b/packages/chat/src/components/message.tsx
index e5f9c29..621a815 100644
--- a/packages/chat/src/components/message.tsx
+++ b/packages/chat/src/components/message.tsx
@@ -41,13 +41,13 @@ function MessageComponent({
   };
   user: User | null;
 }) {
-  const actuallyFailed = message.failed && message.message_state === "awaiting";
+  const actuallyFailed = message.failed && message.MessageState === "awaiting";
 
   // Fade-in
   const [hasFadedIn, setHasFadedIn] = useState(false);
   const opacityClass = !hasFadedIn
     ? "opacity-0"
-    : actuallyFailed || message.message_state === "awaiting"
+    : actuallyFailed || message.MessageState === "awaiting"
       ? "opacity-50"
       : "opacity-100";
   useEffect(() => {
@@ -80,21 +80,21 @@ function MessageComponent({
     const readConfirmations = await load("settings.read_confirmations");
 
     if (readConfirmations) {
-      if (!user?.user_id) return;
+      if (!user?.UserId) return;
 
       await send("message_state", {
-        chat_partner_id: user?.user_id,
-        send_time: message.send_time,
-        message_state: "read",
+        ChatPartnerId: user?.UserId,
+        SendTime: message.SendTime,
+        MessageState: "read",
       });
     } else {
       await send("message_state", {
-        chat_partner_id: user?.user_id,
-        send_time: message.send_time,
-        message_state: "received",
+        ChatPartnerId: user?.UserId,
+        SendTime: message.SendTime,
+        MessageState: "received",
       });
     }
-  }, [load, message.send_time, user?.user_id, send]);
+  }, [load, message.SendTime, user?.UserId, send]);
   useEffect(() => {
     let cancelled = false;
 
@@ -102,7 +102,7 @@ function MessageComponent({
       const receiveConfirmations = await load("settings.receive_confirmations");
       if (cancelled) return;
 
-      switch (message.message_state) {
+      switch (message.MessageState) {
         case "sent":
           if (receiveConfirmations) {
             messageStateReadUpdate();
@@ -123,7 +123,7 @@ function MessageComponent({
     return () => {
       cancelled = true;
     };
-  }, [message.message_state, load, messageStateReadUpdate]);
+  }, [message.MessageState, load, messageStateReadUpdate]);
 
   return (
     <div
@@ -132,7 +132,7 @@ function MessageComponent({
     >
       <MessageContextMenu
         content={message.content}
-        messageId={message.send_time}
+        messageId={message.SendTime}
       >
         <div
           className={cn(
@@ -147,7 +147,7 @@ function MessageComponent({
             <>
               {grouped ? (
                 <p className="w-9 text-xs group-hover:visible invisible text-muted-foreground">
-                  {new Date(message.send_time).toLocaleString([], {
+                  {new Date(message.SendTime).toLocaleString([], {
                     hour: "2-digit",
                     minute: "2-digit",
                   })}
@@ -160,7 +160,7 @@ function MessageComponent({
                   </AvatarFallback>
                 </Avatar>
               )}
-              {message.failed && message.message_state === "awaiting" && (
+              {message.failed && message.MessageState === "awaiting" && (
                 <Tooltip>
                   <TooltipContent>
                     <p>Failed to send message</p>
@@ -192,22 +192,22 @@ function MessageComponent({
                   <div className="flex items-center gap-1">
                     <p className="font-medium">{user.display}</p>
                     <p className="text-xs text-muted-foreground">
-                      {new Date(message.send_time).toLocaleString([], {
+                      {new Date(message.SendTime).toLocaleString([], {
                         hour: "2-digit",
                         minute: "2-digit",
                       })}
                     </p>
                     <div>
-                      {message.message_state === "read" ? (
+                      {message.MessageState === "read" ? (
                         <Check
                           size={12}
                           color="var(--primary-foreground-alt)"
                         />
-                      ) : message.message_state === "received" ? (
+                      ) : message.MessageState === "received" ? (
                         <Check size={12} color="var(--muted-foreground)" />
-                      ) : message.message_state === "sent" ? (
+                      ) : message.MessageState === "sent" ? (
                         <RefreshCw size={12} color="var(--muted-foreground)" />
-                      ) : message.message_state === "sending" ? (
+                      ) : message.MessageState === "sending" ? (
                         <Ellipse size={12} color="var(--muted-foreground)" />
                       ) : null}
                     </div>
@@ -231,11 +231,11 @@ function MessageComponent({
 
 export default React.memo(MessageComponent, (prev, next) => {
   return (
-    prev.message.send_time === next.message.send_time &&
+    prev.message.SendTime === next.message.SendTime &&
     prev.message.content === next.message.content &&
     prev.message.height === next.message.height &&
-    prev.message.sent_by_self === next.message.sent_by_self &&
-    prev.message.message_state === next.message.message_state &&
+    prev.message.SentBySelf === next.message.SentBySelf &&
+    prev.message.MessageState === next.message.MessageState &&
     prev.message.failed === next.message.failed &&
     prev.grouped === next.grouped &&
     prev.user === next.user
diff --git a/packages/chat/src/context.tsx b/packages/chat/src/context.tsx
index 1f641ce..f1688eb 100644
--- a/packages/chat/src/context.tsx
+++ b/packages/chat/src/context.tsx
@@ -24,23 +24,23 @@ export const context = createContext<contextType | undefined>(undefined);
 const queryClient = new QueryClient();
 
 function updateMessageStateBySendTime<
-  T extends { send_time: number; message_state: RawMessage["message_state"] },
+  T extends { SendTime: number; MessageState: RawMessage["MessageState"] },
 >(
   messages: T[],
   sendTime: number,
-  messageState: RawMessage["message_state"],
+  messageState: RawMessage["MessageState"],
 ): { next: T[]; updated: boolean } {
   let updated = false;
 
   const next = messages.map((item) => {
-    if (item.send_time !== sendTime || item.message_state === messageState) {
+    if (item.SendTime !== sendTime || item.MessageState === messageState) {
       return item;
     }
 
     updated = true;
     return {
       ...item,
-      message_state: messageState,
+      MessageState: messageState,
     };
   });
 
@@ -105,8 +105,8 @@ export default function Provider(props: { children: ReactNode }) {
         const ownData = await get(ownId);
         const sharedSecret = await getSharedSecret(
           privateKey,
-          ownData.public_key,
-          recipientData.public_key,
+          ownData.PublicKey,
+          recipientData.PublicKey,
         );
 
         if (active) {
@@ -135,7 +135,7 @@ export default function Provider(props: { children: ReactNode }) {
       const messages = await send("messages_get", {
         amount,
         offset,
-        user_id: userIdValue,
+        UserId: userIdValue,
       });
 
       if (messages.type.startsWith("error")) {
@@ -143,14 +143,14 @@ export default function Provider(props: { children: ReactNode }) {
       }
 
       const rawMessages = messages.data.messages;
-      const sorted = [...rawMessages].sort((a, b) => a.send_time - b.send_time);
+      const sorted = [...rawMessages].sort((a, b) => a.SendTime - b.SendTime);
 
       if (sorted.length > 0) {
-        const fetchedSendTimes = new Set(sorted.map((item) => item.send_time));
+        const fetchedSendTimes = new Set(sorted.map((item) => item.SendTime));
 
         setLiveMessagesState((prev) => {
           const filtered = prev.filter(
-            (liveMessage) => !fetchedSendTimes.has(liveMessage.send_time),
+            (liveMessage) => !fetchedSendTimes.has(liveMessage.SendTime),
           );
 
           return filtered.length === prev.length ? prev : filtered;
@@ -179,7 +179,7 @@ export default function Provider(props: { children: ReactNode }) {
         globalThis.crypto?.randomUUID?.() ??
         `${Date.now()}-${Math.random().toString(36).slice(2)}`;
 
-      if (!message.sent_by_self) {
+      if (!message.SentBySelf) {
         moveUserIdToTop(userIdValue);
       }
 
@@ -219,20 +219,20 @@ export default function Provider(props: { children: ReactNode }) {
       }
 
       const rawData = message.data as {
-        chat_partner_id: unknown;
-        send_time: unknown;
-        message_state: RawMessage["message_state"];
+        ChatPartnerId: unknown;
+        SendTime: unknown;
+        MessageState: RawMessage["MessageState"];
       };
 
       const nextState = {
-        chat_partner_id: Number(rawData.chat_partner_id),
-        send_time: Number(rawData.send_time),
-        message_state: rawData.message_state,
+        ChatPartnerId: Number(rawData.ChatPartnerId),
+        SendTime: Number(rawData.SendTime),
+        MessageState: rawData.MessageState,
       };
 
       if (
-        !Number.isFinite(nextState.chat_partner_id) ||
-        !Number.isFinite(nextState.send_time)
+        !Number.isFinite(nextState.ChatPartnerId) ||
+        !Number.isFinite(nextState.SendTime)
       ) {
         log(
           3,
@@ -243,7 +243,7 @@ export default function Provider(props: { children: ReactNode }) {
         return;
       }
 
-      if (nextState.chat_partner_id !== userIdValue) {
+      if (nextState.ChatPartnerId !== userIdValue) {
         log(
           3,
           "chat",
@@ -251,7 +251,7 @@ export default function Provider(props: { children: ReactNode }) {
           "Cancel message state update due to user ID mismatch",
           {
             expected: userIdValue,
-            received: nextState.chat_partner_id,
+            received: nextState.ChatPartnerId,
           },
         );
         return;
@@ -260,8 +260,8 @@ export default function Provider(props: { children: ReactNode }) {
       setLiveMessagesState((prev) => {
         const { next, updated } = updateMessageStateBySendTime(
           prev,
-          nextState.send_time,
-          nextState.message_state,
+          nextState.SendTime,
+          nextState.MessageState,
         );
         return updated ? next : prev;
       });
@@ -283,8 +283,8 @@ export default function Provider(props: { children: ReactNode }) {
           const pages = current.pages.map((page) => {
             const nextPage = updateMessageStateBySendTime(
               page,
-              nextState.send_time,
-              nextState.message_state,
+              nextState.SendTime,
+              nextState.MessageState,
             );
 
             if (nextPage.updated) {
diff --git a/packages/chat/src/screen.tsx b/packages/chat/src/screen.tsx
index ffdcab7..b49ec04 100644
--- a/packages/chat/src/screen.tsx
+++ b/packages/chat/src/screen.tsx
@@ -48,7 +48,7 @@ function shouldFetchPreviousPage({
 }
 
 function getMessageRenderKey(message: RawMessage | LiveMessage) {
-  return "localId" in message ? message.localId : String(message.send_time);
+  return "localId" in message ? message.localId : String(message.SendTime);
 }
 
 function buildMessageChunks(
@@ -184,11 +184,11 @@ export default function Screen() {
     const dedupedMessages: RawMessage[] = [];
 
     for (const message of [...pages].reverse().flat()) {
-      if (seenSendTimes.has(message.send_time)) {
+      if (seenSendTimes.has(message.SendTime)) {
         continue;
       }
 
-      seenSendTimes.add(message.send_time);
+      seenSendTimes.add(message.SendTime);
       dedupedMessages.push(message);
     }
 
@@ -199,11 +199,11 @@ export default function Screen() {
 
   const liveWithoutDuplicates = React.useMemo(() => {
     const historicalSendTimes = new Set(
-      historicalMessages.map((message) => message.send_time),
+      historicalMessages.map((message) => message.SendTime),
     );
 
     return liveMessagesSnapshot.filter(
-      (message) => !historicalSendTimes.has(message.send_time),
+      (message) => !historicalSendTimes.has(message.SendTime),
     );
   }, [historicalMessages, liveMessagesSnapshot]);
 
@@ -559,9 +559,9 @@ export default function Screen() {
                     const lastMessage = messages[messageIndex - 1];
                     const isGrouped =
                       lastMessage &&
-                      lastMessage.sent_by_self === message.sent_by_self &&
-                      Math.round(lastMessage.send_time / 10000) ===
-                        Math.round(message.send_time / 10000);
+                      lastMessage.SentBySelf === message.SentBySelf &&
+                      Math.round(lastMessage.SendTime / 10000) ===
+                        Math.round(message.SendTime / 10000);
 
                     return (
                       <Message
@@ -569,7 +569,7 @@ export default function Screen() {
                         grouped={isGrouped}
                         message={message}
                         user={
-                          message.sent_by_self
+                          message.SentBySelf
                             ? (messageUsers.own ?? null)
                             : (messageUsers.peer ?? null)
                         }
diff --git a/packages/mtp/src/context.tsx b/packages/mtp/src/context.tsx
index bcdcbaa..6b75c6e 100644
--- a/packages/mtp/src/context.tsx
+++ b/packages/mtp/src/context.tsx
@@ -116,47 +116,15 @@ function getProtocolErrorDetails(error: unknown) {
   };
 }
 
-function toPascalCase(value: string) {
-  return value
-    .split("_")
-    .map((part) => part.charAt(0).toUpperCase() + part.slice(1))
-    .join("");
-}
-
-function toSnakeCase(value: string) {
-  return value
-    .replace(/([a-z0-9])([A-Z])/g, "$1_$2")
-    .replace(/([A-Z]+)([A-Z][a-z])/g, "$1_$2")
-    .toLowerCase();
-}
-
-function mapDataKeys(value: unknown, mapKey: (key: string) => string): unknown {
-  if (Array.isArray(value)) {
-    return value.map((item) => mapDataKeys(item, mapKey));
-  }
-
-  if (typeof value !== "object" || value === null) {
-    return value;
-  }
-
-  return Object.fromEntries(
-    Object.entries(value).map(([key, entry]) => [
-      mapKey(key),
-      mapDataKeys(entry, mapKey),
-    ]),
-  );
-}
-
 // Zod schema validation
 function validateResponse<T extends keyof Schemas & string>(
   type: T,
   message: { id?: number; type: string; data: unknown },
 ): ProtocolMessage<T> {
   const appType = APP_TYPES[message.type] ?? message.type;
-  const data = mapDataKeys(message.data, toSnakeCase);
 
   if (appType.startsWith("error")) {
-    return { ...message, type: appType, data } as ProtocolMessage<T>;
+    return { ...message, type: appType } as ProtocolMessage<T>;
   }
 
   const schema = schemas[type]?.response;
@@ -164,7 +132,7 @@ function validateResponse<T extends keyof Schemas & string>(
     return message as ProtocolMessage<T>;
   }
 
-  const parsed = schema.safeParse(data);
+  const parsed = schema.safeParse(message.data);
   if (!parsed.success) {
     throw new Error(
       `Response validation failed for ${type}: ${parsed.error.message}`,
@@ -223,7 +191,7 @@ export function Provider(props: {
 
       const message = await client.request(
         WIRE_TYPES[type],
-        mapDataKeys(data ?? {}, toPascalCase) as Record<string, unknown>,
+        (data ?? {}) as Record<string, unknown>,
         options,
       );
       return validateResponse(type, message);
@@ -282,10 +250,10 @@ export function Provider(props: {
     const interval = setInterval(async () => {
       try {
         const originalNow = Date.now();
-        const data = await send("ping", { last_ping: originalNow });
+        const data = await send("ping", { LastPing: originalNow });
         setOwnPing(Date.now() - originalNow);
 
-        const remotePing = data.data.ping_iota;
+        const remotePing = data.data.PingIota;
         if (typeof remotePing === "number") {
           setIotaPing(remotePing);
         }
diff --git a/packages/notifications/src/context.tsx b/packages/notifications/src/context.tsx
index 96332ce..799f695 100644
--- a/packages/notifications/src/context.tsx
+++ b/packages/notifications/src/context.tsx
@@ -35,41 +35,41 @@ export default function Provider(props: { children: React.ReactNode }) {
   useEffect(() => {
     return subscribePush(async (ttpMessage) => {
       if (ttpMessage.type === "message_live") {
-        const { message, sender_id } = ttpMessage.data as {
+        const { message, SenderId } = ttpMessage.data as {
           message: z.infer<typeof messageSchema>;
-          sender_id: number;
+          SenderId: number;
         };
 
-        const user = await get(sender_id);
+        const user = await get(SenderId);
 
         const decryptedContent = await decryptText(
           await getSharedSecret(
             await load("private_key"),
-            await get(await load("user_id")).then((data) => data.public_key),
-            user.public_key,
+            await get(await load("user_id")).then((data) => data.PublicKey),
+            user.PublicKey,
           ),
           message.content,
         );
 
         // Update message state
-        if (userId === sender_id) {
+        if (userId === SenderId) {
           addLiveMessage({
             ...message,
             content: decryptedContent,
-            sent_by_self: false,
+            SentBySelf: false,
           });
           return;
         }
 
         // todo: add notification symbol to conversation cards (incl. message start)
 
-        moveUserIdToTop(sender_id);
+        moveUserIdToTop(SenderId);
 
         if (await load("settings.receive_confirmations")) {
           void send(
             "message_state",
             {
-              message_state: "received",
+              MessageState: "received",
             },
             {
               id: ttpMessage.id,
@@ -87,14 +87,14 @@ export default function Provider(props: { children: React.ReactNode }) {
               body: decryptedContent,
               icon: user.avatar || user.display.slice(0, 2).toUpperCase(),
               badge: user.avatar || user.display.slice(0, 2).toUpperCase(),
-              tag: `message-${user.user_id}`,
+              tag: `message-${user.UserId}`,
               silent: true,
             });
 
             notification.onclick = () => {
               window.focus();
               navigate({
-                to: `/chat?id=${user.user_id}`,
+                to: `/chat?id=${user.UserId}`,
               });
 
               notification.close();
diff --git a/packages/shared/src/data.ts b/packages/shared/src/data.ts
index b284c14..d56ec7c 100644
--- a/packages/shared/src/data.ts
+++ b/packages/shared/src/data.ts
@@ -14,28 +14,28 @@ const fileFromMessage = z.object({
 
 export const message = z.object({
   height: z.number(),
-  not_encrypted: z.boolean().optional(),
-  sent_by_self: z.boolean().optional(),
-  send_time: z.number(),
+  NotEncrypted: z.boolean().optional(),
+  SentBySelf: z.boolean().optional(),
+  SendTime: z.number(),
   content: z.base64(),
   files: z.array(fileFromMessage).optional(),
   tint: z.string().length(7).startsWith("#").optional(),
   avatar: z.boolean().optional(),
   display: z.boolean().optional(),
-  message_state: z
+  MessageState: z
     .enum(["read", "received", "sent", "sending", "awaiting"]) // awaiting for 'internal' use
     .default("received"),
 });
 
 export const failedUser = {
   display: "Failed",
-  iota_id: 0,
-  omikron_connections: [],
-  online_status: "user_borked",
-  public_key: "",
-  sub_end: 0,
-  sub_level: 0,
-  user_id: 0,
+  IotaId: 0,
+  OmikronConnections: [],
+  OnlineStatus: "user_borked",
+  PublicKey: "",
+  SubEnd: 0,
+  SubLevel: 0,
+  UserId: 0,
   username: "unknown",
 } as z.infer<typeof mtp.get_user_data.response>;
 
@@ -43,12 +43,12 @@ const authPayload = z.object({
   communities: z.array(z.object({})).optional(),
   contacts: z.array(
     z.object({
-      last_message_at: z.number(),
-      user_id: z.number(),
-      last_message: z
+      LastMessageAt: z.number(),
+      UserId: z.number(),
+      LastMessage: z
         .object({
           content: z.base64(),
-          sender_id: z.number(),
+          SenderId: z.number(),
         })
         .optional(),
       messages: z.array(message),
@@ -56,9 +56,9 @@ const authPayload = z.object({
   ),
   calls: z.array(
     z.object({
-      call_id: z.string(),
-      call_secret: z.base64().optional(),
-      call_members: z.array(z.number()),
+      CallId: z.string(),
+      CallSecret: z.base64().optional(),
+      CallMembers: z.array(z.number()),
     }),
   ),
 });
@@ -92,10 +92,10 @@ const user = z.object({
   about: z.string().max(255).optional(),
   avatar: z.string().optional(),
   display: z.string().min(1).max(15),
-  iota_id: z.number(),
-  omikron_connections: z.array(z.number()),
-  omikron_id: z.number().optional(),
-  online_status: z.enum([
+  IotaId: z.number(),
+  OmikronConnections: z.array(z.number()),
+  OmikronId: z.number().optional(),
+  OnlineStatus: z.enum([
     "user_offline",
     "user_online",
     "user_dnd",
@@ -106,11 +106,11 @@ const user = z.object({
     "iota_online",
     "iota_borked",
   ]),
-  public_key: z.base64(),
+  PublicKey: z.base64(),
   status: z.string().max(15).optional(),
-  sub_end: z.number(),
-  sub_level: z.number(),
-  user_id: z.number(),
+  SubEnd: z.number(),
+  SubLevel: z.number(),
+  UserId: z.number(),
   username: z.string().min(1).max(15),
 });
 export const mtp = {
@@ -120,7 +120,7 @@ export const mtp = {
   },
   get_user_data: {
     request: z.object({
-      user_id: z.number().optional(),
+      UserId: z.number().optional(),
       username: z.string().optional(),
     }),
     response: user,
@@ -131,22 +131,22 @@ export const mtp = {
   },
   ping: {
     request: z.object({
-      last_ping: z.number(),
+      LastPing: z.number(),
     }),
     response: z.object({
-      ping_iota: z.number(),
+      PingIota: z.number(),
     }),
   },
   message_live: {
     request: z.object({}).optional(),
     response: z.object({
-      sender_id: z.number(),
+      SenderId: z.number(),
       message,
     }),
   },
   messages_get: {
     request: z.object({
-      user_id: z.number(),
+      UserId: z.number(),
       amount: z.number(),
       offset: z.number(),
     }),
@@ -158,35 +158,35 @@ export const mtp = {
     request: z.object({
       height: z.number(),
       content: z.base64(),
-      receiver_id: z.number(),
-      send_time: z.number(),
+      ReceiverId: z.number(),
+      SendTime: z.number(),
       files: z.array(fileFromMessage).optional(),
     }),
     response: z.object({}),
   },
   add_conversation: {
     request: z.object({
-      chat_partner_id: z.number().optional(),
-      chat_partner_name: z.string().min(1).max(15).optional(),
+      ChatPartnerId: z.number().optional(),
+      ChatPartnerName: z.string().min(1).max(15).optional(),
     }),
     response: z.object({}),
   },
   message_state: {
     request: z
       .object({
-        chat_partner_id: z.number(),
-        send_time: z.number(),
-        message_state: message.shape.message_state,
+        ChatPartnerId: z.number(),
+        SendTime: z.number(),
+        MessageState: message.shape.MessageState,
       })
       .or(
         z.object({
-          message_state: message.shape.message_state,
+          MessageState: message.shape.MessageState,
         }),
       ),
     response: z.object({
-      chat_partner_id: z.number(),
-      message_state: message.shape.message_state,
-      send_time: z.number(),
+      ChatPartnerId: z.number(),
+      MessageState: message.shape.MessageState,
+      SendTime: z.number(),
     }),
   },
 
@@ -200,7 +200,7 @@ export const mtp = {
   },
   authenticate_app: {
     request: z.object({
-      app_identifier: z.string(),
+      AppIdentifier: z.string(),
     }),
     response: z.object({
       challenge: z.base64(),
@@ -208,8 +208,8 @@ export const mtp = {
   },
   create_app: {
     request: z.object({
-      app_public_key: z.base64(),
-      app_identifier: z.string(),
+      AppPublicKey: z.base64(),
+      AppIdentifier: z.string(),
     }),
     response: z.object({}),
   },
@@ -217,30 +217,30 @@ export const mtp = {
   // Calls
   call_token: {
     request: z.object({
-      call_id: z.string(),
+      CallId: z.string(),
     }),
     response: z.object({
-      call_token: z.string(),
+      CallToken: z.string(),
     }),
   },
   call_data: {
     request: z.object({
-      call_id: z.string(),
+      CallId: z.string(),
     }),
     response: z.object({
-      user_ids: z.array(z.number()),
+      UserIds: z.array(z.number()),
     }),
   },
   call_invite: {
     request: z.object({
-      call_id: z.string(),
-      call_secret: z.base64(),
-      receiver_id: z.number(),
+      CallId: z.string(),
+      CallSecret: z.base64(),
+      ReceiverId: z.number(),
     }),
     response: z.object({
-      call_id: z.string().optional(),
-      call_secret: z.base64().optional(),
-      sender_id: z.number().optional(),
+      CallId: z.string().optional(),
+      CallSecret: z.base64().optional(),
+      SenderId: z.number().optional(),
     }),
   },
   error_no_iota: {
@@ -355,7 +355,7 @@ export const storageDefaults: Storage = {
 
 // User Status
 export function getStatusColor(
-  status: z.infer<typeof mtp.get_user_data.response.shape.online_status>,
+  status: z.infer<typeof mtp.get_user_data.response.shape.OnlineStatus>,
 ) {
   switch (status) {
     case "user_online":
diff --git a/packages/storage/src/session.tsx b/packages/storage/src/session.tsx
index 9a9181b..992a4df 100644
--- a/packages/storage/src/session.tsx
+++ b/packages/storage/src/session.tsx
@@ -29,7 +29,7 @@ export default function SessionProvider({ children }: { children: ReactNode }) {
   const calls = [
     ...freshCalls,
     ...localCalls.filter(
-      (call) => !freshCalls.some((fresh) => fresh.call_id === call.call_id),
+      (call) => !freshCalls.some((fresh) => fresh.CallId === call.CallId),
     ),
   ];
 
@@ -40,7 +40,7 @@ export default function SessionProvider({ children }: { children: ReactNode }) {
         ...freshContacts,
         ...cachedData.filter(
           (item) =>
-            !freshContacts.some((fresh) => fresh.user_id === item.user_id),
+            !freshContacts.some((fresh) => fresh.UserId === item.UserId),
         ),
       ]);
     });
@@ -69,7 +69,7 @@ export default function SessionProvider({ children }: { children: ReactNode }) {
   const moveUserIdToTop = (userId: number) => {
     setContacts((prevContacts) => {
       const userIndex = prevContacts.findIndex(
-        (contact) => contact.user_id === userId,
+        (contact) => contact.UserId === userId,
       );
       if (userIndex === -1) return prevContacts;
       const [user] = prevContacts.splice(userIndex, 1);
@@ -79,13 +79,13 @@ export default function SessionProvider({ children }: { children: ReactNode }) {
 
   const insertContact = (userId: number) => {
     setContacts((prevContacts) => {
-      if (prevContacts.some((contact) => contact.user_id === userId)) {
+      if (prevContacts.some((contact) => contact.UserId === userId)) {
         return prevContacts;
       }
 
       const newUser = {
-        user_id: userId,
-        last_message_at: new Date().getTime(),
+        UserId: userId,
+        LastMessageAt: new Date().getTime(),
         messages: [],
       } satisfies Contacts[0];
 
@@ -95,7 +95,7 @@ export default function SessionProvider({ children }: { children: ReactNode }) {
 
   const insertCall = (call: Calls[number]) => {
     setLocalCalls((prevCalls) => {
-      if (prevCalls.some((prevCall) => prevCall.call_id === call.call_id)) {
+      if (prevCalls.some((prevCall) => prevCall.CallId === call.CallId)) {
         return prevCalls;
       }
 
diff --git a/packages/tauth/src/context.tsx b/packages/tauth/src/context.tsx
index 31ca22a..5dea659 100644
--- a/packages/tauth/src/context.tsx
+++ b/packages/tauth/src/context.tsx
@@ -62,7 +62,7 @@ export default function Wrapper({ children }: { children: ReactNode }) {
       // Get Shared Secret
       const sharedSecret = await getSharedSecret(
         await load("private_key"),
-        user.public_key,
+        user.PublicKey,
         appPublicKey,
       ).catch((err) => {
         log(1, "tauth", "red", "Failed to get shared secret", err, {
@@ -92,8 +92,8 @@ export default function Wrapper({ children }: { children: ReactNode }) {
 
       // Save Session
       await send("create_app", {
-        app_public_key: appPublicKey,
-        app_identifier: identifier,
+        AppPublicKey: appPublicKey,
+        AppIdentifier: identifier,
       });
 
       // Open Redirect URL
diff --git a/packages/user/src/context.tsx b/packages/user/src/context.tsx
index 41340fb..84e56ec 100644
--- a/packages/user/src/context.tsx
+++ b/packages/user/src/context.tsx
@@ -47,7 +47,7 @@ export default function UserProvider(props: { children: React.ReactNode }) {
       }
 
       const request = (async () => {
-        const userData = await send("get_user_data", { user_id: userId });
+        const userData = await send("get_user_data", { UserId: userId });
         const user = {
           ...userData.data,
           avatar: userData.data.avatar