diff --git a/client/src/templates/Challenges/classic/show.tsx b/client/src/templates/Challenges/classic/show.tsx
index c45f64a4564..1716475240b 100644
--- a/client/src/templates/Challenges/classic/show.tsx
+++ b/client/src/templates/Challenges/classic/show.tsx
@@ -23,9 +23,9 @@ import {
   Test
 } from '../../../redux/prop-types';
 import { isContained } from '../../../utils/is-contained';
-import ChallengeDescription from '../components/Challenge-Description';
-import Hotkeys from '../components/Hotkeys';
-import ResetModal from '../components/ResetModal';
+import ChallengeDescription from '../components/challenge-description';
+import Hotkeys from '../components/hotkeys';
+import ResetModal from '../components/reset-modal';
 import ChallengeTitle from '../components/challenge-title';
 import CompletionModal from '../components/completion-modal';
 import HelpModal from '../components/help-modal';
diff --git a/client/src/templates/Challenges/codeally/show.tsx b/client/src/templates/Challenges/codeally/show.tsx
index 6d9c95e4c91..9918545c7bf 100644
--- a/client/src/templates/Challenges/codeally/show.tsx
+++ b/client/src/templates/Challenges/codeally/show.tsx
@@ -18,7 +18,7 @@ import { challengeTypes } from '../../../../utils/challenge-types';
 import CompletionModal from '../components/completion-modal';
 import GreenPass from '../../../assets/icons/green-pass';
 import HelpModal from '../components/help-modal';
