diff --git a/.github/labeler.yml b/.github/labeler.yml
index fa3c16eb..99c277c0 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -28,7 +28,7 @@ lang-card:
       - any-glob-to-any-file:
           - api/top-langs.js
           - src/cards/top-languages-card.js
-          - src/fetchers/top-languages-fetcher.js
+          - src/fetchers/top-languages.js
           - tests/fetchTopLanguages.test.js
           - tests/renderTopLanguagesCard.test.js
           - tests/top-langs.test.js
@@ -38,7 +38,7 @@ repo-card:
       - any-glob-to-any-file:
           - api/pin.js
           - src/cards/repo-card.js
-          - src/fetchers/repo-fetcher.js
+          - src/fetchers/repo.js
           - tests/fetchRepo.test.js
           - tests/renderRepoCard.test.js
           - tests/pin.test.js
@@ -48,7 +48,7 @@ stats-card:
       - any-glob-to-any-file:
           - api/index.js
           - src/cards/stats-card.js
-          - src/fetchers/stats-fetcher.js
+          - src/fetchers/stats.js
           - tests/fetchStats.test.js
           - tests/renderStatsCard.test.js
           - tests/api.test.js
@@ -58,7 +58,7 @@ wakatime-card:
       - any-glob-to-any-file:
           - api/wakatime.js
           - src/cards/wakatime-card.js
-          - src/fetchers/wakatime-fetcher.js
+          - src/fetchers/wakatime.js
           - tests/fetchWakatime.test.js
           - tests/renderWakatimeCard.test.js
           - tests/wakatime.test.js
@@ -68,7 +68,7 @@ gist-card:
       - any-glob-to-any-file:
           - api/gist.js
           - src/cards/gist-card.js
-          - src/fetchers/gist-fetcher.js
+          - src/fetchers/gist.js
           - tests/fetchGist.test.js
           - tests/renderGistCard.test.js
           - tests/gist.test.js
diff --git a/api/gist.js b/api/gist.js
index 5b03743c..560ce1a7 100644
--- a/api/gist.js
+++ b/api/gist.js
@@ -6,7 +6,7 @@ import {
 } from "../src/common/utils.js";
 import { isLocaleAvailable } from "../src/translations.js";
 import { renderGistCard } from "../src/cards/gist-card.js";
