diff --git a/src/app/browser/main/tab.cpp b/src/app/browser/main/tab.cpp
index 57338bb1..1afb28ad 100644
--- a/src/app/browser/main/tab.cpp
+++ b/src/app/browser/main/tab.cpp
@@ -31,10 +31,10 @@ Tab::~Tab() = default;
 
 // Getters
 Glib::ustring Tab::get_label_text(
-    const int & page_number
+    const int & PAGE_NUMBER
 ) {
     auto pageWidget = get_nth_page(
-        page_number
+        PAGE_NUMBER
     );
 
     if (pageWidget != nullptr)
@@ -79,10 +79,10 @@ void Tab::append(
 };
 
 void Tab::close(
-    const int & page_number
+    const int & PAGE_NUMBER
 ) {
     remove_page(
-        page_number
+        PAGE_NUMBER
     );
 
     // @TODO memory cleanup
@@ -106,10 +106,10 @@ void Tab::close_all()
 }
 
 void Tab::update(
-    const int & page_number
+    const int & PAGE_NUMBER
 ) {
     auto pageWidget = get_nth_page(
-        page_number
+        PAGE_NUMBER
     );
 
     if (pageWidget != nullptr)
@@ -122,10 +122,10 @@ void Tab::update(
 } // @TODO
 
 void Tab::refresh(
-    const int & page_number
+    const int & PAGE_NUMBER
 ) {
     auto pageWidget = get_nth_page(
-        page_number
+        PAGE_NUMBER
     );
 
     if (pageWidget == nullptr)
diff --git a/src/app/browser/main/tab.hpp b/src/app/browser/main/tab.hpp
index b3384067..e27abaf8 100644
--- a/src/app/browser/main/tab.hpp
+++ b/src/app/browser/main/tab.hpp
@@ -19,7 +19,7 @@ namespace app::browser::main
             ~Tab();
 
             Glib::ustring get_label_text(
-                const int & page_number
+                const int & PAGE_NUMBER
             );
 
             void append(
@@ -29,7 +29,7 @@ namespace app::browser::main
             );
 
             void close(
-                const int & page_number
+                const int & PAGE_NUMBER
             );
 
             void close_left();
@@ -37,11 +37,11 @@ namespace app::browser::main
             void close_all();
 
             void refresh(
-                const int & page_number
+                const int & PAGE_NUMBER
             );
 
             void update(
-                const int & page_number
+                const int & PAGE_NUMBER
             );
     };
 }
diff --git a/src/app/browser/main/tab/page/navbar.cpp b/src/app/browser/main/tab/page/navbar.cpp
index 0f5b9ef1..b1961ec3 100644
--- a/src/app/browser/main/tab/page/navbar.cpp
+++ b/src/app/browser/main/tab/page/navbar.cpp
@@ -8,7 +8,7 @@
 using namespace app::browser::main::tab::page;
 
 Navbar::Navbar(
-    const Glib::ustring & request_text
+    const Glib::ustring & REQUEST
 ) {
     // Init container
     set_orientation(
@@ -55,7 +55,7 @@ Navbar::Navbar(
         );
 
     navbarRequest = new navbar::Request(
-        request_text
+        REQUEST
     );
 
         append(
@@ -111,10 +111,10 @@ void Navbar::refresh()
 
 // Setters
 void Navbar::set_request_text(
-    const Glib::ustring & value
+    const Glib::ustring & TEXT
 ) {
     navbarRequest->set_text(
-        value
+        TEXT
     );
 
     // refresh(); not wanted as on change listener do same @TODO
diff --git a/src/app/browser/main/tab/page/navbar.hpp b/src/app/browser/main/tab/page/navbar.hpp
index 2c397335..2698e552 100644
--- a/src/app/browser/main/tab/page/navbar.hpp
+++ b/src/app/browser/main/tab/page/navbar.hpp
@@ -32,7 +32,7 @@ namespace app::browser::main::tab::page
         public:
 
             Navbar(
-                const Glib::ustring & request_text = ""
+                const Glib::ustring & REQUEST = ""
             );
 
             ~Navbar();
@@ -42,7 +42,7 @@ namespace app::browser::main::tab::page
 
             // Setters
             void set_request_text(
-                const Glib::ustring & value
+                const Glib::ustring & TEXT
             );
 
             // Getters
diff --git a/src/app/browser/main/tab/page/navbar/request.cpp b/src/app/browser/main/tab/page/navbar/request.cpp
index 49d61efb..e798b8a7 100644
--- a/src/app/browser/main/tab/page/navbar/request.cpp
+++ b/src/app/browser/main/tab/page/navbar/request.cpp
@@ -4,7 +4,7 @@ using namespace app::browser::main::tab::page::navbar;
 
 // Construct
 Request::Request(
-    const Glib::ustring & text
+    const Glib::ustring & TEXT
 ) {
     // Init entry
     set_placeholder_text(
@@ -15,10 +15,10 @@ Request::Request(
         HEXPAND
     );
 
-    if (!text.empty())
+    if (!TEXT.empty())
     {
         set_text(
-            text
+            TEXT
         );
 
         parse();
@@ -92,15 +92,15 @@ void Request::parse()
 
     int index = 0;
 
-    for (const Glib::ustring & value : match)
+    for (const Glib::ustring & VALUE : match)
     {
         switch (index)
         {
-            case 2: scheme = value; break;
-            case 3: host   = value; break;
-            case 5: port   = value; break;
-            case 6: path   = value; break;
-            case 8: query  = value; break;
+            case 2: scheme = VALUE; break;
+            case 3: host   = VALUE; break;
+            case 5: port   = VALUE; break;
+            case 6: path   = VALUE; break;
+            case 8: query  = VALUE; break;
         }
 
         index++;
diff --git a/src/app/browser/main/tab/page/navbar/request.hpp b/src/app/browser/main/tab/page/navbar/request.hpp
index f30c3a8c..0f0e809b 100644
--- a/src/app/browser/main/tab/page/navbar/request.hpp
+++ b/src/app/browser/main/tab/page/navbar/request.hpp
@@ -23,7 +23,7 @@ namespace app::browser::main::tab::page::navbar
         public:
 
             Request(
-                const Glib::ustring & text = ""
+                const Glib::ustring & VALUE = ""
             );
 
             ~Request();