diff --git a/src/app/browser/main/tab/page.cpp b/src/app/browser/main/tab/page.cpp
index 4f5fd144..2ce74cb2 100644
--- a/src/app/browser/main/tab/page.cpp
+++ b/src/app/browser/main/tab/page.cpp
@@ -71,13 +71,13 @@ void Page::refresh()
 }
 
 int Page::save(
-    const sqlite3_int64 & DB__APP_BROWSER_MAIN_TAB__SESSION_ID
+    const sqlite3_int64 & APP_BROWSER_MAIN_TAB__SESSION_ID
 ) {
     // Delegate save action to child components
     return pageNavigation->save(
         DB::SESSION::add(
             db,
-            DB__APP_BROWSER_MAIN_TAB__SESSION_ID,
+            APP_BROWSER_MAIN_TAB__SESSION_ID,
             mime,
             title,
             description
@@ -390,7 +390,7 @@ int Page::DB::SESSION::init(
 
 int Page::DB::SESSION::clean(
     sqlite3 * db,
-    const int & DB__APP_BROWSER_MAIN_TAB__SESSION_ID
+    const int & APP_BROWSER_MAIN_TAB__SESSION_ID
 ) {
     char * error; // @TODO
     sqlite3_stmt * statement;
@@ -401,7 +401,7 @@ int Page::DB::SESSION::clean(
             R"SQL(
                 SELECT * FROM `app_browser_main_tab_page__session` WHERE `app_browser_main_tab__session_id` = %d
             )SQL",
-            DB__APP_BROWSER_MAIN_TAB__SESSION_ID
+            APP_BROWSER_MAIN_TAB__SESSION_ID
         ).c_str(),
         -1,
         SQLITE_PREPARE_NORMALIZE,
@@ -450,7 +450,7 @@ int Page::DB::SESSION::clean(
 
 sqlite3_int64 Page::DB::SESSION::add(
     sqlite3 * db,
-    const sqlite3_int64 & DB__APP_BROWSER_MAIN_TAB__SESSION_ID,
+    const sqlite3_int64 & APP_BROWSER_MAIN_TAB__SESSION_ID,
     const Page::MIME & MIME,
     const Glib::ustring & TITLE,
     const Glib::ustring & DESCRIPTION
@@ -473,7 +473,7 @@ sqlite3_int64 Page::DB::SESSION::add(
                     '%s'
                 )
             )SQL",
-            DB__APP_BROWSER_MAIN_TAB__SESSION_ID,
+            APP_BROWSER_MAIN_TAB__SESSION_ID,
             MIME,
             TITLE,
             DESCRIPTION
diff --git a/src/app/browser/main/tab/page.hpp b/src/app/browser/main/tab/page.hpp
index bf980e4b..9eda0927 100644
--- a/src/app/browser/main/tab/page.hpp
+++ b/src/app/browser/main/tab/page.hpp
@@ -60,12 +60,12 @@ namespace app::browser::main::tab
 
                     static int clean(
                         sqlite3 * db,
-                        const int & DB__APP_BROWSER_MAIN_TAB__SESSION_ID
+                        const int & APP_BROWSER_MAIN_TAB__SESSION_ID
                     ); // return sqlite3_finalize status code
 
                     static sqlite3_int64 add(
                         sqlite3 * db,
-                        const sqlite3_int64 & DB__APP_BROWSER_MAIN_TAB__SESSION_ID,
+                        const sqlite3_int64 & APP_BROWSER_MAIN_TAB__SESSION_ID,
                         const Page::MIME & MIME,
                         const Glib::ustring & TITLE,
                         const Glib::ustring & DESCRIPTION
@@ -120,7 +120,7 @@ namespace app::browser::main::tab
             void refresh();
 
             int save(
-                const sqlite3_int64 & DB__APP_BROWSER_MAIN_TAB__SESSION_ID
+                const sqlite3_int64 & APP_BROWSER_MAIN_TAB__SESSION_ID
             );
 
             void update(
diff --git a/src/app/browser/main/tab/page/navigation.cpp b/src/app/browser/main/tab/page/navigation.cpp
index 1674a747..c24dcd71 100644
--- a/src/app/browser/main/tab/page/navigation.cpp
+++ b/src/app/browser/main/tab/page/navigation.cpp
@@ -109,12 +109,12 @@ void Navigation::refresh(
 }
 
 int Navigation::save(
-    const sqlite3_int64 & DB__APP_BROWSER_MAIN_TAB_PAGE__SESSION_ID
+    const sqlite3_int64 & APP_BROWSER_MAIN_TAB_PAGE__SESSION_ID
 ) {
     return navigationRequest->save(
         DB::SESSION::add(
             db,
-            DB__APP_BROWSER_MAIN_TAB_PAGE__SESSION_ID
+            APP_BROWSER_MAIN_TAB_PAGE__SESSION_ID
         )
     );
 }
@@ -225,7 +225,7 @@ int Navigation::DB::SESSION::init(
 
 int Navigation::DB::SESSION::clean(
     sqlite3 * db,
-    const int & DB__APP_BROWSER_MAIN_TAB_PAGE__SESSION_ID
+    const int & APP_BROWSER_MAIN_TAB_PAGE__SESSION_ID
 ) {
     char * error; // @TODO
     sqlite3_stmt * statement;
@@ -236,7 +236,7 @@ int Navigation::DB::SESSION::clean(
             R"SQL(
                 SELECT * FROM `app_browser_main_tab_page_navigation__session` WHERE `app_browser_main_tab_page__session_id` = %d
             )SQL",
-            DB__APP_BROWSER_MAIN_TAB_PAGE__SESSION_ID
+            APP_BROWSER_MAIN_TAB_PAGE__SESSION_ID
         ).c_str(),
         -1,
         SQLITE_PREPARE_NORMALIZE,
@@ -285,7 +285,7 @@ int Navigation::DB::SESSION::clean(
 
 sqlite3_int64 Navigation::DB::SESSION::add(
     sqlite3 * db,
-    const sqlite3_int64 & DB__APP_BROWSER_MAIN_TAB_PAGE__SESSION_ID
+    const sqlite3_int64 & APP_BROWSER_MAIN_TAB_PAGE__SESSION_ID
 ) {
     char * error; // @TODO
 
@@ -299,7 +299,7 @@ sqlite3_int64 Navigation::DB::SESSION::add(
                     '%d'
                 )
             )SQL",
-            DB__APP_BROWSER_MAIN_TAB_PAGE__SESSION_ID
+            APP_BROWSER_MAIN_TAB_PAGE__SESSION_ID
         ).c_str(),
         nullptr,
         nullptr,
diff --git a/src/app/browser/main/tab/page/navigation.hpp b/src/app/browser/main/tab/page/navigation.hpp
index c67bb327..68c303c4 100644
--- a/src/app/browser/main/tab/page/navigation.hpp
+++ b/src/app/browser/main/tab/page/navigation.hpp
@@ -45,12 +45,12 @@ namespace app::browser::main::tab::page
 
                     static int clean(
                         sqlite3 * db,
-                        const int & DB__APP_BROWSER_MAIN_TAB_PAGE__SESSION_ID
+                        const int & APP_BROWSER_MAIN_TAB_PAGE__SESSION_ID
                     ); // return sqlite3_finalize status code
 
                     static sqlite3_int64 add(
                         sqlite3 * db,
-                        const sqlite3_int64 & DB__APP_BROWSER_MAIN_TAB_PAGE__SESSION_ID
+                        const sqlite3_int64 & APP_BROWSER_MAIN_TAB_PAGE__SESSION_ID
                     ); // return sqlite3_last_insert_rowid
                 };
             };
@@ -93,7 +93,7 @@ namespace app::browser::main::tab::page
             );
 
             int save(
-                const sqlite3_int64 & DB__APP_BROWSER_MAIN_TAB__SESSION_ID
+                const sqlite3_int64 & APP_BROWSER_MAIN_TAB__SESSION_ID
             );
 
             void history_add(
diff --git a/src/app/browser/main/tab/page/navigation/request.cpp b/src/app/browser/main/tab/page/navigation/request.cpp
index 26b1b762..3db77ef2 100644
--- a/src/app/browser/main/tab/page/navigation/request.cpp
+++ b/src/app/browser/main/tab/page/navigation/request.cpp
@@ -85,11 +85,11 @@ void Request::refresh(
 }
 
 int Request::save(
-    const sqlite3_int64 & DB__APP_BROWSER_MAIN_TAB_PAGE_NAVIGATION__SESSION_ID
+    const sqlite3_int64 & APP_BROWSER_MAIN_TAB_PAGE_NAVIGATION__SESSION_ID
 ) {
     return DB::SESSION::add(
         db,
-        DB__APP_BROWSER_MAIN_TAB_PAGE_NAVIGATION__SESSION_ID,
+        APP_BROWSER_MAIN_TAB_PAGE_NAVIGATION__SESSION_ID,
         get_text()
     );
 }
@@ -174,7 +174,7 @@ int Request::DB::SESSION::init(
 
 int Request::DB::SESSION::clean(
     sqlite3 * db,
-    const int & DB__APP_BROWSER_MAIN_TAB_PAGE_NAVIGATION__SESSION_ID
+    const int & APP_BROWSER_MAIN_TAB_PAGE_NAVIGATION__SESSION_ID
 ) {
     char * error; // @TODO
     sqlite3_stmt * statement;
@@ -186,7 +186,7 @@ int Request::DB::SESSION::clean(
                 SELECT * FROM `app_browser_main_tab_page_navigation_request__session`
                         WHERE `app_browser_main_tab_page_navigation__session_id` = %d
             )SQL",
-            DB__APP_BROWSER_MAIN_TAB_PAGE_NAVIGATION__SESSION_ID
+            APP_BROWSER_MAIN_TAB_PAGE_NAVIGATION__SESSION_ID
         ).c_str(),
         -1,
         SQLITE_PREPARE_NORMALIZE,
@@ -230,7 +230,7 @@ int Request::DB::SESSION::clean(
 
 sqlite3_int64 Request::DB::SESSION::add(
     sqlite3 * db,
-    const sqlite3_int64 & DB__APP_BROWSER_MAIN_TAB_PAGE_NAVIGATION__SESSION_ID,
+    const sqlite3_int64 & APP_BROWSER_MAIN_TAB_PAGE_NAVIGATION__SESSION_ID,
     const Glib::ustring & TEXT
 ) {
     char * error; // @TODO
@@ -247,7 +247,7 @@ sqlite3_int64 Request::DB::SESSION::add(
                     '%s'
                 )
             )SQL",
-            DB__APP_BROWSER_MAIN_TAB_PAGE_NAVIGATION__SESSION_ID,
+            APP_BROWSER_MAIN_TAB_PAGE_NAVIGATION__SESSION_ID,
             TEXT
         ).c_str(),
         nullptr,
diff --git a/src/app/browser/main/tab/page/navigation/request.hpp b/src/app/browser/main/tab/page/navigation/request.hpp
index ccb4d308..97fc480c 100644
--- a/src/app/browser/main/tab/page/navigation/request.hpp
+++ b/src/app/browser/main/tab/page/navigation/request.hpp
@@ -39,12 +39,12 @@ namespace app::browser::main::tab::page::navigation
 
                     static int clean(
                         sqlite3 * db,
-                        const int & DB__APP_BROWSER_MAIN_TAB_PAGE_NAVIGATION__SESSION_ID
+                        const int & APP_BROWSER_MAIN_TAB_PAGE_NAVIGATION__SESSION_ID
                     ); // return sqlite3_finalize status code
 
                     static sqlite3_int64 add(
                         sqlite3 * db,
-                        const sqlite3_int64 & DB__APP_BROWSER_MAIN_TAB_PAGE_NAVIGATION__SESSION_ID,
+                        const sqlite3_int64 & APP_BROWSER_MAIN_TAB_PAGE_NAVIGATION__SESSION_ID,
                         const Glib::ustring & TEXT
                     ); // return sqlite3_last_insert_rowid
                 };
@@ -96,7 +96,7 @@ namespace app::browser::main::tab::page::navigation
             );
 
             int save(
-                const sqlite3_int64 & DB__APP_BROWSER_MAIN_TAB_PAGE_NAVIGATION__SESSION_ID
+                const sqlite3_int64 & APP_BROWSER_MAIN_TAB_PAGE_NAVIGATION__SESSION_ID
             );
 
             // Getters