diff --git a/components/InvitePopup.vue b/components/InvitePopup.vue
index ee6f124..f42a659 100644
--- a/components/InvitePopup.vue
+++ b/components/InvitePopup.vue
@@ -20,7 +20,7 @@ const route = useRoute();
 
 async function generateInvite(): Promise<void> {
   const createdInvite: InviteResponse | undefined = await fetchWithApi(
-    `/servers/${route.params.serverId}/invites`,
+    `/guilds/${route.params.guildId}/invites`,
     { method: "POST", body: { custom_id: "oijewfoiewf" } }
   );
 
diff --git a/layouts/client.vue b/layouts/client.vue
index 1038412..52fb3c7 100644
--- a/layouts/client.vue
+++ b/layouts/client.vue
@@ -10,8 +10,8 @@
 			<NuxtLink id="home-button" href="/">
 				<Icon name="lucide:house" class="white" size="2rem" />
 			</NuxtLink>
-			<div id="servers-list">
-				<NuxtLink v-for="server of servers" :href="`/servers/${server.uuid}`">
+			<div id="guilds-list">
+				<NuxtLink v-for="guild of guilds" :href="`/guilds/${guild.uuid}`">
 					<Icon name="lucide:server" class="white" size="2rem" />
 				</NuxtLink>
 			</div>
@@ -26,7 +26,7 @@ import type { GuildResponse } from '~/types/interfaces';
 
 const loading = useState("loading", () => false);
 
-const servers: GuildResponse[] | undefined = await fetchWithApi("/me/guilds");
+const guilds: GuildResponse[] | undefined = await fetchWithApi("/me/guilds");
 
 //const servers = await fetchWithApi("/servers") as { uuid: string, name: string, description: string }[];
 //console.log("servers:", servers);
@@ -169,7 +169,7 @@ const members = [
 	padding-bottom: 1dvh;
 }
 
-#servers-list {
+#guilds-list {
 	display: flex;
 	flex-direction: column;
 	gap: 1dvh;
diff --git a/pages/servers/[serverId]/index.vue b/pages/servers/[serverId]/index.vue
index ce6bea5..cc3f36a 100644
--- a/pages/servers/[serverId]/index.vue
+++ b/pages/servers/[serverId]/index.vue
@@ -5,8 +5,8 @@
 </template>
 
 <script lang="ts" setup>
-const server = await fetchWithApi(`/guilds/${useRoute().params.serverId}`);
-console.log("server:", server);
+const guild = await fetchWithApi(`/guilds/${useRoute().params.guildId}`);
+console.log("guild:", guild);
 
 </script>
 
diff --git a/utils/fetchMember.ts b/utils/fetchMember.ts
index 8f4a9e4..c6eadfb 100644
--- a/utils/fetchMember.ts
+++ b/utils/fetchMember.ts
@@ -1,6 +1,6 @@
 import type { UserResponse } from "~/types/interfaces"
 
-export default async (serverId: string, memberId: string): Promise<UserResponse> => {
-	const user = await fetchWithApi(`/guilds/${serverId}/members/${memberId}`) as UserResponse;
+export default async (guildId: string, memberId: string): Promise<UserResponse> => {
+	const user = await fetchWithApi(`/guilds/${guildId}/members/${memberId}`) as UserResponse;
 	return user;
 }
diff --git a/utils/fetchUser.ts b/utils/fetchUser.ts
index d509fe0..fbd3843 100644
--- a/utils/fetchUser.ts
+++ b/utils/fetchUser.ts
@@ -1,6 +1,6 @@
 import type { UserResponse } from "~/types/interfaces"
 
-export default async (serverId: string, userId: string): Promise<UserResponse> => {
+export default async (guildId: string, userId: string): Promise<UserResponse> => {
 	const user = await fetchWithApi(`/users/${userId}`) as UserResponse;
 	return user;
 }