diff --git a/client/src/App.vue b/client/src/App.vue
index e904aeac..3aeba993 100644
--- a/client/src/App.vue
+++ b/client/src/App.vue
@@ -11,7 +11,7 @@
 </template>
 
 <script setup lang="ts">
-import * as log from "loglevel";
+import log from "loglevel";
 
 import AppFooter from "@/components/AppFooter.vue";
 import MainNavigationBar from "@/components/MainNavigationBar.vue";
diff --git a/client/src/components/FeedbackForm.vue b/client/src/components/FeedbackForm.vue
index 0f662fe3..28464979 100644
--- a/client/src/components/FeedbackForm.vue
+++ b/client/src/components/FeedbackForm.vue
@@ -116,14 +116,14 @@ import ItRadioGroup from "@/components/ui/ItRadioGroup.vue";
 import ItTextarea from "@/components/ui/ItTextarea.vue";
 import { graphql } from "@/gql/";
 import type { SendFeedbackInput } from "@/gql/graphql";
-import { useSetupCourseSessionsStore } from "@/stores/courseSessions";
+import { useCourseSessionsStore } from "@/stores/courseSessions";
 import type { LearningContent } from "@/types";
 import { useMutation } from "@urql/vue";
 import log from "loglevel";
 import { onMounted, reactive, ref } from "vue";
 
 const props = defineProps<{ page: LearningContent }>();
-const courseSessionsStore = useSetupCourseSessionsStore();
+const courseSessionsStore = useCourseSessionsStore();
 
 onMounted(async () => {
   log.debug("Feedback mounted");
diff --git a/client/src/components/MainNavigationBar.vue b/client/src/components/MainNavigationBar.vue
index 363a7e60..819ab453 100644
--- a/client/src/components/MainNavigationBar.vue
+++ b/client/src/components/MainNavigationBar.vue
@@ -1,12 +1,12 @@
 <script setup lang="ts">
-import * as log from "loglevel";
+import log from "loglevel";
 
 import IconLogout from "@/components/icons/IconLogout.vue";
 import IconSettings from "@/components/icons/IconSettings.vue";
 import MobileMenu from "@/components/MobileMenu.vue";
 import ItDropdown from "@/components/ui/ItDropdown.vue";
 import { useAppStore } from "@/stores/app";
-import { useSetupCourseSessionsStore } from "@/stores/courseSessions";
+import { useCourseSessionsStore } from "@/stores/courseSessions";
 import { useUserStore } from "@/stores/user";
 import type { DropdownListItem } from "@/types";
 import type { Component } from "vue";
@@ -26,7 +26,7 @@ const route = useRoute();
 const router = useRouter();
 const userStore = useUserStore();
 const appStore = useAppStore();
-const courseSessionsStore = useSetupCourseSessionsStore();
+const courseSessionsStore = useCourseSessionsStore();
 
 const { t } = useI18n();
 const state = reactive({ showMenu: false });
diff --git a/client/src/pages/DashboardPage.vue b/client/src/pages/DashboardPage.vue
index ec193478..1ad04c75 100644
--- a/client/src/pages/DashboardPage.vue
+++ b/client/src/pages/DashboardPage.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import LearningPathDiagramSmall from "@/components/learningPath/LearningPathDiagramSmall.vue";
-import { useSetupCourseSessionsStore } from "@/stores/courseSessions";
+import { useCourseSessionsStore } from "@/stores/courseSessions";
 import { useUserStore } from "@/stores/user";
 import log from "loglevel";
 import { onMounted } from "vue";
@@ -8,7 +8,7 @@ import { onMounted } from "vue";
 log.debug("DashboardPage created");
 
 const userStore = useUserStore();
-const courseSessionsStore = useSetupCourseSessionsStore();
+const courseSessionsStore = useCourseSessionsStore();
 
 function employer() {
   return userStore.email === "bianca.muster@eiger-versicherungen.ch"
diff --git a/client/src/pages/learningPath/CirclePage.vue b/client/src/pages/learningPath/CirclePage.vue
index 7c13f520..3f1264ea 100644
--- a/client/src/pages/learningPath/CirclePage.vue
+++ b/client/src/pages/learningPath/CirclePage.vue
@@ -4,12 +4,12 @@ import CircleOverview from "@/components/learningPath/CircleOverview.vue";
 import LearningSequence from "@/components/learningPath/LearningSequence.vue";
 import ItDropdownSelect from "@/components/ui/ItDropdownSelect.vue";
 import ItModal from "@/components/ui/ItModal.vue";
-import * as log from "loglevel";
+import log from "loglevel";
 import { computed, onMounted, reactive, ref } from "vue";
 
 import { useAppStore } from "@/stores/app";
 import { useCircleStore } from "@/stores/circle";
-import { useSetupCourseSessionsStore } from "@/stores/courseSessions";
+import { useCourseSessionsStore } from "@/stores/courseSessions";
 import type { CourseSessionUser } from "@/types";
 import { humanizeDuration } from "@/utils/humanizeDuration";
 import _ from "lodash";
@@ -18,7 +18,7 @@ import { useRoute } from "vue-router";
 
 const route = useRoute();
 const { t } = useI18n();
-const courseSessionsStore = useSetupCourseSessionsStore();
+const courseSessionsStore = useCourseSessionsStore();
 
 interface Props {
   courseSlug: string;
diff --git a/client/src/stores/courseSessions.ts b/client/src/stores/courseSessions.ts
index b745485c..68f45780 100644
--- a/client/src/stores/courseSessions.ts
+++ b/client/src/stores/courseSessions.ts
@@ -27,7 +27,7 @@ function loadCourseSessionsData(reload = false) {
   return { courseSessions };
 }
 
-export const useSetupCourseSessionsStore = defineStore("courseSessionsSetup", () => {
+export const useCourseSessionsStore = defineStore("courseSessionsSetup", () => {
   // using setup function seems cleaner, see https://pinia.vuejs.org/core-concepts/#setup-stores
 
   // this will become a state variable (like each other `ref()`
diff --git a/client/src/stores/user.ts b/client/src/stores/user.ts
index 7fdad794..f84c0abc 100644
--- a/client/src/stores/user.ts
+++ b/client/src/stores/user.ts
@@ -1,8 +1,7 @@
-import * as log from "loglevel";
+import log from "loglevel";
 
 import { bustItGetCache, itGetCached, itPost } from "@/fetchHelpers";
 import { useAppStore } from "@/stores/app";
-// import { useSetupCourseSessionsStore } from "@/stores/courseSessions";
 import { defineStore } from "pinia";
 
 const logoutRedirectUrl = import.meta.env.VITE_LOGOUT_REDIRECT;