diff --git a/src/containers/DefaultContainer.vue b/src/containers/TheContainer.vue
similarity index 100%
rename from src/containers/DefaultContainer.vue
rename to src/containers/TheContainer.vue
diff --git a/src/containers/TheHeader.vue b/src/containers/TheHeader.vue
index cab42450..ff0277ed 100644
--- a/src/containers/TheHeader.vue
+++ b/src/containers/TheHeader.vue
@@ -26,7 +26,7 @@
       <CHeaderNavItem class="d-md-down-none mx-2">
         <i class="cui-envelope-open"></i>
       </CHeaderNavItem>
-      <DefaultHeaderDropdownAccnt/>
+      <TheHeaderDropdownAccnt/>
     </ul>
     <div class="c-subheader px-3">
       <CBreadcrumbRouter class="border-0"/>
@@ -35,12 +35,12 @@
 </template>
 
 <script>
-import DefaultHeaderDropdownAccnt from './DefaultHeaderDropdownAccnt'
+import TheHeaderDropdownAccnt from './TheHeaderDropdownAccnt'
 
 export default {
   name: 'TheHeader',
   components: {
-    DefaultHeaderDropdownAccnt
+    TheHeaderDropdownAccnt
   }
 }
 </script>
diff --git a/src/containers/DefaultHeaderDropdownAccnt.vue b/src/containers/TheHeaderDropdownAccnt.vue
similarity index 98%
rename from src/containers/DefaultHeaderDropdownAccnt.vue
rename to src/containers/TheHeaderDropdownAccnt.vue
index dc44553c..4db6565c 100644
--- a/src/containers/DefaultHeaderDropdownAccnt.vue
+++ b/src/containers/TheHeaderDropdownAccnt.vue
@@ -67,7 +67,7 @@
 
 <script>
 export default {
-  name: 'DefaultHeaderDropdownAccnt',
+  name: 'TheHeaderDropdownAccnt',
   data () {
     return { itemsCount: 42 }
   }
diff --git a/src/router/index.js b/src/router/index.js
index bdf5b505..128069be 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -2,7 +2,7 @@ import Vue from 'vue'
 import Router from 'vue-router'
 
 // Containers
-const DefaultContainer = () => import('@/containers/DefaultContainer')
+const TheContainer = () => import('@/containers/TheContainer')
 
 // Views
 const Dashboard = () => import('@/views/Dashboard')
@@ -63,12 +63,16 @@ export default new Router({
   mode: 'hash', // https://router.vuejs.org/api/#mode
   linkActiveClass: 'active',
   scrollBehavior: () => ({ y: 0 }),
-  routes: [
+  routes: configRoutes()
+})
+
+function configRoutes () {
+  return [
     {
       path: '/',
       redirect: '/dashboard',
       name: 'Home',
-      component: DefaultContainer,
+      component: TheContainer,
       children: [
         {
           path: 'dashboard',
@@ -327,4 +331,5 @@ export default new Router({
       ]
     }
   ]
-})
+}
+
diff --git a/tests/unit/containers/DefaultHeaderDropdownAccnt.spec.js b/tests/unit/containers/DefaultHeaderDropdownAccnt.spec.js
deleted file mode 100644
index 37f2dfd3..00000000
--- a/tests/unit/containers/DefaultHeaderDropdownAccnt.spec.js
+++ /dev/null
@@ -1,24 +0,0 @@
-import Vue from 'vue'
-import CoreuiVue from '@coreui/vue'
-import DefaultHeaderDropdownAccnt from '@/containers/DefaultHeaderDropdownAccnt'
-import { shallowMount } from '@vue/test-utils';
-
-Vue.use(CoreuiVue)
-
-describe('DefaultHeaderDropdownAccnt.vue', () => {
-  it('has a name', () => {
-    expect(DefaultHeaderDropdownAccnt.name).toMatch('DefaultHeaderDropdownAccnt')
-  })
-  it('has a created hook', () => {
-    expect(typeof DefaultHeaderDropdownAccnt.data).toMatch('function')
-  })
-  it('sets the correct default data', () => {
-    expect(typeof DefaultHeaderDropdownAccnt.data).toMatch('function')
-    const defaultData = DefaultHeaderDropdownAccnt.data()
-    expect(defaultData.itemsCount).toBe(42)
-  })
-  test('renders correctly', () => {
-    const wrapper = shallowMount(DefaultHeaderDropdownAccnt)
-    expect(wrapper.element).toMatchSnapshot()
-  })
-})
diff --git a/tests/unit/containers/DefaultContainer.spec.js b/tests/unit/containers/TheContainer.spec.js
similarity index 67%
rename from tests/unit/containers/DefaultContainer.spec.js
rename to tests/unit/containers/TheContainer.spec.js
index 9eba0824..4643e3db 100644
--- a/tests/unit/containers/DefaultContainer.spec.js
+++ b/tests/unit/containers/TheContainer.spec.js
@@ -1,7 +1,7 @@
 import CoreuiVue from '@coreui/vue'
 import { shallowMount, createLocalVue } from '@vue/test-utils';
 import VueRouter from 'vue-router'
-import DefaultContainer from '@/containers/DefaultContainer'
+import TheContainer from '@/containers/TheContainer'
 
 const localVue = createLocalVue()
 localVue.use(VueRouter)
@@ -9,19 +9,19 @@ const router = new VueRouter()
 
 localVue.use(CoreuiVue)
 
-describe('DefaultContainer.vue', () => {
+describe('TheContainer.vue', () => {
   it('has a name', () => {
-    expect(DefaultContainer.name).toMatch('full')
+    expect(TheContainer.name).toMatch('full')
   })
   test('renders correctly', () => {
-    const wrapper = shallowMount(DefaultContainer, {
+    const wrapper = shallowMount(TheContainer, {
       localVue,
         router
     })
     expect(wrapper.element).toMatchSnapshot()
   })
   it('is Vue instance', () => {
-    const wrapper = shallowMount(DefaultContainer, {
+    const wrapper = shallowMount(TheContainer, {
       localVue,
       router
     })
diff --git a/tests/unit/containers/TheHeaderDropdownAccnt.spec.js b/tests/unit/containers/TheHeaderDropdownAccnt.spec.js
new file mode 100644
index 00000000..56cb80d5
--- /dev/null
+++ b/tests/unit/containers/TheHeaderDropdownAccnt.spec.js
@@ -0,0 +1,24 @@
+import Vue from 'vue'
+import CoreuiVue from '@coreui/vue'
+import TheHeaderDropdownAccnt from '@/containers/TheHeaderDropdownAccnt'
+import { shallowMount } from '@vue/test-utils';
+
+Vue.use(CoreuiVue)
+
+describe('TheHeaderDropdownAccnt.vue', () => {
+  it('has a name', () => {
+    expect(TheHeaderDropdownAccnt.name).toMatch('TheHeaderDropdownAccnt')
+  })
+  it('has a created hook', () => {
+    expect(typeof TheHeaderDropdownAccnt.data).toMatch('function')
+  })
+  it('sets the correct default data', () => {
+    expect(typeof TheHeaderDropdownAccnt.data).toMatch('function')
+    const defaultData = TheHeaderDropdownAccnt.data()
+    expect(defaultData.itemsCount).toBe(42)
+  })
+  test('renders correctly', () => {
+    const wrapper = shallowMount(TheHeaderDropdownAccnt)
+    expect(wrapper.element).toMatchSnapshot()
+  })
+})