diff --git a/src/app/browser.hpp b/src/app/browser.hpp
index 72dd325b..fdcb19f2 100644
--- a/src/app/browser.hpp
+++ b/src/app/browser.hpp
@@ -29,7 +29,7 @@ namespace app
              */
             struct Database
             {
-                // APP_BROWSER__*
+                // app_browser__*
                 struct Session
                 {
                     enum
diff --git a/src/app/browser/main.hpp b/src/app/browser/main.hpp
index feff0125..c3962e1a 100644
--- a/src/app/browser/main.hpp
+++ b/src/app/browser/main.hpp
@@ -27,7 +27,7 @@ namespace app::browser
              */
             struct Database
             {
-                // APP_BROWSER_MAIN__*
+                // app_browser_main__*
                 struct Session
                 {
                     enum
diff --git a/src/app/browser/main/tab.hpp b/src/app/browser/main/tab.hpp
index bd8025b6..0299d212 100644
--- a/src/app/browser/main/tab.hpp
+++ b/src/app/browser/main/tab.hpp
@@ -27,7 +27,7 @@ namespace app::browser::main
              */
             struct Database
             {
-                // APP_BROWSER_MAIN_TAB__*
+                // app_browser_main_tab__*
                 struct Session
                 {
                     enum
diff --git a/src/app/browser/main/tab/label.hpp b/src/app/browser/main/tab/label.hpp
index f6b3f45d..7c56a7b4 100644
--- a/src/app/browser/main/tab/label.hpp
+++ b/src/app/browser/main/tab/label.hpp
@@ -24,7 +24,7 @@ namespace app::browser::main::tab
              */
             struct Database
             {
-                // APP_BROWSER_MAIN_TAB_LABEL__*
+                // app_browser_main_tab_label__*
                 struct Session
                 {
                     enum
diff --git a/src/app/browser/main/tab/page.hpp b/src/app/browser/main/tab/page.hpp
index 639522e1..39456f4c 100644
--- a/src/app/browser/main/tab/page.hpp
+++ b/src/app/browser/main/tab/page.hpp
@@ -45,7 +45,7 @@ namespace app::browser::main::tab
              */
             struct Database
             {
-                // APP_BROWSER_MAIN_TAB_PAGE__*
+                // app_browser_main_tab_page__*
                 struct Session
                 {
                     enum
diff --git a/src/app/browser/main/tab/page/navigation.hpp b/src/app/browser/main/tab/page/navigation.hpp
index c53ca8ed..abfb0ca6 100644
--- a/src/app/browser/main/tab/page/navigation.hpp
+++ b/src/app/browser/main/tab/page/navigation.hpp
@@ -30,7 +30,7 @@ namespace app::browser::main::tab::page
              */
             struct Database
             {
-                // APP_BROWSER_MAIN_TAB_PAGE_NAVIGATION__*
+                // app_browser_main_tab_page_navigation__*
                 struct Session
                 {
                     enum
diff --git a/src/app/browser/main/tab/page/navigation/history.hpp b/src/app/browser/main/tab/page/navigation/history.hpp
index a288fdaf..88c99701 100644
--- a/src/app/browser/main/tab/page/navigation/history.hpp
+++ b/src/app/browser/main/tab/page/navigation/history.hpp
@@ -29,7 +29,7 @@ namespace app::browser::main::tab::page::navigation
              */
             struct Database
             {
-                // APP_BROWSER_MAIN_TAB_PAGE_NAVIGATION_HISTORY__*
+                // app_browser_main_tab_page_navigation_history__*
                 struct Session
                 {
                     enum
diff --git a/src/app/browser/main/tab/page/navigation/request.hpp b/src/app/browser/main/tab/page/navigation/request.hpp
index d7098953..44cbbd9b 100644
--- a/src/app/browser/main/tab/page/navigation/request.hpp
+++ b/src/app/browser/main/tab/page/navigation/request.hpp
@@ -24,7 +24,7 @@ namespace app::browser::main::tab::page::navigation
              */
             struct Database
             {
-                // APP_BROWSER_MAIN_TAB_PAGE_NAVIGATION_REQUEST__*
+                // app_browser_main_tab_page_navigation_request__*
                 struct Session
                 {
                     enum