11 files changed, 47 insertions, 47 deletions
diff --git a/DevTools/VisualBuilder/VBForm.cpp b/DevTools/VisualBuilder/VBForm.cpp
index 1a37cab479..fad29dfefa 100644
--- a/DevTools/VisualBuilder/VBForm.cpp
+++ b/DevTools/VisualBuilder/VBForm.cpp
@@ -32,11 +32,11 @@
 #include <AK/JsonObject.h>
 #include <AK/StringBuilder.h>
 #include <LibCore/File.h>
-#include <LibGUI/GAction.h>
-#include <LibGUI/GBoxLayout.h>
-#include <LibGUI/GMenu.h>
-#include <LibGUI/GMessageBox.h>
-#include <LibGUI/GPainter.h>
+#include <LibGUI/Action.h>
+#include <LibGUI/BoxLayout.h>
+#include <LibGUI/Menu.h>
+#include <LibGUI/MessageBox.h>
+#include <LibGUI/Painter.h>
 
 static VBForm* s_current;
 VBForm* VBForm::current()
diff --git a/DevTools/VisualBuilder/VBForm.h b/DevTools/VisualBuilder/VBForm.h
index dba01dbe12..0aac6f2acd 100644
--- a/DevTools/VisualBuilder/VBForm.h
+++ b/DevTools/VisualBuilder/VBForm.h
@@ -28,7 +28,7 @@
 
 #include "VBWidget.h"
 #include <AK/NonnullRefPtrVector.h>
