diff --git a/gatsby-config.js b/gatsby-config.js
index c8effb2d5a6..5a3619ef1c1 100644
--- a/gatsby-config.js
+++ b/gatsby-config.js
@@ -112,7 +112,7 @@ module.exports = {
                             const replaced_locale = locale.replace('_', '-')
                             const is_default = ['en', 'x-default'].includes(locale)
                             const href_locale = is_default ? '' : `/${replaced_locale}`
-                            const href = `${site_url}/${href_locale}${current_page}`
+                            const href = `${site_url}${href_locale}${current_page}`
                             return { lang: replaced_locale, url: href }
                         }
                     })
diff --git a/src/pages/careers/BeSquareBanner.tsx b/src/pages/careers/_be_square_banner.tsx
similarity index 100%
rename from src/pages/careers/BeSquareBanner.tsx
rename to src/pages/careers/_be_square_banner.tsx
diff --git a/src/pages/careers/_hero.tsx b/src/pages/careers/_hero.tsx
index 130a610de63..525f169f226 100644
--- a/src/pages/careers/_hero.tsx
+++ b/src/pages/careers/_hero.tsx
@@ -1,7 +1,7 @@
 import React from 'react'
 import styled from 'styled-components'
 import { graphql, useStaticQuery } from 'gatsby'
-import Container from './_layout-components/CareerContainer'
+import Container from './_layout-components/_career_container'
 import { Header, BackgroundImage } from 'components/elements'
 import { LinkButton } from 'components/form'
 import { zoho_url } from 'common/constants'
diff --git a/src/pages/careers/_layout-components/CareerContainer.ts b/src/pages/careers/_layout-components/_career_container.ts
similarity index 100%
rename from src/pages/careers/_layout-components/CareerContainer.ts
rename to src/pages/careers/_layout-components/_career_container.ts
diff --git a/src/pages/careers/_layout-components/_link-list.tsx b/src/pages/careers/_layout-components/_link-list.tsx
index ec0cd620760..38b8bdc839d 100644
--- a/src/pages/careers/_layout-components/_link-list.tsx
+++ b/src/pages/careers/_layout-components/_link-list.tsx
@@ -1,7 +1,7 @@
 import React from 'react'
 import PropTypes from 'prop-types'
 import styled from 'styled-components'
-import Container from './CareerContainer'
+import Container from './_career_container'
 import { Text } from 'components/elements'
 import { Flex } from 'components/containers'
 import { LocalizedLink } from 'components/localization'
diff --git a/src/pages/careers/_lazy-load.ts b/src/pages/careers/_lazy-load.ts
index ce0a9e4a937..555bae90ea0 100644
--- a/src/pages/careers/_lazy-load.ts
+++ b/src/pages/careers/_lazy-load.ts
@@ -6,4 +6,4 @@ export const LifeAtDerivCarousel = Loadable(() => import('./_life-at-deriv-carou
 export const OurValues = Loadable(() => import('./_our-values'))
 export const EmployeeTestimonial = Loadable(() => import('./_employee-testimonial-carousel'))
 export const OurHiringProcess = Loadable(() => import('./_our-hiring-process'))
-export const BeSquareBanner = Loadable(() => import('./BeSquareBanner'))
+export const BeSquareBanner = Loadable(() => import('./_be_square_banner'))
diff --git a/src/pages/careers/locations/_location-layout.tsx b/src/pages/careers/locations/_location-layout.tsx
index 8bfdaa21a45..74dcfbf6bb4 100644
--- a/src/pages/careers/locations/_location-layout.tsx
+++ b/src/pages/careers/locations/_location-layout.tsx
@@ -1,7 +1,7 @@
 import React from 'react'
 import PropTypes from 'prop-types'
 import styled from 'styled-components'
-import CareerContainer from '../_layout-components/CareerContainer'
+import CareerContainer from '../_layout-components/_career_container'
 import { locationsTypes } from '../_model/_locations/_locations.types'
 import device from 'themes/device'
 import { SectionContainer, Flex } from 'components/containers'