-import Hotkeys from '../components/Hotkeys';
+import Hotkeys from '../components/hotkeys';
 import { hideCodeAlly, tryToShowCodeAlly } from '../../../redux/actions';
 import {
   completedChallengesSelector,
diff --git a/client/src/templates/Challenges/components/Challenge-Description.tsx b/client/src/templates/Challenges/components/challenge-description.tsx
similarity index 100%
rename from client/src/templates/Challenges/components/Challenge-Description.tsx
rename to client/src/templates/Challenges/components/challenge-description.tsx
diff --git a/client/src/templates/Challenges/components/Hotkeys.tsx b/client/src/templates/Challenges/components/hotkeys.tsx
similarity index 100%
rename from client/src/templates/Challenges/components/Hotkeys.tsx
rename to client/src/templates/Challenges/components/hotkeys.tsx
diff --git a/client/src/templates/Challenges/components/ResetModal.tsx b/client/src/templates/Challenges/components/reset-modal.tsx
similarity index 100%
rename from client/src/templates/Challenges/components/ResetModal.tsx
rename to client/src/templates/Challenges/components/reset-modal.tsx
diff --git a/client/src/templates/Challenges/components/VideoPlayer.tsx b/client/src/templates/Challenges/components/video-player.tsx
similarity index 100%
rename from client/src/templates/Challenges/components/VideoPlayer.tsx
rename to client/src/templates/Challenges/components/video-player.tsx
diff --git a/client/src/templates/Challenges/odin/Show.tsx b/client/src/templates/Challenges/odin/show.tsx
similarity index 99%
rename from client/src/templates/Challenges/odin/Show.tsx
rename to client/src/templates/Challenges/odin/show.tsx
index 729781827c1..d132508a84d 100644
--- a/client/src/templates/Challenges/odin/Show.tsx
+++ b/client/src/templates/Challenges/odin/show.tsx
@@ -15,8 +15,8 @@ import Loader from '../../../components/helpers/loader';
 import Spacer from '../../../components/helpers/spacer';
 import LearnLayout from '../../../components/layouts/learn';
 import { ChallengeNode, ChallengeMeta } from '../../../redux/prop-types';
-import Hotkeys from '../components/Hotkeys';
-import VideoPlayer from '../components/VideoPlayer';
+import Hotkeys from '../components/hotkeys';
+import VideoPlayer from '../components/video-player';
 import CompletionModal from '../components/completion-modal';
 import PrismFormatted from '../components/prism-formatted';
 import {
diff --git a/client/src/templates/Challenges/projects/backend/Show.tsx b/client/src/templates/Challenges/projects/backend/show.tsx
similarity index 98%
rename from client/src/templates/Challenges/projects/backend/Show.tsx
rename to client/src/templates/Challenges/projects/backend/show.tsx
index d9c22fdeba4..55785cccb92 100644
--- a/client/src/templates/Challenges/projects/backend/Show.tsx
+++ b/client/src/templates/Challenges/projects/backend/show.tsx
@@ -19,8 +19,8 @@ import {
   ChallengeNode,
   Test
 } from '../../../../redux/prop-types';
-import ChallengeDescription from '../../components/Challenge-Description';
-import Hotkeys from '../../components/Hotkeys';
+import ChallengeDescription from '../../components/challenge-description';
+import Hotkeys from '../../components/hotkeys';
 import ChallengeTitle from '../../components/challenge-title';
 import CompletionModal from '../../components/completion-modal';
 import HelpModal from '../../components/help-modal';
diff --git a/client/src/templates/Challenges/projects/frontend/Show.tsx b/client/src/templates/Challenges/projects/frontend/show.tsx
similarity index 98%
rename from client/src/templates/Challenges/projects/frontend/Show.tsx
rename to client/src/templates/Challenges/projects/frontend/show.tsx
index 4fc019294b9..833b8091b7f 100644
--- a/client/src/templates/Challenges/projects/frontend/Show.tsx
+++ b/client/src/templates/Challenges/projects/frontend/show.tsx
@@ -11,8 +11,8 @@ import { createSelector } from 'reselect';
 import Spacer from '../../../../components/helpers/spacer';
 import LearnLayout from '../../../../components/layouts/learn';
 import { ChallengeNode, ChallengeMeta } from '../../../../redux/prop-types';
-import ChallengeDescription from '../../components/Challenge-Description';
-import Hotkeys from '../../components/Hotkeys';
+import ChallengeDescription from '../../components/challenge-description';
+import Hotkeys from '../../components/hotkeys';
 import ChallengeTitle from '../../components/challenge-title';
 import CompletionModal from '../../components/completion-modal';
 import HelpModal from '../../components/help-modal';
diff --git a/client/src/templates/Challenges/video/Show.tsx b/client/src/templates/Challenges/video/show.tsx
similarity index 98%
rename from client/src/templates/Challenges/video/Show.tsx
rename to client/src/templates/Challenges/video/show.tsx
index e6ed0c39c12..6b85a089114 100644
--- a/client/src/templates/Challenges/video/Show.tsx
+++ b/client/src/templates/Challenges/video/show.tsx
@@ -15,9 +15,9 @@ import Loader from '../../../components/helpers/loader';
 import Spacer from '../../../components/helpers/spacer';
 import LearnLayout from '../../../components/layouts/learn';
 import { ChallengeNode, ChallengeMeta } from '../../../redux/prop-types';
-import ChallengeDescription from '../components/Challenge-Description';
-import Hotkeys from '../components/Hotkeys';
-import VideoPlayer from '../components/VideoPlayer';
+import ChallengeDescription from '../components/challenge-description';
+import Hotkeys from '../components/hotkeys';
+import VideoPlayer from '../components/video-player';
 import ChallengeTitle from '../components/challenge-title';
 import CompletionModal from '../components/completion-modal';
 import PrismFormatted from '../components/prism-formatted';
diff --git a/client/utils/gatsby/challenge-page-creator.js b/client/utils/gatsby/challenge-page-creator.js
index 09439cc9b24..2d342bc4965 100644
--- a/client/utils/gatsby/challenge-page-creator.js
+++ b/client/utils/gatsby/challenge-page-creator.js
@@ -5,7 +5,7 @@ const { challengeTypes, viewTypes } = require('../challenge-types');
 
 const backend = path.resolve(
   __dirname,
-  '../../src/templates/Challenges/projects/backend/Show.tsx'
+  '../../src/templates/Challenges/projects/backend/show.tsx'
 );
 const classic = path.resolve(
   __dirname,
@@ -13,7 +13,7 @@ const classic = path.resolve(
 );
 const frontend = path.resolve(
   __dirname,
-  '../../src/templates/Challenges/projects/frontend/Show.tsx'
+  '../../src/templates/Challenges/projects/frontend/show.tsx'
 );
 const codeAlly = path.resolve(
   __dirname,
@@ -29,12 +29,12 @@ const superBlockIntro = path.resolve(
 );
 const video = path.resolve(
   __dirname,
-  '../../src/templates/Challenges/video/Show.tsx'
+  '../../src/templates/Challenges/video/show.tsx'
 );
 
 const odin = path.resolve(
   __dirname,
-  '../../src/templates/Challenges/odin/Show.tsx'
+  '../../src/templates/Challenges/odin/show.tsx'
 );
 
 const views = {