diff --git a/.github/labeler.yml b/.github/labeler.yml
index 99c277c0..ec125284 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -27,7 +27,7 @@ lang-card:
   - changed-files:
       - any-glob-to-any-file:
           - api/top-langs.js
-          - src/cards/top-languages-card.js
+          - src/cards/top-languages.js
           - src/fetchers/top-languages.js
           - tests/fetchTopLanguages.test.js
           - tests/renderTopLanguagesCard.test.js
@@ -37,7 +37,7 @@ repo-card:
   - changed-files:
       - any-glob-to-any-file:
           - api/pin.js
-          - src/cards/repo-card.js
+          - src/cards/repo.js
           - src/fetchers/repo.js
           - tests/fetchRepo.test.js
           - tests/renderRepoCard.test.js
@@ -47,7 +47,7 @@ stats-card:
   - changed-files:
       - any-glob-to-any-file:
           - api/index.js
-          - src/cards/stats-card.js
+          - src/cards/stats.js
           - src/fetchers/stats.js
           - tests/fetchStats.test.js
           - tests/renderStatsCard.test.js
@@ -57,7 +57,7 @@ wakatime-card:
   - changed-files:
       - any-glob-to-any-file:
           - api/wakatime.js
-          - src/cards/wakatime-card.js
+          - src/cards/wakatime.js
           - src/fetchers/wakatime.js
           - tests/fetchWakatime.test.js
           - tests/renderWakatimeCard.test.js
@@ -67,7 +67,7 @@ gist-card:
   - changed-files:
       - any-glob-to-any-file:
           - api/gist.js
-          - src/cards/gist-card.js
+          - src/cards/gist.js
           - src/fetchers/gist.js
           - tests/fetchGist.test.js
           - tests/renderGistCard.test.js
diff --git a/api/gist.js b/api/gist.js
index 560ce1a7..00697761 100644
--- a/api/gist.js
+++ b/api/gist.js
@@ -5,7 +5,7 @@ import {
   parseBoolean,
 } from "../src/common/utils.js";
 import { isLocaleAvailable } from "../src/translations.js";
