diff --git a/src/lib/backend/convex/messages.ts b/src/lib/backend/convex/messages.ts
index c15b58e..2f110a9 100644
--- a/src/lib/backend/convex/messages.ts
+++ b/src/lib/backend/convex/messages.ts
@@ -2,7 +2,7 @@ import { v } from 'convex/values';
 import { mutation, query } from './_generated/server';
 import { api } from './_generated/api';
 import { messageRoleValidator, providerValidator } from './schema';
-import { Id } from './_generated/dataModel';
+import type { Id } from './_generated/dataModel';
 
 export const getAllFromConversation = query({
 	args: {
diff --git a/src/lib/backend/convex/user_enabled_models.ts b/src/lib/backend/convex/user_enabled_models.ts
index afc4c24..d5ca9f9 100644
--- a/src/lib/backend/convex/user_enabled_models.ts
+++ b/src/lib/backend/convex/user_enabled_models.ts
@@ -5,7 +5,7 @@ import * as array from '../../utils/array';
 import * as object from '../../utils/object';
 import { internal } from './_generated/api';
 import { Provider } from '../../types';
-import { Doc } from './_generated/dataModel';
+import type { Doc } from './_generated/dataModel';
 
 export const getModelKey = (args: { provider: Provider; model_id: string }) => {
 	return `${args.provider}:${args.model_id}`;
@@ -13,11 +13,11 @@ export const getModelKey = (args: { provider: Provider; model_id: string }) => {
 
 export const get_enabled = query({
 	args: {
-		sessionToken: v.string(),
+		session_token: v.string(),
 	},
 	handler: async (ctx, args): Promise<Record<string, Doc<'user_enabled_models'>>> => {
 		const session = await ctx.runQuery(internal.betterAuth.getSession, {
-			sessionToken: args.sessionToken,
+			sessionToken: args.session_token,
 		});
 
 		if (!session) throw new Error('Invalid session token');
@@ -59,11 +59,11 @@ export const get = query({
 	args: {
 		provider: providerValidator,
 		model_id: v.string(),
-		sessionToken: v.string(),
+		session_token: v.string(),
 	},
 	handler: async (ctx, args): Promise<Doc<'user_enabled_models'> | null> => {
 		const session = await ctx.runQuery(internal.betterAuth.getSession, {
-			sessionToken: args.sessionToken,
+			sessionToken: args.session_token,
 		});
 
 		if (!session) throw new Error('Invalid session token');
@@ -71,9 +71,7 @@ export const get = query({
 		const model = await ctx.db
 			.query('user_enabled_models')
 			.withIndex('by_model_provider_user', (q) =>
-				q.eq('model_id', args.model_id)
-					.eq('provider', args.provider)
-					.eq('user_id', session.userId)
+				q.eq('model_id', args.model_id).eq('provider', args.provider).eq('user_id', session.userId)
 			)
 			.first();
 
@@ -86,11 +84,11 @@ export const set = mutation({
 		provider: providerValidator,
 		model_id: v.string(),
 		enabled: v.boolean(),
-		sessionToken: v.string(),
+		session_token: v.string(),
 	},
 	handler: async (ctx, args) => {
 		const session = await ctx.runQuery(internal.betterAuth.getSession, {
-			sessionToken: args.sessionToken,
+			sessionToken: args.session_token,
 		});
 
 		if (!session) throw new Error('Invalid session token');
diff --git a/src/lib/backend/convex/user_rules.ts b/src/lib/backend/convex/user_rules.ts
index f8d4ba7..503a477 100644
--- a/src/lib/backend/convex/user_rules.ts
+++ b/src/lib/backend/convex/user_rules.ts
@@ -2,18 +2,18 @@ import { v } from 'convex/values';
 import { mutation, query } from './_generated/server';
 import { internal } from './_generated/api';
 import { ruleAttachValidator } from './schema';
-import { Doc } from './_generated/dataModel';
+import type { Doc } from './_generated/dataModel';
 
 export const create = mutation({
 	args: {
 		name: v.string(),
 		attach: ruleAttachValidator,
 		rule: v.string(),
-		sessionToken: v.string(),
+		session_token: v.string(),
 	},
 	handler: async (ctx, args) => {
 		const session = await ctx.runQuery(internal.betterAuth.getSession, {
-			sessionToken: args.sessionToken,
+			sessionToken: args.session_token,
 		});
 
 		if (!session) throw new Error('Invalid session token');
@@ -39,11 +39,11 @@ export const update = mutation({
 		ruleId: v.id('user_rules'),
 		attach: ruleAttachValidator,
 		rule: v.string(),
-		sessionToken: v.string(),
+		session_token: v.string(),
 	},
 	handler: async (ctx, args) => {
 		const session = await ctx.runQuery(internal.betterAuth.getSession, {
-			sessionToken: args.sessionToken,
+			sessionToken: args.session_token,
 		});
 
 		if (!session) throw new Error('Invalid session token');
@@ -63,11 +63,11 @@ export const update = mutation({
 export const remove = mutation({
 	args: {
 		ruleId: v.id('user_rules'),
-		sessionToken: v.string(),
+		session_token: v.string(),
 	},
 	handler: async (ctx, args) => {
 		const session = await ctx.runQuery(internal.betterAuth.getSession, {
-			sessionToken: args.sessionToken,
+			sessionToken: args.session_token,
 		});
 
 		if (!session) throw new Error('Invalid session token');
@@ -83,11 +83,11 @@ export const remove = mutation({
 
 export const all = query({
 	args: {
-		sessionToken: v.string(),
+		session_token: v.string(),
 	},
 	handler: async (ctx, args): Promise<Doc<'user_rules'>[]> => {
 		const session = await ctx.runQuery(internal.betterAuth.getSession, {
-			sessionToken: args.sessionToken,
+			sessionToken: args.session_token,
 		});
 
 		if (!session) throw new Error('Invalid session token');
diff --git a/src/lib/state/models.svelte.ts b/src/lib/state/models.svelte.ts
index 5a100e0..f301928 100644
--- a/src/lib/state/models.svelte.ts
+++ b/src/lib/state/models.svelte.ts
@@ -13,7 +13,7 @@ export class Models {
 
 	init = createInit(() => {
 		const query = useCachedQuery(api.user_enabled_models.get_enabled, {
-			sessionToken: session.current?.session.token ?? '',
+			session_token: session.current?.session.token ?? '',
 		});
 		watch(
 			() => $state.snapshot(query.data),
diff --git a/src/routes/account/customization/+page.svelte b/src/routes/account/customization/+page.svelte
index d24bfe5..2197286 100644
--- a/src/routes/account/customization/+page.svelte
+++ b/src/routes/account/customization/+page.svelte
@@ -23,7 +23,7 @@
 	let creatingRule = $state(false);
 
 	const userRulesQuery: QueryResult<Doc<'user_rules'>[]> = useCachedQuery(api.user_rules.all, {
-		sessionToken: session.current?.session.token ?? '',
+		session_token: session.current?.session.token ?? '',
 	});
 
 	async function submitNewRule(e: SubmitEvent) {
@@ -44,7 +44,7 @@
 			name,
 			attach,
 			rule,
-			sessionToken: session.current?.session.token ?? '',
+			session_token: session.current?.session.token ?? '',
 		});
 
 		creatingRule = false;
diff --git a/src/routes/account/customization/rule.svelte b/src/routes/account/customization/rule.svelte
index 32bb37c..228ff3e 100644
--- a/src/routes/account/customization/rule.svelte
+++ b/src/routes/account/customization/rule.svelte
@@ -41,7 +41,7 @@
 				ruleId: rule._id,
 				attach,
 				rule: ruleText,
-				sessionToken: session.current?.session.token ?? '',
+				session_token: session.current?.session.token ?? '',
 			}),
 			(e) => e
 		);
@@ -61,7 +61,7 @@
 
 		await client.mutation(api.user_rules.remove, {
 			ruleId: rule._id,
-			sessionToken: session.current?.session.token ?? '',
+			session_token: session.current?.session.token ?? '',
 		});
 
 		deleting = false;
diff --git a/src/routes/account/models/model-card.svelte b/src/routes/account/models/model-card.svelte
index 771884e..ddbe1c6 100644
--- a/src/routes/account/models/model-card.svelte
+++ b/src/routes/account/models/model-card.svelte
@@ -47,7 +47,7 @@
 				provider,
 				model_id: model.id,
 				enabled: v,
-				sessionToken: session.current?.session.token,
+				session_token: session.current?.session.token,
 			}),
 			(e) => e
 		);
diff --git a/src/routes/api/generate-message/+server.ts b/src/routes/api/generate-message/+server.ts
index 6db0708..2db278d 100644
--- a/src/routes/api/generate-message/+server.ts
+++ b/src/routes/api/generate-message/+server.ts
@@ -52,7 +52,7 @@ async function generateAIResponse(
 		client.query(api.user_enabled_models.get, {
 			provider: Provider.OpenRouter,
 			model_id: modelId,
-			sessionToken: session.token,
+			session_token: session.token,
 		}),
 		(e) => `Failed to get model: ${e}`
 	);
diff --git a/src/routes/chat/model-picker.svelte b/src/routes/chat/model-picker.svelte
index 60ab1d4..adf171d 100644
--- a/src/routes/chat/model-picker.svelte
+++ b/src/routes/chat/model-picker.svelte
@@ -11,7 +11,7 @@
 	let { class: className }: Props = $props();
 
 	const enabledModelsQuery = useCachedQuery(api.user_enabled_models.get_enabled, {
-		sessionToken: session.current?.session.token ?? '',
+		session_token: session.current?.session.token ?? '',
 	});
 
 	const enabledArr = $derived(Object.values(enabledModelsQuery.data ?? {}));