diff --git a/components/InvitePopup.vue b/components/InvitePopup.vue
index f42a659..262507a 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(
-    `/guilds/${route.params.guildId}/invites`,
+    `/guilds/${route.params.serverId}/invites`,
     { method: "POST", body: { custom_id: "oijewfoiewf" } }
   );
 
diff --git a/layouts/client.vue b/layouts/client.vue
index 52fb3c7..312b0a5 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="guilds-list">
-				<NuxtLink v-for="guild of guilds" :href="`/guilds/${guild.uuid}`">
+			<div id="servers-list">
+				<NuxtLink v-for="guild of guilds" :href="`/servers/${guild.uuid}`">
 					<Icon name="lucide:server" class="white" size="2rem" />
 				</NuxtLink>
 			</div>
@@ -169,7 +169,7 @@ const members = [
 	padding-bottom: 1dvh;
 }
 
-#guilds-list {
+#servers-list {
 	display: flex;
 	flex-direction: column;
 	gap: 1dvh;
diff --git a/pages/servers/[serverId]/channels/[channelId].vue b/pages/servers/[serverId]/channels/[channelId].vue
index a921b24..5458088 100644
--- a/pages/servers/[serverId]/channels/[channelId].vue
+++ b/pages/servers/[serverId]/channels/[channelId].vue
@@ -5,7 +5,7 @@
 				<h3>
 					{{ server?.name }}
 					<span>
-						<button @click="showServerSettings">
+						<button @click="showGuildSettings">
 							<Icon name="lucide:settings" />
 						</button>
 					</span>
@@ -20,7 +20,7 @@
 			<div id="channels-list">
 				<Channel v-for="channel of channels" :name="channel.name"
 					:uuid="channel.uuid" :current-uuid="(route.params.channelId as string)"
-					:href="`/guilds/${route.params.serverId}/channels/${channel.uuid}`" />
+					:href="`/servers/${route.params.serverId}/channels/${channel.uuid}`" />
 			</div>
 		</div>
 		<MessageArea :channel-url="channelUrlPath" />
@@ -102,10 +102,10 @@ const members = [
 
 onMounted(async () => {
 	console.log("channelid: set loading to true");
-	const serverUrl = `guilds/${route.params.serverId}`;
-	server.value = await fetchWithApi(serverUrl);
+	const guildUrl = `guilds/${route.params.serverId}`;
+	server.value = await fetchWithApi(guildUrl);
 
-	channels.value = await fetchWithApi(`${serverUrl}/channels`);
+	channels.value = await fetchWithApi(`${guildUrl}/channels`);
 	console.log("channels:", channels.value);
 	channel.value = await fetchWithApi(route.path);
 	console.log("channel:", channel.value);
@@ -114,7 +114,7 @@ onMounted(async () => {
 	console.log("channelid: set loading to false");
 });
 
-function showServerSettings() { }
+function showGuildSettings() { }
 
 function toggleInvitePopup(e: Event) {
 	e.preventDefault();
diff --git a/pages/servers/[serverId]/index.vue b/pages/servers/[serverId]/index.vue
index cc3f36a..28ee913 100644
--- a/pages/servers/[serverId]/index.vue
+++ b/pages/servers/[serverId]/index.vue
@@ -5,7 +5,7 @@
 </template>
 
 <script lang="ts" setup>
-const guild = await fetchWithApi(`/guilds/${useRoute().params.guildId}`);
+const guild = await fetchWithApi(`/guilds/${useRoute().params.serverId}`);
 console.log("guild:", guild);
 
 </script>
diff --git a/utils/fetchMember.ts b/utils/fetchMember.ts
index c6eadfb..8f4a9e4 100644
--- a/utils/fetchMember.ts
+++ b/utils/fetchMember.ts
@@ -1,6 +1,6 @@
 import type { UserResponse } from "~/types/interfaces"
 
-export default async (guildId: string, memberId: string): Promise<UserResponse> => {
-	const user = await fetchWithApi(`/guilds/${guildId}/members/${memberId}`) as UserResponse;
+export default async (serverId: string, memberId: string): Promise<UserResponse> => {
+	const user = await fetchWithApi(`/guilds/${serverId}/members/${memberId}`) as UserResponse;
 	return user;
 }
diff --git a/utils/fetchUser.ts b/utils/fetchUser.ts
index fbd3843..d509fe0 100644
--- a/utils/fetchUser.ts
+++ b/utils/fetchUser.ts
@@ -1,6 +1,6 @@
 import type { UserResponse } from "~/types/interfaces"
 
-export default async (guildId: string, userId: string): Promise<UserResponse> => {
+export default async (serverId: string, userId: string): Promise<UserResponse> => {
 	const user = await fetchWithApi(`/users/${userId}`) as UserResponse;
 	return user;
 }