diff --git a/services/kanao-gateway/src/Stores/Listener.ts b/services/kanao-gateway/src/Stores/Listener.ts
index eb35d0b3..44c6d8e6 100644
--- a/services/kanao-gateway/src/Stores/Listener.ts
+++ b/services/kanao-gateway/src/Stores/Listener.ts
@@ -1,13 +1,13 @@
 /* eslint-disable unicorn/no-nested-ternary */
 
 import type { EventEmitter } from "node:events";
-import type { PieceContext, PieceOptions } from "@sapphire/pieces";
+import type { LoaderPieceContext, PieceOptions } from "@sapphire/pieces";
 import { Piece } from "@sapphire/pieces";
 import { Result } from "@sapphire/result";
 import type { Logger } from "pino";
 import type { ListenerStore } from "./ListenerStore.js";
 
-export type ListenerContext = PieceContext & {
+export type ListenerContext = LoaderPieceContext & {
     store: ListenerStore;
 };
 
diff --git a/services/kanao-gateway/src/Structures/NezuGateway.ts b/services/kanao-gateway/src/Structures/KanaoGateway.ts
similarity index 98%
rename from services/kanao-gateway/src/Structures/NezuGateway.ts
rename to services/kanao-gateway/src/Structures/KanaoGateway.ts
index 0f275c27..cfbe63a2 100644
--- a/services/kanao-gateway/src/Structures/NezuGateway.ts
+++ b/services/kanao-gateway/src/Structures/KanaoGateway.ts
@@ -24,7 +24,7 @@ const shardIds = await getShardCount();
 
 export class NezuGateway extends EventEmitter {
     public rest = new REST({ api: proxy, rejectOnRateLimit: proxy === "https://discord.com/api" ? null : () => false });
-    public logger = createLogger("nezu-gateway", clientId, storeLogs, lokiHost);
+    public logger = createLogger("kanao-gateway", clientId, storeLogs, lokiHost);
 
     public drizzle = drizzle(postgres(databaseUrl), { schema });
 
@@ -48,7 +48,7 @@ export class NezuGateway extends EventEmitter {
         initialPresence: {
             activities: [
                 {
-                    name: gatewayPresenceName ?? `NezukoChan Gateway v${packageJson.version}`,
+                    name: gatewayPresenceName ?? `Kanao Gateway v${packageJson.version}`,
                     type: gatewayPresenceType
                 }
             ],
diff --git a/services/kanao-gateway/src/Utilities/WebSockets/ProcessBootstrapper.ts b/services/kanao-gateway/src/Utilities/WebSockets/ProcessBootstrapper.ts
index 6f386796..7f94b431 100644
--- a/services/kanao-gateway/src/Utilities/WebSockets/ProcessBootstrapper.ts
+++ b/services/kanao-gateway/src/Utilities/WebSockets/ProcessBootstrapper.ts
@@ -39,7 +39,7 @@ export class ProcessBootstrapper {
     protected readonly shards = new Collection<number, WebSocketShard>();
 
     public constructor(
-        public logger = createLogger("nezu-gateway", Buffer.from(discordToken.split(".")[0], "base64").toString(), storeLogs, lokiHost),
+        public logger = createLogger("kanao-gateway", Buffer.from(discordToken.split(".")[0], "base64").toString(), storeLogs, lokiHost),
         public stores = new StoreRegistry()
     ) {}
 
diff --git a/services/kanao-gateway/src/index.ts b/services/kanao-gateway/src/index.ts
index bf0d5a51..71a741c3 100644
--- a/services/kanao-gateway/src/index.ts
+++ b/services/kanao-gateway/src/index.ts
@@ -11,7 +11,7 @@ import { drizzle } from "drizzle-orm/postgres-js";
 import { migrate } from "drizzle-orm/postgres-js/migrator";
 import gradient from "gradient-string";
 import postgres from "postgres";
-import { NezuGateway } from "./Structures/NezuGateway.js";
+import { NezuGateway } from "./Structures/KanaoGateway.js";
 import { databaseUrl, getShardCount, replicaCount, replicaId } from "./config.js";
 
 const gateway = new NezuGateway();
@@ -48,7 +48,7 @@ console.log(
                 String.raw`╲________╱╲___╱____╱ ╲______╱ ╲________╱╲________╱╲___╱____╱   ╲_____╱ `
             ],
             extra: [
-                ` Nezu Gateway: v${packageJson.version}`,
+                ` Kanao Gateway: v${packageJson.version}`,
                 ` ├ ReplicaId: ${replicaId}`,
                 ` ├ ReplicaCount: ${replicaCount}`,
                 ` ├ Shards: ${shardIds ? range(shardIds.start, shardIds.end!, 1).join(", ") : range(0, (gateway.ws.options.shardCount ?? 1) - 1, 1).join(", ")}`,