-import { fetchGist } from "../src/fetchers/gist-fetcher.js";
+import { fetchGist } from "../src/fetchers/gist.js";
 
 export default async (req, res) => {
   const {
diff --git a/api/index.js b/api/index.js
index c42bc048..c57630ec 100644
--- a/api/index.js
+++ b/api/index.js
@@ -7,7 +7,7 @@ import {
   parseBoolean,
   renderError,
 } from "../src/common/utils.js";
-import { fetchStats } from "../src/fetchers/stats-fetcher.js";
+import { fetchStats } from "../src/fetchers/stats.js";
 import { isLocaleAvailable } from "../src/translations.js";
 
 export default async (req, res) => {
diff --git a/api/pin.js b/api/pin.js
index bede7d87..6629c29c 100644
--- a/api/pin.js
+++ b/api/pin.js
@@ -6,7 +6,7 @@ import {
   parseBoolean,
   renderError,
 } from "../src/common/utils.js";
-import { fetchRepo } from "../src/fetchers/repo-fetcher.js";
+import { fetchRepo } from "../src/fetchers/repo.js";
 import { isLocaleAvailable } from "../src/translations.js";
 
 export default async (req, res) => {
diff --git a/api/top-langs.js b/api/top-langs.js
index c5bed634..8038b402 100644
--- a/api/top-langs.js
+++ b/api/top-langs.js
@@ -6,7 +6,7 @@ import {
   parseBoolean,
   renderError,
 } from "../src/common/utils.js";
-import { fetchTopLanguages } from "../src/fetchers/top-languages-fetcher.js";
+import { fetchTopLanguages } from "../src/fetchers/top-languages.js";
 import { isLocaleAvailable } from "../src/translations.js";
 
 export default async (req, res) => {
diff --git a/api/wakatime.js b/api/wakatime.js
index 73ef9986..4807445c 100644
--- a/api/wakatime.js
+++ b/api/wakatime.js
@@ -6,7 +6,7 @@ import {
   parseBoolean,
   renderError,
 } from "../src/common/utils.js";
-import { fetchWakatimeStats } from "../src/fetchers/wakatime-fetcher.js";
+import { fetchWakatimeStats } from "../src/fetchers/wakatime.js";
 import { isLocaleAvailable } from "../src/translations.js";
 
 export default async (req, res) => {
diff --git a/src/fetchers/gist-fetcher.js b/src/fetchers/gist.js
similarity index 100%
rename from src/fetchers/gist-fetcher.js
rename to src/fetchers/gist.js
diff --git a/src/fetchers/repo-fetcher.js b/src/fetchers/repo.js
similarity index 100%
rename from src/fetchers/repo-fetcher.js
rename to src/fetchers/repo.js
diff --git a/src/fetchers/stats-fetcher.js b/src/fetchers/stats.js
similarity index 100%
rename from src/fetchers/stats-fetcher.js
rename to src/fetchers/stats.js
diff --git a/src/fetchers/top-languages-fetcher.js b/src/fetchers/top-languages.js
similarity index 100%
rename from src/fetchers/top-languages-fetcher.js
rename to src/fetchers/top-languages.js
diff --git a/src/fetchers/wakatime-fetcher.js b/src/fetchers/wakatime.js
similarity index 100%
rename from src/fetchers/wakatime-fetcher.js
rename to src/fetchers/wakatime.js
diff --git a/tests/fetchGist.test.js b/tests/fetchGist.test.js
index 13c29a8d..ee9be987 100644
--- a/tests/fetchGist.test.js
+++ b/tests/fetchGist.test.js
@@ -2,7 +2,7 @@ import "@testing-library/jest-dom";
 import axios from "axios";
 import MockAdapter from "axios-mock-adapter";
 import { expect, it, describe, afterEach } from "@jest/globals";
-import { fetchGist } from "../src/fetchers/gist-fetcher.js";
+import { fetchGist } from "../src/fetchers/gist.js";
 
 const gist_data = {
   data: {
diff --git a/tests/fetchRepo.test.js b/tests/fetchRepo.test.js
index a980917f..604b34b4 100644
--- a/tests/fetchRepo.test.js
+++ b/tests/fetchRepo.test.js
@@ -1,7 +1,7 @@
 import "@testing-library/jest-dom";
 import axios from "axios";
 import MockAdapter from "axios-mock-adapter";
-import { fetchRepo } from "../src/fetchers/repo-fetcher.js";
+import { fetchRepo } from "../src/fetchers/repo.js";
 import { expect, it, describe, afterEach } from "@jest/globals";
 
 const data_repo = {
diff --git a/tests/fetchStats.test.js b/tests/fetchStats.test.js
index ca8d7bc3..06aefedd 100644
--- a/tests/fetchStats.test.js
+++ b/tests/fetchStats.test.js
@@ -2,7 +2,7 @@ import "@testing-library/jest-dom";
 import axios from "axios";
 import MockAdapter from "axios-mock-adapter";
 import { calculateRank } from "../src/calculateRank.js";
-import { fetchStats } from "../src/fetchers/stats-fetcher.js";
+import { fetchStats } from "../src/fetchers/stats.js";
 import { expect, it, describe, beforeEach, afterEach } from "@jest/globals";
 
 // Test parameters.
diff --git a/tests/fetchTopLanguages.test.js b/tests/fetchTopLanguages.test.js
index e7bd54ac..287c8ede 100644
--- a/tests/fetchTopLanguages.test.js
+++ b/tests/fetchTopLanguages.test.js
@@ -1,7 +1,7 @@
 import "@testing-library/jest-dom";
 import axios from "axios";
 import MockAdapter from "axios-mock-adapter";
-import { fetchTopLanguages } from "../src/fetchers/top-languages-fetcher.js";
+import { fetchTopLanguages } from "../src/fetchers/top-languages.js";
 import { expect, it, describe, afterEach } from "@jest/globals";
 
 const mock = new MockAdapter(axios);
diff --git a/tests/fetchWakatime.test.js b/tests/fetchWakatime.test.js
index 8e24893d..0cfbe4df 100644
--- a/tests/fetchWakatime.test.js
+++ b/tests/fetchWakatime.test.js
@@ -1,7 +1,7 @@
 import "@testing-library/jest-dom";
 import axios from "axios";
 import MockAdapter from "axios-mock-adapter";
-import { fetchWakatimeStats } from "../src/fetchers/wakatime-fetcher.js";
+import { fetchWakatimeStats } from "../src/fetchers/wakatime.js";
 import { expect, it, describe, afterEach } from "@jest/globals";
 
 const mock = new MockAdapter(axios);
diff --git a/tests/renderGistCard.test.js b/tests/renderGistCard.test.js
index f514bf6d..9545fdeb 100644
--- a/tests/renderGistCard.test.js
+++ b/tests/renderGistCard.test.js
@@ -6,7 +6,7 @@ import { themes } from "../themes/index.js";
 import "@testing-library/jest-dom";
 
 /**
- * @type {import("../src/fetchers/gist-fetcher").GistData}
+ * @type {import("../src/fetchers/gist").GistData}
  */
 const data = {
   name: "test",