-#include <LibGUI/GWidget.h>
+#include <LibGUI/Widget.h>
 
 class VBForm : public GUI::Widget {
     C_OBJECT(VBForm)
diff --git a/DevTools/VisualBuilder/VBPropertiesWindow.cpp b/DevTools/VisualBuilder/VBPropertiesWindow.cpp
index 7bd2778dcc..e3721528d5 100644
--- a/DevTools/VisualBuilder/VBPropertiesWindow.cpp
+++ b/DevTools/VisualBuilder/VBPropertiesWindow.cpp
@@ -26,12 +26,12 @@
 
 #include "VBPropertiesWindow.h"
 #include "VBWidgetPropertyModel.h"
-#include <LibGUI/GBoxLayout.h>
-#include <LibGUI/GComboBox.h>
-#include <LibGUI/GModelEditingDelegate.h>
-#include <LibGUI/GTableView.h>
-#include <LibGUI/GTextBox.h>
-#include <LibGUI/GWidget.h>
+#include <LibGUI/BoxLayout.h>
+#include <LibGUI/ComboBox.h>
+#include <LibGUI/ModelEditingDelegate.h>
+#include <LibGUI/TableView.h>
+#include <LibGUI/TextBox.h>
+#include <LibGUI/Widget.h>
 
 class BoolValuesModel final : public GUI::Model {
 public:
diff --git a/DevTools/VisualBuilder/VBPropertiesWindow.h b/DevTools/VisualBuilder/VBPropertiesWindow.h
index 4ae1be9acc..c060cbbd8f 100644
--- a/DevTools/VisualBuilder/VBPropertiesWindow.h
+++ b/DevTools/VisualBuilder/VBPropertiesWindow.h
@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include <LibGUI/GWindow.h>
+#include <LibGUI/Window.h>
 
 namespace GUI {
 class TableView;
diff --git a/DevTools/VisualBuilder/VBProperty.h b/DevTools/VisualBuilder/VBProperty.h
index c84660744b..089908328e 100644
--- a/DevTools/VisualBuilder/VBProperty.h
+++ b/DevTools/VisualBuilder/VBProperty.h
@@ -28,7 +28,7 @@
 
 #include <AK/Function.h>
 #include <AK/String.h>
-#include <LibGUI/GVariant.h>
+#include <LibGUI/Variant.h>
 
 namespace GUI {
 class Widget;
diff --git a/DevTools/VisualBuilder/VBWidget.cpp b/DevTools/VisualBuilder/VBWidget.cpp
index 307f27218c..82006047ec 100644
--- a/DevTools/VisualBuilder/VBWidget.cpp
+++ b/DevTools/VisualBuilder/VBWidget.cpp
@@ -29,17 +29,17 @@
 #include "VBProperty.h"
 #include "VBWidgetPropertyModel.h"
 #include "VBWidgetRegistry.h"
-#include <LibGUI/GButton.h>
-#include <LibGUI/GCheckBox.h>
-#include <LibGUI/GGroupBox.h>
-#include <LibGUI/GLabel.h>
-#include <LibGUI/GPainter.h>
-#include <LibGUI/GProgressBar.h>
-#include <LibGUI/GRadioButton.h>
-#include <LibGUI/GScrollBar.h>
-#include <LibGUI/GSlider.h>
-#include <LibGUI/GSpinBox.h>
-#include <LibGUI/GTextEditor.h>
+#include <LibGUI/Button.h>
+#include <LibGUI/CheckBox.h>
+#include <LibGUI/GroupBox.h>
+#include <LibGUI/Label.h>
+#include <LibGUI/Painter.h>
+#include <LibGUI/ProgressBar.h>
+#include <LibGUI/RadioButton.h>
+#include <LibGUI/ScrollBar.h>
+#include <LibGUI/Slider.h>
+#include <LibGUI/SpinBox.h>
+#include <LibGUI/TextEditor.h>
 
 VBWidget::VBWidget(VBWidgetType type, VBForm& form, VBWidget* parent)
     : m_type(type)
diff --git a/DevTools/VisualBuilder/VBWidget.h b/DevTools/VisualBuilder/VBWidget.h
index 6d593363da..08c5be2597 100644
--- a/DevTools/VisualBuilder/VBWidget.h
+++ b/DevTools/VisualBuilder/VBWidget.h
@@ -34,7 +34,7 @@
 #include <AK/RefCounted.h>
 #include <AK/Weakable.h>
 #include <LibGfx/Rect.h>
-#include <LibGUI/GWidget.h>
+#include <LibGUI/Widget.h>
 
 namespace GUI {
 class Painter;
diff --git a/DevTools/VisualBuilder/VBWidgetPropertyModel.h b/DevTools/VisualBuilder/VBWidgetPropertyModel.h
index ec04cee905..480c23ec88 100644
--- a/DevTools/VisualBuilder/VBWidgetPropertyModel.h
+++ b/DevTools/VisualBuilder/VBWidgetPropertyModel.h
@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include <LibGUI/GModel.h>
+#include <LibGUI/Model.h>
 
 class VBWidget;
 class VBProperty;
diff --git a/DevTools/VisualBuilder/VBWidgetRegistry.cpp b/DevTools/VisualBuilder/VBWidgetRegistry.cpp
index 076c2f7e9f..bf176bbcf1 100644
--- a/DevTools/VisualBuilder/VBWidgetRegistry.cpp
+++ b/DevTools/VisualBuilder/VBWidgetRegistry.cpp
@@ -26,16 +26,16 @@
 
 #include "VBWidgetRegistry.h"
 #include "VBProperty.h"
-#include <LibGUI/GButton.h>
-#include <LibGUI/GCheckBox.h>
-#include <LibGUI/GGroupBox.h>
-#include <LibGUI/GLabel.h>
-#include <LibGUI/GProgressBar.h>
-#include <LibGUI/GRadioButton.h>
-#include <LibGUI/GScrollBar.h>
-#include <LibGUI/GSlider.h>
-#include <LibGUI/GSpinBox.h>
-#include <LibGUI/GTextEditor.h>
+#include <LibGUI/Button.h>
+#include <LibGUI/CheckBox.h>
+#include <LibGUI/GroupBox.h>
+#include <LibGUI/Label.h>
+#include <LibGUI/ProgressBar.h>
+#include <LibGUI/RadioButton.h>
+#include <LibGUI/ScrollBar.h>
+#include <LibGUI/Slider.h>
+#include <LibGUI/SpinBox.h>
+#include <LibGUI/TextEditor.h>
 
 String to_class_name(VBWidgetType type)
 {
diff --git a/DevTools/VisualBuilder/VBWidgetRegistry.h b/DevTools/VisualBuilder/VBWidgetRegistry.h
index 189b5b2e80..bea285bb29 100644
--- a/DevTools/VisualBuilder/VBWidgetRegistry.h
+++ b/DevTools/VisualBuilder/VBWidgetRegistry.h
@@ -31,7 +31,7 @@
 #include <AK/NonnullOwnPtrVector.h>
 #include <AK/OwnPtr.h>
 #include <AK/String.h>
-#include <LibGUI/GWidget.h>
+#include <LibGUI/Widget.h>
 
 class VBProperty;
 class VBWidget;
diff --git a/DevTools/VisualBuilder/main.cpp b/DevTools/VisualBuilder/main.cpp
index c514cf84bb..090eca3b81 100644
--- a/DevTools/VisualBuilder/main.cpp
+++ b/DevTools/VisualBuilder/main.cpp
@@ -28,15 +28,15 @@
 #include "VBPropertiesWindow.h"
 #include "VBWidget.h"
 #include "VBWidgetPropertyModel.h"
-#include <LibGUI/GAboutDialog.h>
-#include <LibGUI/GAction.h>
-#include <LibGUI/GApplication.h>
-#include <LibGUI/GBoxLayout.h>
-#include <LibGUI/GButton.h>
-#include <LibGUI/GMenuBar.h>
-#include <LibGUI/GTableView.h>
-#include <LibGUI/GWidget.h>
-#include <LibGUI/GWindow.h>
+#include <LibGUI/AboutDialog.h>
+#include <LibGUI/Action.h>
+#include <LibGUI/Application.h>
+#include <LibGUI/BoxLayout.h>
+#include <LibGUI/Button.h>
+#include <LibGUI/MenuBar.h>
+#include <LibGUI/TableView.h>
+#include <LibGUI/Widget.h>
+#include <LibGUI/Window.h>
 #include <fcntl.h>
 #include <signal.h>
 #include <stdio.h>