Everywhere: It's now "Foobar", not "FooBar", and not "foo bar"

I hereby declare these to be full nouns that we don't split, neither by space, nor by underscore: - Breadcrumbbar - Coolbar - Menubar - Progressbar - Scrollbar - Statusbar - Taskbar - Toolbar This patch makes everything consistent by replacing every other variant of these with the proper one. :^)
author: Andreas Kling <kling@serenityos.org> 2021-04-13 16:18:20 +0200
committer: Andreas Kling <kling@serenityos.org> 2021-04-13 16:58:15 +0200
commit: a2baab38fd58e18f690e2256b0a5081580c05968 (patch)
tree: ee4585bda0e59a1727f10b1203e540e44a2edafb
parent: 86bdfa1edf21293e2c0f3ca8b31808a21882cb99 (diff)
download: serenity-a2baab38fd58e18f690e2256b0a5081580c05968.zip
141 files changed, 518 insertions, 518 deletions
diff --git a/Base/home/anon/Source/little/test.frm b/Base/home/anon/Source/little/test.frm
index 481eead9e6..3a0119df7c 100644
--- a/Base/home/anon/Source/little/test.frm
+++ b/Base/home/anon/Source/little/test.frm
@@ -1 +1 @@
-{"name":"Form1","widgets":[{"enabled":true,"forecolor":"#000000ff","ruler_visible":false,"autofill":false,"x":155,"tooltip":null,"height":121,"width":126,"y":10,"class":"GTextEditor","text":"Hi","backcolor":"#c0c0c0ff","visible":true},{"tooltip":null,"backcolor":"#c0c0c0ff","forecolor":"#000000ff","text":"Okydoky","class":"GButton","autofill":false,"enabled":true,"visible":true,"x":10,"height":21,"y":70,"width":81},{"tooltip":null,"backcolor":"#c0c0c0ff","forecolor":"#000000ff","class":"GGroupBox","autofill":true,"enabled":true,"visible":true,"title":"groupie","x":10,"height":71,"y":100,"width":141},{"tooltip":null,"forecolor":"#000000ff","y":10,"max":100,"autofill":false,"x":10,"min":0,"class":"GProgressBar","backcolor":"#c0c0c0ff","height":21,"enabled":true,"visible":true,"width":136,"value":50},{"tooltip":null,"backcolor":"#c0c0c0ff","forecolor":"#000000ff","text":"Looks like success!","class":"GLabel","autofill":true,"enabled":true,"visible":true,"x":10,"height":26,"y":35,"width":136},{"enabled":true,"forecolor":"#000000ff","checked":false,"autofill":false,"x":160,"tooltip":null,"height":26,"width":91,"y":140,"class":"GCheckBox","text":"checkbox_1","backcolor":"#c0c0c0ff","visible":true},{"enabled":true,"forecolor":"#000000ff","checked":false,"autofill":false,"x":160,"tooltip":null,"height":26,"width":61,"y":160,"class":"GRadioButton","text":"radio_1","backcolor":"#c0c0c0ff","visible":true},{"tooltip":null,"forecolor":"#000000ff","y":125,"max":100,"autofill":false,"x":25,"min":0,"class":"GSlider","backcolor":"#c0c0c0ff","height":26,"enabled":true,"visible":true,"width":116,"value":"60"}]}
-\ No newline at end of file
+{"name":"Form1","widgets":[{"enabled":true,"forecolor":"#000000ff","ruler_visible":false,"autofill":false,"x":155,"tooltip":null,"height":121,"width":126,"y":10,"class":"GTextEditor","text":"Hi","backcolor":"#c0c0c0ff","visible":true},{"tooltip":null,"backcolor":"#c0c0c0ff","forecolor":"#000000ff","text":"Okydoky","class":"GButton","autofill":false,"enabled":true,"visible":true,"x":10,"height":21,"y":70,"width":81},{"tooltip":null,"backcolor":"#c0c0c0ff","forecolor":"#000000ff","class":"GGroupBox","autofill":true,"enabled":true,"visible":true,"title":"groupie","x":10,"height":71,"y":100,"width":141},{"tooltip":null,"forecolor":"#000000ff","y":10,"max":100,"autofill":false,"x":10,"min":0,"class":"GProgressbar","backcolor":"#c0c0c0ff","height":21,"enabled":true,"visible":true,"width":136,"value":50},{"tooltip":null,"backcolor":"#c0c0c0ff","forecolor":"#000000ff","text":"Looks like success!","class":"GLabel","autofill":true,"enabled":true,"visible":true,"x":10,"height":26,"y":35,"width":136},{"enabled":true,"forecolor":"#000000ff","checked":false,"autofill":false,"x":160,"tooltip":null,"height":26,"width":91,"y":140,"class":"GCheckBox","text":"checkbox_1","backcolor":"#c0c0c0ff","visible":true},{"enabled":true,"forecolor":"#000000ff","checked":false,"autofill":false,"x":160,"tooltip":null,"height":26,"width":61,"y":160,"class":"GRadioButton","text":"radio_1","backcolor":"#c0c0c0ff","visible":true},{"tooltip":null,"forecolor":"#000000ff","y":125,"max":100,"autofill":false,"x":25,"min":0,"class":"GSlider","backcolor":"#c0c0c0ff","height":26,"enabled":true,"visible":true,"width":116,"value":"60"}]}
diff --git a/Userland/Applications/Browser/BookmarksBarWidget.cpp b/Userland/Applications/Browser/BookmarksBarWidget.cpp
index a84975debe..671530fa44 100644
--- a/Userland/Applications/Browser/BookmarksBarWidget.cpp
+++ b/Userland/Applications/Browser/BookmarksBarWidget.cpp
@@ -131,7 +131,7 @@ BookmarksBarWidget::BookmarksBarWidget(const String& bookmarks_file, bool enable
         set_visible(false);
 
     m_additional = GUI::Button::construct();
-    m_additional->set_button_style(Gfx::ButtonStyle::CoolBar);
+    m_additional->set_button_style(Gfx::ButtonStyle::Coolbar);
     m_additional->set_text(">");
     m_additional->set_fixed_size(14, 20);
     m_additional->set_focus_policy(GUI::FocusPolicy::TabFocus);
@@ -208,7 +208,7 @@ void BookmarksBarWidget::model_did_update(unsigned)
         auto& button = add<GUI::Button>();
         m_bookmarks.append(button);
 
-        button.set_button_style(Gfx::ButtonStyle::CoolBar);
+        button.set_button_style(Gfx::ButtonStyle::Coolbar);
         button.set_text(title);
         button.set_icon(Gfx::Bitmap::load_from_file("/res/icons/16x16/filetype-html.png"));
         button.set_fixed_size(font().width(title) + 32, 20);
diff --git a/Userland/Applications/Browser/DownloadWidget.cpp b/Userland/Applications/Browser/DownloadWidget.cpp
index 54c872eb2c..d9bf01f9f4 100644
--- a/Userland/Applications/Browser/DownloadWidget.cpp
+++ b/Userland/Applications/Browser/DownloadWidget.cpp
@@ -36,7 +36,7 @@
 #include <LibGUI/ImageWidget.h>
 #include <LibGUI/Label.h>
 #include <LibGUI/MessageBox.h>
-#include <LibGUI/ProgressBar.h>
+#include <LibGUI/Progressbar.h>
 #include <LibGUI/Window.h>
 #include <LibProtocol/Client.h>
 #include <LibWeb/Loader/ResourceLoader.h>
@@ -91,8 +91,8 @@ DownloadWidget::DownloadWidget(const URL& url)
     source_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
     source_label.set_fixed_height(16);
 
-    m_progress_bar = add<GUI::ProgressBar>();
-    m_progress_bar->set_fixed_height(20);
+    m_progressbar = add<GUI::Progressbar>();
+    m_progressbar->set_fixed_height(20);
 
     m_progress_label = add<GUI::Label>();
     m_progress_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
@@ -127,15 +127,15 @@ DownloadWidget::~DownloadWidget()
 
 void DownloadWidget::did_progress(Optional<u32> total_size, u32 downloaded_size)
 {
-    m_progress_bar->set_min(0);
+    m_progressbar->set_min(0);
     if (total_size.has_value()) {
         int percent = roundf(((float)downloaded_size / (float)total_size.value()) * 100.0f);
         window()->set_progress(percent);
-        m_progress_bar->set_max(total_size.value());
+        m_progressbar->set_max(total_size.value());
     } else {
-        m_progress_bar->set_max(0);
+        m_progressbar->set_max(0);
     }
-    m_progress_bar->set_value(downloaded_size);
+    m_progressbar->set_value(downloaded_size);
 
     {
         StringBuilder builder;
diff --git a/Userland/Applications/Browser/DownloadWidget.h b/Userland/Applications/Browser/DownloadWidget.h
index 44fc21c60d..10f839a68c 100644
--- a/Userland/Applications/Browser/DownloadWidget.h
+++ b/Userland/Applications/Browser/DownloadWidget.h
@@ -29,7 +29,7 @@
 #include <AK/URL.h>
 #include <LibCore/ElapsedTimer.h>
 #include <LibCore/FileStream.h>
-#include <LibGUI/ProgressBar.h>
+#include <LibGUI/Progressbar.h>
 #include <LibGUI/Widget.h>
 #include <LibProtocol/Download.h>
 
@@ -50,7 +50,7 @@ private:
     URL m_url;
     String m_destination_path;
     RefPtr<Protocol::Download> m_download;
-    RefPtr<GUI::ProgressBar> m_progress_bar;
+    RefPtr<GUI::Progressbar> m_progressbar;
     RefPtr<GUI::Label> m_progress_label;
     RefPtr<GUI::Button> m_cancel_button;
     RefPtr<GUI::Button> m_close_button;
diff --git a/Userland/Applications/Browser/Tab.cpp b/Userland/Applications/Browser/Tab.cpp
index a24a19a37a..d976378843 100644
--- a/Userland/Applications/Browser/Tab.cpp
+++ b/Userland/Applications/Browser/Tab.cpp
@@ -39,12 +39,12 @@
 #include <LibGUI/Button.h>
 #include <LibGUI/Clipboard.h>
 #include <LibGUI/Menu.h>
-#include <LibGUI/MenuBar.h>
-#include <LibGUI/StatusBar.h>
+#include <LibGUI/Menubar.h>
+#include <LibGUI/Statusbar.h>
 #include <LibGUI/TabWidget.h>
 #include <LibGUI/TextBox.h>
-#include <LibGUI/ToolBar.h>
-#include <LibGUI/ToolBarContainer.h>
+#include <LibGUI/Toolbar.h>
+#include <LibGUI/ToolbarContainer.h>
 #include <LibGUI/Window.h>
 #include <LibJS/Interpreter.h>
 #include <LibWeb/Dump.h>
@@ -99,8 +99,8 @@ Tab::Tab(Type type)
 {
     load_from_gml(tab_gml);
 
-    m_toolbar_container = *find_descendant_of_type_named<GUI::ToolBarContainer>("toolbar_container");
-    auto& toolbar = *find_descendant_of_type_named<GUI::ToolBar>("toolbar");
+    m_toolbar_container = *find_descendant_of_type_named<GUI::ToolbarContainer>("toolbar_container");
+    auto& toolbar = *find_descendant_of_type_named<GUI::Toolbar>("toolbar");
 
     auto& webview_container = *find_descendant_of_type_named<GUI::Widget>("webview_container");
 
@@ -136,7 +136,7 @@ Tab::Tab(Type type)
     }));
 
     m_bookmark_button = toolbar.add<GUI::Button>();
-    m_bookmark_button->set_button_style(Gfx::ButtonStyle::CoolBar);
+    m_bookmark_button->set_button_style(Gfx::ButtonStyle::Coolbar);
     m_bookmark_button->set_focus_policy(GUI::FocusPolicy::TabFocus);
     m_bookmark_button->set_icon(Gfx::Bitmap::load_from_file("/res/icons/16x16/bookmark-contour.png"));
     m_bookmark_button->set_fixed_size(22, 22);
@@ -280,7 +280,7 @@ Tab::Tab(Type type)
         },
         this);
 
-    m_statusbar = *find_descendant_of_type_named<GUI::StatusBar>("statusbar");
+    m_statusbar = *find_descendant_of_type_named<GUI::Statusbar>("statusbar");
 
     hooks().on_link_hover = [this](auto& url) {
         if (url.is_valid())
@@ -293,7 +293,7 @@ Tab::Tab(Type type)
         load(url);
     };
 
-    m_menubar = GUI::MenuBar::construct();
+    m_menubar = GUI::Menubar::construct();
 
     auto& app_menu = m_menubar->add_menu("&File");
     app_menu.add_action(WindowActions::the().create_new_tab_action());
diff --git a/Userland/Applications/Browser/Tab.gml b/Userland/Applications/Browser/Tab.gml
index 24c7456d77..96dfba65be 100644
--- a/Userland/Applications/Browser/Tab.gml
+++ b/Userland/Applications/Browser/Tab.gml
@@ -2,10 +2,10 @@
     layout: @GUI::VerticalBoxLayout {
     }
 
-    @GUI::ToolBarContainer {
+    @GUI::ToolbarContainer {
         name: "toolbar_container"
 
-        @GUI::ToolBar {
+        @GUI::Toolbar {
             name: "toolbar"
         }
     }
@@ -16,7 +16,7 @@
         }
     }
 
-    @GUI::StatusBar {
+    @GUI::Statusbar {
         name: "statusbar"
     }
 }
diff --git a/Userland/Applications/Browser/Tab.h b/Userland/Applications/Browser/Tab.h
index 8a2c008686..8c806dcfb9 100644
--- a/Userland/Applications/Browser/Tab.h
+++ b/Userland/Applications/Browser/Tab.h
@@ -103,9 +103,9 @@ private:
     RefPtr<GUI::Button> m_bookmark_button;
     RefPtr<GUI::Window> m_dom_inspector_window;
     RefPtr<GUI::Window> m_console_window;
-    RefPtr<GUI::StatusBar> m_statusbar;
-    RefPtr<GUI::MenuBar> m_menubar;
-    RefPtr<GUI::ToolBarContainer> m_toolbar_container;
+    RefPtr<GUI::Statusbar> m_statusbar;
+    RefPtr<GUI::Menubar> m_menubar;
+    RefPtr<GUI::ToolbarContainer> m_toolbar_container;
 
     RefPtr<GUI::Menu> m_link_context_menu;
     RefPtr<GUI::Action> m_link_context_menu_default_action;
diff --git a/Userland/Applications/Calculator/main.cpp b/Userland/Applications/Calculator/main.cpp
index bdcd0362e6..e625c10f2a 100644
--- a/Userland/Applications/Calculator/main.cpp
+++ b/Userland/Applications/Calculator/main.cpp
@@ -30,7 +30,7 @@
 #include <LibGUI/Clipboard.h>
 #include <LibGUI/Icon.h>
 #include <LibGUI/Menu.h>
-#include <LibGUI/MenuBar.h>
+#include <LibGUI/Menubar.h>
 #include <LibGUI/Window.h>
 #include <LibGfx/Bitmap.h>
 #include <stdio.h>
@@ -69,7 +69,7 @@ int main(int argc, char** argv)
     window->show();
     window->set_icon(app_icon.bitmap_for_size(16));
 
