diff --git a/client/src/components/settings/Email.js b/client/src/components/settings/Email.js
index 9a26f360f2..f2e910e723 100644
--- a/client/src/components/settings/Email.js
+++ b/client/src/components/settings/Email.js
@@ -18,7 +18,7 @@ import { updateMyEmail } from '../../redux/settings';
 import { maybeEmailRE } from '../../utils';
 
 import FullWidthRow from '../helpers/FullWidthRow';
-import Spacer from '../helpers/Spacer';
+import Spacer from '../helpers/spacer';
 import SectionHeader from './SectionHeader';
 import BlockSaveButton from '../helpers/form/BlockSaveButton';
 import ToggleSetting from './ToggleSetting';
diff --git a/client/src/components/settings/Privacy.js b/client/src/components/settings/Privacy.js
index 0e34243975..4f52a195b8 100644
--- a/client/src/components/settings/Privacy.js
+++ b/client/src/components/settings/Privacy.js
@@ -10,7 +10,7 @@ import { userSelector } from '../../redux';
 import { submitProfileUI } from '../../redux/settings';
 
 import FullWidthRow from '../helpers/FullWidthRow';
-import Spacer from '../helpers/Spacer';
+import Spacer from '../helpers/spacer';
 import ToggleSetting from './ToggleSetting';
 import SectionHeader from './SectionHeader';
 
diff --git a/client/src/components/settings/ToggleSetting.js b/client/src/components/settings/ToggleSetting.js
index 5853a74042..00ce9ccef5 100644
--- a/client/src/components/settings/ToggleSetting.js
+++ b/client/src/components/settings/ToggleSetting.js
@@ -6,7 +6,7 @@ import {
   HelpBlock
 } from '@freecodecamp/react-bootstrap';
 
-import TB from '../helpers/ToggleButton';
+import TB from '../helpers/toggle-button';
 import { ButtonSpacer } from '../helpers';
 
 import './toggle-setting.css';
diff --git a/client/src/templates/Challenges/projects/backend/Show.js b/client/src/templates/Challenges/projects/backend/Show.js
index 0c68c761ea..75d6b0a5bf 100644
--- a/client/src/templates/Challenges/projects/backend/Show.js
+++ b/client/src/templates/Challenges/projects/backend/Show.js
@@ -29,7 +29,7 @@ import CompletionModal from '../../components/CompletionModal';
 import HelpModal from '../../components/HelpModal';
 import ProjectToolPanel from '../Tool-Panel';
 import SolutionForm from '../SolutionForm';
-import Spacer from '../../../../components/helpers/Spacer';
+import Spacer from '../../../../components/helpers/spacer';
 import { ChallengeNode } from '../../../../redux/prop-types';
 import { isSignedInSelector } from '../../../../redux';
 import Hotkeys from '../../components/Hotkeys';
diff --git a/client/src/templates/Challenges/projects/frontend/Show.js b/client/src/templates/Challenges/projects/frontend/Show.js
index b5beb1573c..9c71875f19 100644
--- a/client/src/templates/Challenges/projects/frontend/Show.js
+++ b/client/src/templates/Challenges/projects/frontend/Show.js
@@ -22,7 +22,7 @@ import { getGuideUrl } from '../../utils';
 import LearnLayout from '../../../../components/layouts/Learn';
 import ChallengeTitle from '../../components/Challenge-Title';
 import ChallengeDescription from '../../components/Challenge-Description';
-import Spacer from '../../../../components/helpers/Spacer';
+import Spacer from '../../../../components/helpers/spacer';
 import SolutionForm from '../SolutionForm';
 import ProjectToolPanel from '../Tool-Panel';
 import CompletionModal from '../../components/CompletionModal';
diff --git a/client/src/templates/Challenges/video/Show.js b/client/src/templates/Challenges/video/Show.js
index 63d0dece7d..0d822e0aa0 100644
--- a/client/src/templates/Challenges/video/Show.js
+++ b/client/src/templates/Challenges/video/Show.js
@@ -17,7 +17,7 @@ import { ChallengeNode } from '../../../redux/prop-types';
 import LearnLayout from '../../../components/layouts/Learn';
 import ChallengeTitle from '../components/Challenge-Title';
 import ChallengeDescription from '../components/Challenge-Description';
-import Spacer from '../../../components/helpers/Spacer';
+import Spacer from '../../../components/helpers/spacer';
 import CompletionModal from '../components/CompletionModal';
 import Hotkeys from '../components/Hotkeys';
 import Loader from '../../../components/helpers/Loader';