diff --git a/src/background/messageListeners/moment.ts b/src/background/messageListeners/moment.ts
index 7a9f13a8..17653b6b 100644
--- a/src/background/messageListeners/moment.ts
+++ b/src/background/messageListeners/moment.ts
@@ -1,7 +1,7 @@
 import browser from 'webextension-polyfill'
 
 function handleMessage(message: any) {
-  if (message.contentScriptQuery === 'getTopbarNewMomentsCount') {
+  if (message.contentScriptQuery === 'getTopBarNewMomentsCount') {
     const url = 'https://api.bilibili.com/x/web-interface/dynamic/entrance'
     return fetch(url)
       .then(response => response.json())
@@ -10,7 +10,7 @@ function handleMessage(message: any) {
   }
 
   // v2 get moment list
-  // else if (message.contentScriptQuery === 'getTopbarNewMoments') {
+  // else if (message.contentScriptQuery === 'getTopBarNewMoments') {
   //   // type: video | article
   //   const url = `https://api.bilibili.com/x/polymer/web-dynamic/v1/feed/nav?type=${message.type}&update_baseline=${message.updateBaseline}`
   //   return fetch(url)
@@ -26,7 +26,7 @@ function handleMessage(message: any) {
   //     .catch(error => console.error(error))
   // }
 
-  else if (message.contentScriptQuery === 'getTopbarNewMoments') {
+  else if (message.contentScriptQuery === 'getTopBarNewMoments') {
     const url = `https://api.vc.bilibili.com/dynamic_svr/v1/dynamic_svr/dynamic_new?uid=${message.uid}
     &type_list=${message.typeList}`
     return fetch(url)
diff --git a/src/components/TopBar/TopBar.vue b/src/components/TopBar/TopBar.vue
index 0c391267..3ecaf159 100644
--- a/src/components/TopBar/TopBar.vue
+++ b/src/components/TopBar/TopBar.vue
@@ -92,7 +92,7 @@ watch(
       return
 
     if (!newVal)
-      await getTopbarNewMomentsCount()
+      await getTopBarNewMomentsCount()
   },
 )
 
@@ -125,12 +125,12 @@ onBeforeMount(() => {
 async function initData() {
   await getUserInfo()
   getUnreadMessageCount()
-  getTopbarNewMomentsCount()
+  getTopBarNewMomentsCount()
 
   // automatically update notifications and moments count
   setInterval(() => {
     getUnreadMessageCount()
-    getTopbarNewMomentsCount()
+    getTopBarNewMomentsCount()
   }, updateInterval)
 }
 
@@ -231,7 +231,7 @@ async function getUnreadMessageCount() {
   }
 }
 
-async function getTopbarNewMomentsCount() {
+async function getTopBarNewMomentsCount() {
   if (!isLogin)
     return
 
@@ -239,7 +239,7 @@ async function getTopbarNewMomentsCount() {
 
   try {
     const res = await browser.runtime.sendMessage({
-      contentScriptQuery: 'getTopbarNewMomentsCount',
+      contentScriptQuery: 'getTopBarNewMomentsCount',
     })
     newMomentsCount.value = res.data.update_info.item.count
     // If moments count > 0 then refresh the key to get the new moments
@@ -253,7 +253,7 @@ async function getTopbarNewMomentsCount() {
 
 function toggleTopBarVisible(visible: boolean) {
   hideTopBar.value = !visible
-  emitter.emit('topbarVisibleChange', visible)
+  emitter.emit('topBarVisibleChange', visible)
 }
 
 defineExpose({
diff --git a/src/components/TopBar/components/MomentsPop.vue b/src/components/TopBar/components/MomentsPop.vue
index 148b5d31..a9c9e6fc 100644
--- a/src/components/TopBar/components/MomentsPop.vue
+++ b/src/components/TopBar/components/MomentsPop.vue
@@ -44,19 +44,19 @@ watch(selectedTab, (newVal: number, oldVal: number) => {
     smoothScrollToTop(momentsWrap.value, 300)
 
   if (newVal === 0) {
-    getTopbarNewMoments([MomentType.Video, MomentType.Bangumi])
+    getTopBarNewMoments([MomentType.Video, MomentType.Bangumi])
   }
   else if (newVal === 1) {
     livePage.value = 1
     getTopbarLiveMoments(livePage.value)
   }
   else if (newVal === 2) {
-    getTopbarNewMoments([MomentType.Article])
+    getTopBarNewMoments([MomentType.Article])
   }
 })
 
 onMounted(() => {
-  getTopbarNewMoments([MomentType.Video, MomentType.Bangumi])
+  getTopBarNewMoments([MomentType.Video, MomentType.Bangumi])
 
   if (momentsWrap.value) {
     momentsWrap.value.addEventListener('scroll', () => {
@@ -89,12 +89,12 @@ function onClickTab(tabId: number) {
   })
 }
 
-function getTopbarNewMoments(typeList: number[]) {
+function getTopBarNewMoments(typeList: number[]) {
   moments.length = 0
   isLoading.value = true
   browser.runtime
     .sendMessage({
-      contentScriptQuery: 'getTopbarNewMoments',
+      contentScriptQuery: 'getTopBarNewMoments',
       uid: getUserID(),
       typeList,
     })
diff --git a/src/contentScripts/views/App.vue b/src/contentScripts/views/App.vue
index 6fc211ae..fe21517d 100644
--- a/src/contentScripts/views/App.vue
+++ b/src/contentScripts/views/App.vue
@@ -266,7 +266,7 @@ provide('scrollbarRef', scrollbarRef)
       />
     </div>
 
-    <!-- Topbar -->
+    <!-- TopBar -->
     <div m-auto max-w="$bew-page-max-width">
       <Transition name="top-bar">
         <TopBar
diff --git a/src/contentScripts/views/Favorites/Favorites.vue b/src/contentScripts/views/Favorites/Favorites.vue
index 4eac8d89..bc4af3f2 100644
--- a/src/contentScripts/views/Favorites/Favorites.vue
+++ b/src/contentScripts/views/Favorites/Favorites.vue
@@ -42,8 +42,8 @@ onMounted(async () => {
     favoriteResources.length = 0
     handleSearch()
   })
-  emitter.off('topbarVisibleChange')
-  emitter.on('topbarVisibleChange', (val) => {
+  emitter.off('topBarVisibleChange')
+  emitter.on('topBarVisibleChange', (val) => {
     shouldMoveCtrlBarUp.value = false
 
     // Allow moving tabs up only when the top bar is not hidden & is set to auto-hide
@@ -62,7 +62,7 @@ onMounted(async () => {
 onUnmounted(() => {
   emitter.off('reachBottom')
   emitter.off('pageRefresh')
-  emitter.off('topbarVisibleChange')
+  emitter.off('topBarVisibleChange')
 })
 
 async function getFavoriteCategories() {
diff --git a/src/contentScripts/views/Home/Home.vue b/src/contentScripts/views/Home/Home.vue
index 5f07b70d..dff46de1 100644
--- a/src/contentScripts/views/Home/Home.vue
+++ b/src/contentScripts/views/Home/Home.vue
@@ -55,8 +55,8 @@ onMounted(() => {
   emitter.on('pageRefresh', async () => {
     recommendContentKey.value = `recommendContent${Number(new Date())}`
   })
-  emitter.off('topbarVisibleChange')
-  emitter.on('topbarVisibleChange', (val) => {
+  emitter.off('topBarVisibleChange')
+  emitter.on('topBarVisibleChange', (val) => {
     shouldMoveTabsUp.value = false
 
     // Allow moving tabs up only when the top bar is not hidden & is set to auto-hide
@@ -74,7 +74,7 @@ onMounted(() => {
 
 onUnmounted(() => {
   emitter.off('pageRefresh')
-  emitter.off('topbarVisibleChange')
+  emitter.off('topBarVisibleChange')
 })
 </script>
 
diff --git a/src/contentScripts/views/Home/components/Ranking.vue b/src/contentScripts/views/Home/components/Ranking.vue
index e04e5d09..d86a73e9 100644
--- a/src/contentScripts/views/Home/components/Ranking.vue
+++ b/src/contentScripts/views/Home/components/Ranking.vue
@@ -56,7 +56,7 @@ watch(() => activatedRankingType.value.id, () => {
 })
 
 onMounted(() => {
-  emitter.on('topbarVisibleChange', (val) => {
+  emitter.on('topBarVisibleChange', (val) => {
     shouldMoveAsideUp.value = false
 
     // Allow moving tabs up only when the top bar is not hidden & is set to auto-hide
@@ -75,7 +75,7 @@ onMounted(() => {
 })
 
 onBeforeUnmount(() => {
-  emitter.off('topbarVisibleChange')
+  emitter.off('topBarVisibleChange')
 })
 
 function getRankingVideos() {