diff --git a/src/controllers/internal/new-episode/index.ts b/src/controllers/internal/new-episode/index.ts
index 3e1088e..a90202c 100644
--- a/src/controllers/internal/new-episode/index.ts
+++ b/src/controllers/internal/new-episode/index.ts
@@ -6,8 +6,8 @@ import { z } from "zod";
 
 import { fetchEpisodeUrlFromAllProviders } from "~/controllers/episodes/getEpisodeUrl";
 import { Case, changeStringCase } from "~/libs/changeStringCase";
-import type { AdminSdkCredentials } from "~/libs/fcm/getGoogleAuthToken";
-import { sendFcmMessage } from "~/libs/fcm/sendFcmMessage";
+import type { AdminSdkCredentials } from "~/libs/gcloud/getGoogleAuthToken";
+import { sendFcmMessage } from "~/libs/gcloud/sendFcmMessage";
 import { maybeScheduleNextAiringEpisode } from "~/libs/maybeScheduleNextAiringEpisode";
 import { verifyQstashHeader } from "~/libs/qstash/verifyQstashHeader";
 import { readEnvVariable } from "~/libs/readEnvVariable";
diff --git a/src/controllers/internal/upcoming-titles/index.ts b/src/controllers/internal/upcoming-titles/index.ts
index 45a5d6e..53f5b9f 100644
--- a/src/controllers/internal/upcoming-titles/index.ts
+++ b/src/controllers/internal/upcoming-titles/index.ts
@@ -4,8 +4,8 @@ import mapKeys from "lodash.mapkeys";
 import { DateTime } from "luxon";
 
 import { Case, changeStringCase } from "~/libs/changeStringCase";
-import type { AdminSdkCredentials } from "~/libs/fcm/getGoogleAuthToken";
-import { sendFcmMessage } from "~/libs/fcm/sendFcmMessage";
+import type { AdminSdkCredentials } from "~/libs/gcloud/getGoogleAuthToken";
+import { sendFcmMessage } from "~/libs/gcloud/sendFcmMessage";
 import { verifyQstashHeader } from "~/libs/qstash/verifyQstashHeader";
 import { readEnvVariable } from "~/libs/readEnvVariable";
 import type { Env } from "~/types/env";
diff --git a/src/controllers/token/index.spec.ts b/src/controllers/token/index.spec.ts
index d6c11f3..7450058 100644
--- a/src/controllers/token/index.spec.ts
+++ b/src/controllers/token/index.spec.ts
@@ -16,7 +16,7 @@ describe("requests the /token route", () => {
 
   beforeEach(async () => {
     await resetTestDb();
-    mock.module("src/libs/fcm/verifyFcmToken", () => ({
+    mock.module("src/libs/gcloud/verifyFcmToken", () => ({
       verifyFcmToken: () => true,
     }));
   });
@@ -136,7 +136,7 @@ describe("requests the /token route", () => {
   });
 
   it("token is invalid, should fail", async () => {
-    mock.module("src/libs/fcm/verifyFcmToken", () => ({
+    mock.module("src/libs/gcloud/verifyFcmToken", () => ({
       verifyFcmToken: () => false,
     }));
 
@@ -153,7 +153,7 @@ describe("requests the /token route", () => {
   });
 
   it("token is invalid, should not insert new entry", async () => {
-    mock.module("src/libs/fcm/verifyFcmToken", () => ({
+    mock.module("src/libs/gcloud/verifyFcmToken", () => ({
       verifyFcmToken: () => false,
     }));
     await app.request("/token", {
diff --git a/src/controllers/token/index.ts b/src/controllers/token/index.ts
index 1e4a9a2..a2b2bbe 100644
--- a/src/controllers/token/index.ts
+++ b/src/controllers/token/index.ts
@@ -3,8 +3,8 @@ import { env } from "hono/adapter";
 import mapKeys from "lodash.mapkeys";
 
 import { Case, changeStringCase } from "~/libs/changeStringCase";
-import type { AdminSdkCredentials } from "~/libs/fcm/getGoogleAuthToken";
-import { verifyFcmToken } from "~/libs/fcm/verifyFcmToken";
+import type { AdminSdkCredentials } from "~/libs/gcloud/getGoogleAuthToken";
+import { verifyFcmToken } from "~/libs/gcloud/verifyFcmToken";
 import { readEnvVariable } from "~/libs/readEnvVariable";
 import { saveToken } from "~/models/token";
 import type { Env } from "~/types/env";
diff --git a/src/libs/fcm/getGoogleAuthToken.ts b/src/libs/gcloud/getGoogleAuthToken.ts
similarity index 100%
rename from src/libs/fcm/getGoogleAuthToken.ts
rename to src/libs/gcloud/getGoogleAuthToken.ts
diff --git a/src/libs/fcm/sendFcmMessage.ts b/src/libs/gcloud/sendFcmMessage.ts
similarity index 100%
rename from src/libs/fcm/sendFcmMessage.ts
rename to src/libs/gcloud/sendFcmMessage.ts
diff --git a/src/libs/fcm/verifyFcmToken.spec.ts b/src/libs/gcloud/verifyFcmToken.spec.ts
similarity index 100%
rename from src/libs/fcm/verifyFcmToken.spec.ts
rename to src/libs/gcloud/verifyFcmToken.spec.ts
diff --git a/src/libs/fcm/verifyFcmToken.ts b/src/libs/gcloud/verifyFcmToken.ts
similarity index 100%
rename from src/libs/fcm/verifyFcmToken.ts
rename to src/libs/gcloud/verifyFcmToken.ts
diff --git a/src/mocks/fcm.ts b/src/mocks/fcm.ts
index dca48df..b07c473 100644
--- a/src/mocks/fcm.ts
+++ b/src/mocks/fcm.ts
@@ -1,6 +1,6 @@
 import { HttpResponse, http } from "msw";
 
-import type { FcmMessagePayload } from "~/libs/fcm/sendFcmMessage";
+import type { FcmMessagePayload } from "~/libs/gcloud/sendFcmMessage";
 
 export function mockFcmMessageResponse() {
   return http.post<{}, { message: FcmMessagePayload; validate_only: boolean }>(
diff --git a/src/mocks/getGoogleAuthToken.ts b/src/mocks/getGoogleAuthToken.ts
index 43348dd..78ccff5 100644
--- a/src/mocks/getGoogleAuthToken.ts
+++ b/src/mocks/getGoogleAuthToken.ts
@@ -2,7 +2,7 @@ import type { TokenOptions } from "gtoken";
 
 import { mock } from "bun:test";
 
-import type { AdminSdkCredentials } from "~/libs/fcm/getGoogleAuthToken";
+import type { AdminSdkCredentials } from "~/libs/gcloud/getGoogleAuthToken";
 
 const emailRegex =
   /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|.(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
@@ -29,7 +29,7 @@ class MockGoogleToken {
   }
 }
 
-mock.module("src/libs/fcm/getGoogleAuthToken", () => {
+mock.module("src/libs/gcloud/getGoogleAuthToken", () => {
   return {
     getGoogleAuthToken: (adminSdkJson: AdminSdkCredentials) => {
       return new MockGoogleToken({