-import { renderGistCard } from "../src/cards/gist-card.js";
+import { renderGistCard } from "../src/cards/gist.js";
 import { fetchGist } from "../src/fetchers/gist.js";
 
 export default async (req, res) => {
diff --git a/api/index.js b/api/index.js
index c57630ec..ef41fa13 100644
--- a/api/index.js
+++ b/api/index.js
@@ -1,4 +1,4 @@
-import { renderStatsCard } from "../src/cards/stats-card.js";
+import { renderStatsCard } from "../src/cards/stats.js";
 import { blacklist } from "../src/common/blacklist.js";
 import {
   clampValue,
diff --git a/api/pin.js b/api/pin.js
index 6629c29c..b8fa617b 100644
--- a/api/pin.js
+++ b/api/pin.js
@@ -1,4 +1,4 @@
-import { renderRepoCard } from "../src/cards/repo-card.js";
+import { renderRepoCard } from "../src/cards/repo.js";
 import { blacklist } from "../src/common/blacklist.js";
 import {
   clampValue,
diff --git a/api/top-langs.js b/api/top-langs.js
index 8038b402..fe5fb4af 100644
--- a/api/top-langs.js
+++ b/api/top-langs.js
@@ -1,4 +1,4 @@
-import { renderTopLanguages } from "../src/cards/top-languages-card.js";
+import { renderTopLanguages } from "../src/cards/top-languages.js";
 import { blacklist } from "../src/common/blacklist.js";
 import {
   CONSTANTS,
diff --git a/api/wakatime.js b/api/wakatime.js
index 4807445c..1517cc49 100644
--- a/api/wakatime.js
+++ b/api/wakatime.js
@@ -1,4 +1,4 @@
-import { renderWakatimeCard } from "../src/cards/wakatime-card.js";
+import { renderWakatimeCard } from "../src/cards/wakatime.js";
 import {
   clampValue,
   CONSTANTS,
diff --git a/src/cards/gist-card.js b/src/cards/gist.js
similarity index 100%
rename from src/cards/gist-card.js
rename to src/cards/gist.js
diff --git a/src/cards/index.js b/src/cards/index.js
index f2c5fb0e..5ca3a97a 100644
--- a/src/cards/index.js
+++ b/src/cards/index.js
@@ -1,4 +1,4 @@
-export { renderRepoCard } from "./repo-card.js";
-export { renderStatsCard } from "./stats-card.js";
-export { renderTopLanguages } from "./top-languages-card.js";
-export { renderWakatimeCard } from "./wakatime-card.js";
+export { renderRepoCard } from "./repo.js";
+export { renderStatsCard } from "./stats.js";
+export { renderTopLanguages } from "./top-languages.js";
+export { renderWakatimeCard } from "./wakatime.js";
diff --git a/src/cards/repo-card.js b/src/cards/repo.js
similarity index 100%
rename from src/cards/repo-card.js
rename to src/cards/repo.js
diff --git a/src/cards/stats-card.js b/src/cards/stats.js
similarity index 100%
rename from src/cards/stats-card.js
rename to src/cards/stats.js
diff --git a/src/cards/top-languages-card.js b/src/cards/top-languages.js
similarity index 100%
rename from src/cards/top-languages-card.js
rename to src/cards/top-languages.js
diff --git a/src/cards/wakatime-card.js b/src/cards/wakatime.js
similarity index 100%
rename from src/cards/wakatime-card.js
rename to src/cards/wakatime.js
diff --git a/tests/api.test.js b/tests/api.test.js
index 1073014f..1b576b19 100644
--- a/tests/api.test.js
+++ b/tests/api.test.js
@@ -3,7 +3,7 @@ import axios from "axios";
 import MockAdapter from "axios-mock-adapter";
 import api from "../api/index.js";
 import { calculateRank } from "../src/calculateRank.js";
-import { renderStatsCard } from "../src/cards/stats-card.js";
+import { renderStatsCard } from "../src/cards/stats.js";
 import { CONSTANTS, renderError } from "../src/common/utils.js";
 import { expect, it, describe, afterEach } from "@jest/globals";
 
diff --git a/tests/e2e/e2e.test.js b/tests/e2e/e2e.test.js
index 196a8974..e3970aae 100644
--- a/tests/e2e/e2e.test.js
+++ b/tests/e2e/e2e.test.js
@@ -5,11 +5,11 @@ import dotenv from "dotenv";
 dotenv.config();
 
 import axios from "axios";
-import { renderRepoCard } from "../../src/cards/repo-card.js";
-import { renderStatsCard } from "../../src/cards/stats-card.js";
-import { renderTopLanguages } from "../../src/cards/top-languages-card.js";
-import { renderWakatimeCard } from "../../src/cards/wakatime-card.js";
-import { renderGistCard } from "../../src/cards/gist-card.js";
+import { renderRepoCard } from "../../src/cards/repo.js";
+import { renderStatsCard } from "../../src/cards/stats.js";
+import { renderTopLanguages } from "../../src/cards/top-languages.js";
+import { renderWakatimeCard } from "../../src/cards/wakatime.js";
+import { renderGistCard } from "../../src/cards/gist.js";
 import { expect, describe, beforeAll, test } from "@jest/globals";
 
 const REPO = "curly-fiesta";
diff --git a/tests/gist.test.js b/tests/gist.test.js
index 8c717d64..fdbf9cf5 100644
--- a/tests/gist.test.js
+++ b/tests/gist.test.js
@@ -3,7 +3,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 { renderGistCard } from "../src/cards/gist-card.js";
+import { renderGistCard } from "../src/cards/gist.js";
 import { CONSTANTS, renderError } from "../src/common/utils.js";
 import gist from "../api/gist.js";
 
diff --git a/tests/pin.test.js b/tests/pin.test.js
index 5fe21ffe..e9adcaa8 100644
--- a/tests/pin.test.js
+++ b/tests/pin.test.js
@@ -3,7 +3,7 @@ import "@testing-library/jest-dom";
 import axios from "axios";
 import MockAdapter from "axios-mock-adapter";
 import pin from "../api/pin.js";
-import { renderRepoCard } from "../src/cards/repo-card.js";
+import { renderRepoCard } from "../src/cards/repo.js";
 import { CONSTANTS, renderError } from "../src/common/utils.js";
 import { expect, it, describe, afterEach } from "@jest/globals";
 
diff --git a/tests/renderGistCard.test.js b/tests/renderGistCard.test.js
index 9545fdeb..9d360052 100644
--- a/tests/renderGistCard.test.js
+++ b/tests/renderGistCard.test.js
@@ -1,4 +1,4 @@
-import { renderGistCard } from "../src/cards/gist-card";
+import { renderGistCard } from "../src/cards/gist.js";
 import { describe, expect, it } from "@jest/globals";
 import { queryByTestId } from "@testing-library/dom";
 import { cssToObject } from "@uppercod/css-to-object";
diff --git a/tests/renderRepoCard.test.js b/tests/renderRepoCard.test.js
index abbad4db..04c1090d 100644
--- a/tests/renderRepoCard.test.js
+++ b/tests/renderRepoCard.test.js
@@ -1,7 +1,7 @@
 import { queryByTestId } from "@testing-library/dom";
 import "@testing-library/jest-dom";
 import { cssToObject } from "@uppercod/css-to-object";
-import { renderRepoCard } from "../src/cards/repo-card.js";
+import { renderRepoCard } from "../src/cards/repo.js";
 import { expect, it, describe } from "@jest/globals";
 
 import { themes } from "../themes/index.js";
diff --git a/tests/renderStatsCard.test.js b/tests/renderStatsCard.test.js
index 973ee0a5..dab0f861 100644
--- a/tests/renderStatsCard.test.js
+++ b/tests/renderStatsCard.test.js
@@ -4,7 +4,7 @@ import {
   queryByTestId,
 } from "@testing-library/dom";
 import { cssToObject } from "@uppercod/css-to-object";
-import { renderStatsCard } from "../src/cards/stats-card.js";
+import { renderStatsCard } from "../src/cards/stats.js";
 import { expect, it, describe } from "@jest/globals";
 import { CustomError } from "../src/common/utils.js";
 
diff --git a/tests/renderTopLanguagesCard.test.js b/tests/renderTopLanguagesCard.test.js
index 8d67c3fb..55965da0 100644
--- a/tests/renderTopLanguagesCard.test.js
+++ b/tests/renderTopLanguagesCard.test.js
@@ -17,7 +17,7 @@ import {
   renderTopLanguages,
   MIN_CARD_WIDTH,
   getDefaultLanguagesCountByLayout,
-} from "../src/cards/top-languages-card.js";
+} from "../src/cards/top-languages.js";
 import { expect, it, describe } from "@jest/globals";
 
 // adds special assertions like toHaveTextContent
diff --git a/tests/renderWakatimeCard.test.js b/tests/renderWakatimeCard.test.js
index 7c371075..7a3b85bf 100644
--- a/tests/renderWakatimeCard.test.js
+++ b/tests/renderWakatimeCard.test.js
@@ -1,6 +1,6 @@
 import { queryByTestId } from "@testing-library/dom";
 import "@testing-library/jest-dom";
-import { renderWakatimeCard } from "../src/cards/wakatime-card.js";
+import { renderWakatimeCard } from "../src/cards/wakatime.js";
 import { getCardColors } from "../src/common/utils.js";
 import { wakaTimeData } from "./fetchWakatime.test.js";
 import { expect, it, describe } from "@jest/globals";
diff --git a/tests/top-langs.test.js b/tests/top-langs.test.js
index 907d4bc1..62d4f7a0 100644
--- a/tests/top-langs.test.js
+++ b/tests/top-langs.test.js
@@ -3,7 +3,7 @@ import "@testing-library/jest-dom";
 import axios from "axios";
 import MockAdapter from "axios-mock-adapter";
 import topLangs from "../api/top-langs.js";
-import { renderTopLanguages } from "../src/cards/top-languages-card.js";
+import { renderTopLanguages } from "../src/cards/top-languages.js";
 import { CONSTANTS, renderError } from "../src/common/utils.js";
 import { expect, it, describe, afterEach } from "@jest/globals";
 
diff --git a/tests/wakatime.test.js b/tests/wakatime.test.js
index 944c3e02..ade0dc2b 100644
--- a/tests/wakatime.test.js
+++ b/tests/wakatime.test.js
@@ -3,7 +3,7 @@ import "@testing-library/jest-dom";
 import axios from "axios";
 import MockAdapter from "axios-mock-adapter";
 import wakatime from "../api/wakatime.js";
-import { renderWakatimeCard } from "../src/cards/wakatime-card.js";
+import { renderWakatimeCard } from "../src/cards/wakatime.js";
 import { expect, it, describe, afterEach } from "@jest/globals";
 
 const wakaTimeData = {