-    auto menubar = GUI::MenuBar::construct();
+    auto menubar = GUI::Menubar::construct();
 
     auto& app_menu = menubar->add_menu("&File");
     app_menu.add_action(GUI::CommonActions::make_quit_action([](auto&) {
diff --git a/Userland/Applications/Calendar/CalendarWindow.gml b/Userland/Applications/Calendar/CalendarWindow.gml
index 9a33d34c8c..f8feb0f3b3 100644
--- a/Userland/Applications/Calendar/CalendarWindow.gml
+++ b/Userland/Applications/Calendar/CalendarWindow.gml
@@ -3,10 +3,10 @@
     layout: @GUI::VerticalBoxLayout {
     }
 
-    @GUI::ToolBarContainer {
+    @GUI::ToolbarContainer {
         name: "toolbar_container"
 
-        @GUI::ToolBar {
+        @GUI::Toolbar {
             name: "toolbar"
         }
     }
diff --git a/Userland/Applications/Calendar/main.cpp b/Userland/Applications/Calendar/main.cpp
index 08b645288b..0c0da931f9 100644
--- a/Userland/Applications/Calendar/main.cpp
+++ b/Userland/Applications/Calendar/main.cpp
@@ -34,9 +34,9 @@
 #include <LibGUI/Calendar.h>
 #include <LibGUI/Icon.h>
 #include <LibGUI/Menu.h>
-#include <LibGUI/MenuBar.h>
-#include <LibGUI/ToolBar.h>
-#include <LibGUI/ToolBarContainer.h>
+#include <LibGUI/Menubar.h>
+#include <LibGUI/Toolbar.h>
+#include <LibGUI/ToolbarContainer.h>
 #include <LibGUI/Window.h>
 #include <unistd.h>
 
@@ -71,7 +71,7 @@ int main(int argc, char** argv)
     auto& main_widget = window->set_main_widget<GUI::Widget>();
     main_widget.load_from_gml(calendar_window_gml);
 
-    auto toolbar = main_widget.find_descendant_of_type_named<GUI::ToolBar>("toolbar");
+    auto toolbar = main_widget.find_descendant_of_type_named<GUI::Toolbar>("toolbar");
     auto calendar = main_widget.find_descendant_of_type_named<GUI::Calendar>("calendar");
 
     auto prev_date_action = GUI::Action::create({}, Gfx::Bitmap::load_from_file("/res/icons/16x16/go-back.png"), [&](const GUI::Action&) {
@@ -146,7 +146,7 @@ int main(int argc, char** argv)
         view_month_action->set_checked(true);
     };
 
-    auto menubar = GUI::MenuBar::construct();
+    auto menubar = GUI::Menubar::construct();
     auto& app_menu = menubar->add_menu("&File");
     app_menu.add_action(GUI::Action::create("&Add Event", { Mod_Ctrl | Mod_Shift, Key_E }, Gfx::Bitmap::load_from_file("/res/icons/16x16/add-event.png"),
         [&](const GUI::Action&) {
diff --git a/Userland/Applications/DisplaySettings/DisplaySettingsWindow.gml b/Userland/Applications/DisplaySettings/DisplaySettingsWindow.gml
index 26770c7ad0..da5d399bd4 100644
--- a/Userland/Applications/DisplaySettings/DisplaySettingsWindow.gml
+++ b/Userland/Applications/DisplaySettings/DisplaySettingsWindow.gml
@@ -28,7 +28,7 @@
         @GUI::Button {
             name: "wallpaper_open_button"
             tooltip: "Select wallpaper from file system."
-            button_style: "CoolBar"
+            button_style: "Coolbar"
             fixed_width: 22
             fixed_height: 22
         }
diff --git a/Userland/Applications/DisplaySettings/main.cpp b/Userland/Applications/DisplaySettings/main.cpp
index 6c51fe42c0..12227d65da 100644
--- a/Userland/Applications/DisplaySettings/main.cpp
+++ b/Userland/Applications/DisplaySettings/main.cpp
@@ -30,7 +30,7 @@
 #include <LibGUI/BoxLayout.h>
 #include <LibGUI/Icon.h>
 #include <LibGUI/Menu.h>
-#include <LibGUI/MenuBar.h>
+#include <LibGUI/Menubar.h>
 #include <LibGUI/TabWidget.h>
 #include <LibGUI/Window.h>
 #include <LibGfx/Bitmap.h>
@@ -66,7 +66,7 @@ int main(int argc, char** argv)
     window->set_main_widget(tab_widget.ptr());
     window->set_icon(app_icon.bitmap_for_size(16));
 
-    auto menubar = GUI::MenuBar::construct();
+    auto menubar = GUI::Menubar::construct();
 
     auto& app_menu = menubar->add_menu("File");
     app_menu.add_action(GUI::CommonActions::make_quit_action([&](const GUI::Action&) {
diff --git a/Userland/Applications/FileManager/FileManagerWindow.gml b/Userland/Applications/FileManager/FileManagerWindow.gml
index 9568fabc3f..2c2825e905 100644
--- a/Userland/Applications/FileManager/FileManagerWindow.gml
+++ b/Userland/Applications/FileManager/FileManagerWindow.gml
@@ -4,12 +4,12 @@
         spacing: 2
     }
 
-    @GUI::ToolBarContainer {
+    @GUI::ToolbarContainer {
         name: "toolbar_container"
-        @GUI::ToolBar {
+        @GUI::Toolbar {
             name: "main_toolbar"
         }
-        @GUI::ToolBar {
+        @GUI::Toolbar {
             name: "location_toolbar"
             visible: false
 
@@ -23,7 +23,7 @@
                 fixed_height: 22
             }
         }
-        @GUI::ToolBar {
+        @GUI::Toolbar {
             name: "breadcrumb_toolbar"
 
             @GUI::Label {
@@ -31,8 +31,8 @@
                 autosize: true
             }
 
-            @GUI::BreadcrumbBar {
-                name: "breadcrumb_bar"
+            @GUI::Breadcrumbbar {
+                name: "breadcrumbbar"
             }
         }
     }
@@ -47,10 +47,10 @@
 
     }
 
-    @GUI::StatusBar {
+    @GUI::Statusbar {
         name: "statusbar"
 
-        @GUI::ProgressBar {
+        @GUI::Progressbar {
             name: "progressbar"
             text: "Generating thumbnails: "
             visible: false
diff --git a/Userland/Applications/FileManager/FileOperationProgress.gml b/Userland/Applications/FileManager/FileOperationProgress.gml
index 039845a0c4..2ab7257a3d 100644
--- a/Userland/Applications/FileManager/FileOperationProgress.gml
+++ b/Userland/Applications/FileManager/FileOperationProgress.gml
@@ -36,9 +36,9 @@
         }
     }
 
-    @GUI::ProgressBar {
+    @GUI::Progressbar {
         fixed_height: 22
-        name: "current_file_progress_bar"
+        name: "current_file_progressbar"
         min: 0
     }
 
@@ -62,9 +62,9 @@
         }
     }
 
-    @GUI::ProgressBar {
+    @GUI::Progressbar {
         fixed_height: 22
-        name: "overall_progress_bar"
+        name: "overall_progressbar"
         min: 0
     }
 
diff --git a/Userland/Applications/FileManager/FileOperationProgressWidget.cpp b/Userland/Applications/FileManager/FileOperationProgressWidget.cpp
index 534efca7e0..83821344ea 100644
--- a/Userland/Applications/FileManager/FileOperationProgressWidget.cpp
+++ b/Userland/Applications/FileManager/FileOperationProgressWidget.cpp
@@ -31,7 +31,7 @@
 #include <LibGUI/Button.h>
 #include <LibGUI/Label.h>
 #include <LibGUI/MessageBox.h>
-#include <LibGUI/ProgressBar.h>
+#include <LibGUI/Progressbar.h>
 #include <LibGUI/Window.h>
 
 namespace FileManager {
@@ -99,17 +99,17 @@ void FileOperationProgressWidget::did_error()
 void FileOperationProgressWidget::did_progress([[maybe_unused]] off_t bytes_done, [[maybe_unused]] off_t total_byte_count, size_t files_done, size_t total_file_count, off_t current_file_done, off_t current_file_size, const StringView& current_file_name)
 {
     auto& current_file_label = *find_descendant_of_type_named<GUI::Label>("current_file_label");
-    auto& current_file_progress_bar = *find_descendant_of_type_named<GUI::ProgressBar>("current_file_progress_bar");
+    auto& current_file_progressbar = *find_descendant_of_type_named<GUI::Progressbar>("current_file_progressbar");
     auto& overall_progress_label = *find_descendant_of_type_named<GUI::Label>("overall_progress_label");
-    auto& overall_progress_bar = *find_descendant_of_type_named<GUI::ProgressBar>("overall_progress_bar");
+    auto& overall_progressbar = *find_descendant_of_type_named<GUI::Progressbar>("overall_progressbar");
 
     current_file_label.set_text(current_file_name);
-    current_file_progress_bar.set_max(current_file_size);
-    current_file_progress_bar.set_value(current_file_done);
+    current_file_progressbar.set_max(current_file_size);
+    current_file_progressbar.set_value(current_file_done);
 
     overall_progress_label.set_text(String::formatted("{} of {}", files_done, total_file_count));
-    overall_progress_bar.set_max(total_file_count);
-    overall_progress_bar.set_value(files_done);
+    overall_progressbar.set_max(total_file_count);
+    overall_progressbar.set_value(files_done);
 }
 
 void FileOperationProgressWidget::close_pipe()
diff --git a/Userland/Applications/FileManager/main.cpp b/Userland/Applications/FileManager/main.cpp
index 944f520557..1407dde810 100644
--- a/Userland/Applications/FileManager/main.cpp
+++ b/Userland/Applications/FileManager/main.cpp
@@ -42,7 +42,7 @@
 #include <LibGUI/ActionGroup.h>
 #include <LibGUI/Application.h>
 #include <LibGUI/BoxLayout.h>
-#include <LibGUI/BreadcrumbBar.h>
+#include <LibGUI/Breadcrumbbar.h>
 #include <LibGUI/Clipboard.h>
 #include <LibGUI/Desktop.h>
 #include <LibGUI/FileIconProvider.h>
@@ -50,15 +50,15 @@
 #include <LibGUI/InputBox.h>
 #include <LibGUI/Label.h>
 #include <LibGUI/Menu.h>
-#include <LibGUI/MenuBar.h>
+#include <LibGUI/Menubar.h>
 #include <LibGUI/MessageBox.h>
 #include <LibGUI/Painter.h>
-#include <LibGUI/ProgressBar.h>
+#include <LibGUI/Progressbar.h>
 #include <LibGUI/Splitter.h>
-#include <LibGUI/StatusBar.h>
+#include <LibGUI/Statusbar.h>
 #include <LibGUI/TextEditor.h>
-#include <LibGUI/ToolBar.h>
-#include <LibGUI/ToolBarContainer.h>
+#include <LibGUI/Toolbar.h>
+#include <LibGUI/ToolbarContainer.h>
 #include <LibGUI/TreeView.h>
 #include <LibGUI/Widget.h>
 #include <LibGUI/Window.h>
@@ -411,16 +411,16 @@ int run_in_windowed_mode(RefPtr<Core::ConfigFile> config, String initial_locatio
 
     widget.load_from_gml(file_manager_window_gml);
 
-    auto& toolbar_container = *widget.find_descendant_of_type_named<GUI::ToolBarContainer>("toolbar_container");
-    auto& main_toolbar = *widget.find_descendant_of_type_named<GUI::ToolBar>("main_toolbar");
-    auto& location_toolbar = *widget.find_descendant_of_type_named<GUI::ToolBar>("location_toolbar");
+    auto& toolbar_container = *widget.find_descendant_of_type_named<GUI::ToolbarContainer>("toolbar_container");
+    auto& main_toolbar = *widget.find_descendant_of_type_named<GUI::Toolbar>("main_toolbar");
+    auto& location_toolbar = *widget.find_descendant_of_type_named<GUI::Toolbar>("location_toolbar");
     location_toolbar.layout()->set_margins({ 6, 3, 6, 3 });
 
     auto& location_textbox = *widget.find_descendant_of_type_named<GUI::TextBox>("location_textbox");
 
-    auto& breadcrumb_toolbar = *widget.find_descendant_of_type_named<GUI::ToolBar>("breadcrumb_toolbar");
+    auto& breadcrumb_toolbar = *widget.find_descendant_of_type_named<GUI::Toolbar>("breadcrumb_toolbar");
     breadcrumb_toolbar.layout()->set_margins({ 6, 0, 6, 0 });
-    auto& breadcrumb_bar = *widget.find_descendant_of_type_named<GUI::BreadcrumbBar>("breadcrumb_bar");
+    auto& breadcrumbbar = *widget.find_descendant_of_type_named<GUI::Breadcrumbbar>("breadcrumbbar");
 
     auto& splitter = *widget.find_descendant_of_type_named<GUI::HorizontalSplitter>("splitter");
     auto& tree_view = *widget.find_descendant_of_type_named<GUI::TreeView>("tree_view");
@@ -446,10 +446,10 @@ int run_in_windowed_mode(RefPtr<Core::ConfigFile> config, String initial_locatio
     // Open the root directory. FIXME: This is awkward.
     tree_view.toggle_index(directories_model->index(0, 0, {}));
 
-    auto& statusbar = *widget.find_descendant_of_type_named<GUI::StatusBar>("statusbar");
+    auto& statusbar = *widget.find_descendant_of_type_named<GUI::Statusbar>("statusbar");
 
-    auto& progressbar = *widget.find_descendant_of_type_named<GUI::ProgressBar>("progressbar");
-    progressbar.set_format(GUI::ProgressBar::Format::ValueSlashMax);
+    auto& progressbar = *widget.find_descendant_of_type_named<GUI::Progressbar>("progressbar");
+    progressbar.set_format(GUI::Progressbar::Format::ValueSlashMax);
     progressbar.set_frame_shape(Gfx::FrameShape::Panel);
     progressbar.set_frame_shadow(Gfx::FrameShadow::Sunken);
     progressbar.set_frame_thickness(1);
@@ -537,11 +537,11 @@ int run_in_windowed_mode(RefPtr<Core::ConfigFile> config, String initial_locatio
 
     layout_statusbar_action = GUI::Action::create_checkable("&Status Bar", [&](auto& action) {
         action.is_checked() ? statusbar.set_visible(true) : statusbar.set_visible(false);
-        config->write_bool_entry("Layout", "ShowStatusBar", action.is_checked());
+        config->write_bool_entry("Layout", "ShowStatusbar", action.is_checked());
         config->sync();
     });
 
-    auto show_statusbar = config->read_bool_entry("Layout", "ShowStatusBar", true);
+    auto show_statusbar = config->read_bool_entry("Layout", "ShowStatusbar", true);
     layout_statusbar_action->set_checked(show_statusbar);
     statusbar.set_visible(show_statusbar);
 
@@ -751,7 +751,7 @@ int run_in_windowed_mode(RefPtr<Core::ConfigFile> config, String initial_locatio
         refresh_tree_view();
     });
 
-    auto menubar = GUI::MenuBar::construct();
+    auto menubar = GUI::Menubar::construct();
 
     auto& app_menu = menubar->add_menu("&File");
     app_menu.add_action(mkdir_action);
@@ -845,20 +845,20 @@ int run_in_windowed_mode(RefPtr<Core::ConfigFile> config, String initial_locatio
         {
             LexicalPath lexical_path(new_path);
 
-            auto segment_index_of_new_path_in_breadcrumb_bar = [&]() -> Optional<size_t> {
-                for (size_t i = 0; i < breadcrumb_bar.segment_count(); ++i) {
-                    if (breadcrumb_bar.segment_data(i) == new_path)
+            auto segment_index_of_new_path_in_breadcrumbbar = [&]() -> Optional<size_t> {
+                for (size_t i = 0; i < breadcrumbbar.segment_count(); ++i) {
+                    if (breadcrumbbar.segment_data(i) == new_path)
                         return i;
                 }
                 return {};
             }();
 
-            if (segment_index_of_new_path_in_breadcrumb_bar.has_value()) {
-                breadcrumb_bar.set_selected_segment(segment_index_of_new_path_in_breadcrumb_bar.value());
+            if (segment_index_of_new_path_in_breadcrumbbar.has_value()) {
+                breadcrumbbar.set_selected_segment(segment_index_of_new_path_in_breadcrumbbar.value());
             } else {
-                breadcrumb_bar.clear_segments();
+                breadcrumbbar.clear_segments();
 
-                breadcrumb_bar.append_segment("/", GUI::FileIconProvider::icon_for_path("/").bitmap_for_size(16), "/", "/");
+                breadcrumbbar.append_segment("/", GUI::FileIconProvider::icon_for_path("/").bitmap_for_size(16), "/", "/");
                 StringBuilder builder;
 
                 for (auto& part : lexical_path.parts()) {
@@ -866,13 +866,13 @@ int run_in_windowed_mode(RefPtr<Core::ConfigFile> config, String initial_locatio
                     builder.append('/');
                     builder.append(part);
 
-                    breadcrumb_bar.append_segment(part, GUI::FileIconProvider::icon_for_path(builder.string_view()).bitmap_for_size(16), builder.string_view(), builder.string_view());
+                    breadcrumbbar.append_segment(part, GUI::FileIconProvider::icon_for_path(builder.string_view()).bitmap_for_size(16), builder.string_view(), builder.string_view());
                 }
 
-                breadcrumb_bar.set_selected_segment(breadcrumb_bar.segment_count() - 1);
+                breadcrumbbar.set_selected_segment(breadcrumbbar.segment_count() - 1);
 
-                breadcrumb_bar.on_segment_click = [&](size_t segment_index) {
-                    directory_view.open(breadcrumb_bar.segment_data(segment_index));
+                breadcrumbbar.on_segment_click = [&](size_t segment_index) {
+                    directory_view.open(breadcrumbbar.segment_data(segment_index));
                 };
             }
         }
@@ -1045,18 +1045,18 @@ int run_in_windowed_mode(RefPtr<Core::ConfigFile> config, String initial_locatio
             refresh_tree_view();
     };
 
-    breadcrumb_bar.on_segment_drop = [&](size_t segment_index, const GUI::DropEvent& event) {
+    breadcrumbbar.on_segment_drop = [&](size_t segment_index, const GUI::DropEvent& event) {
         if (!event.mime_data().has_urls())
             return;
-        copy_urls_to_directory(event.mime_data().urls(), breadcrumb_bar.segment_data(segment_index));
+        copy_urls_to_directory(event.mime_data().urls(), breadcrumbbar.segment_data(segment_index));
     };
 
-    breadcrumb_bar.on_segment_drag_enter = [&](size_t, GUI::DragEvent& event) {
+    breadcrumbbar.on_segment_drag_enter = [&](size_t, GUI::DragEvent& event) {
         if (event.mime_types().contains_slow("text/uri-list"))
             event.accept();
     };
 
-    breadcrumb_bar.on_doubleclick = [&](const GUI::MouseEvent&) {
+    breadcrumbbar.on_doubleclick = [&](const GUI::MouseEvent&) {
         go_to_location_action->activate();
     };
 
diff --git a/Userland/Applications/FontEditor/FontEditor.cpp b/Userland/Applications/FontEditor/FontEditor.cpp
index bd123909f9..cb1f712dfb 100644
--- a/Userland/Applications/FontEditor/FontEditor.cpp
+++ b/Userland/Applications/FontEditor/FontEditor.cpp
@@ -43,13 +43,13 @@
 #include <LibGUI/GroupBox.h>
 #include <LibGUI/Label.h>
 #include <LibGUI/Menu.h>
-#include <LibGUI/MenuBar.h>
+#include <LibGUI/Menubar.h>
 #include <LibGUI/MessageBox.h>
 #include <LibGUI/Painter.h>
 #include <LibGUI/SpinBox.h>
-#include <LibGUI/StatusBar.h>
+#include <LibGUI/Statusbar.h>
 #include <LibGUI/TextBox.h>
-#include <LibGUI/ToolBarContainer.h>
+#include <LibGUI/ToolbarContainer.h>
 #include <LibGUI/Window.h>
 #include <LibGfx/BitmapFont.h>
 #include <LibGfx/Palette.h>
@@ -99,8 +99,8 @@ FontEditorWidget::FontEditorWidget(const String& path, RefPtr<Gfx::BitmapFont>&&
 {
     load_from_gml(font_editor_window_gml);
 
-    auto& toolbar = *find_descendant_of_type_named<GUI::ToolBar>("toolbar");
-    auto& status_bar = *find_descendant_of_type_named<GUI::StatusBar>("status_bar");
+    auto& toolbar = *find_descendant_of_type_named<GUI::Toolbar>("toolbar");
+    auto& statusbar = *find_descendant_of_type_named<GUI::Statusbar>("statusbar");
     auto& glyph_map_container = *find_descendant_of_type_named<GUI::Widget>("glyph_map_container");
     m_glyph_editor_container = *find_descendant_of_type_named<GUI::Widget>("glyph_editor_container");
     m_left_column_container = *find_descendant_of_type_named<GUI::Widget>("left_column_container");
@@ -256,7 +256,7 @@ FontEditorWidget::FontEditorWidget(const String& path, RefPtr<Gfx::BitmapFont>&&
         }
         builder.append(") ");
         builder.appendff("[{}x{}]", m_edited_font->glyph_width(glyph), m_edited_font->glyph_height());
-        status_bar.set_text(builder.to_string());
+        statusbar.set_text(builder.to_string());
     };
 
     m_name_textbox->on_change = [&] {
@@ -378,7 +378,7 @@ void FontEditorWidget::initialize(const String& path, RefPtr<Gfx::BitmapFont>&&
         on_initialize();
 }
 
-void FontEditorWidget::initialize_menubar(GUI::MenuBar& menubar)
+void FontEditorWidget::initialize_menubar(GUI::Menubar& menubar)
 {
     auto& app_menu = menubar.add_menu("&File");
     app_menu.add_action(*m_new_action);
diff --git a/Userland/Applications/FontEditor/FontEditor.h b/Userland/Applications/FontEditor/FontEditor.h
index 98131b9412..ec3a2cce49 100644
--- a/Userland/Applications/FontEditor/FontEditor.h
+++ b/Userland/Applications/FontEditor/FontEditor.h
@@ -42,7 +42,7 @@ public:
     const String& path() { return m_path; }
     const Gfx::BitmapFont& edited_font() { return *m_edited_font; }
     void initialize(const String& path, RefPtr<Gfx::BitmapFont>&&);
-    void initialize_menubar(GUI::MenuBar&);
+    void initialize_menubar(GUI::Menubar&);
 
     bool is_showing_font_metadata() { return m_font_metadata; }
     void set_show_font_metadata(bool b);
diff --git a/Userland/Applications/FontEditor/FontEditorWindow.gml b/Userland/Applications/FontEditor/FontEditorWindow.gml
index 37ce603a57..37969dc29c 100644
--- a/Userland/Applications/FontEditor/FontEditorWindow.gml
+++ b/Userland/Applications/FontEditor/FontEditorWindow.gml
@@ -3,10 +3,10 @@
     layout: @GUI::VerticalBoxLayout {
     }
 
-    @GUI::ToolBarContainer {
+    @GUI::ToolbarContainer {
         name: "toolbar_container"
 
-        @GUI::ToolBar {
+        @GUI::Toolbar {
             name: "toolbar"
         }
     }
@@ -205,7 +205,7 @@
         }
     }
 
-    @GUI::StatusBar {
-        name: "status_bar"
+    @GUI::Statusbar {
+        name: "statusbar"
     }
 }
diff --git a/Userland/Applications/FontEditor/main.cpp b/Userland/Applications/FontEditor/main.cpp
index 0f1dde82f7..20fba8be82 100644
--- a/Userland/Applications/FontEditor/main.cpp
+++ b/Userland/Applications/FontEditor/main.cpp
@@ -30,7 +30,7 @@
 #include <LibDesktop/Launcher.h>
 #include <LibGUI/Application.h>
 #include <LibGUI/Icon.h>
-#include <LibGUI/MenuBar.h>
+#include <LibGUI/Menubar.h>
 #include <LibGUI/MessageBox.h>
 #include <LibGUI/Window.h>
 #include <LibGfx/BitmapFont.h>
@@ -98,7 +98,7 @@ int main(int argc, char** argv)
 
     auto& font_editor = window->set_main_widget<FontEditorWidget>(path, move(edited_font));
 
-    auto menubar = GUI::MenuBar::construct();
+    auto menubar = GUI::Menubar::construct();
     font_editor.initialize_menubar(menubar);
     window->set_menubar(move(menubar));
 
diff --git a/Userland/Applications/Help/main.cpp b/Userland/Applications/Help/main.cpp
index 22e6f83407..05f5d3c075 100644
--- a/Userland/Applications/Help/main.cpp
+++ b/Userland/Applications/Help/main.cpp
@@ -36,13 +36,13 @@
 #include <LibGUI/FilteringProxyModel.h>
 #include <LibGUI/ListView.h>
 #include <LibGUI/Menu.h>
-#include <LibGUI/MenuBar.h>
+#include <LibGUI/Menubar.h>
 #include <LibGUI/MessageBox.h>
 #include <LibGUI/Splitter.h>
 #include <LibGUI/TabWidget.h>
 #include <LibGUI/TextBox.h>
-#include <LibGUI/ToolBar.h>
-#include <LibGUI/ToolBarContainer.h>
+#include <LibGUI/Toolbar.h>
+#include <LibGUI/ToolbarContainer.h>
 #include <LibGUI/TreeView.h>
 #include <LibGUI/Window.h>
 #include <LibMarkdown/Document.h>
@@ -107,8 +107,8 @@ int main(int argc, char* argv[])
     widget.set_fill_with_background_color(true);
     widget.layout()->set_spacing(2);
 
-    auto& toolbar_container = widget.add<GUI::ToolBarContainer>();
-    auto& toolbar = toolbar_container.add<GUI::ToolBar>();
+    auto& toolbar_container = widget.add<GUI::ToolbarContainer>();
+    auto& toolbar = toolbar_container.add<GUI::Toolbar>();
 
     auto& splitter = widget.add<GUI::HorizontalSplitter>();
 
@@ -272,7 +272,7 @@ int main(int argc, char* argv[])
     toolbar.add_action(*go_forward_action);
     toolbar.add_action(*go_home_action);
 
-    auto menubar = GUI::MenuBar::construct();
+    auto menubar = GUI::Menubar::construct();
 
     auto& app_menu = menubar->add_menu("File");
     app_menu.add_action(GUI::CommonActions::make_about_action("Help", app_icon, window));
diff --git a/Userland/Applications/HexEditor/HexEditor.cpp b/Userland/Applications/HexEditor/HexEditor.cpp
index 392ddb2d4b..f41a2e3259 100644
--- a/Userland/Applications/HexEditor/HexEditor.cpp
+++ b/Userland/Applications/HexEditor/HexEditor.cpp
@@ -31,7 +31,7 @@
 #include <LibGUI/Clipboard.h>
 #include <LibGUI/Menu.h>
 #include <LibGUI/Painter.h>
-#include <LibGUI/ScrollBar.h>
+#include <LibGUI/Scrollbar.h>
 #include <LibGUI/TextEditor.h>
 #include <LibGUI/Window.h>
 #include <LibGfx/FontDatabase.h>
diff --git a/Userland/Applications/HexEditor/HexEditorWidget.cpp b/Userland/Applications/HexEditor/HexEditorWidget.cpp
index 7c7cda71f3..7ae043cc5b 100644
--- a/Userland/Applications/HexEditor/HexEditorWidget.cpp
+++ b/Userland/Applications/HexEditor/HexEditorWidget.cpp
@@ -35,12 +35,12 @@
 #include <LibGUI/FilePicker.h>
 #include <LibGUI/InputBox.h>
 #include <LibGUI/Menu.h>
-#include <LibGUI/MenuBar.h>
+#include <LibGUI/Menubar.h>
 #include <LibGUI/MessageBox.h>
-#include <LibGUI/StatusBar.h>
+#include <LibGUI/Statusbar.h>
 #include <LibGUI/TextBox.h>
 #include <LibGUI/TextEditor.h>
-#include <LibGUI/ToolBar.h>
+#include <LibGUI/Toolbar.h>
 #include <stdio.h>
 #include <string.h>
 
@@ -67,7 +67,7 @@ HexEditorWidget::HexEditorWidget()
             update_title();
     };
 
-    m_statusbar = add<GUI::StatusBar>(5);
+    m_statusbar = add<GUI::Statusbar>(5);
 
     m_new_action = GUI::Action::create("New", { Mod_Ctrl, Key_N }, Gfx::Bitmap::load_from_file("/res/icons/16x16/new.png"), [this](const GUI::Action&) {
         if (m_document_dirty) {
@@ -135,7 +135,7 @@ HexEditorWidget::~HexEditorWidget()
 {
 }
 
-void HexEditorWidget::initialize_menubar(GUI::MenuBar& menubar)
+void HexEditorWidget::initialize_menubar(GUI::Menubar& menubar)
 {
     auto& app_menu = menubar.add_menu("File");
     app_menu.add_action(*m_new_action);
diff --git a/Userland/Applications/HexEditor/HexEditorWidget.h b/Userland/Applications/HexEditor/HexEditorWidget.h
index 6aefa4f0e0..2a8c5badf9 100644
--- a/Userland/Applications/HexEditor/HexEditorWidget.h
+++ b/Userland/Applications/HexEditor/HexEditorWidget.h
@@ -42,7 +42,7 @@ class HexEditorWidget final : public GUI::Widget {
 public:
     virtual ~HexEditorWidget() override;
     void open_file(const String& path);
-    void initialize_menubar(GUI::MenuBar&);
+    void initialize_menubar(GUI::Menubar&);
     bool request_close();
 
 private:
@@ -69,7 +69,7 @@ private:
 
     GUI::ActionGroup m_bytes_per_row_actions;
 
-    RefPtr<GUI::StatusBar> m_statusbar;
+    RefPtr<GUI::Statusbar> m_statusbar;
 
     bool m_document_dirty { false };
 };
diff --git a/Userland/Applications/HexEditor/main.cpp b/Userland/Applications/HexEditor/main.cpp
index d83c428542..285639cd7c 100644
--- a/Userland/Applications/HexEditor/main.cpp
+++ b/Userland/Applications/HexEditor/main.cpp
@@ -26,7 +26,7 @@
 
 #include "HexEditorWidget.h"
 #include <LibGUI/Icon.h>
-#include <LibGUI/MenuBar.h>
+#include <LibGUI/Menubar.h>
 #include <LibGfx/Bitmap.h>
 #include <stdio.h>
 #include <unistd.h>
@@ -59,7 +59,7 @@ int main(int argc, char** argv)
         return GUI::Window::CloseRequestDecision::StayOpen;
     };
 
-    auto menubar = GUI::MenuBar::construct();
+    auto menubar = GUI::Menubar::construct();
     hex_editor_widget.initialize_menubar(menubar);
     window->set_menubar(menubar);
     window->show();
diff --git a/Userland/Applications/IRCClient/IRCAppWindow.cpp b/Userland/Applications/IRCClient/IRCAppWindow.cpp
index 383d3a8789..e623a0cec8 100644
--- a/Userland/Applications/IRCClient/IRCAppWindow.cpp
+++ b/Userland/Applications/IRCClient/IRCAppWindow.cpp
@@ -33,12 +33,12 @@
 #include <LibGUI/BoxLayout.h>
 #include <LibGUI/InputBox.h>
 #include <LibGUI/Menu.h>
-#include <LibGUI/MenuBar.h>
+#include <LibGUI/Menubar.h>
 #include <LibGUI/Splitter.h>
 #include <LibGUI/StackWidget.h>
 #include <LibGUI/TableView.h>
-#include <LibGUI/ToolBar.h>
-#include <LibGUI/ToolBarContainer.h>
+#include <LibGUI/Toolbar.h>
+#include <LibGUI/ToolbarContainer.h>
 
 static IRCAppWindow* s_the;
 
@@ -257,7 +257,7 @@ void IRCAppWindow::setup_actions()
 
 void IRCAppWindow::setup_menus()
 {
-    auto menubar = GUI::MenuBar::construct();
+    auto menubar = GUI::Menubar::construct();
     auto& app_menu = menubar->add_menu("File");
     app_menu.add_action(GUI::CommonActions::make_quit_action([](auto&) {
         dbgln("Terminal: Quit menu activated!");
@@ -307,8 +307,8 @@ void IRCAppWindow::setup_widgets()
     widget.set_layout<GUI::VerticalBoxLayout>();
     widget.layout()->set_spacing(0);
 
-    auto& toolbar_container = widget.add<GUI::ToolBarContainer>();
-    auto& toolbar = toolbar_container.add<GUI::ToolBar>();
+    auto& toolbar_container = widget.add<GUI::ToolbarContainer>();
+    auto& toolbar = toolbar_container.add<GUI::Toolbar>();
     toolbar.set_has_frame(false);
     toolbar.add_action(*m_change_nick_action);
     toolbar.add_separator();
diff --git a/Userland/Applications/KeyboardMapper/main.cpp b/Userland/Applications/KeyboardMapper/main.cpp
index 10a8694c9f..2152a7ab7f 100644
--- a/Userland/Applications/KeyboardMapper/main.cpp
+++ b/Userland/Applications/KeyboardMapper/main.cpp
@@ -31,7 +31,7 @@
 #include <LibGUI/FilePicker.h>
 #include <LibGUI/Icon.h>
 #include <LibGUI/Menu.h>
-#include <LibGUI/MenuBar.h>
+#include <LibGUI/Menubar.h>
 #include <unistd.h>
 
 int main(int argc, char** argv)
@@ -104,7 +104,7 @@ int main(int argc, char** argv)
         });
 
     // Menu
-    auto menubar = GUI::MenuBar::construct();
+    auto menubar = GUI::Menubar::construct();
 
     auto& app_menu = menubar->add_menu("File");
     app_menu.add_action(open_action);
diff --git a/Userland/Applications/KeyboardSettings/main.cpp b/Userland/Applications/KeyboardSettings/main.cpp
index 9d03249bf8..958d61049a 100644
--- a/Userland/Applications/KeyboardSettings/main.cpp
+++ b/Userland/Applications/KeyboardSettings/main.cpp
@@ -37,7 +37,7 @@
 #include <LibGUI/ComboBox.h>
 #include <LibGUI/Label.h>
 #include <LibGUI/Menu.h>
-#include <LibGUI/MenuBar.h>
+#include <LibGUI/Menubar.h>
 #include <LibGUI/MessageBox.h>
 #include <LibGUI/WindowServerConnection.h>
 #include <LibKeyboard/CharacterMap.h>
@@ -186,7 +186,7 @@ int main(int argc, char** argv)
             app->quit();
         });
 
-    auto menubar = GUI::MenuBar::construct();
+    auto menubar = GUI::Menubar::construct();
 
     auto& app_menu = menubar->add_menu("File");
     app_menu.add_action(quit_action);
diff --git a/Userland/Applications/MouseSettings/main.cpp b/Userland/Applications/MouseSettings/main.cpp
index a9e114daa3..fb1c05dfe7 100644
--- a/Userland/Applications/MouseSettings/main.cpp
+++ b/Userland/Applications/MouseSettings/main.cpp
@@ -30,7 +30,7 @@
 #include <LibGUI/Application.h>
 #include <LibGUI/Icon.h>
 #include <LibGUI/Menu.h>
-#include <LibGUI/MenuBar.h>
+#include <LibGUI/Menubar.h>
 #include <unistd.h>
 
 int main(int argc, char** argv)
@@ -56,7 +56,7 @@ int main(int argc, char** argv)
     window->set_minimizable(false);
     window->set_icon(app_icon.bitmap_for_size(16));
 
-    auto menubar = GUI::MenuBar::construct();
+    auto menubar = GUI::Menubar::construct();
     auto& app_menu = menubar->add_menu("File");
     app_menu.add_action(GUI::CommonActions::make_quit_action([&](auto&) {
         app->quit();
diff --git a/Userland/Applications/Piano/RollWidget.cpp b/Userland/Applications/Piano/RollWidget.cpp
index cc63e7ee92..ab360b6ec7 100644
--- a/Userland/Applications/Piano/RollWidget.cpp
+++ b/Userland/Applications/Piano/RollWidget.cpp
@@ -28,7 +28,7 @@
 #include "RollWidget.h"
 #include "TrackManager.h"
 #include <LibGUI/Painter.h>
-#include <LibGUI/ScrollBar.h>
+#include <LibGUI/Scrollbar.h>
 #include <LibGfx/Font.h>
 #include <LibGfx/FontDatabase.h>
 #include <math.h>
diff --git a/Userland/Applications/Piano/main.cpp b/Userland/Applications/Piano/main.cpp
index 7f4d31dfaf..f24b4e18fa 100644
--- a/Userland/Applications/Piano/main.cpp
+++ b/Userland/Applications/Piano/main.cpp
@@ -36,7 +36,7 @@
 #include <LibGUI/Application.h>
 #include <LibGUI/FilePicker.h>
 #include <LibGUI/Menu.h>
-#include <LibGUI/MenuBar.h>
+#include <LibGUI/Menubar.h>
 #include <LibGUI/MessageBox.h>
 #include <LibGUI/Window.h>
 #include <LibGfx/Bitmap.h>
@@ -104,7 +104,7 @@ int main(int argc, char** argv)
     });
     audio_thread->start();
 
-    auto menubar = GUI::MenuBar::construct();
+    auto menubar = GUI::Menubar::construct();
 
     auto& app_menu = menubar->add_menu("File");
     app_menu.add_action(GUI::Action::create("Export", { Mod_Ctrl, Key_E }, [&](const GUI::Action&) {
diff --git a/Userland/Applications/PixelPaint/main.cpp b/Userland/Applications/PixelPaint/main.cpp
index dd68010e35..eba74da9ce 100644
--- a/Userland/Applications/PixelPaint/main.cpp
+++ b/Userland/Applications/PixelPaint/main.cpp
@@ -44,7 +44,7 @@
 #include <LibGUI/Clipboard.h>
 #include <LibGUI/FilePicker.h>
 #include <LibGUI/Icon.h>
-#include <LibGUI/MenuBar.h>
+#include <LibGUI/Menubar.h>
 #include <LibGUI/MessageBox.h>
 #include <LibGUI/Window.h>
 #include <LibGfx/Bitmap.h>
@@ -114,7 +114,7 @@ int main(int argc, char** argv)
 
     window->show();
 
-    auto menubar = GUI::MenuBar::construct();
+    auto menubar = GUI::Menubar::construct();
     auto& file_menu = menubar->add_menu("&File");
 
     auto open_image_file = [&](auto& path) {
diff --git a/Userland/Applications/QuickShow/main.cpp b/Userland/Applications/QuickShow/main.cpp
index 1e8ad3e706..1d453bb6f4 100644
--- a/Userland/Applications/QuickShow/main.cpp
+++ b/Userland/Applications/QuickShow/main.cpp
@@ -37,10 +37,10 @@
 #include <LibGUI/FilePicker.h>
 #include <LibGUI/Label.h>
 #include <LibGUI/Menu.h>
-#include <LibGUI/MenuBar.h>
+#include <LibGUI/Menubar.h>
 #include <LibGUI/MessageBox.h>
-#include <LibGUI/ToolBar.h>
-#include <LibGUI/ToolBarContainer.h>
+#include <LibGUI/Toolbar.h>
+#include <LibGUI/ToolbarContainer.h>
 #include <LibGUI/Window.h>
 #include <LibGfx/Bitmap.h>
 #include <LibGfx/Palette.h>
@@ -97,8 +97,8 @@ int main(int argc, char** argv)
     root_widget.set_layout<GUI::VerticalBoxLayout>();
     root_widget.layout()->set_spacing(2);
 
-    auto& toolbar_container = root_widget.add<GUI::ToolBarContainer>();
-    auto& main_toolbar = toolbar_container.add<GUI::ToolBar>();
+    auto& toolbar_container = root_widget.add<GUI::ToolbarContainer>();
+    auto& main_toolbar = toolbar_container.add<GUI::Toolbar>();
 
     auto& widget = root_widget.add<QSWidget>();
     widget.on_scale_change = [&](int scale, Gfx::IntRect rect) {
@@ -270,7 +270,7 @@ int main(int argc, char** argv)
     main_toolbar.add_action(zoom_reset_action);
     main_toolbar.add_action(zoom_out_action);
 
-    auto menubar = GUI::MenuBar::construct();
+    auto menubar = GUI::Menubar::construct();
 
     auto& app_menu = menubar->add_menu("&File");
     app_menu.add_action(open_action);
diff --git a/Userland/Applications/SoundPlayer/SoundPlayerWidgetAdvancedView.cpp b/Userland/Applications/SoundPlayer/SoundPlayerWidgetAdvancedView.cpp
index bb9d73845b..4b3f56b6c8 100644
--- a/Userland/Applications/SoundPlayer/SoundPlayerWidgetAdvancedView.cpp
+++ b/Userland/Applications/SoundPlayer/SoundPlayerWidgetAdvancedView.cpp
@@ -38,8 +38,8 @@
 #include <LibGUI/MessageBox.h>
 #include <LibGUI/Slider.h>
 #include <LibGUI/Splitter.h>
-#include <LibGUI/ToolBar.h>
-#include <LibGUI/ToolBarContainer.h>
+#include <LibGUI/Toolbar.h>
+#include <LibGUI/ToolbarContainer.h>
 #include <LibGUI/Window.h>
 #include <LibGfx/Bitmap.h>
 
@@ -75,8 +75,8 @@ SoundPlayerWidgetAdvancedView::SoundPlayerWidgetAdvancedView(GUI::Window& window
         this->manager().seek(value);
     };
 
-    auto& toolbar_container = m_player_view->add<GUI::ToolBarContainer>();
-    auto& menubar = toolbar_container.add<GUI::ToolBar>();
+    auto& toolbar_container = m_player_view->add<GUI::ToolbarContainer>();
+    auto& menubar = toolbar_container.add<GUI::Toolbar>();
 
     m_play_button = menubar.add<GUI::Button>();
     m_play_button->set_icon(is_paused() ? (!has_loaded_file() ? *m_play_icon : *m_pause_icon) : *m_pause_icon);
diff --git a/Userland/Applications/SoundPlayer/main.cpp b/Userland/Applications/SoundPlayer/main.cpp
index 00ccd2bfcb..b667939452 100644
--- a/Userland/Applications/SoundPlayer/main.cpp
+++ b/Userland/Applications/SoundPlayer/main.cpp
@@ -33,7 +33,7 @@
 #include <LibGUI/Application.h>
 #include <LibGUI/FilePicker.h>
 #include <LibGUI/Menu.h>
-#include <LibGUI/MenuBar.h>
+#include <LibGUI/Menubar.h>
 #include <LibGUI/Window.h>
 #include <LibGfx/CharacterBitmap.h>
 #include <stdio.h>
@@ -78,7 +78,7 @@ int main(int argc, char** argv)
     window->set_title("Sound Player");
     window->set_icon(app_icon.bitmap_for_size(16));
 
-    auto menubar = GUI::MenuBar::construct();
+    auto menubar = GUI::Menubar::construct();
 
     auto& app_menu = menubar->add_menu("File");
 
diff --git a/Userland/Applications/SpaceAnalyzer/SpaceAnalyzer.gml b/Userland/Applications/SpaceAnalyzer/SpaceAnalyzer.gml
index 5d9153f669..79ebf6bdb0 100644
--- a/Userland/Applications/SpaceAnalyzer/SpaceAnalyzer.gml
+++ b/Userland/Applications/SpaceAnalyzer/SpaceAnalyzer.gml
@@ -3,10 +3,10 @@
         spacing: 0
     }
 
-    @GUI::ToolBarContainer {
-        @GUI::BreadcrumbBar {
+    @GUI::ToolbarContainer {
+        @GUI::Breadcrumbbar {
             fixed_height: 25
-            name: "breadcrumb_bar"
+            name: "breadcrumbbar"
         }
     }
 
@@ -14,7 +14,7 @@
         name: "tree_map"
     }
 
-    @GUI::StatusBar {
-        name: "status_bar"
+    @GUI::Statusbar {
+        name: "statusbar"
     }
 }
diff --git a/Userland/Applications/SpaceAnalyzer/main.cpp b/Userland/Applications/SpaceAnalyzer/main.cpp
index c0ae638bca..9d23023d7c 100644
--- a/Userland/Applications/SpaceAnalyzer/main.cpp
+++ b/Userland/Applications/SpaceAnalyzer/main.cpp
@@ -35,13 +35,13 @@
 #include <LibDesktop/Launcher.h>
 #include <LibGUI/AboutDialog.h>
 #include <LibGUI/Application.h>
-#include <LibGUI/BreadcrumbBar.h>
+#include <LibGUI/Breadcrumbbar.h>
 #include <LibGUI/Clipboard.h>
 #include <LibGUI/Icon.h>
 #include <LibGUI/Menu.h>
-#include <LibGUI/MenuBar.h>
+#include <LibGUI/Menubar.h>
 #include <LibGUI/MessageBox.h>
-#include <LibGUI/StatusBar.h>
+#include <LibGUI/Statusbar.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
@@ -209,7 +209,7 @@ static void populate_filesize_tree(TreeNode& root, Vector<MountInfo>& mounts, Ha
     update_totals(root);
 }
 
-static void analyze(RefPtr<Tree> tree, SpaceAnalyzer::TreeMapWidget& treemapwidget, GUI::StatusBar& statusbar)
+static void analyze(RefPtr<Tree> tree, SpaceAnalyzer::TreeMapWidget& treemapwidget, GUI::Statusbar& statusbar)
 {
     // Build an in-memory tree mirroring the filesystem and for each node
     // calculate the sum of the file size for all its descendants.
@@ -285,12 +285,12 @@ int main(int argc, char* argv[])
     // Load widgets.
     auto& mainwidget = window->set_main_widget<GUI::Widget>();
     mainwidget.load_from_gml(space_analyzer_gml);
-    auto& breadcrumbbar = *mainwidget.find_descendant_of_type_named<GUI::BreadcrumbBar>("breadcrumb_bar");
+    auto& breadcrumbbar = *mainwidget.find_descendant_of_type_named<GUI::Breadcrumbbar>("breadcrumbbar");
     auto& treemapwidget = *mainwidget.find_descendant_of_type_named<SpaceAnalyzer::TreeMapWidget>("tree_map");
-    auto& statusbar = *mainwidget.find_descendant_of_type_named<GUI::StatusBar>("status_bar");
+    auto& statusbar = *mainwidget.find_descendant_of_type_named<GUI::Statusbar>("statusbar");
 
     // Configure the menubar.
-    auto menubar = GUI::MenuBar::construct();
+    auto menubar = GUI::Menubar::construct();
     auto& app_menu = menubar->add_menu("File");
     app_menu.add_action(GUI::Action::create("Analyze", [&](auto&) {
         analyze(tree, treemapwidget, statusbar);
diff --git a/Userland/Applications/Spreadsheet/SpreadsheetView.cpp b/Userland/Applications/Spreadsheet/SpreadsheetView.cpp
index 377a30b60a..4d25eee9fd 100644
--- a/Userland/Applications/Spreadsheet/SpreadsheetView.cpp
+++ b/Userland/Applications/Spreadsheet/SpreadsheetView.cpp
@@ -35,7 +35,7 @@
 #include <LibGUI/Menu.h>
 #include <LibGUI/ModelEditingDelegate.h>
 #include <LibGUI/Painter.h>
-#include <LibGUI/ScrollBar.h>
+#include <LibGUI/Scrollbar.h>
 #include <LibGUI/TableView.h>
 #include <LibGfx/Palette.h>
 
diff --git a/Userland/Applications/Spreadsheet/main.cpp b/Userland/Applications/Spreadsheet/main.cpp
index c2ecb7c2cd..0519f3f465 100644
--- a/Userland/Applications/Spreadsheet/main.cpp
+++ b/Userland/Applications/Spreadsheet/main.cpp
@@ -35,7 +35,7 @@
 #include <LibGUI/FilePicker.h>
 #include <LibGUI/Icon.h>
 #include <LibGUI/Menu.h>
-#include <LibGUI/MenuBar.h>
+#include <LibGUI/Menubar.h>
 #include <LibGUI/MessageBox.h>
 #include <LibGUI/Window.h>
 #include <unistd.h>
@@ -110,7 +110,7 @@ int main(int argc, char* argv[])
     if (filename)
         spreadsheet_widget.load(filename);
 
-    auto menubar = GUI::MenuBar::construct();
+    auto menubar = GUI::Menubar::construct();
     auto& app_menu = menubar->add_menu("File");
 
     app_menu.add_action(GUI::Action::create("Add New Sheet", Gfx::Bitmap::load_from_file("/res/icons/16x16/new-tab.png"), [&](auto&) {
diff --git a/Userland/Applications/SystemMonitor/main.cpp b/Userland/Applications/SystemMonitor/main.cpp
index fab16c06c6..18e3fb9fe4 100644
--- a/Userland/Applications/SystemMonitor/main.cpp
+++ b/Userland/Applications/SystemMonitor/main.cpp
@@ -49,15 +49,15 @@
 #include <LibGUI/Label.h>
 #include <LibGUI/LazyWidget.h>
 #include <LibGUI/Menu.h>
-#include <LibGUI/MenuBar.h>
+#include <LibGUI/Menubar.h>
 #include <LibGUI/Painter.h>
 #include <LibGUI/SeparatorWidget.h>
 #include <LibGUI/SortingProxyModel.h>
 #include <LibGUI/StackWidget.h>
-#include <LibGUI/StatusBar.h>
+#include <LibGUI/Statusbar.h>
 #include <LibGUI/TabWidget.h>
 #include <LibGUI/TableView.h>
-#include <LibGUI/ToolBar.h>
+#include <LibGUI/Toolbar.h>
 #include <LibGUI/Widget.h>
 #include <LibGUI/Window.h>
 #include <LibGfx/FontDatabase.h>
@@ -76,7 +76,7 @@ static NonnullRefPtr<GUI::Widget> build_devices_tab();
 static NonnullRefPtr<GUI::Widget> build_graphs_tab();
 static NonnullRefPtr<GUI::Widget> build_processors_tab();
 
-static RefPtr<GUI::StatusBar> statusbar;
+static RefPtr<GUI::Statusbar> statusbar;
 
 class UnavailableProcessWidget final : public GUI::Frame {
     C_OBJECT(UnavailableProcessWidget)
@@ -192,7 +192,7 @@ int main(int argc, char** argv)
     tabwidget_container.layout()->set_margins({ 4, 0, 4, 4 });
     auto& tabwidget = tabwidget_container.add<GUI::TabWidget>();
 
-    statusbar = main_widget.add<GUI::StatusBar>(3);
+    statusbar = main_widget.add<GUI::Statusbar>(3);
 
     auto process_model = ProcessModel::create();
     process_model->on_state_update = [&](int process_count, int thread_count) {
@@ -340,7 +340,7 @@ int main(int argc, char** argv)
         },
         &process_table_view);
 
-    auto menubar = GUI::MenuBar::construct();
+    auto menubar = GUI::Menubar::construct();
     auto& app_menu = menubar->add_menu("&File");
     app_menu.add_action(GUI::CommonActions::make_quit_action([](auto&) {
         GUI::Application::the()->quit();
@@ -408,9 +408,9 @@ int main(int argc, char** argv)
     return app->exec();
 }
 
-class ProgressBarPaintingDelegate final : public GUI::TableCellPaintingDelegate {
+class ProgressbarPaintingDelegate final : public GUI::TableCellPaintingDelegate {
 public:
-    virtual ~ProgressBarPaintingDelegate() override { }
+    virtual ~ProgressbarPaintingDelegate() override { }
 
     virtual void paint(GUI::Painter& painter, const Gfx::IntRect& a_rect, const Palette& palette, const GUI::ModelIndex& index) override
     {
@@ -421,7 +421,7 @@ public:
         String text;
         if (data.is_string())
             text = data.as_string();
-        Gfx::StylePainter::paint_progress_bar(painter, rect, palette, 0, 100, percentage, text);
+        Gfx::StylePainter::paint_progressbar(painter, rect, palette, 0, 100, percentage, text);
         painter.draw_rect(rect, Color::Black);
     }
 };
@@ -580,7 +580,7 @@ NonnullRefPtr<GUI::Widget> build_file_systems_tab()
         df_fields.empend("block_size", "Block size", Gfx::TextAlignment::CenterRight);
         fs_table_view.set_model(GUI::SortingProxyModel::create(GUI::JsonArrayModel::create("/proc/df", move(df_fields))));
 
-        fs_table_view.set_column_painting_delegate(3, make<ProgressBarPaintingDelegate>());
+        fs_table_view.set_column_painting_delegate(3, make<ProgressbarPaintingDelegate>());
 
         fs_table_view.model()->update();
     };
diff --git a/Userland/Applications/Terminal/main.cpp b/Userland/Applications/Terminal/main.cpp
index ae1a2f78ea..33bc94c35d 100644
--- a/Userland/Applications/Terminal/main.cpp
+++ b/Userland/Applications/Terminal/main.cpp
@@ -41,7 +41,7 @@
 #include <LibGUI/GroupBox.h>
 #include <LibGUI/Icon.h>
 #include <LibGUI/Menu.h>
-#include <LibGUI/MenuBar.h>
+#include <LibGUI/Menubar.h>
 #include <LibGUI/OpacitySlider.h>
 #include <LibGUI/RadioButton.h>
 #include <LibGUI/SpinBox.h>
@@ -426,7 +426,7 @@ int main(int argc, char** argv)
     terminal.context_menu().add_separator();
     terminal.context_menu().add_action(open_settings_action);
 
-    auto menubar = GUI::MenuBar::construct();
+    auto menubar = GUI::Menubar::construct();
 
     auto& app_menu = menubar->add_menu("&File");
     app_menu.add_action(GUI::Action::create("Open New &Terminal", { Mod_Ctrl | Mod_Shift, Key_N }, Gfx::Bitmap::load_from_file("/res/icons/16x16/app-terminal.png"), [&](auto&) {
diff --git a/Userland/Applications/TextEditor/TextEditorWidget.cpp b/Userland/Applications/TextEditor/TextEditorWidget.cpp
index 7a89c99b59..c52e50d0a7 100644
--- a/Userland/Applications/TextEditor/TextEditorWidget.cpp
+++ b/Userland/Applications/TextEditor/TextEditorWidget.cpp
@@ -47,15 +47,15 @@
 #include <LibGUI/GroupBox.h>
 #include <LibGUI/INISyntaxHighlighter.h>
 #include <LibGUI/Menu.h>
-#include <LibGUI/MenuBar.h>
+#include <LibGUI/Menubar.h>
 #include <LibGUI/MessageBox.h>
 #include <LibGUI/RegularEditingEngine.h>
 #include <LibGUI/Splitter.h>
-#include <LibGUI/StatusBar.h>
+#include <LibGUI/Statusbar.h>
 #include <LibGUI/TextBox.h>
 #include <LibGUI/TextEditor.h>
-#include <LibGUI/ToolBar.h>
-#include <LibGUI/ToolBarContainer.h>
+#include <LibGUI/Toolbar.h>
+#include <LibGUI/ToolbarContainer.h>
 #include <LibGUI/VimEditingEngine.h>
 #include <LibGfx/Font.h>
 #include <LibJS/SyntaxHighlighter.h>
@@ -69,8 +69,8 @@ TextEditorWidget::TextEditorWidget()
 
     m_config = Core::ConfigFile::get_for_app("TextEditor");
 
-    m_toolbar = *find_descendant_of_type_named<GUI::ToolBar>("toolbar");
-    m_toolbar_container = *find_descendant_of_type_named<GUI::ToolBarContainer>("toolbar_container");
+    m_toolbar = *find_descendant_of_type_named<GUI::Toolbar>("toolbar");
+    m_toolbar_container = *find_descendant_of_type_named<GUI::ToolbarContainer>("toolbar_container");
 
     m_editor = *find_descendant_of_type_named<GUI::TextEditor>("editor");
     m_editor->set_ruler_visible(true);
@@ -272,7 +272,7 @@ TextEditorWidget::TextEditorWidget()
     m_editor->add_custom_context_menu_action(*m_find_next_action);
     m_editor->add_custom_context_menu_action(*m_find_previous_action);
 
-    m_statusbar = *find_descendant_of_type_named<GUI::StatusBar>("statusbar");
+    m_statusbar = *find_descendant_of_type_named<GUI::Statusbar>("statusbar");
 
     m_editor->on_cursor_change = [this] { update_statusbar(); };
     m_editor->on_selection_change = [this] { update_statusbar(); };
@@ -359,7 +359,7 @@ TextEditorWidget::~TextEditorWidget()
 {
 }
 
-void TextEditorWidget::initialize_menubar(GUI::MenuBar& menubar)
+void TextEditorWidget::initialize_menubar(GUI::Menubar& menubar)
 {
     auto& app_menu = menubar.add_menu("&File");
     app_menu.add_action(*m_new_action);
@@ -423,10 +423,10 @@ void TextEditorWidget::initialize_menubar(GUI::MenuBar& menubar)
 
     m_layout_statusbar_action = GUI::Action::create_checkable("&Status Bar", [&](auto& action) {
         action.is_checked() ? m_statusbar->set_visible(true) : m_statusbar->set_visible(false);
-        m_config->write_bool_entry("Layout", "ShowStatusBar", action.is_checked());
+        m_config->write_bool_entry("Layout", "ShowStatusbar", action.is_checked());
         m_config->sync();
     });
-    auto show_statusbar = m_config->read_bool_entry("Layout", "ShowStatusBar", true);
+    auto show_statusbar = m_config->read_bool_entry("Layout", "ShowStatusbar", true);
     m_layout_statusbar_action->set_checked(show_statusbar);
     m_statusbar->set_visible(show_statusbar);
 
diff --git a/Userland/Applications/TextEditor/TextEditorWidget.h b/Userland/Applications/TextEditor/TextEditorWidget.h
index 36f519158a..d5164a5842 100644
--- a/Userland/Applications/TextEditor/TextEditorWidget.h
+++ b/Userland/Applications/TextEditor/TextEditorWidget.h
@@ -55,7 +55,7 @@ public:
     void set_auto_detect_preview_mode(bool value) { m_auto_detect_preview_mode = value; }
 
     void update_title();
-    void initialize_menubar(GUI::MenuBar&);
+    void initialize_menubar(GUI::Menubar&);
 
 private:
     TextEditorWidget();
@@ -92,9 +92,9 @@ private:
     RefPtr<GUI::Action> m_markdown_preview_action;
     RefPtr<GUI::Action> m_html_preview_action;
 
-    RefPtr<GUI::ToolBar> m_toolbar;
-    RefPtr<GUI::ToolBarContainer> m_toolbar_container;
-    RefPtr<GUI::StatusBar> m_statusbar;
+    RefPtr<GUI::Toolbar> m_toolbar;
+    RefPtr<GUI::ToolbarContainer> m_toolbar_container;
+    RefPtr<GUI::Statusbar> m_statusbar;
 
     RefPtr<GUI::TextBox> m_find_textbox;
     RefPtr<GUI::TextBox> m_replace_textbox;
diff --git a/Userland/Applications/TextEditor/TextEditorWindow.gml b/Userland/Applications/TextEditor/TextEditorWindow.gml
index 97a50c348e..91c2db28d6 100644
--- a/Userland/Applications/TextEditor/TextEditorWindow.gml
+++ b/Userland/Applications/TextEditor/TextEditorWindow.gml
@@ -6,10 +6,10 @@
         spacing: 2
     }
 
-    @GUI::ToolBarContainer {
+    @GUI::ToolbarContainer {
         name: "toolbar_container"
 
-        @GUI::ToolBar {
+        @GUI::Toolbar {
             name: "toolbar"
         }
     }
@@ -105,7 +105,7 @@
         }
     }
 
-    @GUI::StatusBar {
+    @GUI::Statusbar {
         name: "statusbar"
     }
 }
diff --git a/Userland/Applications/TextEditor/main.cpp b/Userland/Applications/TextEditor/main.cpp
index 7aa58a7218..9421cc4cab 100644
--- a/Userland/Applications/TextEditor/main.cpp
+++ b/Userland/Applications/TextEditor/main.cpp
@@ -26,7 +26,7 @@
 
 #include "TextEditorWidget.h"
 #include <LibCore/ArgsParser.h>
-#include <LibGUI/MenuBar.h>
+#include <LibGUI/Menubar.h>
 #include <LibGfx/Bitmap.h>
 #include <stdio.h>
 #include <unistd.h>
@@ -85,7 +85,7 @@ int main(int argc, char** argv)
         return 1;
     }
 
-    auto menubar = GUI::MenuBar::construct();
+    auto menubar = GUI::Menubar::construct();
     text_widget.initialize_menubar(menubar);
     window->set_menubar(menubar);
 
diff --git a/Userland/Applications/ThemeEditor/PreviewWidget.cpp b/Userland/Applications/ThemeEditor/PreviewWidget.cpp
index fe4e74faf4..b7e62f6fbd 100644
--- a/Userland/Applications/ThemeEditor/PreviewWidget.cpp
+++ b/Userland/Applications/ThemeEditor/PreviewWidget.cpp
@@ -31,7 +31,7 @@
 #include <LibGUI/CheckBox.h>
 #include <LibGUI/Painter.h>
 #include <LibGUI/RadioButton.h>
-#include <LibGUI/StatusBar.h>
+#include <LibGUI/Statusbar.h>
 #include <LibGUI/TextEditor.h>
 #include <LibGfx/Bitmap.h>
 #include <LibGfx/WindowTheme.h>
@@ -65,7 +65,7 @@ private:
         m_checkbox->set_text("Check box");
         m_radio = add<GUI::RadioButton>();
         m_radio->set_text("Radio button");
-        m_statusbar = add<GUI::StatusBar>();
+        m_statusbar = add<GUI::Statusbar>();
         m_statusbar->set_text("Status bar");
         m_editor = add<GUI::TextEditor>();
         m_editor->set_text("Text editor\nwith multiple\nlines.");
@@ -84,7 +84,7 @@ private:
     RefPtr<GUI::Button> m_button;
     RefPtr<GUI::CheckBox> m_checkbox;
     RefPtr<GUI::RadioButton> m_radio;
-    RefPtr<GUI::StatusBar> m_statusbar;
+    RefPtr<GUI::Statusbar> m_statusbar;
 };
 
 PreviewWidget::PreviewWidget(const Gfx::Palette& preview_palette)
diff --git a/Userland/Demos/CatDog/main.cpp b/Userland/Demos/CatDog/main.cpp
index 6299f6e5c3..4f4d427615 100644
--- a/Userland/Demos/CatDog/main.cpp
+++ b/Userland/Demos/CatDog/main.cpp
@@ -30,7 +30,7 @@
 #include <LibGUI/BoxLayout.h>
 #include <LibGUI/Icon.h>
 #include <LibGUI/Menu.h>
-#include <LibGUI/MenuBar.h>
+#include <LibGUI/Menubar.h>
 #include <LibGUI/Painter.h>
 #include <LibGUI/Widget.h>
 #include <LibGUI/Window.h>
@@ -233,7 +233,7 @@ int main(int argc, char** argv)
     root_widget.set_layout<GUI::VerticalBoxLayout>();
     root_widget.layout()->set_spacing(0);
 
-    auto menubar = GUI::MenuBar::construct();
+    auto menubar = GUI::Menubar::construct();
     auto& app_menu = menubar->add_menu("File");
     app_menu.add_action(GUI::CommonActions::make_quit_action([&](auto&) { app->quit(); }));
     auto& help_menu = menubar->add_menu("Help");
diff --git a/Userland/Demos/Cube/Cube.cpp b/Userland/Demos/Cube/Cube.cpp
index a5f78c5384..807fcf8595 100644
--- a/Userland/Demos/Cube/Cube.cpp
+++ b/Userland/Demos/Cube/Cube.cpp
@@ -30,7 +30,7 @@
 #include <LibGUI/Icon.h>
 #include <LibGUI/Label.h>
 #include <LibGUI/Menu.h>
-#include <LibGUI/MenuBar.h>
+#include <LibGUI/Menubar.h>
 #include <LibGUI/Painter.h>
 #include <LibGUI/Widget.h>
 #include <LibGUI/Window.h>
@@ -263,7 +263,7 @@ int main(int argc, char** argv)
     auto app_icon = GUI::Icon::default_icon("app-cube");
     window->set_icon(app_icon.bitmap_for_size(16));
 
-    auto menubar = GUI::MenuBar::construct();
+    auto menubar = GUI::Menubar::construct();
     auto& app_menu = menubar->add_menu("File");
     auto show_window_frame_action = GUI::Action::create_checkable("Show window frame", [&](auto& action) {
         cube.set_show_window_frame(action.is_checked());
diff --git a/Userland/Demos/Eyes/main.cpp b/Userland/Demos/Eyes/main.cpp
index 1cad75db3b..0a2629d9ed 100644
--- a/Userland/Demos/Eyes/main.cpp
+++ b/Userland/Demos/Eyes/main.cpp
@@ -29,7 +29,7 @@
 #include <LibGUI/Application.h>
 #include <LibGUI/Icon.h>
 #include <LibGUI/Menu.h>
-#include <LibGUI/MenuBar.h>
+#include <LibGUI/Menubar.h>
 #include <LibGUI/Window.h>
 #include <LibGfx/Bitmap.h>
 #include <unistd.h>
@@ -99,7 +99,7 @@ int main(int argc, char* argv[])
 
     auto& eyes = window->set_main_widget<EyesWidget>(num_eyes, full_rows, extra_columns);
 
-    auto menubar = GUI::MenuBar::construct();
+    auto menubar = GUI::Menubar::construct();
     auto& app_menu = menubar->add_menu("File");
     app_menu.add_action(GUI::CommonActions::make_quit_action([&](auto&) { app->quit(); }));
 
diff --git a/Userland/Demos/Mouse/main.cpp b/Userland/Demos/Mouse/main.cpp
index 9878ae8dbb..998e3dbbcf 100644
--- a/Userland/Demos/Mouse/main.cpp
+++ b/Userland/Demos/Mouse/main.cpp
@@ -30,7 +30,7 @@
 #include <LibGUI/Frame.h>
 #include <LibGUI/Icon.h>
 #include <LibGUI/Menu.h>
-#include <LibGUI/MenuBar.h>
+#include <LibGUI/Menubar.h>
 #include <LibGUI/Painter.h>
 #include <LibGUI/Widget.h>
 #include <LibGUI/Window.h>
@@ -198,7 +198,7 @@ int main(int argc, char** argv)
     auto& main_widget = window->set_main_widget<MainFrame>();
     main_widget.set_fill_with_background_color(true);
 
-    auto menubar = GUI::MenuBar::construct();
+    auto menubar = GUI::Menubar::construct();
     auto& app_menu = menubar->add_menu("File");
     app_menu.add_action(GUI::CommonActions::make_quit_action([&](auto&) { app->quit(); }));
 
diff --git a/Userland/Demos/WidgetGallery/DemoWizardDialog.cpp b/Userland/Demos/WidgetGallery/DemoWizardDialog.cpp
index 96c8bdde56..e0e4da5e51 100644
--- a/Userland/Demos/WidgetGallery/DemoWizardDialog.cpp
+++ b/Userland/Demos/WidgetGallery/DemoWizardDialog.cpp
@@ -58,7 +58,7 @@ DemoWizardDialog::DemoWizardDialog(GUI::Window* parent_window)
         "Installation in progress...",
         "Please wait. Do not turn off your computer.");
     m_page_2->body_widget().load_from_gml(demo_wizard_page_2_gml);
-    m_page_2_progress_bar = m_page_2->body_widget().find_descendant_of_type_named<GUI::ProgressBar>("page_2_progress_bar");
+    m_page_2_progressbar = m_page_2->body_widget().find_descendant_of_type_named<GUI::Progressbar>("page_2_progressbar");
     m_page_2_timer = Core::Timer::construct(this);
     m_page_2->on_page_enter = [&]() {
         m_page_2_progress_value = 0;
@@ -71,7 +71,7 @@ DemoWizardDialog::DemoWizardDialog(GUI::Window* parent_window)
     m_page_2_timer->on_timeout = [&]() {
         if (m_page_2_progress_value < 100)
             m_page_2_progress_value++;
-        m_page_2_progress_bar->set_value(m_page_2_progress_value);
+        m_page_2_progressbar->set_value(m_page_2_progress_value);
 
         // Go to final page on progress completion
         if (m_page_2_progress_value == 100) {
diff --git a/Userland/Demos/WidgetGallery/DemoWizardDialog.h b/Userland/Demos/WidgetGallery/DemoWizardDialog.h
index 430ec505c6..6b8ebfbbd4 100644
--- a/Userland/Demos/WidgetGallery/DemoWizardDialog.h
+++ b/Userland/Demos/WidgetGallery/DemoWizardDialog.h
@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include <LibGUI/ProgressBar.h>
+#include <LibGUI/Progressbar.h>
 #include <LibGUI/TextBox.h>
 #include <LibGUI/Window.h>
 #include <LibGUI/Wizards/CoverWizardPage.h>
@@ -47,7 +47,7 @@ private:
     RefPtr<GUI::TextBox> m_page_1_location_text_box;
 
     RefPtr<GUI::WizardPage> m_page_2;
-    RefPtr<GUI::ProgressBar> m_page_2_progress_bar;
+    RefPtr<GUI::Progressbar> m_page_2_progressbar;
     int m_page_2_progress_value { 0 };
     RefPtr<Core::Timer> m_page_2_timer;
 
diff --git a/Userland/Demos/WidgetGallery/DemoWizardPage2.gml b/Userland/Demos/WidgetGallery/DemoWizardPage2.gml
index 47da912052..262d25864d 100644
--- a/Userland/Demos/WidgetGallery/DemoWizardPage2.gml
+++ b/Userland/Demos/WidgetGallery/DemoWizardPage2.gml
@@ -9,8 +9,8 @@
         fixed_height: 32
     }
 
-    @GUI::ProgressBar {
-        name: "page_2_progress_bar"
+    @GUI::Progressbar {
+        name: "page_2_progressbar"
         fixed_height: 28
     }
 
diff --git a/Userland/Demos/WidgetGallery/GalleryGML/BasicsTab.gml b/Userland/Demos/WidgetGallery/GalleryGML/BasicsTab.gml
index dfd3f03ff6..0d3bcf245d 100644
--- a/Userland/Demos/WidgetGallery/GalleryGML/BasicsTab.gml
+++ b/Userland/Demos/WidgetGallery/GalleryGML/BasicsTab.gml
@@ -126,15 +126,15 @@
 
                 @GUI::Button {
                     name: "enabled_coolbar_button"
-                    text: "CoolBar button"
-                    button_style: "CoolBar"
+                    text: "Coolbar button"
+                    button_style: "Coolbar"
                 }
 
                 @GUI::Button {
                     name: "disabled_coolbar_button"
                     text: "Disabled"
                     enabled: "false"
-                    button_style: "CoolBar"
+                    button_style: "Coolbar"
                 }
 
                 @GUI::Widget {
diff --git a/Userland/Demos/WidgetGallery/GalleryGML/SlidersTab.gml b/Userland/Demos/WidgetGallery/GalleryGML/SlidersTab.gml
index 87943af289..982c4ca660 100644
--- a/Userland/Demos/WidgetGallery/GalleryGML/SlidersTab.gml
+++ b/Userland/Demos/WidgetGallery/GalleryGML/SlidersTab.gml
@@ -42,7 +42,7 @@
         @GUI::Widget {
         }
 
-        @GUI::ScrollBar {
+        @GUI::Scrollbar {
             name: "enabled_scrollbar"
             fixed_height: 16
             fixed_width: -1
@@ -60,7 +60,7 @@
         @GUI::Widget {
         }
 
-        @GUI::ScrollBar {
+        @GUI::Scrollbar {
             name: "disabled_scrollbar"
             fixed_height: 16
             fixed_width: -1
@@ -75,7 +75,7 @@
             margins: [8, 8, 8, 8]
         }
 
-        @GUI::VerticalProgressBar {
+        @GUI::VerticalProgressbar {
             name: "vertical_progressbar_left"
             fixed_width: 36
         }
@@ -103,7 +103,7 @@
         @GUI::VerticalSeparator {
         }
 
-        @GUI::VerticalProgressBar {
+        @GUI::VerticalProgressbar {
             name: "vertical_progressbar_right"
             fixed_width: 36
         }
@@ -160,7 +160,7 @@
         @GUI::HorizontalSeparator {
         }
 
-        @GUI::HorizontalProgressBar {
+        @GUI::HorizontalProgressbar {
             name: "horizontal_progressbar"
             fixed_height: 20
         }
diff --git a/Userland/Demos/WidgetGallery/GalleryWidget.cpp b/Userland/Demos/WidgetGallery/GalleryWidget.cpp
index 1263106ee2..447befec24 100644
--- a/Userland/Demos/WidgetGallery/GalleryWidget.cpp
+++ b/Userland/Demos/WidgetGallery/GalleryWidget.cpp
@@ -191,10 +191,10 @@ GalleryWidget::GalleryWidget()
     auto& sliders_tab = tab_widget.add_tab<GUI::Widget>("Sliders");
     sliders_tab.load_from_gml(sliders_tab_gml);
 
-    m_vertical_progressbar_left = sliders_tab.find_descendant_of_type_named<GUI::VerticalProgressBar>("vertical_progressbar_left");
+    m_vertical_progressbar_left = sliders_tab.find_descendant_of_type_named<GUI::VerticalProgressbar>("vertical_progressbar_left");
     m_vertical_progressbar_left->set_value(0);
 
-    m_vertical_progressbar_right = sliders_tab.find_descendant_of_type_named<GUI::VerticalProgressBar>("vertical_progressbar_right");
+    m_vertical_progressbar_right = sliders_tab.find_descendant_of_type_named<GUI::VerticalProgressbar>("vertical_progressbar_right");
     m_vertical_progressbar_right->set_value(100);
 
     m_vertical_slider_left = sliders_tab.find_descendant_of_type_named<GUI::VerticalSlider>("vertical_slider_left");
@@ -208,7 +208,7 @@ GalleryWidget::GalleryWidget()
         m_vertical_progressbar_right->set_value((100 / m_vertical_slider_right->max()) * (m_vertical_slider_right->max() - value));
     };
 
-    m_horizontal_progressbar = sliders_tab.find_descendant_of_type_named<GUI::HorizontalProgressBar>("horizontal_progressbar");
+    m_horizontal_progressbar = sliders_tab.find_descendant_of_type_named<GUI::HorizontalProgressbar>("horizontal_progressbar");
     m_horizontal_progressbar->set_value(0);
 
     m_horizontal_slider_left = sliders_tab.find_descendant_of_type_named<GUI::HorizontalSlider>("horizontal_slider_left");
@@ -225,10 +225,10 @@ GalleryWidget::GalleryWidget()
         m_horizontal_slider_left->set_value((value * 100) / m_horizontal_slider_right->max());
     };
 
-    m_enabled_scrollbar = sliders_tab.find_descendant_of_type_named<GUI::ScrollBar>("enabled_scrollbar");
+    m_enabled_scrollbar = sliders_tab.find_descendant_of_type_named<GUI::Scrollbar>("enabled_scrollbar");
     m_enabled_scrollbar->set_orientation(Orientation::Horizontal);
 
-    m_disabled_scrollbar = sliders_tab.find_descendant_of_type_named<GUI::ScrollBar>("disabled_scrollbar");
+    m_disabled_scrollbar = sliders_tab.find_descendant_of_type_named<GUI::Scrollbar>("disabled_scrollbar");
     m_disabled_scrollbar->set_orientation(Orientation::Horizontal);
 
     m_opacity_imagewidget = sliders_tab.find_descendant_of_type_named<GUI::ImageWidget>("opacity_imagewidget");
diff --git a/Userland/Demos/WidgetGallery/GalleryWidget.h b/Userland/Demos/WidgetGallery/GalleryWidget.h
index 8e1a0a3fb5..8c03f1ea2a 100644
--- a/Userland/Demos/WidgetGallery/GalleryWidget.h
+++ b/Userland/Demos/WidgetGallery/GalleryWidget.h
@@ -31,7 +31,7 @@
 #include <LibGUI/ImageWidget.h>
 #include <LibGUI/MessageBox.h>
 #include <LibGUI/OpacitySlider.h>
-#include <LibGUI/ProgressBar.h>
+#include <LibGUI/Progressbar.h>
 #include <LibGUI/Slider.h>
 #include <LibGUI/Widget.h>
 #include <LibGfx/Bitmap.h>
@@ -61,12 +61,12 @@ private:
     RefPtr<GUI::HorizontalSlider> m_horizontal_slider_left;
     RefPtr<GUI::HorizontalSlider> m_horizontal_slider_right;
 
-    RefPtr<GUI::VerticalProgressBar> m_vertical_progressbar_left;
-    RefPtr<GUI::VerticalProgressBar> m_vertical_progressbar_right;
-    RefPtr<GUI::HorizontalProgressBar> m_horizontal_progressbar;
+    RefPtr<GUI::VerticalProgressbar> m_vertical_progressbar_left;
+    RefPtr<GUI::VerticalProgressbar> m_vertical_progressbar_right;
+    RefPtr<GUI::HorizontalProgressbar> m_horizontal_progressbar;
 
-    RefPtr<GUI::ScrollBar> m_enabled_scrollbar;
-    RefPtr<GUI::ScrollBar> m_disabled_scrollbar;
+    RefPtr<GUI::Scrollbar> m_enabled_scrollbar;
+    RefPtr<GUI::Scrollbar> m_disabled_scrollbar;
 
     RefPtr<GUI::TextEditor> m_text_editor;
     RefPtr<GUI::TextEditor> m_wizard_output;
diff --git a/Userland/Demos/WidgetGallery/main.cpp b/Userland/Demos/WidgetGallery/main.cpp
index a63af424e8..1a249bab8b 100644
--- a/Userland/Demos/WidgetGallery/main.cpp
+++ b/Userland/Demos/WidgetGallery/main.cpp
@@ -29,7 +29,7 @@
 #include <LibGUI/Application.h>
 #include <LibGUI/Icon.h>
 #include <LibGUI/Menu.h>
-#include <LibGUI/MenuBar.h>
+#include <LibGUI/Menubar.h>
 #include <LibGUI/Window.h>
 #include <unistd.h>
 
@@ -75,7 +75,7 @@ int main(int argc, char** argv)
     window->set_icon(app_icon.bitmap_for_size(16));
     window->set_main_widget<GalleryWidget>();
 
-    auto menubar = GUI::MenuBar::construct();
+    auto menubar = GUI::Menubar::construct();
 
     auto& app_menu = menubar->add_menu("File");
     app_menu.add_action(GUI::CommonActions::make_quit_action([&](auto&) { app->quit(); }));
diff --git a/Userland/DevTools/HackStudio/Debugger/DebugInfoWidget.cpp b/Userland/DevTools/HackStudio/Debugger/DebugInfoWidget.cpp
index 9ccaae9bdc..c2749f091b 100644
--- a/Userland/DevTools/HackStudio/Debugger/DebugInfoWidget.cpp
+++ b/Userland/DevTools/HackStudio/Debugger/DebugInfoWidget.cpp
@@ -72,8 +72,8 @@ void DebugInfoWidget::init_toolbar()
 DebugInfoWidget::DebugInfoWidget()
 {
     set_layout<GUI::VerticalBoxLayout>();
-    auto& toolbar_container = add<GUI::ToolBarContainer>();
-    m_toolbar = toolbar_container.add<GUI::ToolBar>();
+    auto& toolbar_container = add<GUI::ToolbarContainer>();
+    m_toolbar = toolbar_container.add<GUI::Toolbar>();
     init_toolbar();
     auto& bottom_box = add<GUI::Widget>();
     bottom_box.set_layout<GUI::HorizontalBoxLayout>();
diff --git a/Userland/DevTools/HackStudio/Debugger/DebugInfoWidget.h b/Userland/DevTools/HackStudio/Debugger/DebugInfoWidget.h
index efc6f4b958..783107e723 100644
--- a/Userland/DevTools/HackStudio/Debugger/DebugInfoWidget.h
+++ b/Userland/DevTools/HackStudio/Debugger/DebugInfoWidget.h
@@ -33,8 +33,8 @@
 #include <LibGUI/Menu.h>
 #include <LibGUI/Model.h>
 #include <LibGUI/TableView.h>
-#include <LibGUI/ToolBar.h>
-#include <LibGUI/ToolBarContainer.h>
+#include <LibGUI/Toolbar.h>
+#include <LibGUI/ToolbarContainer.h>
 #include <LibGUI/TreeView.h>
 #include <LibGUI/Widget.h>
 #include <sys/arch/i386/regs.h>
@@ -61,7 +61,7 @@ private:
     RefPtr<GUI::TableView> m_registers_view;
     RefPtr<GUI::ListView> m_backtrace_view;
     RefPtr<GUI::Menu> m_variable_context_menu;
-    RefPtr<GUI::ToolBar> m_toolbar;
+    RefPtr<GUI::Toolbar> m_toolbar;
     RefPtr<GUI::Action> m_continue_action;
     RefPtr<GUI::Action> m_singlestep_action;
     RefPtr<GUI::Action> m_step_in_action;
diff --git a/Userland/DevTools/HackStudio/Editor.cpp b/Userland/DevTools/HackStudio/Editor.cpp
index 6cdbca9cfa..58ed61207f 100644
--- a/Userland/DevTools/HackStudio/Editor.cpp
+++ b/Userland/DevTools/HackStudio/Editor.cpp
@@ -42,7 +42,7 @@
 #include <LibGUI/Label.h>
 #include <LibGUI/MessageBox.h>
 #include <LibGUI/Painter.h>
-#include <LibGUI/ScrollBar.h>
+#include <LibGUI/Scrollbar.h>
 #include <LibGUI/Window.h>
 #include <LibJS/SyntaxHighlighter.h>
 #include <LibMarkdown/Document.h>
diff --git a/Userland/DevTools/HackStudio/Git/DiffViewer.cpp b/Userland/DevTools/HackStudio/Git/DiffViewer.cpp
index 39785998fc..c29ce9edbd 100644
--- a/Userland/DevTools/HackStudio/Git/DiffViewer.cpp
+++ b/Userland/DevTools/HackStudio/Git/DiffViewer.cpp
@@ -29,7 +29,7 @@
 #include <LibDiff/Hunks.h>
 #include <LibGUI/AbstractView.h>
 #include <LibGUI/Painter.h>
-#include <LibGUI/ScrollBar.h>
+#include <LibGUI/Scrollbar.h>
 #include <LibGfx/Color.h>
 #include <LibGfx/Font.h>
 #include <LibGfx/FontDatabase.h>
diff --git a/Userland/DevTools/HackStudio/Git/GitFilesView.cpp b/Userland/DevTools/HackStudio/Git/GitFilesView.cpp
index 0a7afa3c99..2ef856200b 100644
--- a/Userland/DevTools/HackStudio/Git/GitFilesView.cpp
+++ b/Userland/DevTools/HackStudio/Git/GitFilesView.cpp
@@ -27,7 +27,7 @@
 #include "GitFilesView.h"
 #include <LibGUI/Model.h>
 #include <LibGUI/Painter.h>
-#include <LibGUI/ScrollBar.h>
+#include <LibGUI/Scrollbar.h>
 #include <LibGfx/Palette.h>
 
 namespace HackStudio {
diff --git a/Userland/DevTools/HackStudio/HackStudioWidget.cpp b/Userland/DevTools/HackStudio/HackStudioWidget.cpp
index cbb599eca3..b8a6deac45 100644
--- a/Userland/DevTools/HackStudio/HackStudioWidget.cpp
+++ b/Userland/DevTools/HackStudio/HackStudioWidget.cpp
@@ -66,7 +66,7 @@
 #include <LibGUI/ItemListModel.h>
 #include <LibGUI/Label.h>
 #include <LibGUI/Menu.h>
-#include <LibGUI/MenuBar.h>
+#include <LibGUI/Menubar.h>
 #include <LibGUI/MessageBox.h>
 #include <LibGUI/RegularEditingEngine.h>
 #include <LibGUI/Splitter.h>
@@ -75,8 +75,8 @@
 #include <LibGUI/TableView.h>
 #include <LibGUI/TextBox.h>
 #include <LibGUI/TextEditor.h>
-#include <LibGUI/ToolBar.h>
-#include <LibGUI/ToolBarContainer.h>
+#include <LibGUI/Toolbar.h>
+#include <LibGUI/ToolbarContainer.h>
 #include <LibGUI/TreeView.h>
 #include <LibGUI/VimEditingEngine.h>
 #include <LibGUI/Widget.h>
@@ -103,7 +103,7 @@ HackStudioWidget::HackStudioWidget(const String& path_to_project)
 
     open_project(path_to_project);
 
-    auto& toolbar_container = add<GUI::ToolBarContainer>();
+    auto& toolbar_container = add<GUI::ToolbarContainer>();
 
     auto& outer_splitter = add<GUI::HorizontalSplitter>();
 
@@ -785,7 +785,7 @@ void HackStudioWidget::create_form_editor(GUI::Widget& parent)
 {
     m_form_inner_container = parent.add<GUI::Widget>();
     m_form_inner_container->set_layout<GUI::HorizontalBoxLayout>();
-    auto& form_widgets_toolbar = m_form_inner_container->add<GUI::ToolBar>(Orientation::Vertical, 26);
+    auto& form_widgets_toolbar = m_form_inner_container->add<GUI::Toolbar>(Orientation::Vertical, 26);
     form_widgets_toolbar.set_fixed_width(38);
 
     GUI::ActionGroup tool_actions;
@@ -868,7 +868,7 @@ void HackStudioWidget::create_form_editor(GUI::Widget& parent)
 
 void HackStudioWidget::create_toolbar(GUI::Widget& parent)
 {
-    auto& toolbar = parent.add<GUI::ToolBar>();
+    auto& toolbar = parent.add<GUI::Toolbar>();
     toolbar.add_action(*m_new_file_action);
     toolbar.add_action(*m_new_directory_action);
     toolbar.add_action(*m_save_action);
@@ -950,7 +950,7 @@ void HackStudioWidget::create_project_tab(GUI::Widget& parent)
     };
 }
 
-void HackStudioWidget::create_app_menubar(GUI::MenuBar& menubar)
+void HackStudioWidget::create_app_menubar(GUI::Menubar& menubar)
 {
     auto& file_menu = menubar.add_menu("&File");
     file_menu.add_action(*m_new_project_action);
@@ -962,7 +962,7 @@ void HackStudioWidget::create_app_menubar(GUI::MenuBar& menubar)
     }));
 }
 
-void HackStudioWidget::create_project_menubar(GUI::MenuBar& menubar)
+void HackStudioWidget::create_project_menubar(GUI::Menubar& menubar)
 {
     auto& project_menu = menubar.add_menu("&Project");
     project_menu.add_action(*m_new_file_action);
@@ -971,7 +971,7 @@ void HackStudioWidget::create_project_menubar(GUI::MenuBar& menubar)
     project_menu.add_action(*create_set_autocomplete_mode_action());
 }
 
-void HackStudioWidget::create_edit_menubar(GUI::MenuBar& menubar)
+void HackStudioWidget::create_edit_menubar(GUI::Menubar& menubar)
 {
     auto& edit_menu = menubar.add_menu("&Edit");
     edit_menu.add_action(GUI::Action::create("Find in Files...", { Mod_Ctrl | Mod_Shift, Key_F }, Gfx::Bitmap::load_from_file("/res/icons/16x16/find.png"), [this](auto&) {
@@ -991,7 +991,7 @@ void HackStudioWidget::create_edit_menubar(GUI::MenuBar& menubar)
     edit_menu.add_action(vim_emulation_setting_action);
 }
 
-void HackStudioWidget::create_build_menubar(GUI::MenuBar& menubar)
+void HackStudioWidget::create_build_menubar(GUI::Menubar& menubar)
 {
     auto& build_menu = menubar.add_menu("&Build");
     build_menu.add_action(*m_build_action);
@@ -1002,7 +1002,7 @@ void HackStudioWidget::create_build_menubar(GUI::MenuBar& menubar)
     build_menu.add_action(*m_debug_action);
 }
 
-void HackStudioWidget::create_view_menubar(GUI::MenuBar& menubar)
+void HackStudioWidget::create_view_menubar(GUI::Menubar& menubar)
 {
     auto hide_action_tabs_action = GUI::Action::create("&Hide Action Tabs", { Mod_Ctrl | Mod_Shift, Key_X }, [this](auto&) {
         hide_action_tabs();
@@ -1048,7 +1048,7 @@ void HackStudioWidget::create_view_menubar(GUI::MenuBar& menubar)
     view_menu.add_action(*m_remove_current_terminal_action);
 }
 
-void HackStudioWidget::create_help_menubar(GUI::MenuBar& menubar)
+void HackStudioWidget::create_help_menubar(GUI::Menubar& menubar)
 {
     auto& help_menu = menubar.add_menu("Help");
     help_menu.add_action(GUI::CommonActions::make_about_action("Hack Studio", GUI::Icon::default_icon("app-hack-studio"), window()));
@@ -1073,7 +1073,7 @@ NonnullRefPtr<GUI::Action> HackStudioWidget::create_set_autocomplete_mode_action
     return action;
 }
 
-void HackStudioWidget::initialize_menubar(GUI::MenuBar& menubar)
+void HackStudioWidget::initialize_menubar(GUI::Menubar& menubar)
 {
     create_app_menubar(menubar);
     create_project_menubar(menubar);
diff --git a/Userland/DevTools/HackStudio/HackStudioWidget.h b/Userland/DevTools/HackStudio/HackStudioWidget.h
index 210fc964fb..40dd554108 100644
--- a/Userland/DevTools/HackStudio/HackStudioWidget.h
+++ b/Userland/DevTools/HackStudio/HackStudioWidget.h
@@ -41,7 +41,7 @@
 #include "ProjectFile.h"
 #include "TerminalWrapper.h"
 #include <LibGUI/ActionGroup.h>
-#include <LibGUI/ScrollBar.h>
+#include <LibGUI/Scrollbar.h>
 #include <LibGUI/Splitter.h>
 #include <LibGUI/Widget.h>
 #include <LibThread/Thread.h>
@@ -62,7 +62,7 @@ public:
     void set_current_editor_wrapper(RefPtr<EditorWrapper>);
 
     String currently_open_file() const { return m_currently_open_file; }
-    void initialize_menubar(GUI::MenuBar&);
+    void initialize_menubar(GUI::Menubar&);
 
     Locator& locator()
     {
@@ -117,12 +117,12 @@ private:
     void create_form_editor(GUI::Widget& parent);
     void create_toolbar(GUI::Widget& parent);
     void create_action_tab(GUI::Widget& parent);
-    void create_app_menubar(GUI::MenuBar&);
-    void create_project_menubar(GUI::MenuBar&);
-    void create_edit_menubar(GUI::MenuBar&);
-    void create_build_menubar(GUI::MenuBar&);
-    void create_view_menubar(GUI::MenuBar&);
-    void create_help_menubar(GUI::MenuBar&);
+    void create_app_menubar(GUI::Menubar&);
+    void create_project_menubar(GUI::Menubar&);
+    void create_edit_menubar(GUI::Menubar&);
+    void create_build_menubar(GUI::Menubar&);
+    void create_view_menubar(GUI::Menubar&);
+    void create_help_menubar(GUI::Menubar&);
     void create_project_tab(GUI::Widget& parent);
     void configure_project_tree_view();
 
diff --git a/Userland/DevTools/HackStudio/main.cpp b/Userland/DevTools/HackStudio/main.cpp
index fbeba335e3..5db91b3ef8 100644
--- a/Userland/DevTools/HackStudio/main.cpp
+++ b/Userland/DevTools/HackStudio/main.cpp
@@ -34,7 +34,7 @@
 #include <LibCore/EventLoop.h>
 #include <LibCore/File.h>
 #include <LibGUI/Application.h>
-#include <LibGUI/MenuBar.h>
+#include <LibGUI/Menubar.h>
 #include <LibGUI/MessageBox.h>
 #include <LibGUI/Notification.h>
 #include <LibGUI/Widget.h>
@@ -97,7 +97,7 @@ int main(int argc, char** argv)
 
     s_window->set_title(String::formatted("{} - Hack Studio", s_hack_studio_widget->project().name()));
 
-    auto menubar = GUI::MenuBar::construct();
+    auto menubar = GUI::Menubar::construct();
     s_hack_studio_widget->initialize_menubar(menubar);
     s_window->set_menubar(menubar);
 
diff --git a/Userland/DevTools/Inspector/main.cpp b/Userland/DevTools/Inspector/main.cpp
index 52c428a4a5..791dc49824 100644
--- a/Userland/DevTools/Inspector/main.cpp
+++ b/Userland/DevTools/Inspector/main.cpp
@@ -34,7 +34,7 @@
 #include <LibGUI/Application.h>
 #include <LibGUI/BoxLayout.h>
 #include <LibGUI/Menu.h>
-#include <LibGUI/MenuBar.h>
+#include <LibGUI/Menubar.h>
 #include <LibGUI/MessageBox.h>
 #include <LibGUI/ModelEditingDelegate.h>
 #include <LibGUI/ProcessChooser.h>
@@ -128,7 +128,7 @@ int main(int argc, char** argv)
     window->resize(685, 500);
     window->set_icon(app_icon.bitmap_for_size(16));
 
-    auto menubar = GUI::MenuBar::construct();
+    auto menubar = GUI::Menubar::construct();
     auto& app_menu = menubar->add_menu("File");
     app_menu.add_action(GUI::CommonActions::make_quit_action([&](auto&) { app->quit(); }));
 
diff --git a/Userland/DevTools/Playground/main.cpp b/Userland/DevTools/Playground/main.cpp
index f3c5ac12b0..c7c2749478 100644
--- a/Userland/DevTools/Playground/main.cpp
+++ b/Userland/DevTools/Playground/main.cpp
@@ -36,7 +36,7 @@
 #include <LibGUI/GMLSyntaxHighlighter.h>
 #include <LibGUI/Icon.h>
 #include <LibGUI/Menu.h>
-#include <LibGUI/MenuBar.h>
+#include <LibGUI/Menubar.h>
 #include <LibGUI/MessageBox.h>
 #include <LibGUI/Painter.h>
 #include <LibGUI/Splitter.h>
@@ -153,7 +153,7 @@ int main(int argc, char** argv)
         });
     };
 
-    auto menubar = GUI::MenuBar::construct();
+    auto menubar = GUI::Menubar::construct();
     auto& app_menu = menubar->add_menu("&File");
 
     app_menu.add_action(GUI::CommonActions::make_open_action([&](auto&) {
diff --git a/Userland/DevTools/Profiler/main.cpp b/Userland/DevTools/Profiler/main.cpp
index 4666e4ffe5..76c8aff332 100644
--- a/Userland/DevTools/Profiler/main.cpp
+++ b/Userland/DevTools/Profiler/main.cpp
@@ -39,7 +39,7 @@
 #include <LibGUI/Button.h>
 #include <LibGUI/Label.h>
 #include <LibGUI/Menu.h>
-#include <LibGUI/MenuBar.h>
+#include <LibGUI/Menubar.h>
 #include <LibGUI/MessageBox.h>
 #include <LibGUI/Model.h>
 #include <LibGUI/ProcessChooser.h>
@@ -140,7 +140,7 @@ int main(int argc, char** argv)
         individual_sample_view.set_model(move(model));
     };
 
-    auto menubar = GUI::MenuBar::construct();
+    auto menubar = GUI::Menubar::construct();
     auto& app_menu = menubar->add_menu("&File");
     app_menu.add_action(GUI::CommonActions::make_quit_action([&](auto&) { app->quit(); }));
 
diff --git a/Userland/Games/2048/main.cpp b/Userland/Games/2048/main.cpp
index 5adbea5132..e43c751a4c 100644
--- a/Userland/Games/2048/main.cpp
+++ b/Userland/Games/2048/main.cpp
@@ -34,9 +34,9 @@
 #include <LibGUI/Button.h>
 #include <LibGUI/Icon.h>
 #include <LibGUI/Menu.h>
-#include <LibGUI/MenuBar.h>
+#include <LibGUI/Menubar.h>
 #include <LibGUI/MessageBox.h>
-#include <LibGUI/StatusBar.h>
+#include <LibGUI/Statusbar.h>
 #include <LibGUI/Window.h>
 #include <stdio.h>
 #include <time.h>
@@ -98,7 +98,7 @@ int main(int argc, char** argv)
 
     auto& board_view = main_widget.add<BoardView>(&game.board());
     board_view.set_focus(true);
-    auto& statusbar = main_widget.add<GUI::StatusBar>();
+    auto& statusbar = main_widget.add<GUI::Statusbar>();
 
     auto update = [&]() {
         board_view.set_board(&game.board());
@@ -178,7 +178,7 @@ int main(int argc, char** argv)
         }
     };
 
-    auto menubar = GUI::MenuBar::construct();
+    auto menubar = GUI::Menubar::construct();
 
     auto& app_menu = menubar->add_menu("File");
 
diff --git a/Userland/Games/Breakout/main.cpp b/Userland/Games/Breakout/main.cpp
index af8e4d9a8c..306a228169 100644
--- a/Userland/Games/Breakout/main.cpp
+++ b/Userland/Games/Breakout/main.cpp
@@ -28,7 +28,7 @@
 #include <LibGUI/Application.h>
 #include <LibGUI/Icon.h>
 #include <LibGUI/Menu.h>
-#include <LibGUI/MenuBar.h>
+#include <LibGUI/Menubar.h>
 #include <LibGUI/Window.h>
 #include <LibGfx/Bitmap.h>
 #include <unistd.h>
@@ -67,7 +67,7 @@ int main(int argc, char** argv)
     auto& game = window->set_main_widget<Breakout::Game>();
     window->show();
 
-    auto menubar = GUI::MenuBar::construct();
+    auto menubar = GUI::Menubar::construct();
 
     auto& app_menu = menubar->add_menu("Game");
     app_menu.add_action(GUI::Action::create_checkable("Pause", { {}, Key_P }, [&](auto& action) {
diff --git a/Userland/Games/Chess/main.cpp b/Userland/Games/Chess/main.cpp
index c2a3a2de78..9e817a089b 100644
--- a/Userland/Games/Chess/main.cpp
+++ b/Userland/Games/Chess/main.cpp
@@ -33,7 +33,7 @@
 #include <LibGUI/FilePicker.h>
 #include <LibGUI/Icon.h>
 #include <LibGUI/Menu.h>
-#include <LibGUI/MenuBar.h>
+#include <LibGUI/Menubar.h>
 #include <LibGUI/MessageBox.h>
 #include <LibGUI/Window.h>
 #include <unistd.h>
@@ -96,7 +96,7 @@ int main(int argc, char** argv)
     widget.set_coordinates(config->read_bool_entry("Style", "Coordinates", true));
     widget.set_show_available_moves(config->read_bool_entry("Style", "ShowAvailableMoves", true));
 
-    auto menubar = GUI::MenuBar::construct();
+    auto menubar = GUI::Menubar::construct();
     auto& app_menu = menubar->add_menu("Game");
 
     app_menu.add_action(GUI::Action::create("Resign", { Mod_None, Key_F3 }, [&](auto&) {
diff --git a/Userland/Games/Conway/main.cpp b/Userland/Games/Conway/main.cpp
index bc7210b86b..1c2d6a37d2 100644
--- a/Userland/Games/Conway/main.cpp
+++ b/Userland/Games/Conway/main.cpp
@@ -28,7 +28,7 @@
 #include <LibGUI/Application.h>
 #include <LibGUI/Icon.h>
 #include <LibGUI/Menu.h>
-#include <LibGUI/MenuBar.h>
+#include <LibGUI/Menubar.h>
 #include <LibGUI/Window.h>
 #include <stdio.h>
 #include <unistd.h>
@@ -69,7 +69,7 @@ int main(int argc, char** argv)
     auto& game = window->set_main_widget<Game>();
     window->set_minimum_size(game.columns(), game.rows());
 
-    auto menubar = GUI::MenuBar::construct();
+    auto menubar = GUI::Menubar::construct();
 
     auto& app_menu = menubar->add_menu("Game");
 
diff --git a/Userland/Games/Minesweeper/main.cpp b/Userland/Games/Minesweeper/main.cpp
index 8c3835b796..067bf6a570 100644
--- a/Userland/Games/Minesweeper/main.cpp
+++ b/Userland/Games/Minesweeper/main.cpp
@@ -34,7 +34,7 @@
 #include <LibGUI/ImageWidget.h>
 #include <LibGUI/Label.h>
 #include <LibGUI/Menu.h>
-#include <LibGUI/MenuBar.h>
+#include <LibGUI/Menubar.h>
 #include <LibGUI/Window.h>
 #include <stdio.h>
 #include <unistd.h>
@@ -92,7 +92,7 @@ int main(int argc, char** argv)
     auto& flag_label = container.add<GUI::Label>();
     auto& face_button = container.add<GUI::Button>();
     face_button.set_focus_policy(GUI::FocusPolicy::TabFocus);
-    face_button.set_button_style(Gfx::ButtonStyle::CoolBar);
+    face_button.set_button_style(Gfx::ButtonStyle::Coolbar);
     face_button.set_fixed_size(36, 36);
 
     auto& time_image = container.add<GUI::ImageWidget>();
@@ -104,7 +104,7 @@ int main(int argc, char** argv)
         window->resize(size);
     });
 
-    auto menubar = GUI::MenuBar::construct();
+    auto menubar = GUI::Menubar::construct();
 
     auto& app_menu = menubar->add_menu("Game");
 
diff --git a/Userland/Games/Pong/main.cpp b/Userland/Games/Pong/main.cpp
index 24829629ca..b967245b64 100644
--- a/Userland/Games/Pong/main.cpp
+++ b/Userland/Games/Pong/main.cpp
@@ -29,7 +29,7 @@
 #include <LibGUI/Application.h>
 #include <LibGUI/Icon.h>
 #include <LibGUI/Menu.h>
-#include <LibGUI/MenuBar.h>
+#include <LibGUI/Menubar.h>
 #include <LibGUI/Window.h>
 #include <LibGfx/Bitmap.h>
 #include <unistd.h>
@@ -74,7 +74,7 @@ int main(int argc, char** argv)
     window->set_main_widget<Pong::Game>();
     window->show();
 
-    auto menubar = GUI::MenuBar::construct();
+    auto menubar = GUI::Menubar::construct();
 
     auto& app_menu = menubar->add_menu("Game");
     app_menu.add_action(GUI::CommonActions::make_quit_action([](auto&) {
diff --git a/Userland/Games/Snake/main.cpp b/Userland/Games/Snake/main.cpp
index 9a6e1d87f9..6c237b233d 100644
--- a/Userland/Games/Snake/main.cpp
+++ b/Userland/Games/Snake/main.cpp
@@ -32,7 +32,7 @@
 #include <LibGUI/Button.h>
 #include <LibGUI/Icon.h>
 #include <LibGUI/Menu.h>
-#include <LibGUI/MenuBar.h>
+#include <LibGUI/Menubar.h>
 #include <LibGUI/Window.h>
 #include <stdio.h>
 #include <unistd.h>
@@ -78,7 +78,7 @@ int main(int argc, char** argv)
 
     auto& game = window->set_main_widget<SnakeGame>();
 
-    auto menubar = GUI::MenuBar::construct();
+    auto menubar = GUI::Menubar::construct();
 
     auto& app_menu = menubar->add_menu("Game");
 
diff --git a/Userland/Games/Solitaire/main.cpp b/Userland/Games/Solitaire/main.cpp
index 7879b9269f..513c206f44 100644
--- a/Userland/Games/Solitaire/main.cpp
+++ b/Userland/Games/Solitaire/main.cpp
@@ -29,7 +29,7 @@
 #include <LibGUI/Application.h>
 #include <LibGUI/Icon.h>
 #include <LibGUI/Menu.h>
-#include <LibGUI/MenuBar.h>
+#include <LibGUI/Menubar.h>
 #include <LibGUI/Window.h>
 #include <stdio.h>
 #include <unistd.h>
@@ -63,7 +63,7 @@ int main(int argc, char** argv)
         window->set_title(String::formatted("Score: {} - Solitaire", score));
     });
 
-    auto menubar = GUI::MenuBar::construct();
+    auto menubar = GUI::Menubar::construct();
     auto& app_menu = menubar->add_menu("Game");
 
     app_menu.add_action(GUI::Action::create("New game", { Mod_None, Key_F2 }, [&](auto&) {
diff --git a/Userland/Libraries/LibGUI/AbstractTableView.cpp b/Userland/Libraries/LibGUI/AbstractTableView.cpp
index 8f360acbba..0713ac5c5f 100644
--- a/Userland/Libraries/LibGUI/AbstractTableView.cpp
+++ b/Userland/Libraries/LibGUI/AbstractTableView.cpp
@@ -33,7 +33,7 @@
 #include <LibGUI/Menu.h>
 #include <LibGUI/Model.h>
 #include <LibGUI/Painter.h>
-#include <LibGUI/ScrollBar.h>
+#include <LibGUI/Scrollbar.h>
 #include <LibGUI/Window.h>
 #include <LibGfx/Palette.h>
 
diff --git a/Userland/Libraries/LibGUI/AbstractView.cpp b/Userland/Libraries/LibGUI/AbstractView.cpp
index 6e41342142..48a4c480bf 100644
--- a/Userland/Libraries/LibGUI/AbstractView.cpp
+++ b/Userland/Libraries/LibGUI/AbstractView.cpp
@@ -33,7 +33,7 @@
 #include <LibGUI/Model.h>
 #include <LibGUI/ModelEditingDelegate.h>
 #include <LibGUI/Painter.h>
-#include <LibGUI/ScrollBar.h>
+#include <LibGUI/Scrollbar.h>
 #include <LibGUI/TextBox.h>
 #include <LibGfx/Palette.h>
 
diff --git a/Userland/Libraries/LibGUI/Application.cpp b/Userland/Libraries/LibGUI/Application.cpp
index 8f9b3e92ef..0d22137683 100644
--- a/Userland/Libraries/LibGUI/Application.cpp
+++ b/Userland/Libraries/LibGUI/Application.cpp
@@ -31,7 +31,7 @@
 #include <LibGUI/Clipboard.h>
 #include <LibGUI/Desktop.h>
 #include <LibGUI/Label.h>
-#include <LibGUI/MenuBar.h>
+#include <LibGUI/Menubar.h>
 #include <LibGUI/Painter.h>
 #include <LibGUI/Window.h>
 #include <LibGUI/WindowServerConnection.h>
diff --git a/Userland/Libraries/LibGUI/BreadcrumbBar.cpp b/Userland/Libraries/LibGUI/Breadcrumbbar.cpp
index 15fce14f53..400202b881 100644
--- a/Userland/Libraries/LibGUI/BreadcrumbBar.cpp
+++ b/Userland/Libraries/LibGUI/Breadcrumbbar.cpp
@@ -25,13 +25,13 @@
  */
 
 #include <LibGUI/BoxLayout.h>
-#include <LibGUI/BreadcrumbBar.h>
+#include <LibGUI/Breadcrumbbar.h>
 #include <LibGUI/Button.h>
 #include <LibGUI/Painter.h>
 #include <LibGfx/Font.h>
 #include <LibGfx/Palette.h>
 
-REGISTER_WIDGET(GUI, BreadcrumbBar)
+REGISTER_WIDGET(GUI, Breadcrumbbar)
 
 namespace GUI {
 
@@ -76,26 +76,26 @@ private:
     BreadcrumbButton() { }
 };
 
-BreadcrumbBar::BreadcrumbBar()
+Breadcrumbbar::Breadcrumbbar()
 {
     auto& layout = set_layout<HorizontalBoxLayout>();
     layout.set_spacing(0);
 }
 
-BreadcrumbBar::~BreadcrumbBar()
+Breadcrumbbar::~Breadcrumbbar()
 {
 }
 
-void BreadcrumbBar::clear_segments()
+void Breadcrumbbar::clear_segments()
 {
     m_segments.clear();
     remove_all_children();
 }
 
-void BreadcrumbBar::append_segment(String text, const Gfx::Bitmap* icon, String data, String tooltip)
+void Breadcrumbbar::append_segment(String text, const Gfx::Bitmap* icon, String data, String tooltip)
 {
     auto& button = add<BreadcrumbButton>();
-    button.set_button_style(Gfx::ButtonStyle::CoolBar);
+    button.set_button_style(Gfx::ButtonStyle::Coolbar);
     button.set_text(text);
     button.set_icon(icon);
     button.set_tooltip(move(tooltip));
@@ -125,7 +125,7 @@ void BreadcrumbBar::append_segment(String text, const Gfx::Bitmap* icon, String
     m_segments.append(move(segment));
 }
 
-void BreadcrumbBar::set_selected_segment(Optional<size_t> index)
+void Breadcrumbbar::set_selected_segment(Optional<size_t> index)
 {
     if (!index.has_value()) {
         for_each_child_of_type<GUI::AbstractButton>([&](auto& button) {
@@ -140,7 +140,7 @@ void BreadcrumbBar::set_selected_segment(Optional<size_t> index)
     segment.button->set_checked(true);
 }
 
-void BreadcrumbBar::doubleclick_event(MouseEvent& event)
+void Breadcrumbbar::doubleclick_event(MouseEvent& event)
 {
     if (on_doubleclick)
         on_doubleclick(event);
diff --git a/Userland/Libraries/LibGUI/BreadcrumbBar.h b/Userland/Libraries/LibGUI/Breadcrumbbar.h
index a7fdb3d01d..a23d47eb46 100644
--- a/Userland/Libraries/LibGUI/BreadcrumbBar.h
+++ b/Userland/Libraries/LibGUI/Breadcrumbbar.h
@@ -30,11 +30,11 @@
 
 namespace GUI {
 
-class BreadcrumbBar : public GUI::Widget {
-    C_OBJECT(BreadcrumbBar);
+class Breadcrumbbar : public GUI::Widget {
+    C_OBJECT(Breadcrumbbar);
 
 public:
-    virtual ~BreadcrumbBar() override;
+    virtual ~Breadcrumbbar() override;
 
     void clear_segments();
     void append_segment(String text, const Gfx::Bitmap* icon = nullptr, String data = {}, String tooltip = {});
@@ -51,7 +51,7 @@ public:
     Function<void(MouseEvent& event)> on_doubleclick;
 
 private:
-    BreadcrumbBar();
+    Breadcrumbbar();
 
     struct Segment {
         RefPtr<const Gfx::Bitmap> icon;
diff --git a/Userland/Libraries/LibGUI/Button.cpp b/Userland/Libraries/LibGUI/Button.cpp
index a7172ffc7f..035eddf67f 100644
--- a/Userland/Libraries/LibGUI/Button.cpp
+++ b/Userland/Libraries/LibGUI/Button.cpp
@@ -49,7 +49,7 @@ Button::Button(String text)
     REGISTER_ENUM_PROPERTY(
         "button_style", button_style, set_button_style, Gfx::ButtonStyle,
         { Gfx::ButtonStyle::Normal, "Normal" },
-        { Gfx::ButtonStyle::CoolBar, "CoolBar" });
+        { Gfx::ButtonStyle::Coolbar, "Coolbar" });
 }
 
 Button::~Button()
@@ -77,7 +77,7 @@ void Button::paint_event(PaintEvent& event)
 
     if (paint_pressed || is_checked()) {
         painter.translate(1, 1);
-    } else if (m_icon && is_enabled() && is_hovered() && button_style() == Gfx::ButtonStyle::CoolBar) {
+    } else if (m_icon && is_enabled() && is_hovered() && button_style() == Gfx::ButtonStyle::Coolbar) {
         auto shadow_color = palette().button().darkened(0.7f);
         painter.blit_filtered(icon_location.translated(1, 1), *m_icon, m_icon->rect(), [&shadow_color](auto) {
             return shadow_color;
diff --git a/Userland/Libraries/LibGUI/CMakeLists.txt b/Userland/Libraries/LibGUI/CMakeLists.txt
index 53580255b5..1e674b2b43 100644
--- a/Userland/Libraries/LibGUI/CMakeLists.txt
+++ b/Userland/Libraries/LibGUI/CMakeLists.txt
@@ -12,7 +12,7 @@ set(SOURCES
     Application.cpp
     AutocompleteProvider.cpp
     BoxLayout.cpp
-    BreadcrumbBar.cpp
+    Breadcrumbbar.cpp
     Button.cpp
     Calendar.cpp
     CheckBox.cpp
@@ -56,7 +56,7 @@ set(SOURCES
     LinkLabel.cpp
     ListView.cpp
     Menu.cpp
-    MenuBar.cpp
+        Menubar.cpp
     MenuItem.cpp
     MessageBox.cpp
     Model.cpp
@@ -67,12 +67,12 @@ set(SOURCES
     OpacitySlider.cpp
     Painter.cpp
     ProcessChooser.cpp
-    ProgressBar.cpp
+    Progressbar.cpp
     RadioButton.cpp
     RegularEditingEngine.cpp
     ResizeCorner.cpp
     RunningProcessesModel.cpp
-    ScrollBar.cpp
+        Scrollbar.cpp
     ScrollableWidget.cpp
     SeparatorWidget.cpp
     Shortcut.cpp
@@ -81,14 +81,14 @@ set(SOURCES
     SpinBox.cpp
     Splitter.cpp
     StackWidget.cpp
-    StatusBar.cpp
+        Statusbar.cpp
     TabWidget.cpp
     TableView.cpp
     TextBox.cpp
     TextDocument.cpp
     TextEditor.cpp
-    ToolBar.cpp
-    ToolBarContainer.cpp
+        Toolbar.cpp
+        ToolbarContainer.cpp
     TreeView.cpp
     UndoStack.cpp
     Variant.cpp
diff --git a/Userland/Libraries/LibGUI/ColumnsView.cpp b/Userland/Libraries/LibGUI/ColumnsView.cpp
index c2d2747dcc..737219ce25 100644
--- a/Userland/Libraries/LibGUI/ColumnsView.cpp
+++ b/Userland/Libraries/LibGUI/ColumnsView.cpp
@@ -27,7 +27,7 @@
 #include <LibGUI/ColumnsView.h>
 #include <LibGUI/Model.h>
 #include <LibGUI/Painter.h>
-#include <LibGUI/ScrollBar.h>
+#include <LibGUI/Scrollbar.h>
 #include <LibGfx/CharacterBitmap.h>
 #include <LibGfx/Palette.h>
 
diff --git a/Userland/Libraries/LibGUI/ComboBox.cpp b/Userland/Libraries/LibGUI/ComboBox.cpp
index 3563f4621b..9e3cb8744a 100644
--- a/Userland/Libraries/LibGUI/ComboBox.cpp
+++ b/Userland/Libraries/LibGUI/ComboBox.cpp
@@ -29,7 +29,7 @@
 #include <LibGUI/Desktop.h>
 #include <LibGUI/ListView.h>
 #include <LibGUI/Model.h>
-#include <LibGUI/ScrollBar.h>
+#include <LibGUI/Scrollbar.h>
 #include <LibGUI/TextBox.h>
 #include <LibGUI/Window.h>
 
diff --git a/Userland/Libraries/LibGUI/EmojiInputDialog.cpp b/Userland/Libraries/LibGUI/EmojiInputDialog.cpp
index 06072d6815..ec64e7ba84 100644
--- a/Userland/Libraries/LibGUI/EmojiInputDialog.cpp
+++ b/Userland/Libraries/LibGUI/EmojiInputDialog.cpp
@@ -85,7 +85,7 @@ EmojiInputDialog::EmojiInputDialog(Window* parent_window)
                 auto emoji_text = builder.to_string();
                 auto& button = horizontal_container.add<Button>(emoji_text);
                 button.set_min_size(16, 16);
-                button.set_button_style(Gfx::ButtonStyle::CoolBar);
+                button.set_button_style(Gfx::ButtonStyle::Coolbar);
                 button.on_click = [this, button = &button](auto) {
                     m_selected_emoji_text = button->text();
                     done(ExecOK);
diff --git a/Userland/Libraries/LibGUI/FilePicker.cpp b/Userland/Libraries/LibGUI/FilePicker.cpp
index ced3dadf84..deb81ef4e3 100644
--- a/Userland/Libraries/LibGUI/FilePicker.cpp
+++ b/Userland/Libraries/LibGUI/FilePicker.cpp
@@ -41,7 +41,7 @@
 #include <LibGUI/MultiView.h>
 #include <LibGUI/SortingProxyModel.h>
 #include <LibGUI/TextBox.h>
-#include <LibGUI/ToolBar.h>
+#include <LibGUI/Toolbar.h>
 #include <LibGfx/FontDatabase.h>
 #include <LibGfx/Palette.h>
 #include <string.h>
@@ -104,7 +104,7 @@ FilePicker::FilePicker(Window* parent_window, Mode mode, const StringView& file_
     if (!widget.load_from_gml(file_picker_dialog_gml))
         VERIFY_NOT_REACHED();
 
-    auto& toolbar = *widget.find_descendant_of_type_named<GUI::ToolBar>("toolbar");
+    auto& toolbar = *widget.find_descendant_of_type_named<GUI::Toolbar>("toolbar");
     toolbar.set_has_frame(false);
 
     m_location_textbox = *widget.find_descendant_of_type_named<GUI::TextBox>("location_textbox");
diff --git a/Userland/Libraries/LibGUI/FilePickerDialog.gml b/Userland/Libraries/LibGUI/FilePickerDialog.gml
index 6ee14b1bf6..6bac8140cc 100644
--- a/Userland/Libraries/LibGUI/FilePickerDialog.gml
+++ b/Userland/Libraries/LibGUI/FilePickerDialog.gml
@@ -51,7 +51,7 @@
                 name: "location_textbox"
             }
 
-            @GUI::ToolBar {
+            @GUI::Toolbar {
                 name: "toolbar"
             }
         }
diff --git a/Userland/Libraries/LibGUI/FontPicker.cpp b/Userland/Libraries/LibGUI/FontPicker.cpp
index 9ed0b42017..f48d7442c0 100644
--- a/Userland/Libraries/LibGUI/FontPicker.cpp
+++ b/Userland/Libraries/LibGUI/FontPicker.cpp
@@ -31,7 +31,7 @@
 #include <LibGUI/FontPickerWeightModel.h>
 #include <LibGUI/Label.h>
 #include <LibGUI/ListView.h>
-#include <LibGUI/ScrollBar.h>
+#include <LibGUI/Scrollbar.h>
 #include <LibGUI/Widget.h>
 #include <LibGfx/FontDatabase.h>
 
diff --git a/Userland/Libraries/LibGUI/Forward.h b/Userland/Libraries/LibGUI/Forward.h
index e25c63c7c6..ca74b7c437 100644
--- a/Userland/Libraries/LibGUI/Forward.h
+++ b/Userland/Libraries/LibGUI/Forward.h
@@ -58,7 +58,7 @@ class Label;
 class Layout;
 class ListView;
 class Menu;
-class MenuBar;
+class Menubar;
 class MenuItem;
 class Model;
 class ModelEditingDelegate;
@@ -73,14 +73,14 @@ class RadioButton;
 class ResizeCorner;
 class ResizeEvent;
 class ScreenRectChangeEvent;
-class ScrollBar;
+class Scrollbar;
 class ScrollableWidget;
 class Slider;
 class SortingProxyModel;
 class SpinBox;
 class Splitter;
 class StackWidget;
-class StatusBar;
+class Statusbar;
 class TabWidget;
 class TableView;
 class TextBox;
@@ -90,8 +90,8 @@ struct TextDocumentSpan;
 class TextDocumentUndoCommand;
 class TextEditor;
 class ThemeChangeEvent;
-class ToolBar;
-class ToolBarContainer;
+class Toolbar;
+class ToolbarContainer;
 class TreeView;
 class Variant;
 class VerticalBoxLayout;
diff --git a/Userland/Libraries/LibGUI/IconView.cpp b/Userland/Libraries/LibGUI/IconView.cpp
index f2abf20c85..e0391b67c5 100644
--- a/Userland/Libraries/LibGUI/IconView.cpp
+++ b/Userland/Libraries/LibGUI/IconView.cpp
@@ -31,7 +31,7 @@
 #include <LibGUI/IconView.h>
 #include <LibGUI/Model.h>
 #include <LibGUI/Painter.h>
-#include <LibGUI/ScrollBar.h>
+#include <LibGUI/Scrollbar.h>
 #include <LibGfx/Palette.h>
 
 namespace GUI {
diff --git a/Userland/Libraries/LibGUI/ListView.cpp b/Userland/Libraries/LibGUI/ListView.cpp
index 27091e1e19..32b090d8a4 100644
--- a/Userland/Libraries/LibGUI/ListView.cpp
+++ b/Userland/Libraries/LibGUI/ListView.cpp
@@ -27,7 +27,7 @@
 #include <LibGUI/ListView.h>
 #include <LibGUI/Model.h>
 #include <LibGUI/Painter.h>
-#include <LibGUI/ScrollBar.h>
+#include <LibGUI/Scrollbar.h>
 #include <LibGfx/Palette.h>
 
 REGISTER_WIDGET(GUI, ListView)
diff --git a/Userland/Libraries/LibGUI/Menu.h b/Userland/Libraries/LibGUI/Menu.h
index 9d03823e2c..464b39d8ea 100644
--- a/Userland/Libraries/LibGUI/Menu.h
+++ b/Userland/Libraries/LibGUI/Menu.h
@@ -66,7 +66,7 @@ public:
     bool is_visible() const { return m_visible; }
 
 private:
-    friend class MenuBar;
+    friend class Menubar;
 
     int realize_menu(RefPtr<Action> default_action = nullptr);
     void unrealize_menu();
diff --git a/Userland/Libraries/LibGUI/MenuBar.cpp b/Userland/Libraries/LibGUI/Menubar.cpp
index 3fc5f65617..96f5b0e7f9 100644
--- a/Userland/Libraries/LibGUI/MenuBar.cpp
+++ b/Userland/Libraries/LibGUI/Menubar.cpp
@@ -26,34 +26,34 @@
 
 #include <AK/Badge.h>
 #include <LibGUI/Menu.h>
-#include <LibGUI/MenuBar.h>
 #include <LibGUI/MenuItem.h>
+#include <LibGUI/Menubar.h>
 #include <LibGUI/WindowServerConnection.h>
 
 namespace GUI {
 
-MenuBar::MenuBar()
+Menubar::Menubar()
 {
 }
 
-MenuBar::~MenuBar()
+Menubar::~Menubar()
 {
     unrealize_menubar();
 }
 
-Menu& MenuBar::add_menu(String name)
+Menu& Menubar::add_menu(String name)
 {
     auto& menu = add<Menu>(move(name));
     m_menus.append(menu);
     return menu;
 }
 
-int MenuBar::realize_menubar()
+int Menubar::realize_menubar()
 {
     return WindowServerConnection::the().send_sync<Messages::WindowServer::CreateMenubar>()->menubar_id();
 }
 
-void MenuBar::unrealize_menubar()
+void Menubar::unrealize_menubar()
 {
     if (m_menubar_id == -1)
         return;
@@ -61,7 +61,7 @@ void MenuBar::unrealize_menubar()
     m_menubar_id = -1;
 }
 
-void MenuBar::notify_added_to_window(Badge<Window>)
+void Menubar::notify_added_to_window(Badge<Window>)
 {
     VERIFY(m_menubar_id == -1);
     m_menubar_id = realize_menubar();
@@ -73,7 +73,7 @@ void MenuBar::notify_added_to_window(Badge<Window>)
     }
 }
 
-void MenuBar::notify_removed_from_window(Badge<Window>)
+void Menubar::notify_removed_from_window(Badge<Window>)
 {
     unrealize_menubar();
 }
diff --git a/Userland/Libraries/LibGUI/MenuBar.h b/Userland/Libraries/LibGUI/Menubar.h
index 971bc5559e..d4b875a245 100644
--- a/Userland/Libraries/LibGUI/MenuBar.h
+++ b/Userland/Libraries/LibGUI/Menubar.h
@@ -33,11 +33,11 @@
 
 namespace GUI {
 
-class MenuBar : public Core::Object {
-    C_OBJECT(MenuBar);
+class Menubar : public Core::Object {
+    C_OBJECT(Menubar);
 
 public:
-    ~MenuBar();
+    ~Menubar();
 
     Menu& add_menu(String name);
 
@@ -47,7 +47,7 @@ public:
     int menubar_id() const { return m_menubar_id; }
 
 private:
-    MenuBar();
+    Menubar();
 
     int realize_menubar();
     void unrealize_menubar();
diff --git a/Userland/Libraries/LibGUI/ProgressBar.cpp b/Userland/Libraries/LibGUI/Progressbar.cpp
index fe452a9711..db608b0698 100644
--- a/Userland/Libraries/LibGUI/ProgressBar.cpp
+++ b/Userland/Libraries/LibGUI/Progressbar.cpp
@@ -27,16 +27,16 @@
 #include <AK/Assertions.h>
 #include <AK/StringBuilder.h>
 #include <LibGUI/Painter.h>
-#include <LibGUI/ProgressBar.h>
+#include <LibGUI/Progressbar.h>
 #include <LibGfx/Palette.h>
 
-REGISTER_WIDGET(GUI, ProgressBar)
-REGISTER_WIDGET(GUI, VerticalProgressBar)
-REGISTER_WIDGET(GUI, HorizontalProgressBar)
+REGISTER_WIDGET(GUI, Progressbar)
+REGISTER_WIDGET(GUI, VerticalProgressbar)
+REGISTER_WIDGET(GUI, HorizontalProgressbar)
 
 namespace GUI {
 
-ProgressBar::ProgressBar(Orientation orientation)
+Progressbar::Progressbar(Orientation orientation)
     : m_orientation(orientation)
 {
     REGISTER_STRING_PROPERTY("text", text, set_text);
@@ -48,11 +48,11 @@ ProgressBar::ProgressBar(Orientation orientation)
     REGISTER_INT_PROPERTY("max", max, set_max);
 }
 
-ProgressBar::~ProgressBar()
+Progressbar::~Progressbar()
 {
 }
 
-void ProgressBar::set_value(int value)
+void Progressbar::set_value(int value)
 {
     if (m_value == value)
         return;
@@ -60,7 +60,7 @@ void ProgressBar::set_value(int value)
     update();
 }
 
-void ProgressBar::set_range(int min, int max)
+void Progressbar::set_range(int min, int max)
 {
     VERIFY(min <= max);
     m_min = min;
@@ -68,7 +68,7 @@ void ProgressBar::set_range(int min, int max)
     m_value = clamp(m_value, m_min, m_max);
 }
 
-void ProgressBar::paint_event(PaintEvent& event)
+void Progressbar::paint_event(PaintEvent& event)
 {
     Frame::paint_event(event);
 
@@ -93,10 +93,10 @@ void ProgressBar::paint_event(PaintEvent& event)
         progress_text = builder.to_string();
     }
 
-    Gfx::StylePainter::paint_progress_bar(painter, rect, palette(), m_min, m_max, m_value, progress_text, m_orientation);
+    Gfx::StylePainter::paint_progressbar(painter, rect, palette(), m_min, m_max, m_value, progress_text, m_orientation);
 }
 
-void ProgressBar::set_orientation(Orientation value)
+void Progressbar::set_orientation(Orientation value)
 {
     if (m_orientation == value)
         return;
diff --git a/Userland/Libraries/LibGUI/ProgressBar.h b/Userland/Libraries/LibGUI/Progressbar.h
index b4965ca6c8..48e4001182 100644
--- a/Userland/Libraries/LibGUI/ProgressBar.h
+++ b/Userland/Libraries/LibGUI/Progressbar.h
@@ -30,10 +30,10 @@
 
 namespace GUI {
 
-class ProgressBar : public Frame {
-    C_OBJECT(ProgressBar)
+class Progressbar : public Frame {
+    C_OBJECT(Progressbar)
 public:
-    virtual ~ProgressBar() override;
+    virtual ~Progressbar() override;
 
     void set_range(int min, int max);
     void set_min(int min) { set_range(min, max()); }
@@ -59,7 +59,7 @@ public:
     void set_format(Format format) { m_format = format; }
 
 protected:
-    ProgressBar(Orientation = Orientation::Horizontal);
+    Progressbar(Orientation = Orientation::Horizontal);
 
     virtual void paint_event(PaintEvent&) override;
 
@@ -72,28 +72,28 @@ private:
     Orientation m_orientation { Orientation::Horizontal };
 };
 
-class VerticalProgressBar final : public ProgressBar {
-    C_OBJECT(VerticalProgressBar);
+class VerticalProgressbar final : public Progressbar {
+    C_OBJECT(VerticalProgressbar);
 
 public:
-    virtual ~VerticalProgressBar() override { }
+    virtual ~VerticalProgressbar() override { }
 
 private:
-    VerticalProgressBar()
-        : ProgressBar(Orientation::Vertical)
+    VerticalProgressbar()
+        : Progressbar(Orientation::Vertical)
     {
     }
 };
 
-class HorizontalProgressBar final : public ProgressBar {
-    C_OBJECT(HorizontalProgressBar);
+class HorizontalProgressbar final : public Progressbar {
+    C_OBJECT(HorizontalProgressbar);
 
 public:
-    virtual ~HorizontalProgressBar() override { }
+    virtual ~HorizontalProgressbar() override { }
 
 private:
-    HorizontalProgressBar()
-        : ProgressBar(Orientation::Horizontal)
+    HorizontalProgressbar()
+        : Progressbar(Orientation::Horizontal)
     {
     }
 };
diff --git a/Userland/Libraries/LibGUI/ScrollableWidget.cpp b/Userland/Libraries/LibGUI/ScrollableWidget.cpp
index 4a0be62737..a25b5db883 100644
--- a/Userland/Libraries/LibGUI/ScrollableWidget.cpp
+++ b/Userland/Libraries/LibGUI/ScrollableWidget.cpp
@@ -24,21 +24,21 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibGUI/ScrollBar.h>
 #include <LibGUI/ScrollableWidget.h>
+#include <LibGUI/Scrollbar.h>
 
 namespace GUI {
 
 ScrollableWidget::ScrollableWidget()
 {
-    m_vertical_scrollbar = add<ScrollableWidgetScrollBar>(*this, Orientation::Vertical);
+    m_vertical_scrollbar = add<ScrollableWidgetScrollbar>(*this, Orientation::Vertical);
     m_vertical_scrollbar->set_step(4);
     m_vertical_scrollbar->on_change = [this](int) {
         did_scroll();
         update();
     };
 
-    m_horizontal_scrollbar = add<ScrollableWidgetScrollBar>(*this, Orientation::Horizontal);
+    m_horizontal_scrollbar = add<ScrollableWidgetScrollbar>(*this, Orientation::Horizontal);
     m_horizontal_scrollbar->set_step(4);
     m_horizontal_scrollbar->set_page_step(30);
     m_horizontal_scrollbar->on_change = [this](int) {
diff --git a/Userland/Libraries/LibGUI/ScrollableWidget.h b/Userland/Libraries/LibGUI/ScrollableWidget.h
index f1e5d9aa65..c0e36f0f2a 100644
--- a/Userland/Libraries/LibGUI/ScrollableWidget.h
+++ b/Userland/Libraries/LibGUI/ScrollableWidget.h
@@ -27,7 +27,7 @@
 #pragma once
 
 #include <LibGUI/Frame.h>
-#include <LibGUI/ScrollBar.h>
+#include <LibGUI/Scrollbar.h>
 
 namespace GUI {
 
@@ -60,10 +60,10 @@ public:
     Gfx::IntSize available_size() const;
     Gfx::IntSize excess_size() const;
 
-    ScrollBar& vertical_scrollbar() { return *m_vertical_scrollbar; }
-    const ScrollBar& vertical_scrollbar() const { return *m_vertical_scrollbar; }
-    ScrollBar& horizontal_scrollbar() { return *m_horizontal_scrollbar; }
-    const ScrollBar& horizontal_scrollbar() const { return *m_horizontal_scrollbar; }
+    Scrollbar& vertical_scrollbar() { return *m_vertical_scrollbar; }
+    const Scrollbar& vertical_scrollbar() const { return *m_vertical_scrollbar; }
+    Scrollbar& horizontal_scrollbar() { return *m_horizontal_scrollbar; }
+    const Scrollbar& horizontal_scrollbar() const { return *m_horizontal_scrollbar; }
     Widget& corner_widget() { return *m_corner_widget; }
     const Widget& corner_widget() const { return *m_corner_widget; }
 
@@ -92,12 +92,12 @@ protected:
     void set_size_occupied_by_fixed_elements(const Gfx::IntSize&);
 
 private:
-    class ScrollableWidgetScrollBar final : public ScrollBar {
-        C_OBJECT(ScrollableWidgetScrollBar);
+    class ScrollableWidgetScrollbar final : public Scrollbar {
+        C_OBJECT(ScrollableWidgetScrollbar);
 
     protected:
-        explicit ScrollableWidgetScrollBar(ScrollableWidget& owner, Gfx::Orientation orientation)
-            : ScrollBar(orientation)
+        explicit ScrollableWidgetScrollbar(ScrollableWidget& owner, Gfx::Orientation orientation)
+            : Scrollbar(orientation)
             , m_owner(owner)
         {
         }
@@ -110,13 +110,13 @@ private:
     private:
         ScrollableWidget& m_owner;
     };
-    friend class ScrollableWidgetScrollBar;
+    friend class ScrollableWidgetScrollbar;
 
     void update_scrollbar_ranges();
     void handle_wheel_event(MouseEvent&, Widget&);
 
-    RefPtr<ScrollableWidgetScrollBar> m_vertical_scrollbar;
-    RefPtr<ScrollableWidgetScrollBar> m_horizontal_scrollbar;
+    RefPtr<ScrollableWidgetScrollbar> m_vertical_scrollbar;
+    RefPtr<ScrollableWidgetScrollbar> m_horizontal_scrollbar;
     RefPtr<Widget> m_corner_widget;
     Gfx::IntSize m_content_size;
     Gfx::IntSize m_size_occupied_by_fixed_elements;
diff --git a/Userland/Libraries/LibGUI/ScrollBar.cpp b/Userland/Libraries/LibGUI/Scrollbar.cpp
index 7216df5a38..6f9214dd08 100644
--- a/Userland/Libraries/LibGUI/ScrollBar.cpp
+++ b/Userland/Libraries/LibGUI/Scrollbar.cpp
@@ -26,12 +26,12 @@
 
 #include <LibCore/Timer.h>
 #include <LibGUI/Painter.h>
-#include <LibGUI/ScrollBar.h>
+#include <LibGUI/Scrollbar.h>
 #include <LibGfx/CharacterBitmap.h>
 #include <LibGfx/Palette.h>
 #include <LibGfx/StylePainter.h>
 
-REGISTER_WIDGET(GUI, ScrollBar)
+REGISTER_WIDGET(GUI, Scrollbar)
 
 namespace GUI {
 
@@ -88,7 +88,7 @@ static Gfx::CharacterBitmap* s_down_arrow_bitmap;
 static Gfx::CharacterBitmap* s_left_arrow_bitmap;
 static Gfx::CharacterBitmap* s_right_arrow_bitmap;
 
-ScrollBar::ScrollBar(Orientation orientation)
+Scrollbar::Scrollbar(Orientation orientation)
     : AbstractSlider(orientation)
 {
     m_automatic_scrolling_timer = add<Core::Timer>();
@@ -113,16 +113,16 @@ ScrollBar::ScrollBar(Orientation orientation)
     };
 }
 
-ScrollBar::~ScrollBar()
+Scrollbar::~Scrollbar()
 {
 }
 
-Gfx::IntRect ScrollBar::decrement_button_rect() const
+Gfx::IntRect Scrollbar::decrement_button_rect() const
 {
     return { 0, 0, button_width(), button_height() };
 }
 
-Gfx::IntRect ScrollBar::increment_button_rect() const
+Gfx::IntRect Scrollbar::increment_button_rect() const
 {
     if (orientation() == Orientation::Vertical)
         return { 0, height() - button_height(), button_width(), button_height() };
@@ -130,7 +130,7 @@ Gfx::IntRect ScrollBar::increment_button_rect() const
         return { width() - button_width(), 0, button_width(), button_height() };
 }
 
-Gfx::IntRect ScrollBar::decrement_gutter_rect() const
+Gfx::IntRect Scrollbar::decrement_gutter_rect() const
 {
     if (orientation() == Orientation::Vertical)
         return { 0, button_height(), button_width(), scrubber_rect().top() - button_height() };
@@ -138,7 +138,7 @@ Gfx::IntRect ScrollBar::decrement_gutter_rect() const
         return { button_width(), 0, scrubber_rect().x() - button_width(), button_height() };
 }
 
-Gfx::IntRect ScrollBar::increment_gutter_rect() const
+Gfx::IntRect Scrollbar::increment_gutter_rect() const
 {
     auto scrubber_rect = this->scrubber_rect();
     if (orientation() == Orientation::Vertical)
@@ -147,7 +147,7 @@ Gfx::IntRect ScrollBar::increment_gutter_rect() const
         return { scrubber_rect.right() + 1, 0, width() - button_width() - scrubber_rect.right() - 1, button_width() };
 }
 
-int ScrollBar::scrubbable_range_in_pixels() const
+int Scrollbar::scrubbable_range_in_pixels() const
 {
     if (orientation() == Orientation::Vertical)
         return height() - button_height() * 2 - visible_scrubber_size();
@@ -155,12 +155,12 @@ int ScrollBar::scrubbable_range_in_pixels() const
         return width() - button_width() * 2 - visible_scrubber_size();
 }
 
-bool ScrollBar::has_scrubber() const
+bool Scrollbar::has_scrubber() const
 {
     return max() != min();
 }
 
-int ScrollBar::unclamped_scrubber_size() const
+int Scrollbar::unclamped_scrubber_size() const
 {
     int pixel_range = length(orientation()) - button_size() * 2;
     int value_range = max() - min();
@@ -174,12 +174,12 @@ int ScrollBar::unclamped_scrubber_size() const
     return scrubber_size;
 }
 
-int ScrollBar::visible_scrubber_size() const
+int Scrollbar::visible_scrubber_size() const
 {
     return ::max(unclamped_scrubber_size(), button_size());
 }
 
-Gfx::IntRect ScrollBar::scrubber_rect() const
+Gfx::IntRect Scrollbar::scrubber_rect() const
 {
     if (!has_scrubber() || length(orientation()) <= (button_size() * 2) + visible_scrubber_size())
         return {};
@@ -201,7 +201,7 @@ Gfx::IntRect ScrollBar::scrubber_rect() const
         return { (int)x_or_y, 0, visible_scrubber_size(), button_height() };
 }
 
-void ScrollBar::paint_event(PaintEvent& event)
+void Scrollbar::paint_event(PaintEvent& event)
 {
     Painter painter(*this);
     painter.add_clip_rect(event.rect());
@@ -238,7 +238,7 @@ void ScrollBar::paint_event(PaintEvent& event)
         Gfx::StylePainter::paint_button(painter, scrubber_rect(), palette(), Gfx::ButtonStyle::Normal, false, hovered_component_for_painting == Component::Scrubber || m_pressed_component == Component::Scrubber);
 }
 
-void ScrollBar::on_automatic_scrolling_timer_fired()
+void Scrollbar::on_automatic_scrolling_timer_fired()
 {
     if (m_pressed_component == Component::DecrementButton && component_at_position(m_last_mouse_position) == Component::DecrementButton) {
         set_value(value() - step());
@@ -255,7 +255,7 @@ void ScrollBar::on_automatic_scrolling_timer_fired()
     }
 }
 
-void ScrollBar::mousedown_event(MouseEvent& event)
+void Scrollbar::mousedown_event(MouseEvent& event)
 {
     if (event.button() != MouseButton::Left)
         return;
@@ -294,7 +294,7 @@ void ScrollBar::mousedown_event(MouseEvent& event)
     update();
 }
 
-void ScrollBar::mouseup_event(MouseEvent& event)
+void Scrollbar::mouseup_event(MouseEvent& event)
 {
     if (event.button() != MouseButton::Left)
         return;
@@ -302,7 +302,7 @@ void ScrollBar::mouseup_event(MouseEvent& event)
     update();
 }
 
-void ScrollBar::mousewheel_event(MouseEvent& event)
+void Scrollbar::mousewheel_event(MouseEvent& event)
 {
     if (!is_scrollable())
         return;
@@ -310,7 +310,7 @@ void ScrollBar::mousewheel_event(MouseEvent& event)
     Widget::mousewheel_event(event);
 }
 
-void ScrollBar::set_automatic_scrolling_active(bool active, Component pressed_component)
+void Scrollbar::set_automatic_scrolling_active(bool active, Component pressed_component)
 {
     m_pressed_component = pressed_component;
     if (m_pressed_component == Component::Gutter)
@@ -326,7 +326,7 @@ void ScrollBar::set_automatic_scrolling_active(bool active, Component pressed_co
     }
 }
 
-void ScrollBar::scroll_by_page(const Gfx::IntPoint& click_position)
+void Scrollbar::scroll_by_page(const Gfx::IntPoint& click_position)
 {
     float range_size = max() - min();
     float available = scrubbable_range_in_pixels();
@@ -339,7 +339,7 @@ void ScrollBar::scroll_by_page(const Gfx::IntPoint& click_position)
         set_value(value() + page_increment);
 }
 
-void ScrollBar::scroll_to_position(const Gfx::IntPoint& click_position)
+void Scrollbar::scroll_to_position(const Gfx::IntPoint& click_position)
 {
     float range_size = max() - min();
     float available = scrubbable_range_in_pixels();
@@ -349,7 +349,7 @@ void ScrollBar::scroll_to_position(const Gfx::IntPoint& click_position)
     set_value(min() + rel_x_or_y * range_size);
 }
 
-ScrollBar::Component ScrollBar::component_at_position(const Gfx::IntPoint& position)
+Scrollbar::Component Scrollbar::component_at_position(const Gfx::IntPoint& position)
 {
     if (scrubber_rect().contains(position))
         return Component::Scrubber;
@@ -362,7 +362,7 @@ ScrollBar::Component ScrollBar::component_at_position(const Gfx::IntPoint& posit
     return Component::None;
 }
 
-void ScrollBar::mousemove_event(MouseEvent& event)
+void Scrollbar::mousemove_event(MouseEvent& event)
 {
     m_last_mouse_position = event.position();
 
@@ -380,7 +380,7 @@ void ScrollBar::mousemove_event(MouseEvent& event)
     set_value(new_value);
 }
 
-void ScrollBar::leave_event(Core::Event&)
+void Scrollbar::leave_event(Core::Event&)
 {
     if (m_hovered_component != Component::None) {
         m_hovered_component = Component::None;
@@ -388,7 +388,7 @@ void ScrollBar::leave_event(Core::Event&)
     }
 }
 
-void ScrollBar::change_event(Event& event)
+void Scrollbar::change_event(Event& event)
 {
     if (event.type() == Event::Type::EnabledChange) {
         if (!is_enabled())
diff --git a/Userland/Libraries/LibGUI/ScrollBar.h b/Userland/Libraries/LibGUI/Scrollbar.h
index d4fe7e28e9..ca9a68faf1 100644
--- a/Userland/Libraries/LibGUI/ScrollBar.h
+++ b/Userland/Libraries/LibGUI/Scrollbar.h
@@ -31,11 +31,11 @@
 
 namespace GUI {
 
-class ScrollBar : public AbstractSlider {
-    C_OBJECT(ScrollBar);
+class Scrollbar : public AbstractSlider {
+    C_OBJECT(Scrollbar);
 
 public:
-    virtual ~ScrollBar() override;
+    virtual ~Scrollbar() override;
 
     bool is_scrollable() const { return max() != min(); }
 
@@ -50,7 +50,7 @@ public:
     };
 
 protected:
-    explicit ScrollBar(Gfx::Orientation = Gfx::Orientation::Vertical);
+    explicit Scrollbar(Gfx::Orientation = Gfx::Orientation::Vertical);
 
     virtual void paint_event(PaintEvent&) override;
     virtual void mousedown_event(MouseEvent&) override;
diff --git a/Userland/Libraries/LibGUI/StatusBar.cpp b/Userland/Libraries/LibGUI/Statusbar.cpp
index c32b45cf0b..62a38a58f3 100644
--- a/Userland/Libraries/LibGUI/StatusBar.cpp
+++ b/Userland/Libraries/LibGUI/Statusbar.cpp
@@ -28,16 +28,16 @@
 #include <LibGUI/Label.h>
 #include <LibGUI/Painter.h>
 #include <LibGUI/ResizeCorner.h>
-#include <LibGUI/StatusBar.h>
+#include <LibGUI/Statusbar.h>
 #include <LibGUI/Window.h>
 #include <LibGfx/Palette.h>
 #include <LibGfx/StylePainter.h>
 
-REGISTER_WIDGET(GUI, StatusBar)
+REGISTER_WIDGET(GUI, Statusbar)
 
 namespace GUI {
 
-StatusBar::StatusBar(int label_count)
+Statusbar::Statusbar(int label_count)
 {
     set_fixed_height(18);
     set_layout<HorizontalBoxLayout>();
@@ -55,11 +55,11 @@ StatusBar::StatusBar(int label_count)
     REGISTER_STRING_PROPERTY("text", text, set_text);
 }
 
-StatusBar::~StatusBar()
+Statusbar::~Statusbar()
 {
 }
 
-NonnullRefPtr<Label> StatusBar::create_label()
+NonnullRefPtr<Label> Statusbar::create_label()
 {
     auto& label = add<Label>();
     label.set_frame_shadow(Gfx::FrameShadow::Sunken);
@@ -69,34 +69,34 @@ NonnullRefPtr<Label> StatusBar::create_label()
     return label;
 }
 
-void StatusBar::set_text(const StringView& text)
+void Statusbar::set_text(const StringView& text)
 {
     m_labels.first().set_text(text);
 }
 
-String StatusBar::text() const
+String Statusbar::text() const
 {
     return m_labels.first().text();
 }
 
-void StatusBar::set_text(int index, const StringView& text)
+void Statusbar::set_text(int index, const StringView& text)
 {
     m_labels.at(index).set_text(text);
 }
 
-String StatusBar::text(int index) const
+String Statusbar::text(int index) const
 {
     return m_labels.at(index).text();
 }
 
-void StatusBar::paint_event(PaintEvent& event)
+void Statusbar::paint_event(PaintEvent& event)
 {
     Painter painter(*this);
     painter.add_clip_rect(event.rect());
     painter.fill_rect(rect(), palette().button());
 }
 
-void StatusBar::resize_event(ResizeEvent& event)
+void Statusbar::resize_event(ResizeEvent& event)
 {
     if (window())
         m_corner->set_visible(window()->is_maximized() ? false : true);
diff --git a/Userland/Libraries/LibGUI/StatusBar.h b/Userland/Libraries/LibGUI/Statusbar.h
index 9615d9374f..c01e910603 100644
--- a/Userland/Libraries/LibGUI/StatusBar.h
+++ b/Userland/Libraries/LibGUI/Statusbar.h
@@ -30,10 +30,10 @@
 
 namespace GUI {
 
-class StatusBar : public Widget {
-    C_OBJECT(StatusBar)
+class Statusbar : public Widget {
+    C_OBJECT(Statusbar)
 public:
-    virtual ~StatusBar() override;
+    virtual ~Statusbar() override;
 
     String text() const;
     String text(int index) const;
@@ -41,7 +41,7 @@ public:
     void set_text(int index, const StringView&);
 
 protected:
-    explicit StatusBar(int label_count = 1);
+    explicit Statusbar(int label_count = 1);
     virtual void paint_event(PaintEvent&) override;
     virtual void resize_event(ResizeEvent&) override;
 
diff --git a/Userland/Libraries/LibGUI/TableView.cpp b/Userland/Libraries/LibGUI/TableView.cpp
index f965c9448b..6da97458bb 100644
--- a/Userland/Libraries/LibGUI/TableView.cpp
+++ b/Userland/Libraries/LibGUI/TableView.cpp
@@ -31,7 +31,7 @@
 #include <LibGUI/Model.h>
 #include <LibGUI/ModelEditingDelegate.h>
 #include <LibGUI/Painter.h>
-#include <LibGUI/ScrollBar.h>
+#include <LibGUI/Scrollbar.h>
 #include <LibGUI/TableView.h>
 #include <LibGUI/TextBox.h>
 #include <LibGUI/Window.h>
diff --git a/Userland/Libraries/LibGUI/TextEditor.cpp b/Userland/Libraries/LibGUI/TextEditor.cpp
index bbf1ae116f..159e1ab78f 100644
--- a/Userland/Libraries/LibGUI/TextEditor.cpp
+++ b/Userland/Libraries/LibGUI/TextEditor.cpp
@@ -37,7 +37,7 @@
 #include <LibGUI/Menu.h>
 #include <LibGUI/Painter.h>
 #include <LibGUI/RegularEditingEngine.h>
-#include <LibGUI/ScrollBar.h>
+#include <LibGUI/Scrollbar.h>
 #include <LibGUI/TextEditor.h>
 #include <LibGUI/Window.h>
 #include <LibGfx/Bitmap.h>
diff --git a/Userland/Libraries/LibGUI/ToolBar.cpp b/Userland/Libraries/LibGUI/Toolbar.cpp
index c2486ee884..0968b81b6d 100644
--- a/Userland/Libraries/LibGUI/ToolBar.cpp
+++ b/Userland/Libraries/LibGUI/Toolbar.cpp
@@ -32,14 +32,14 @@
 #include <LibGUI/Button.h>
 #include <LibGUI/Painter.h>
 #include <LibGUI/SeparatorWidget.h>
-#include <LibGUI/ToolBar.h>
+#include <LibGUI/Toolbar.h>
 #include <LibGfx/Palette.h>
 
-REGISTER_WIDGET(GUI, ToolBar)
+REGISTER_WIDGET(GUI, Toolbar)
 
 namespace GUI {
 
-ToolBar::ToolBar(Orientation orientation, int button_size)
+Toolbar::Toolbar(Orientation orientation, int button_size)
     : m_orientation(orientation)
     , m_button_size(button_size)
 {
@@ -53,18 +53,18 @@ ToolBar::ToolBar(Orientation orientation, int button_size)
     layout()->set_margins({ 2, 2, 2, 2 });
 }
 
-ToolBar::~ToolBar()
+Toolbar::~Toolbar()
 {
 }
 
-class ToolBarButton final : public Button {
-    C_OBJECT(ToolBarButton);
+class ToolbarButton final : public Button {
+    C_OBJECT(ToolbarButton);
 
 public:
-    virtual ~ToolBarButton() override { }
+    virtual ~ToolbarButton() override { }
 
 private:
-    explicit ToolBarButton(Action& action)
+    explicit ToolbarButton(Action& action)
     {
         if (action.group() && action.group()->is_exclusive())
             set_exclusive(true);
@@ -75,7 +75,7 @@ private:
             set_icon(action.icon());
         else
             set_text(action.text());
-        set_button_style(Gfx::ButtonStyle::CoolBar);
+        set_button_style(Gfx::ButtonStyle::Coolbar);
     }
     String tooltip(const Action& action) const
     {
@@ -90,19 +90,19 @@ private:
     }
 };
 
-void ToolBar::add_action(Action& action)
+void Toolbar::add_action(Action& action)
 {
     auto item = make<Item>();
     item->type = Item::Type::Action;
     item->action = action;
 
-    auto& button = add<ToolBarButton>(action);
+    auto& button = add<ToolbarButton>(action);
     button.set_fixed_size(m_button_size + 8, m_button_size + 8);
 
     m_items.append(move(item));
 }
 
-void ToolBar::add_separator()
+void Toolbar::add_separator()
 {
     auto item = make<Item>();
     item->type = Item::Type::Separator;
@@ -110,7 +110,7 @@ void ToolBar::add_separator()
     m_items.append(move(item));
 }
 
-void ToolBar::paint_event(PaintEvent& event)
+void Toolbar::paint_event(PaintEvent& event)
 {
     Painter painter(*this);
     painter.add_clip_rect(event.rect());
diff --git a/Userland/Libraries/LibGUI/ToolBar.h b/Userland/Libraries/LibGUI/Toolbar.h
index e6e6790d7c..9c2af48a36 100644
--- a/Userland/Libraries/LibGUI/ToolBar.h
+++ b/Userland/Libraries/LibGUI/Toolbar.h
@@ -31,10 +31,10 @@
 
 namespace GUI {
 
-class ToolBar : public Widget {
-    C_OBJECT(ToolBar)
+class Toolbar : public Widget {
+    C_OBJECT(Toolbar)
 public:
-    virtual ~ToolBar() override;
+    virtual ~Toolbar() override;
 
     void add_action(Action&);
     void add_separator();
@@ -43,7 +43,7 @@ public:
     void set_has_frame(bool has_frame) { m_has_frame = has_frame; }
 
 protected:
-    explicit ToolBar(Gfx::Orientation = Gfx::Orientation::Horizontal, int button_size = 16);
+    explicit Toolbar(Gfx::Orientation = Gfx::Orientation::Horizontal, int button_size = 16);
 
     virtual void paint_event(PaintEvent&) override;
 
diff --git a/Userland/Libraries/LibGUI/ToolBarContainer.cpp b/Userland/Libraries/LibGUI/ToolbarContainer.cpp
index 140a442343..c87260f9b0 100644
--- a/Userland/Libraries/LibGUI/ToolBarContainer.cpp
+++ b/Userland/Libraries/LibGUI/ToolbarContainer.cpp
@@ -26,15 +26,15 @@
 
 #include <LibGUI/BoxLayout.h>
 #include <LibGUI/Painter.h>
-#include <LibGUI/ToolBarContainer.h>
+#include <LibGUI/ToolbarContainer.h>
 #include <LibGfx/Palette.h>
 #include <LibGfx/StylePainter.h>
 
-REGISTER_WIDGET(GUI, ToolBarContainer)
+REGISTER_WIDGET(GUI, ToolbarContainer)
 
 namespace GUI {
 
-ToolBarContainer::ToolBarContainer(Gfx::Orientation orientation)
+ToolbarContainer::ToolbarContainer(Gfx::Orientation orientation)
     : m_orientation(orientation)
 {
     set_fill_with_background_color(true);
@@ -50,7 +50,7 @@ ToolBarContainer::ToolBarContainer(Gfx::Orientation orientation)
     set_shrink_to_fit(true);
 }
 
-void ToolBarContainer::paint_event(GUI::PaintEvent& event)
+void ToolbarContainer::paint_event(GUI::PaintEvent& event)
 {
     Painter painter(*this);
     painter.add_clip_rect(event.rect());
diff --git a/Userland/Libraries/LibGUI/ToolBarContainer.h b/Userland/Libraries/LibGUI/ToolbarContainer.h
index 46db33d269..174caad9d4 100644
--- a/Userland/Libraries/LibGUI/ToolBarContainer.h
+++ b/Userland/Libraries/LibGUI/ToolbarContainer.h
@@ -27,16 +27,16 @@
 #pragma once
 
 #include <LibGUI/Frame.h>
-#include <LibGUI/ToolBar.h>
+#include <LibGUI/Toolbar.h>
 
 namespace GUI {
 
-class ToolBarContainer : public Frame {
-    C_OBJECT(ToolBarContainer);
+class ToolbarContainer : public Frame {
+    C_OBJECT(ToolbarContainer);
 
 public:
 private:
-    explicit ToolBarContainer(Gfx::Orientation = Gfx::Orientation::Horizontal);
+    explicit ToolbarContainer(Gfx::Orientation = Gfx::Orientation::Horizontal);
 
     virtual void paint_event(GUI::PaintEvent&) override;
 
diff --git a/Userland/Libraries/LibGUI/TreeView.cpp b/Userland/Libraries/LibGUI/TreeView.cpp
index c21bc6f3cb..bf7eb33e90 100644
--- a/Userland/Libraries/LibGUI/TreeView.cpp
+++ b/Userland/Libraries/LibGUI/TreeView.cpp
@@ -28,7 +28,7 @@
 #include <LibGUI/HeaderView.h>
 #include <LibGUI/Model.h>
 #include <LibGUI/Painter.h>
-#include <LibGUI/ScrollBar.h>
+#include <LibGUI/Scrollbar.h>
 #include <LibGUI/TreeView.h>
 #include <LibGfx/Bitmap.h>
 #include <LibGfx/Palette.h>
diff --git a/Userland/Libraries/LibGUI/Window.cpp b/Userland/Libraries/LibGUI/Window.cpp
index b05c03ad36..e00052578b 100644
--- a/Userland/Libraries/LibGUI/Window.cpp
+++ b/Userland/Libraries/LibGUI/Window.cpp
@@ -35,7 +35,7 @@
 #include <LibGUI/Application.h>
 #include <LibGUI/Desktop.h>
 #include <LibGUI/Event.h>
-#include <LibGUI/MenuBar.h>
+#include <LibGUI/Menubar.h>
 #include <LibGUI/Painter.h>
 #include <LibGUI/Widget.h>
 #include <LibGUI/Window.h>
@@ -1084,7 +1084,7 @@ Gfx::Bitmap* Window::back_bitmap()
     return m_back_store ? &m_back_store->bitmap() : nullptr;
 }
 
-void Window::set_menubar(RefPtr<MenuBar> menubar)
+void Window::set_menubar(RefPtr<Menubar> menubar)
 {
     if (m_menubar == menubar)
         return;
diff --git a/Userland/Libraries/LibGUI/Window.h b/Userland/Libraries/LibGUI/Window.h
index a3675484f3..c2e9627497 100644
--- a/Userland/Libraries/LibGUI/Window.h
+++ b/Userland/Libraries/LibGUI/Window.h
@@ -211,7 +211,7 @@ public:
 
     void did_disable_focused_widget(Badge<Widget>);
 
-    void set_menubar(RefPtr<MenuBar>);
+    void set_menubar(RefPtr<Menubar>);
 
 protected:
     Window(Core::Object* parent = nullptr);
@@ -245,7 +245,7 @@ private:
     OwnPtr<WindowBackingStore> m_front_store;
     OwnPtr<WindowBackingStore> m_back_store;
 
-    RefPtr<MenuBar> m_menubar;
+    RefPtr<Menubar> m_menubar;
 
     RefPtr<Gfx::Bitmap> m_icon;
     RefPtr<Gfx::Bitmap> m_custom_cursor;
diff --git a/Userland/Libraries/LibGfx/ClassicStylePainter.cpp b/Userland/Libraries/LibGfx/ClassicStylePainter.cpp
index b36ba1c81f..1806e5f959 100644
--- a/Userland/Libraries/LibGfx/ClassicStylePainter.cpp
+++ b/Userland/Libraries/LibGfx/ClassicStylePainter.cpp
@@ -165,12 +165,12 @@ void ClassicStylePainter::paint_button(Painter& painter, const IntRect& rect, co
     if (button_style == ButtonStyle::Normal)
         return paint_button_new(painter, rect, palette, pressed, checked, hovered, enabled, focused);
 
-    if (button_style == ButtonStyle::CoolBar && !enabled)
+    if (button_style == ButtonStyle::Coolbar && !enabled)
         return;
 
     Color button_color = palette.button();
     Color highlight_color = palette.threed_highlight();
-    Color shadow_color = button_style == ButtonStyle::CoolBar ? palette.threed_shadow1() : palette.threed_shadow2();
+    Color shadow_color = button_style == ButtonStyle::Coolbar ? palette.threed_shadow1() : palette.threed_shadow2();
 
     PainterStateSaver saver(painter);
     painter.translate(rect.location());
@@ -178,7 +178,7 @@ void ClassicStylePainter::paint_button(Painter& painter, const IntRect& rect, co
     if (pressed || checked) {
         // Base
         IntRect base_rect { 1, 1, rect.width() - 2, rect.height() - 2 };
-        if (button_style == ButtonStyle::CoolBar) {
+        if (button_style == ButtonStyle::Coolbar) {
             if (checked && !pressed) {
                 painter.fill_rect_with_dither_pattern(base_rect, palette.button().lightened(1.3f), Color());
             } else {
@@ -194,7 +194,7 @@ void ClassicStylePainter::paint_button(Painter& painter, const IntRect& rect, co
         painter.draw_line({ rect.width() - 2, 1 }, { rect.width() - 2, rect.height() - 3 }, highlight_color);
         painter.draw_line({ 1, rect.height() - 2 }, { rect.width() - 2, rect.height() - 2 }, highlight_color);
     } else if (hovered) {
-        if (button_style == ButtonStyle::CoolBar) {
+        if (button_style == ButtonStyle::Coolbar) {
             // Base
             painter.fill_rect({ 1, 1, rect.width() - 2, rect.height() - 2 }, button_color);
         }
@@ -313,7 +313,7 @@ void ClassicStylePainter::paint_window_frame(Painter& painter, const IntRect& re
     painter.draw_line(rect.bottom_left().translated(3, -3), rect.bottom_right().translated(-3, -3), base_color);
 }
 
-void ClassicStylePainter::paint_progress_bar(Painter& painter, const IntRect& rect, const Palette& palette, int min, int max, int value, const StringView& text, Orientation orientation)
+void ClassicStylePainter::paint_progressbar(Painter& painter, const IntRect& rect, const Palette& palette, int min, int max, int value, const StringView& text, Orientation orientation)
 {
     // First we fill the entire widget with the gradient. This incurs a bit of
     // overdraw but ensures a consistent look throughout the progression.
diff --git a/Userland/Libraries/LibGfx/ClassicStylePainter.h b/Userland/Libraries/LibGfx/ClassicStylePainter.h
index 7054056b19..5e9bed57cb 100644
--- a/Userland/Libraries/LibGfx/ClassicStylePainter.h
+++ b/Userland/Libraries/LibGfx/ClassicStylePainter.h
@@ -40,7 +40,7 @@ public:
     void paint_surface(Painter&, const IntRect&, const Palette&, bool paint_vertical_lines = true, bool paint_top_line = true) override;
     void paint_frame(Painter&, const IntRect&, const Palette&, FrameShape, FrameShadow, int thickness, bool skip_vertical_lines = false) override;
     void paint_window_frame(Painter&, const IntRect&, const Palette&) override;
-    void paint_progress_bar(Painter&, const IntRect&, const Palette&, int min, int max, int value, const StringView& text, Orientation = Orientation::Horizontal) override;
+    void paint_progressbar(Painter&, const IntRect&, const Palette&, int min, int max, int value, const StringView& text, Orientation = Orientation::Horizontal) override;
     void paint_radio_button(Painter&, const IntRect&, const Palette&, bool is_checked, bool is_being_pressed) override;
     void paint_check_box(Painter&, const IntRect&, const Palette&, bool is_enabled, bool is_checked, bool is_being_pressed) override;
     void paint_transparency_grid(Painter&, const IntRect&, const Palette&) override;
diff --git a/Userland/Libraries/LibGfx/Palette.h b/Userland/Libraries/LibGfx/Palette.h
index 1c87a73b33..888ca09cfa 100644
--- a/Userland/Libraries/LibGfx/Palette.h
+++ b/Userland/Libraries/LibGfx/Palette.h
@@ -143,7 +143,7 @@ public:
     String active_window_shadow_path() const { return path(PathRole::ActiveWindowShadow); }
     String inactive_window_shadow_path() const { return path(PathRole::InactiveWindowShadow); }
     String menu_shadow_path() const { return path(PathRole::MenuShadow); }
-    String task_bar_shadow_path() const { return path(PathRole::TaskBarShadow); }
+    String taskbar_shadow_path() const { return path(PathRole::TaskbarShadow); }
     String tooltip_shadow_path() const { return path(PathRole::TooltipShadow); }
 
     Color color(ColorRole role) const { return m_impl->color(role); }
diff --git a/Userland/Libraries/LibGfx/StylePainter.cpp b/Userland/Libraries/LibGfx/StylePainter.cpp
index ec38c063fb..5d2622cc0a 100644
--- a/Userland/Libraries/LibGfx/StylePainter.cpp
+++ b/Userland/Libraries/LibGfx/StylePainter.cpp
@@ -63,9 +63,9 @@ void StylePainter::paint_window_frame(Painter& painter, const IntRect& rect, con
     current().paint_window_frame(painter, rect, palette);
 }
 
-void StylePainter::paint_progress_bar(Painter& painter, const IntRect& rect, const Palette& palette, int min, int max, int value, const StringView& text, Orientation orientation)
+void StylePainter::paint_progressbar(Painter& painter, const IntRect& rect, const Palette& palette, int min, int max, int value, const StringView& text, Orientation orientation)
 {
-    current().paint_progress_bar(painter, rect, palette, min, max, value, text, orientation);
+    current().paint_progressbar(painter, rect, palette, min, max, value, text, orientation);
 }
 
 void StylePainter::paint_radio_button(Painter& painter, const IntRect& rect, const Palette& palette, bool is_checked, bool is_being_pressed)
diff --git a/Userland/Libraries/LibGfx/StylePainter.h b/Userland/Libraries/LibGfx/StylePainter.h
index 41ee5e1415..664664f334 100644
--- a/Userland/Libraries/LibGfx/StylePainter.h
+++ b/Userland/Libraries/LibGfx/StylePainter.h
@@ -33,7 +33,7 @@ namespace Gfx {
 
 enum class ButtonStyle {
     Normal,
-    CoolBar,
+    Coolbar,
     Tray,
 };
 enum class FrameShadow {
@@ -60,7 +60,7 @@ public:
     virtual void paint_surface(Painter&, const IntRect&, const Palette&, bool paint_vertical_lines = true, bool paint_top_line = true) = 0;
     virtual void paint_frame(Painter&, const IntRect&, const Palette&, FrameShape, FrameShadow, int thickness, bool skip_vertical_lines = false) = 0;
     virtual void paint_window_frame(Painter&, const IntRect&, const Palette&) = 0;
-    virtual void paint_progress_bar(Painter&, const IntRect&, const Palette&, int min, int max, int value, const StringView& text, Orientation = Orientation::Horizontal) = 0;
+    virtual void paint_progressbar(Painter&, const IntRect&, const Palette&, int min, int max, int value, const StringView& text, Orientation = Orientation::Horizontal) = 0;
     virtual void paint_radio_button(Painter&, const IntRect&, const Palette&, bool is_checked, bool is_being_pressed) = 0;
     virtual void paint_check_box(Painter&, const IntRect&, const Palette&, bool is_enabled, bool is_checked, bool is_being_pressed) = 0;
     virtual void paint_transparency_grid(Painter&, const IntRect&, const Palette&) = 0;
@@ -79,7 +79,7 @@ public:
     static void paint_surface(Painter&, const IntRect&, const Palette&, bool paint_vertical_lines = true, bool paint_top_line = true);
     static void paint_frame(Painter&, const IntRect&, const Palette&, FrameShape, FrameShadow, int thickness, bool skip_vertical_lines = false);
     static void paint_window_frame(Painter&, const IntRect&, const Palette&);
-    static void paint_progress_bar(Painter&, const IntRect&, const Palette&, int min, int max, int value, const StringView& text, Orientation = Orientation::Horizontal);
+    static void paint_progressbar(Painter&, const IntRect&, const Palette&, int min, int max, int value, const StringView& text, Orientation = Orientation::Horizontal);
     static void paint_radio_button(Painter&, const IntRect&, const Palette&, bool is_checked, bool is_being_pressed);
     static void paint_check_box(Painter&, const IntRect&, const Palette&, bool is_enabled, bool is_checked, bool is_being_pressed);
     static void paint_transparency_grid(Painter&, const IntRect&, const Palette&);
diff --git a/Userland/Libraries/LibGfx/SystemTheme.cpp b/Userland/Libraries/LibGfx/SystemTheme.cpp
index 5e3fda5635..31014486ff 100644
--- a/Userland/Libraries/LibGfx/SystemTheme.cpp
+++ b/Userland/Libraries/LibGfx/SystemTheme.cpp
@@ -121,7 +121,7 @@ Core::AnonymousBuffer load_system_theme(const String& path)
     DO_PATH(TitleButtonIcons, false);
     DO_PATH(ActiveWindowShadow, true);
     DO_PATH(InactiveWindowShadow, true);
-    DO_PATH(TaskBarShadow, true);
+    DO_PATH(TaskbarShadow, true);
     DO_PATH(MenuShadow, true);
     DO_PATH(TooltipShadow, true);
 
diff --git a/Userland/Libraries/LibGfx/SystemTheme.h b/Userland/Libraries/LibGfx/SystemTheme.h
index 85e1e9569f..15ed2e6889 100644
--- a/Userland/Libraries/LibGfx/SystemTheme.h
+++ b/Userland/Libraries/LibGfx/SystemTheme.h
@@ -148,7 +148,7 @@ enum class PathRole {
     TitleButtonIcons,
     InactiveWindowShadow,
     ActiveWindowShadow,
-    TaskBarShadow,
+    TaskbarShadow,
     MenuShadow,
     TooltipShadow,
     __Count,
diff --git a/Userland/Libraries/LibVT/TerminalWidget.cpp b/Userland/Libraries/LibVT/TerminalWidget.cpp
index cf8610a95e..1471fa1ae4 100644
--- a/Userland/Libraries/LibVT/TerminalWidget.cpp
+++ b/Userland/Libraries/LibVT/TerminalWidget.cpp
@@ -43,7 +43,7 @@
 #include <LibGUI/Icon.h>
 #include <LibGUI/Menu.h>
 #include <LibGUI/Painter.h>
-#include <LibGUI/ScrollBar.h>
+#include <LibGUI/Scrollbar.h>
 #include <LibGUI/Window.h>
 #include <LibGfx/Font.h>
 #include <LibGfx/FontDatabase.h>
@@ -107,7 +107,7 @@ TerminalWidget::TerminalWidget(int ptm_fd, bool automatic_size_policy, RefPtr<Co
     m_visual_beep_timer = add<Core::Timer>();
     m_auto_scroll_timer = add<Core::Timer>();
 
-    m_scrollbar = add<GUI::ScrollBar>(Orientation::Vertical);
+    m_scrollbar = add<GUI::Scrollbar>(Orientation::Vertical);
     m_scrollbar->set_relative_rect(0, 0, 16, 0);
     m_scrollbar->on_change = [this](int) {
         update();
diff --git a/Userland/Libraries/LibVT/TerminalWidget.h b/Userland/Libraries/LibVT/TerminalWidget.h
index abbb59252f..0c7a49cf3c 100644
--- a/Userland/Libraries/LibVT/TerminalWidget.h
+++ b/Userland/Libraries/LibVT/TerminalWidget.h
@@ -210,7 +210,7 @@ private:
     RefPtr<Core::Timer> m_auto_scroll_timer;
     RefPtr<Core::ConfigFile> m_config;
 
-    RefPtr<GUI::ScrollBar> m_scrollbar;
+    RefPtr<GUI::Scrollbar> m_scrollbar;
 
     RefPtr<GUI::Action> m_copy_action;
     RefPtr<GUI::Action> m_paste_action;
diff --git a/Userland/Libraries/LibWeb/InProcessWebView.cpp b/Userland/Libraries/LibWeb/InProcessWebView.cpp
index 4c2b49bdf8..7a8745bfcb 100644
--- a/Userland/Libraries/LibWeb/InProcessWebView.cpp
+++ b/Userland/Libraries/LibWeb/InProcessWebView.cpp
@@ -33,7 +33,7 @@
 #include <LibGUI/InputBox.h>
 #include <LibGUI/MessageBox.h>
 #include <LibGUI/Painter.h>
-#include <LibGUI/ScrollBar.h>
+#include <LibGUI/Scrollbar.h>
 #include <LibGUI/Window.h>
 #include <LibGfx/ShareableBitmap.h>
 #include <LibWeb/HTML/HTMLAnchorElement.h>
diff --git a/Userland/Libraries/LibWeb/OutOfProcessWebView.cpp b/Userland/Libraries/LibWeb/OutOfProcessWebView.cpp
index 09b49014d6..017a7f258e 100644
--- a/Userland/Libraries/LibWeb/OutOfProcessWebView.cpp
+++ b/Userland/Libraries/LibWeb/OutOfProcessWebView.cpp
@@ -33,7 +33,7 @@
 #include <LibGUI/InputBox.h>
 #include <LibGUI/MessageBox.h>
 #include <LibGUI/Painter.h>
-#include <LibGUI/ScrollBar.h>
+#include <LibGUI/Scrollbar.h>
 #include <LibGUI/Window.h>
 #include <LibGfx/Palette.h>
 #include <LibGfx/SystemTheme.h>
diff --git a/Userland/Services/Taskbar/ClockWidget.cpp b/Userland/Services/Taskbar/ClockWidget.cpp
index c25035946c..f4914542bb 100644
--- a/Userland/Services/Taskbar/ClockWidget.cpp
+++ b/Userland/Services/Taskbar/ClockWidget.cpp
@@ -80,7 +80,7 @@ ClockWidget::ClockWidget()
     navigation_container.layout()->set_margins({ 2, 2, 3, 2 });
 
     m_prev_date = navigation_container.add<GUI::Button>();
-    m_prev_date->set_button_style(Gfx::ButtonStyle::CoolBar);
+    m_prev_date->set_button_style(Gfx::ButtonStyle::Coolbar);
     m_prev_date->set_fixed_size(24, 24);
     m_prev_date->set_icon(Gfx::Bitmap::load_from_file("/res/icons/16x16/go-back.png"));
     m_prev_date->on_click = [&](auto) {
@@ -103,7 +103,7 @@ ClockWidget::ClockWidget()
     };
 
     m_selected_calendar_button = navigation_container.add<GUI::Button>();
-    m_selected_calendar_button->set_button_style(Gfx::ButtonStyle::CoolBar);
+    m_selected_calendar_button->set_button_style(Gfx::ButtonStyle::Coolbar);
     m_selected_calendar_button->set_fixed_height(24);
     m_selected_calendar_button->on_click = [&](auto) {
         m_calendar->toggle_mode();
@@ -114,7 +114,7 @@ ClockWidget::ClockWidget()
     };
 
     m_next_date = navigation_container.add<GUI::Button>();
-    m_next_date->set_button_style(Gfx::ButtonStyle::CoolBar);
+    m_next_date->set_button_style(Gfx::ButtonStyle::Coolbar);
     m_next_date->set_fixed_size(24, 24);
     m_next_date->set_icon(Gfx::Bitmap::load_from_file("/res/icons/16x16/go-forward.png"));
     m_next_date->on_click = [&](auto) {
@@ -164,7 +164,7 @@ ClockWidget::ClockWidget()
     settings_container.layout()->add_spacer();
 
     m_jump_to_button = settings_container.add<GUI::Button>();
-    m_jump_to_button->set_button_style(Gfx::ButtonStyle::CoolBar);
+    m_jump_to_button->set_button_style(Gfx::ButtonStyle::Coolbar);
     m_jump_to_button->set_fixed_size(24, 24);
     m_jump_to_button->set_icon(Gfx::Bitmap::load_from_file("/res/icons/16x16/calendar-date.png"));
     m_jump_to_button->set_tooltip("Jump to today");
@@ -173,7 +173,7 @@ ClockWidget::ClockWidget()
     };
 
     m_calendar_launcher = settings_container.add<GUI::Button>();
-    m_calendar_launcher->set_button_style(Gfx::ButtonStyle::CoolBar);
+    m_calendar_launcher->set_button_style(Gfx::ButtonStyle::Coolbar);
     m_calendar_launcher->set_fixed_size(24, 24);
     m_calendar_launcher->set_icon(Gfx::Bitmap::load_from_file("/res/icons/16x16/app-calendar.png"));
     m_calendar_launcher->set_tooltip("Calendar");
diff --git a/Userland/Services/Taskbar/TaskbarButton.cpp b/Userland/Services/Taskbar/TaskbarButton.cpp
index d40a61c49c..4cba622826 100644
--- a/Userland/Services/Taskbar/TaskbarButton.cpp
+++ b/Userland/Services/Taskbar/TaskbarButton.cpp
@@ -72,7 +72,7 @@ void TaskbarButton::resize_event(GUI::ResizeEvent& event)
     return GUI::Button::resize_event(event);
 }
 
-static void paint_custom_progress_bar(GUI::Painter& painter, const Gfx::IntRect& rect, const Gfx::IntRect& text_rect, const Palette& palette, int min, int max, int value, const StringView& text, const Gfx::Font& font, Gfx::TextAlignment text_alignment)
+static void paint_custom_progressbar(GUI::Painter& painter, const Gfx::IntRect& rect, const Gfx::IntRect& text_rect, const Palette& palette, int min, int max, int value, const StringView& text, const Gfx::Font& font, Gfx::TextAlignment text_alignment)
 {
     float range_size = max - min;
     float progress = (value - min) / range_size;
@@ -145,7 +145,7 @@ void TaskbarButton::paint_event(GUI::PaintEvent& event)
         if (is_being_pressed() || is_checked()) {
             adjusted_rect.set_height(adjusted_rect.height() + 1);
         }
-        paint_custom_progress_bar(painter, adjusted_rect, text_rect, palette(), 0, 100, window.progress(), text(), font, text_alignment());
+        paint_custom_progressbar(painter, adjusted_rect, text_rect, palette(), 0, 100, window.progress(), text(), font, text_alignment());
     }
 
     if (is_enabled()) {
diff --git a/Userland/Services/Taskbar/TaskbarWindow.cpp b/Userland/Services/Taskbar/TaskbarWindow.cpp
index 3f0fdf2bb2..6e4abd1afe 100644
--- a/Userland/Services/Taskbar/TaskbarWindow.cpp
+++ b/Userland/Services/Taskbar/TaskbarWindow.cpp
@@ -136,7 +136,7 @@ void TaskbarWindow::create_quick_launch_bar()
         const int button_size = 24;
         auto& button = quick_launch_bar.add<GUI::Button>();
         button.set_fixed_size(button_size, button_size);
-        button.set_button_style(Gfx::ButtonStyle::CoolBar);
+        button.set_button_style(Gfx::ButtonStyle::Coolbar);
         button.set_icon(af->icon().bitmap_for_size(16));
         button.set_tooltip(af->name());
         button.on_click = [app_executable](auto) {
diff --git a/Userland/Services/WindowServer/CMakeLists.txt b/Userland/Services/WindowServer/CMakeLists.txt
index 33a3b7f040..ce759b7afe 100644
--- a/Userland/Services/WindowServer/CMakeLists.txt
+++ b/Userland/Services/WindowServer/CMakeLists.txt
@@ -9,7 +9,7 @@ set(SOURCES
     Cursor.cpp
     EventLoop.cpp
     main.cpp
-    MenuBar.cpp
+        Menubar.cpp
     Menu.cpp
     MenuItem.cpp
     MenuManager.cpp
diff --git a/Userland/Services/WindowServer/ClientConnection.cpp b/Userland/Services/WindowServer/ClientConnection.cpp
index 19a758e081..0a4bdc3ed3 100644
--- a/Userland/Services/WindowServer/ClientConnection.cpp
+++ b/Userland/Services/WindowServer/ClientConnection.cpp
@@ -32,8 +32,8 @@
 #include <WindowServer/ClientConnection.h>
 #include <WindowServer/Compositor.h>
 #include <WindowServer/Menu.h>
-#include <WindowServer/MenuBar.h>
 #include <WindowServer/MenuItem.h>
+#include <WindowServer/Menubar.h>
 #include <WindowServer/Screen.h>
 #include <WindowServer/Window.h>
 #include <WindowServer/WindowClientEndpoint.h>
@@ -104,7 +104,7 @@ void ClientConnection::notify_about_new_screen_rect(const Gfx::IntRect& rect)
 OwnPtr<Messages::WindowServer::CreateMenubarResponse> ClientConnection::handle(const Messages::WindowServer::CreateMenubar&)
 {
     int menubar_id = m_next_menubar_id++;
-    auto menubar = MenuBar::create(*this, menubar_id);
+    auto menubar = Menubar::create(*this, menubar_id);
     m_menubars.set(menubar_id, move(menubar));
     return make<Messages::WindowServer::CreateMenubarResponse>(menubar_id);
 }
@@ -155,7 +155,7 @@ OwnPtr<Messages::WindowServer::SetWindowMenubarResponse> ClientConnection::handl
         }
         window = it->value;
     }
-    RefPtr<MenuBar> menubar;
+    RefPtr<Menubar> menubar;
     if (message.menubar_id() != -1) {
         auto it = m_menubars.find(message.menubar_id());
         if (it == m_menubars.end()) {
diff --git a/Userland/Services/WindowServer/ClientConnection.h b/Userland/Services/WindowServer/ClientConnection.h
index 37ea4eff2e..12d437cd1e 100644
--- a/Userland/Services/WindowServer/ClientConnection.h
+++ b/Userland/Services/WindowServer/ClientConnection.h
@@ -44,7 +44,7 @@ namespace WindowServer {
 class Compositor;
 class Window;
 class Menu;
-class MenuBar;
+class Menubar;
 
 class ClientConnection final
     : public IPC::ClientConnection<WindowClientEndpoint, WindowServerEndpoint>
@@ -175,7 +175,7 @@ private:
     Window* window_from_id(i32 window_id);
 
     HashMap<int, NonnullRefPtr<Window>> m_windows;
-    HashMap<int, NonnullRefPtr<MenuBar>> m_menubars;
+    HashMap<int, NonnullRefPtr<Menubar>> m_menubars;
     HashMap<int, NonnullRefPtr<Menu>> m_menus;
 
     RefPtr<Core::Timer> m_ping_timer;
diff --git a/Userland/Services/WindowServer/Menu.h b/Userland/Services/WindowServer/Menu.h
index de33cb71fd..fa26b7c3ce 100644
--- a/Userland/Services/WindowServer/Menu.h
+++ b/Userland/Services/WindowServer/Menu.h
@@ -41,7 +41,7 @@
 namespace WindowServer {
 
 class ClientConnection;
-class MenuBar;
+class Menubar;
 
 class Menu final : public Core::Object {
     C_OBJECT(Menu);
diff --git a/Userland/Services/WindowServer/MenuManager.h b/Userland/Services/WindowServer/MenuManager.h
index 5d034c66a2..f2def99c8a 100644
--- a/Userland/Services/WindowServer/MenuManager.h
+++ b/Userland/Services/WindowServer/MenuManager.h
@@ -27,7 +27,7 @@
 #pragma once
 
 #include "Menu.h"
-#include "MenuBar.h"
+#include "Menubar.h"
 #include "Window.h"
 #include <AK/HashMap.h>
 #include <AK/StringBuilder.h>
diff --git a/Userland/Services/WindowServer/MenuBar.cpp b/Userland/Services/WindowServer/Menubar.cpp
index cf2f9814c9..a6fca7370e 100644
--- a/Userland/Services/WindowServer/MenuBar.cpp
+++ b/Userland/Services/WindowServer/Menubar.cpp
@@ -24,22 +24,22 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "MenuBar.h"
+#include "Menubar.h"
 #include "Menu.h"
 
 namespace WindowServer {
 
-MenuBar::MenuBar(ClientConnection& client, int menubar_id)
+Menubar::Menubar(ClientConnection& client, int menubar_id)
     : m_client(client)
     , m_menubar_id(menubar_id)
 {
 }
 
-MenuBar::~MenuBar()
+Menubar::~Menubar()
 {
 }
 
-void MenuBar::add_menu(Menu& menu)
+void Menubar::add_menu(Menu& menu)
 {
     m_menus.append(&menu);
 }
diff --git a/Userland/Services/WindowServer/MenuBar.h b/Userland/Services/WindowServer/Menubar.h
index 4008b8e722..4853ef9a75 100644
--- a/Userland/Services/WindowServer/MenuBar.h
+++ b/Userland/Services/WindowServer/Menubar.h
@@ -33,12 +33,12 @@
 
 namespace WindowServer {
 
-class MenuBar
-    : public RefCounted<MenuBar>
-    , public Weakable<MenuBar> {
+class Menubar
+    : public RefCounted<Menubar>
+    , public Weakable<Menubar> {
 public:
-    static NonnullRefPtr<MenuBar> create(ClientConnection& client, int menubar_id) { return adopt(*new MenuBar(client, menubar_id)); }
-    ~MenuBar();
+    static NonnullRefPtr<Menubar> create(ClientConnection& client, int menubar_id) { return adopt(*new Menubar(client, menubar_id)); }
+    ~Menubar();
 
     ClientConnection& client() { return m_client; }
     const ClientConnection& client() const { return m_client; }
@@ -55,7 +55,7 @@ public:
     }
 
 private:
-    MenuBar(ClientConnection&, int menubar_id);
+    Menubar(ClientConnection&, int menubar_id);
 
     ClientConnection& m_client;
     int m_menubar_id { 0 };
diff --git a/Userland/Services/WindowServer/Window.cpp b/Userland/Services/WindowServer/Window.cpp
index f9e0a38267..6eef418973 100644
--- a/Userland/Services/WindowServer/Window.cpp
+++ b/Userland/Services/WindowServer/Window.cpp
@@ -977,7 +977,7 @@ bool Window::hit_test(const Gfx::IntPoint& point, bool include_frame) const
     return color.alpha() >= threshold;
 }
 
-void Window::set_menubar(MenuBar* menubar)
+void Window::set_menubar(Menubar* menubar)
 {
     if (m_menubar == menubar)
         return;
diff --git a/Userland/Services/WindowServer/Window.h b/Userland/Services/WindowServer/Window.h
index a46ec66151..8697f2e17b 100644
--- a/Userland/Services/WindowServer/Window.h
+++ b/Userland/Services/WindowServer/Window.h
@@ -43,7 +43,7 @@ class ClientConnection;
 class Cursor;
 class KeyEvent;
 class Menu;
-class MenuBar;
+class Menubar;
 class MenuItem;
 class MouseEvent;
 
@@ -333,9 +333,9 @@ public:
     Gfx::DisjointRectSet& transparency_rects() { return m_transparency_rects; }
     Gfx::DisjointRectSet& transparency_wallpaper_rects() { return m_transparency_wallpaper_rects; }
 
-    MenuBar* menubar() { return m_menubar; }
-    const MenuBar* menubar() const { return m_menubar; }
-    void set_menubar(MenuBar*);
+    Menubar* menubar() { return m_menubar; }
+    const Menubar* menubar() const { return m_menubar; }
+    void set_menubar(Menubar*);
 
 private:
     virtual void event(Core::Event&) override;
@@ -354,7 +354,7 @@ private:
     Vector<WeakPtr<Window>> m_child_windows;
     Vector<WeakPtr<Window>> m_accessory_windows;
 
-    RefPtr<MenuBar> m_menubar;
+    RefPtr<Menubar> m_menubar;
 
     String m_title;
     Gfx::IntRect m_rect;
diff --git a/Userland/Services/WindowServer/WindowFrame.cpp b/Userland/Services/WindowServer/WindowFrame.cpp
index ac913b8e51..4a6162fae2 100644
--- a/Userland/Services/WindowServer/WindowFrame.cpp
+++ b/Userland/Services/WindowServer/WindowFrame.cpp
@@ -65,12 +65,12 @@ static int s_last_title_button_icons_scale;
 static Gfx::Bitmap* s_active_window_shadow;
 static Gfx::Bitmap* s_inactive_window_shadow;
 static Gfx::Bitmap* s_menu_shadow;
-static Gfx::Bitmap* s_task_bar_shadow;
+static Gfx::Bitmap* s_taskbar_shadow;
 static Gfx::Bitmap* s_tooltip_shadow;
 static String s_last_active_window_shadow_path;
 static String s_last_inactive_window_shadow_path;
 static String s_last_menu_shadow_path;
-static String s_last_task_bar_shadow_path;
+static String s_last_taskbar_shadow_path;
 static String s_last_tooltip_shadow_path;
 
 static Gfx::IntRect frame_rect_for_window(Window& window, const Gfx::IntRect& rect)
@@ -195,7 +195,7 @@ void WindowFrame::reload_config()
     load_shadow(WindowManager::the().palette().active_window_shadow_path(), s_last_active_window_shadow_path, s_active_window_shadow);
     load_shadow(WindowManager::the().palette().inactive_window_shadow_path(), s_last_inactive_window_shadow_path, s_inactive_window_shadow);
     load_shadow(WindowManager::the().palette().menu_shadow_path(), s_last_menu_shadow_path, s_menu_shadow);
-    load_shadow(WindowManager::the().palette().task_bar_shadow_path(), s_last_task_bar_shadow_path, s_task_bar_shadow);
+    load_shadow(WindowManager::the().palette().taskbar_shadow_path(), s_last_taskbar_shadow_path, s_taskbar_shadow);
     load_shadow(WindowManager::the().palette().tooltip_shadow_path(), s_last_tooltip_shadow_path, s_tooltip_shadow);
 }
 
@@ -211,7 +211,7 @@ Gfx::Bitmap* WindowFrame::window_shadow() const
     case WindowType::Tooltip:
         return s_tooltip_shadow;
     case WindowType::Taskbar:
-        return s_task_bar_shadow;
+        return s_taskbar_shadow;
     case WindowType::AppletArea:
         return nullptr;
     default:
@@ -315,7 +315,7 @@ void WindowFrame::paint_menubar(Gfx::Painter& painter)
         bool paint_as_pressed = MenuManager::the().is_open(menu);
         bool paint_as_hovered = !paint_as_pressed && &menu == MenuManager::the().hovered_menu();
         if (paint_as_pressed || paint_as_hovered) {
-            Gfx::StylePainter::paint_button(painter, menu.rect_in_window_menubar(), palette, Gfx::ButtonStyle::CoolBar, paint_as_pressed, paint_as_hovered);
+            Gfx::StylePainter::paint_button(painter, menu.rect_in_window_menubar(), palette, Gfx::ButtonStyle::Coolbar, paint_as_pressed, paint_as_hovered);
         }
         painter.draw_ui_text(text_rect, menu.name(), font, Gfx::TextAlignment::Center, text_color);
         return IterationDecision::Continue;
diff --git a/Userland/Services/WindowServer/WindowManager.cpp b/Userland/Services/WindowServer/WindowManager.cpp
index 181d7ca467..95ecf13aac 100644
--- a/Userland/Services/WindowServer/WindowManager.cpp
+++ b/Userland/Services/WindowServer/WindowManager.cpp
@@ -28,8 +28,8 @@
 #include "Compositor.h"
 #include "EventLoop.h"
 #include "Menu.h"
-#include "MenuBar.h"
 #include "MenuItem.h"
+#include "Menubar.h"
 #include "Screen.h"
 #include "Window.h"
 #include <AK/StdLibExtras.h>
diff --git a/Userland/Services/WindowServer/WindowManager.h b/Userland/Services/WindowServer/WindowManager.h
index 97e6901418..68dda9940d 100644
--- a/Userland/Services/WindowServer/WindowManager.h
+++ b/Userland/Services/WindowServer/WindowManager.h
@@ -39,8 +39,8 @@
 #include <LibGfx/Rect.h>
 #include <WindowServer/Cursor.h>
 #include <WindowServer/Event.h>
-#include <WindowServer/MenuBar.h>
 #include <WindowServer/MenuManager.h>
+#include <WindowServer/Menubar.h>
 #include <WindowServer/Window.h>
 #include <WindowServer/WindowSwitcher.h>
 #include <WindowServer/WindowType.h>
diff --git a/Userland/Services/WindowServer/WindowSwitcher.cpp b/Userland/Services/WindowServer/WindowSwitcher.cpp
index bace155aa0..82d0985b4d 100644
--- a/Userland/Services/WindowServer/WindowSwitcher.cpp
+++ b/Userland/Services/WindowServer/WindowSwitcher.cpp
@@ -192,7 +192,7 @@ void WindowSwitcher::draw()
             rect_text_color = palette.threed_shadow1();
         } else {
             if (static_cast<int>(index) == m_hovered_index)
-                Gfx::StylePainter::paint_button(painter, item_rect, palette, Gfx::ButtonStyle::CoolBar, false, true);
+                Gfx::StylePainter::paint_button(painter, item_rect, palette, Gfx::ButtonStyle::Coolbar, false, true);
             text_color = palette.window_text();
             rect_text_color = palette.threed_shadow2();
         }
diff --git a/Userland/Utilities/html.cpp b/Userland/Utilities/html.cpp
index b4fda8e353..23cbb65ff3 100644
--- a/Userland/Utilities/html.cpp
+++ b/Userland/Utilities/html.cpp
@@ -30,7 +30,7 @@
 #include <LibGUI/Application.h>
 #include <LibGUI/Icon.h>
 #include <LibGUI/Menu.h>
-#include <LibGUI/MenuBar.h>
+#include <LibGUI/Menubar.h>
 #include <LibGUI/Window.h>
 #include <LibGfx/Bitmap.h>
 #include <LibWeb/OutOfProcessWebView.h>
@@ -67,7 +67,7 @@ int main(int argc, char** argv)
     widget.load_html(html, url);
     window->show();
 
-    auto menubar = GUI::MenuBar::construct();
+    auto menubar = GUI::Menubar::construct();
 
     auto& app_menu = menubar->add_menu("File");
     app_menu.add_action(GUI::CommonActions::make_quit_action([&](auto&) {
author	Andreas Kling <kling@serenityos.org>	2021-04-13 16:18:20 +0200
committer	Andreas Kling <kling@serenityos.org>	2021-04-13 16:58:15 +0200
commit	a2baab38fd58e18f690e2256b0a5081580c05968 (patch)
tree	ee4585bda0e59a1727f10b1203e540e44a2edafb
parent	86bdfa1edf21293e2c0f3ca8b31808a21882cb99 (diff)
download	serenity-a2baab38fd58e18f690e2256b0a5081580c05968.zip