diff --git a/client/src/components/book-navigation/ContentNavigation.vue b/client/src/components/book-navigation/ContentNavigation.vue
index c8362b54..0b3f57c3 100644
--- a/client/src/components/book-navigation/ContentNavigation.vue
+++ b/client/src/components/book-navigation/ContentNavigation.vue
@@ -15,7 +15,7 @@
           {{ $flavor.textTopics }}
         </router-link>
 
-        <book-topic-navigation
+        <topic-navigation
           v-if="isSidebar"
         />
       </div>
@@ -97,7 +97,7 @@
 </template>
 
 <script>
-  import BookTopicNavigation from '@/components/book-navigation/BookTopicNavigation';
+  import TopicNavigation from '@/components/book-navigation/TopicNavigation';
 
   import sidebarMixin from '@/mixins/sidebar';
   import meMixin from '@/mixins/me';
@@ -114,7 +114,7 @@
     mixins: [sidebarMixin, meMixin],
 
     components: {
-      BookTopicNavigation,
+      TopicNavigation,
       Logo
     },
 
diff --git a/client/src/components/book-navigation/BookTopicNavigation.vue b/client/src/components/book-navigation/TopicNavigation.vue
similarity index 82%
rename from client/src/components/book-navigation/BookTopicNavigation.vue
rename to client/src/components/book-navigation/TopicNavigation.vue
index 09a181c3..3c99d0e6 100644
--- a/client/src/components/book-navigation/BookTopicNavigation.vue
+++ b/client/src/components/book-navigation/TopicNavigation.vue
@@ -1,11 +1,11 @@
 <template>
-  <nav class="book-topics">
+  <nav class="topic-navigation">
     <router-link
       :to="{name: 'topic', params: {topicSlug: topic.slug}}"
-      :class="{'book-topics__topic--active': topic.active, 'book-subnavigation__item--mobile': mobile}"
+      :class="{'topic-navigation__topic--active': topic.active, 'book-subnavigation__item--mobile': mobile}"
       tag="div"
       active-class="book-subnavigation__item--active"
-      class="book-topics__topic book-subnavigation__item"
+      class="topic-navigation__topic book-subnavigation__item"
       v-for="topic in topics"
       :key="topic.id"
       @click.native="closeSidebar('navigation')"
@@ -58,7 +58,7 @@
 <style scoped lang="scss">
   @import "@/styles/_variables.scss";
 
-  .book-topics {
+  .topic-navigation {
     &__topic {
     }
   }
diff --git a/client/src/pages/topic-page.vue b/client/src/pages/topic-page.vue
index 47acb63c..2f3848cd 100644
--- a/client/src/pages/topic-page.vue
+++ b/client/src/pages/topic-page.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="topic">
     <div class="topic__navigation">
-      <book-topic-navigation />
+      <topic-navigation />
     </div>
 
     <div class="topic__content">
@@ -48,7 +48,7 @@
   import ModuleTeaser from '@/components/modules/ModuleTeaser.vue';
   import TOPIC_QUERY from '@/graphql/gql/queries/topicQuery.gql';
   import me from '@/mixins/me';
-  import BookTopicNavigation from '@/components/book-navigation/BookTopicNavigation';
+  import TopicNavigation from '@/components/book-navigation/TopicNavigation';
 
   import UPDATE_LAST_TOPIC_MUTATION from '@/graphql/gql/mutations/updateLastTopic.gql';
   import ME_QUERY from '@/graphql/gql/queries/meQuery.gql';
@@ -60,7 +60,7 @@
 
     mixins: [me],
     components: {
-      BookTopicNavigation,
+      TopicNavigation,
       ModuleTeaser,
       PlayIcon,
       BulbIcon,