diff --git a/Applications/CMakeLists.txt b/Applications/CMakeLists.txt
index c7a1828b852..56b2ed9cb29 100644
--- a/Applications/CMakeLists.txt
+++ b/Applications/CMakeLists.txt
@@ -9,7 +9,7 @@ add_subdirectory(FontEditor)
 add_subdirectory(Help)
 add_subdirectory(HexEditor)
 add_subdirectory(IRCClient)
-add_subdirectory(PaintBrush)
+add_subdirectory(PixelPaint)
 add_subdirectory(Piano)
 add_subdirectory(QuickShow)
 add_subdirectory(SoundPlayer)
diff --git a/Applications/PaintBrush/BucketTool.cpp b/Applications/PixelPaint/BucketTool.cpp
similarity index 99%
rename from Applications/PaintBrush/BucketTool.cpp
rename to Applications/PixelPaint/BucketTool.cpp
index a45448c5638..6b18fb4fc2e 100644
--- a/Applications/PaintBrush/BucketTool.cpp
+++ b/Applications/PixelPaint/BucketTool.cpp
@@ -33,7 +33,7 @@
 #include <LibGfx/Bitmap.h>
 #include <LibGfx/Rect.h>
 
-namespace PaintBrush {
+namespace PixelPaint {
 
 BucketTool::BucketTool()
 {
diff --git a/Applications/PaintBrush/BucketTool.h b/Applications/PixelPaint/BucketTool.h
similarity index 98%
rename from Applications/PaintBrush/BucketTool.h
rename to Applications/PixelPaint/BucketTool.h
index 8052f018dd1..e579edd5c0f 100644
--- a/Applications/PaintBrush/BucketTool.h
+++ b/Applications/PixelPaint/BucketTool.h
@@ -28,7 +28,7 @@
 
 #include "Tool.h"
 
-namespace PaintBrush {
+namespace PixelPaint {
 
 class BucketTool final : public Tool {
 public:
diff --git a/Applications/PaintBrush/CMakeLists.txt b/Applications/PixelPaint/CMakeLists.txt
similarity index 82%
rename from Applications/PaintBrush/CMakeLists.txt
rename to Applications/PixelPaint/CMakeLists.txt
index bebff13c689..0efc42cfaef 100644
--- a/Applications/PaintBrush/CMakeLists.txt
+++ b/Applications/PixelPaint/CMakeLists.txt
@@ -19,5 +19,5 @@ set(SOURCES
     Tool.cpp
 )
 
-serenity_bin(PaintBrush)
-target_link_libraries(PaintBrush LibGUI LibGfx)
+serenity_bin(PixelPaint)
+target_link_libraries(PixelPaint LibGUI LibGfx)
diff --git a/Applications/PaintBrush/CreateNewLayerDialog.cpp b/Applications/PixelPaint/CreateNewLayerDialog.cpp
similarity index 99%
rename from Applications/PaintBrush/CreateNewLayerDialog.cpp
rename to Applications/PixelPaint/CreateNewLayerDialog.cpp
index e801b80f2b4..18d57cd6cee 100644
--- a/Applications/PaintBrush/CreateNewLayerDialog.cpp
+++ b/Applications/PixelPaint/CreateNewLayerDialog.cpp
@@ -31,7 +31,7 @@
 #include <LibGUI/SpinBox.h>
 #include <LibGUI/TextBox.h>
 
-namespace PaintBrush {
+namespace PixelPaint {
 
 CreateNewLayerDialog::CreateNewLayerDialog(const Gfx::Size& suggested_size, GUI::Window* parent_window)
     : Dialog(parent_window)
diff --git a/Applications/PaintBrush/CreateNewLayerDialog.h b/Applications/PixelPaint/CreateNewLayerDialog.h
similarity index 98%
rename from Applications/PaintBrush/CreateNewLayerDialog.h
rename to Applications/PixelPaint/CreateNewLayerDialog.h
index 79184848627..a42b4e7124c 100644
--- a/Applications/PaintBrush/CreateNewLayerDialog.h
+++ b/Applications/PixelPaint/CreateNewLayerDialog.h
@@ -28,7 +28,7 @@
 
 #include <LibGUI/Dialog.h>
 
-namespace PaintBrush {
+namespace PixelPaint {
 
 class CreateNewLayerDialog final : public GUI::Dialog {
     C_OBJECT(CreateNewLayerDialog);
diff --git a/Applications/PaintBrush/EllipseTool.cpp b/Applications/PixelPaint/EllipseTool.cpp
similarity index 99%
rename from Applications/PaintBrush/EllipseTool.cpp
rename to Applications/PixelPaint/EllipseTool.cpp
index 6c69e4e41b8..91b03473ccc 100644
--- a/Applications/PaintBrush/EllipseTool.cpp
+++ b/Applications/PixelPaint/EllipseTool.cpp
@@ -33,7 +33,7 @@
 #include <LibGfx/Rect.h>
 #include <LibM/math.h>
 
-namespace PaintBrush {
+namespace PixelPaint {
 
 EllipseTool::EllipseTool()
 {
diff --git a/Applications/PaintBrush/EllipseTool.h b/Applications/PixelPaint/EllipseTool.h
similarity index 99%
rename from Applications/PaintBrush/EllipseTool.h
rename to Applications/PixelPaint/EllipseTool.h
index e3c8d790475..762862d6922 100644
--- a/Applications/PaintBrush/EllipseTool.h
+++ b/Applications/PixelPaint/EllipseTool.h
@@ -30,7 +30,7 @@
 #include <LibGfx/Point.h>
 #include <LibGUI/ActionGroup.h>
 
-namespace PaintBrush {
+namespace PixelPaint {
 
 class EllipseTool final : public Tool {
 public:
diff --git a/Applications/PaintBrush/EraseTool.cpp b/Applications/PixelPaint/EraseTool.cpp
similarity index 99%
rename from Applications/PaintBrush/EraseTool.cpp
rename to Applications/PixelPaint/EraseTool.cpp
index 4c1c6416173..4d91580f094 100644
--- a/Applications/PaintBrush/EraseTool.cpp
+++ b/Applications/PixelPaint/EraseTool.cpp
@@ -32,7 +32,7 @@
 #include <LibGUI/Painter.h>
 #include <LibGfx/Bitmap.h>
 
-namespace PaintBrush {
+namespace PixelPaint {
 
 EraseTool::EraseTool()
 {
diff --git a/Applications/PaintBrush/EraseTool.h b/Applications/PixelPaint/EraseTool.h
similarity index 98%
rename from Applications/PaintBrush/EraseTool.h
rename to Applications/PixelPaint/EraseTool.h
index cdb354f3396..713c15d87cd 100644
--- a/Applications/PaintBrush/EraseTool.h
+++ b/Applications/PixelPaint/EraseTool.h
@@ -31,7 +31,7 @@
 #include <LibGfx/Point.h>
 #include <LibGfx/Forward.h>
 
-namespace PaintBrush {
+namespace PixelPaint {
 
 class EraseTool final : public Tool {
 public:
diff --git a/Applications/PaintBrush/Image.cpp b/Applications/PixelPaint/Image.cpp
similarity index 99%
rename from Applications/PaintBrush/Image.cpp
rename to Applications/PixelPaint/Image.cpp
index 2236b383588..ca20eb146a6 100644
--- a/Applications/PaintBrush/Image.cpp
+++ b/Applications/PixelPaint/Image.cpp
@@ -31,7 +31,7 @@
 
 //#define PAINT_DEBUG
 
-namespace PaintBrush {
+namespace PixelPaint {
 
 RefPtr<Image> Image::create_with_size(const Gfx::Size& size)
 {
diff --git a/Applications/PaintBrush/Image.h b/Applications/PixelPaint/Image.h
similarity index 99%
rename from Applications/PaintBrush/Image.h
rename to Applications/PixelPaint/Image.h
index 96e87e73ff7..c42ad51d393 100644
--- a/Applications/PaintBrush/Image.h
+++ b/Applications/PixelPaint/Image.h
@@ -35,7 +35,7 @@
 #include <LibGfx/Rect.h>
 #include <LibGfx/Size.h>
 
-namespace PaintBrush {
+namespace PixelPaint {
 
 class Layer;
 
diff --git a/Applications/PaintBrush/ImageEditor.cpp b/Applications/PixelPaint/ImageEditor.cpp
similarity index 99%
rename from Applications/PaintBrush/ImageEditor.cpp
rename to Applications/PixelPaint/ImageEditor.cpp
index 0a35989a9a2..db64cbc5a11 100644
--- a/Applications/PaintBrush/ImageEditor.cpp
+++ b/Applications/PixelPaint/ImageEditor.cpp
@@ -32,7 +32,7 @@
 #include <LibGUI/Painter.h>
 #include <LibGfx/Palette.h>
 
-namespace PaintBrush {
+namespace PixelPaint {
 
 ImageEditor::ImageEditor()
 {
diff --git a/Applications/PaintBrush/ImageEditor.h b/Applications/PixelPaint/ImageEditor.h
similarity index 99%
rename from Applications/PaintBrush/ImageEditor.h
rename to Applications/PixelPaint/ImageEditor.h
index 6945b42a493..b313be18c96 100644
--- a/Applications/PaintBrush/ImageEditor.h
+++ b/Applications/PixelPaint/ImageEditor.h
@@ -28,7 +28,7 @@
 
 #include <LibGUI/Frame.h>
 
-namespace PaintBrush {
+namespace PixelPaint {
 
 class Image;
 class Layer;
diff --git a/Applications/PaintBrush/Layer.cpp b/Applications/PixelPaint/Layer.cpp
similarity index 98%
rename from Applications/PaintBrush/Layer.cpp
rename to Applications/PixelPaint/Layer.cpp
index 73737d486eb..e633aaaf09b 100644
--- a/Applications/PaintBrush/Layer.cpp
+++ b/Applications/PixelPaint/Layer.cpp
@@ -27,7 +27,7 @@
 #include "Layer.h"
 #include <LibGfx/Bitmap.h>
 
-namespace PaintBrush {
+namespace PixelPaint {
 
 RefPtr<Layer> Layer::create_with_size(const Gfx::Size& size, const String& name)
 {
diff --git a/Applications/PaintBrush/Layer.h b/Applications/PixelPaint/Layer.h
similarity index 99%
rename from Applications/PaintBrush/Layer.h
rename to Applications/PixelPaint/Layer.h
index ab7d5e2b1fc..5eb8ed2d129 100644
--- a/Applications/PaintBrush/Layer.h
+++ b/Applications/PixelPaint/Layer.h
@@ -31,7 +31,7 @@
 #include <AK/String.h>
 #include <LibGfx/Bitmap.h>
 
-namespace PaintBrush {
+namespace PixelPaint {
 
 class Layer : public RefCounted<Layer> {
     AK_MAKE_NONCOPYABLE(Layer);
diff --git a/Applications/PaintBrush/LayerModel.cpp b/Applications/PixelPaint/LayerModel.cpp
similarity index 99%
rename from Applications/PaintBrush/LayerModel.cpp
rename to Applications/PixelPaint/LayerModel.cpp
index 9f533d091fb..37420e78deb 100644
--- a/Applications/PaintBrush/LayerModel.cpp
+++ b/Applications/PixelPaint/LayerModel.cpp
@@ -28,7 +28,7 @@
 #include "Image.h"
 #include "Layer.h"
 
-namespace PaintBrush {
+namespace PixelPaint {
 
 NonnullRefPtr<LayerModel> LayerModel::create(Image& image)
 {
diff --git a/Applications/PaintBrush/LayerModel.h b/Applications/PixelPaint/LayerModel.h
similarity index 98%
rename from Applications/PaintBrush/LayerModel.h
rename to Applications/PixelPaint/LayerModel.h
index e4a8bc1229f..76ac1cac0a2 100644
--- a/Applications/PaintBrush/LayerModel.h
+++ b/Applications/PixelPaint/LayerModel.h
@@ -28,7 +28,7 @@
 
 #include <LibGUI/Model.h>
 
-namespace PaintBrush {
+namespace PixelPaint {
 
 class Image;
 
diff --git a/Applications/PaintBrush/LineTool.cpp b/Applications/PixelPaint/LineTool.cpp
similarity index 99%
rename from Applications/PaintBrush/LineTool.cpp
rename to Applications/PixelPaint/LineTool.cpp
index 7c0c44163fa..2d1d34387a3 100644
--- a/Applications/PaintBrush/LineTool.cpp
+++ b/Applications/PixelPaint/LineTool.cpp
@@ -32,7 +32,7 @@
 #include <LibGUI/Painter.h>
 #include <LibM/math.h>
 
-namespace PaintBrush {
+namespace PixelPaint {
 
 static Gfx::Point constrain_line_angle(const Gfx::Point& start_pos, const Gfx::Point& end_pos, float angle_increment)
 {
diff --git a/Applications/PaintBrush/LineTool.h b/Applications/PixelPaint/LineTool.h
similarity index 99%
rename from Applications/PaintBrush/LineTool.h
rename to Applications/PixelPaint/LineTool.h
index 218cc09c23d..88a8d30e3ef 100644
--- a/Applications/PaintBrush/LineTool.h
+++ b/Applications/PixelPaint/LineTool.h
@@ -30,7 +30,7 @@
 #include <LibGUI/ActionGroup.h>
 #include <LibGfx/Point.h>
 
-namespace PaintBrush {
+namespace PixelPaint {
 
 class LineTool final : public Tool {
 public:
diff --git a/Applications/PaintBrush/MoveTool.cpp b/Applications/PixelPaint/MoveTool.cpp
similarity index 99%
rename from Applications/PaintBrush/MoveTool.cpp
rename to Applications/PixelPaint/MoveTool.cpp
index 8a73e6d37f6..960dcc88d7a 100644
--- a/Applications/PaintBrush/MoveTool.cpp
+++ b/Applications/PixelPaint/MoveTool.cpp
@@ -33,7 +33,7 @@
 #include <LibGUI/Window.h>
 #include <LibGfx/Bitmap.h>
 
-namespace PaintBrush {
+namespace PixelPaint {
 
 MoveTool::MoveTool()
 {
diff --git a/Applications/PaintBrush/MoveTool.h b/Applications/PixelPaint/MoveTool.h
similarity index 99%
rename from Applications/PaintBrush/MoveTool.h
rename to Applications/PixelPaint/MoveTool.h
index 0c363ebd97c..ff1c9d8e776 100644
--- a/Applications/PaintBrush/MoveTool.h
+++ b/Applications/PixelPaint/MoveTool.h
@@ -28,7 +28,7 @@
 
 #include "Tool.h"
 
-namespace PaintBrush {
+namespace PixelPaint {
 
 class MoveTool final : public Tool {
 public:
diff --git a/Applications/PaintBrush/PaletteWidget.cpp b/Applications/PixelPaint/PaletteWidget.cpp
similarity index 99%
rename from Applications/PaintBrush/PaletteWidget.cpp
rename to Applications/PixelPaint/PaletteWidget.cpp
index b6a2830369e..289213b5f22 100644
--- a/Applications/PaintBrush/PaletteWidget.cpp
+++ b/Applications/PixelPaint/PaletteWidget.cpp
@@ -30,7 +30,7 @@
 #include <LibGUI/ColorPicker.h>
 #include <LibGfx/Palette.h>
 
-namespace PaintBrush {
+namespace PixelPaint {
 
 class ColorWidget : public GUI::Frame {
     C_OBJECT(ColorWidget);
diff --git a/Applications/PaintBrush/PaletteWidget.h b/Applications/PixelPaint/PaletteWidget.h
similarity index 98%
rename from Applications/PaintBrush/PaletteWidget.h
rename to Applications/PixelPaint/PaletteWidget.h
index 1ae3986fa20..02c843f038c 100644
--- a/Applications/PaintBrush/PaletteWidget.h
+++ b/Applications/PixelPaint/PaletteWidget.h
@@ -28,7 +28,7 @@
 
 #include <LibGUI/Frame.h>
 
-namespace PaintBrush {
+namespace PixelPaint {
 
 class ImageEditor;
 
diff --git a/Applications/PaintBrush/PenTool.cpp b/Applications/PixelPaint/PenTool.cpp
similarity index 99%
rename from Applications/PaintBrush/PenTool.cpp
rename to Applications/PixelPaint/PenTool.cpp
index c80a84e38f8..bf50ed1b36d 100644
--- a/Applications/PaintBrush/PenTool.cpp
+++ b/Applications/PixelPaint/PenTool.cpp
@@ -31,7 +31,7 @@
 #include <LibGUI/Menu.h>
 #include <LibGUI/Painter.h>
 
-namespace PaintBrush {
+namespace PixelPaint {
 
 PenTool::PenTool()
 {
diff --git a/Applications/PaintBrush/PenTool.h b/Applications/PixelPaint/PenTool.h
similarity index 98%
rename from Applications/PaintBrush/PenTool.h
rename to Applications/PixelPaint/PenTool.h
index 38d2ae9450e..86b717e8a59 100644
--- a/Applications/PaintBrush/PenTool.h
+++ b/Applications/PixelPaint/PenTool.h
@@ -30,7 +30,7 @@
 #include <LibGfx/Point.h>
 #include <LibGUI/ActionGroup.h>
 
-namespace PaintBrush {
+namespace PixelPaint {
 
 class PenTool final : public Tool {
 public:
diff --git a/Applications/PaintBrush/PickerTool.cpp b/Applications/PixelPaint/PickerTool.cpp
similarity index 98%
rename from Applications/PaintBrush/PickerTool.cpp
rename to Applications/PixelPaint/PickerTool.cpp
index e8d396f65db..86a7acf961c 100644
--- a/Applications/PaintBrush/PickerTool.cpp
+++ b/Applications/PixelPaint/PickerTool.cpp
@@ -29,7 +29,7 @@
 #include "Layer.h"
 #include <LibGfx/Bitmap.h>
 
-namespace PaintBrush {
+namespace PixelPaint {
 
 PickerTool::PickerTool()
 {
diff --git a/Applications/PaintBrush/PickerTool.h b/Applications/PixelPaint/PickerTool.h
similarity index 98%
rename from Applications/PaintBrush/PickerTool.h
rename to Applications/PixelPaint/PickerTool.h
index c9f682762e2..a9d714879de 100644
--- a/Applications/PaintBrush/PickerTool.h
+++ b/Applications/PixelPaint/PickerTool.h
@@ -28,7 +28,7 @@
 
 #include "Tool.h"
 
-namespace PaintBrush {
+namespace PixelPaint {
 
 class PickerTool final : public Tool {
 public:
diff --git a/Applications/PaintBrush/RectangleTool.cpp b/Applications/PixelPaint/RectangleTool.cpp
similarity index 99%
rename from Applications/PaintBrush/RectangleTool.cpp
rename to Applications/PixelPaint/RectangleTool.cpp
index f9befddd84c..c9e69c2617d 100644
--- a/Applications/PaintBrush/RectangleTool.cpp
+++ b/Applications/PixelPaint/RectangleTool.cpp
@@ -33,7 +33,7 @@
 #include <LibGfx/Rect.h>
 #include <LibM/math.h>
 
-namespace PaintBrush {
+namespace PixelPaint {
 
 RectangleTool::RectangleTool()
 {
diff --git a/Applications/PaintBrush/RectangleTool.h b/Applications/PixelPaint/RectangleTool.h
similarity index 99%
rename from Applications/PaintBrush/RectangleTool.h
rename to Applications/PixelPaint/RectangleTool.h
index 882d8bd918c..63c8ec718f9 100644
--- a/Applications/PaintBrush/RectangleTool.h
+++ b/Applications/PixelPaint/RectangleTool.h
@@ -30,7 +30,7 @@
 #include <LibGfx/Point.h>
 #include <LibGUI/Forward.h>
 
-namespace PaintBrush {
+namespace PixelPaint {
 
 class RectangleTool final : public Tool {
 public:
diff --git a/Applications/PaintBrush/SprayTool.cpp b/Applications/PixelPaint/SprayTool.cpp
similarity index 99%
rename from Applications/PaintBrush/SprayTool.cpp
rename to Applications/PixelPaint/SprayTool.cpp
index f3de797d5f1..36e92dbd85f 100644
--- a/Applications/PaintBrush/SprayTool.cpp
+++ b/Applications/PixelPaint/SprayTool.cpp
@@ -36,7 +36,7 @@
 #include <LibM/math.h>
 #include <stdio.h>
 
-namespace PaintBrush {
+namespace PixelPaint {
 
 SprayTool::SprayTool()
 {
diff --git a/Applications/PaintBrush/SprayTool.h b/Applications/PixelPaint/SprayTool.h
similarity index 99%
rename from Applications/PaintBrush/SprayTool.h
rename to Applications/PixelPaint/SprayTool.h
index 4d9cdfe8747..c9dfb843fbd 100644
--- a/Applications/PaintBrush/SprayTool.h
+++ b/Applications/PixelPaint/SprayTool.h
@@ -31,7 +31,7 @@
 #include <LibGUI/ActionGroup.h>
 #include <LibGUI/Painter.h>
 
-namespace PaintBrush {
+namespace PixelPaint {
 
 class SprayTool final : public Tool {
 public:
diff --git a/Applications/PaintBrush/Tool.cpp b/Applications/PixelPaint/Tool.cpp
similarity index 98%
rename from Applications/PaintBrush/Tool.cpp
rename to Applications/PixelPaint/Tool.cpp
index 831f48c3c65..415bcb15360 100644
--- a/Applications/PaintBrush/Tool.cpp
+++ b/Applications/PixelPaint/Tool.cpp
@@ -28,7 +28,7 @@
 #include "ImageEditor.h"
 #include <LibGUI/Action.h>
 
-namespace PaintBrush {
+namespace PixelPaint {
 
 Tool::Tool()
 {
diff --git a/Applications/PaintBrush/Tool.h b/Applications/PixelPaint/Tool.h
similarity index 99%
rename from Applications/PaintBrush/Tool.h
rename to Applications/PixelPaint/Tool.h
index 954e0cc51df..b223ab70425 100644
--- a/Applications/PaintBrush/Tool.h
+++ b/Applications/PixelPaint/Tool.h
@@ -29,7 +29,7 @@
 #include <LibGUI/Event.h>
 #include <LibGUI/Forward.h>
 
-namespace PaintBrush {
+namespace PixelPaint {
 
 class ImageEditor;
 class Layer;
diff --git a/Applications/PaintBrush/ToolboxWidget.cpp b/Applications/PixelPaint/ToolboxWidget.cpp
similarity index 99%
rename from Applications/PaintBrush/ToolboxWidget.cpp
rename to Applications/PixelPaint/ToolboxWidget.cpp
index 61be4860abf..ee4cd0a88e9 100644
--- a/Applications/PaintBrush/ToolboxWidget.cpp
+++ b/Applications/PixelPaint/ToolboxWidget.cpp
@@ -39,7 +39,7 @@
 #include <LibGUI/BoxLayout.h>
 #include <LibGUI/Button.h>
 
-namespace PaintBrush {
+namespace PixelPaint {
 
 class ToolButton final : public GUI::Button {
     C_OBJECT(ToolButton)
diff --git a/Applications/PaintBrush/ToolboxWidget.h b/Applications/PixelPaint/ToolboxWidget.h
similarity index 98%
rename from Applications/PaintBrush/ToolboxWidget.h
rename to Applications/PixelPaint/ToolboxWidget.h
index 60a3de0c5a2..93a5b705524 100644
--- a/Applications/PaintBrush/ToolboxWidget.h
+++ b/Applications/PixelPaint/ToolboxWidget.h
@@ -29,7 +29,7 @@
 #include <LibGUI/ActionGroup.h>
 #include <LibGUI/Frame.h>
 
-namespace PaintBrush {
+namespace PixelPaint {
 
 class Tool;
 
diff --git a/Applications/PaintBrush/main.cpp b/Applications/PixelPaint/main.cpp
similarity index 92%
rename from Applications/PaintBrush/main.cpp
rename to Applications/PixelPaint/main.cpp
index 749a3cdcf2b..3f5fd536c57 100644
--- a/Applications/PaintBrush/main.cpp
+++ b/Applications/PixelPaint/main.cpp
@@ -60,7 +60,7 @@ int main(int argc, char** argv)
     }
 
     auto window = GUI::Window::construct();
-    window->set_title("PaintBrush");
+    window->set_title("PixelPaint");
     window->set_rect(40, 100, 950, 570);
     window->set_icon(Gfx::Bitmap::load_from_file("/res/icons/16x16/app-paintbrush.png"));
 
@@ -68,20 +68,20 @@ int main(int argc, char** argv)
     horizontal_container.set_layout<GUI::HorizontalBoxLayout>();
     horizontal_container.layout()->set_spacing(0);
 
-    auto& toolbox = horizontal_container.add<PaintBrush::ToolboxWidget>();
+    auto& toolbox = horizontal_container.add<PixelPaint::ToolboxWidget>();
 
     auto& vertical_container = horizontal_container.add<GUI::Widget>();
     vertical_container.set_layout<GUI::VerticalBoxLayout>();
     vertical_container.layout()->set_spacing(0);
 
-    auto& image_editor = vertical_container.add<PaintBrush::ImageEditor>();
+    auto& image_editor = vertical_container.add<PixelPaint::ImageEditor>();
     image_editor.set_focus(true);
 
     toolbox.on_tool_selection = [&](auto* tool) {
         image_editor.set_active_tool(tool);
     };
 
-    vertical_container.add<PaintBrush::PaletteWidget>(image_editor);
+    vertical_container.add<PixelPaint::PaletteWidget>(image_editor);
 
     auto& right_panel = horizontal_container.add<GUI::Widget>();
     right_panel.set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fill);
@@ -94,7 +94,7 @@ int main(int argc, char** argv)
     window->show();
 
     auto menubar = GUI::MenuBar::construct();
-    auto& app_menu = menubar->add_menu("PaintBrush");
+    auto& app_menu = menubar->add_menu("PixelPaint");
 
     app_menu.add_action(GUI::CommonActions::make_open_action([&](auto&) {
         Optional<String> open_path = GUI::FilePicker::get_open_filepath();
@@ -125,9 +125,9 @@ int main(int argc, char** argv)
 
     auto& layer_menu = menubar->add_menu("Layer");
     layer_menu.add_action(GUI::Action::create("Create new layer...", { Mod_Ctrl | Mod_Shift, Key_N }, [&](auto&) {
-        auto dialog = PaintBrush::CreateNewLayerDialog::construct(image_editor.image()->size(), window);
+        auto dialog = PixelPaint::CreateNewLayerDialog::construct(image_editor.image()->size(), window);
         if (dialog->exec() == GUI::Dialog::ExecOK) {
-            auto layer = PaintBrush::Layer::create_with_size(dialog->layer_size(), dialog->layer_name());
+            auto layer = PixelPaint::Layer::create_with_size(dialog->layer_size(), dialog->layer_name());
             if (!layer) {
                 GUI::MessageBox::show_error(String::format("Unable to create layer with size %s", dialog->size().to_string().characters()));
                 return;
@@ -179,7 +179,7 @@ int main(int argc, char** argv)
 
     auto& help_menu = menubar->add_menu("Help");
     help_menu.add_action(GUI::Action::create("About", [&](auto&) {
-        GUI::AboutDialog::show("PaintBrush", Gfx::Bitmap::load_from_file("/res/icons/32x32/app-paintbrush.png"), window);
+        GUI::AboutDialog::show("PixelPaint", Gfx::Bitmap::load_from_file("/res/icons/32x32/app-paintbrush.png"), window);
     }));
 
     app.set_menubar(move(menubar));
@@ -191,9 +191,9 @@ int main(int argc, char** argv)
             layer_table_view.selection().clear();
     };
 
-    auto image = PaintBrush::Image::create_with_size({ 640, 480 });
+    auto image = PixelPaint::Image::create_with_size({ 640, 480 });
 
-    auto bg_layer = PaintBrush::Layer::create_with_size({ 640, 480 }, "Background");
+    auto bg_layer = PixelPaint::Layer::create_with_size({ 640, 480 }, "Background");
     image->add_layer(*bg_layer);
     bg_layer->bitmap().fill(Color::White);
 
@@ -201,7 +201,7 @@ int main(int argc, char** argv)
     layer_table_view.on_selection_change = [&] {
         auto index = layer_table_view.selection().first();
         if (index.is_valid())
-            image_editor.set_active_layer(const_cast<PaintBrush::Layer*>(&image->layer(index.row())));
+            image_editor.set_active_layer(const_cast<PixelPaint::Layer*>(&image->layer(index.row())));
         else
             image_editor.set_active_layer(nullptr);
     };
diff --git a/Base/res/apps/PaintBrush.af b/Base/res/apps/PaintBrush.af
deleted file mode 100644
index f8ed11afd1d..00000000000
--- a/Base/res/apps/PaintBrush.af
+++ /dev/null
@@ -1,8 +0,0 @@
-[App]
-Name=PaintBrush
-Executable=/bin/PaintBrush
-Category=Graphics
-
-[Icons]
-16x16=/res/icons/16x16/app-paintbrush.png
-32x32=/res/icons/32x32/app-paintbrush.png
diff --git a/Base/res/apps/PixelPaint.af b/Base/res/apps/PixelPaint.af
new file mode 100644
index 00000000000..be6a410da7d
--- /dev/null
+++ b/Base/res/apps/PixelPaint.af
@@ -0,0 +1,8 @@
+[App]
+Name=PixelPaint
+Executable=/bin/PixelPaint
+Category=Graphics
+
+[Icons]
+16x16=/res/icons/16x16/app-pixelpaint.png
+32x32=/res/icons/32x32/app-pixelpaint.png
diff --git a/Base/res/welcome.txt b/Base/res/welcome.txt
index 7b198e204cd..5d1986db70f 100644
--- a/Base/res/welcome.txt
+++ b/Base/res/welcome.txt
@@ -61,5 +61,5 @@ Serenity includes the Piano, which allows you to create your own tunes by
 simply pressing keys on the keyboard. You can pick the wavetype, octave, and
 more! Serenity also has SoundPlayer, which lets you play WAV files.
 
-Serenity also has PaintBrush, which is a simple bitmap editor. Draw with the
+Serenity also has PixelPaint, which is a layered bitmap editor. Draw with the
 pencil and change colors. Try drawing shapes! Can't do that in GIMP!
diff --git a/Meta/build-root-filesystem.sh b/Meta/build-root-filesystem.sh
index 47bd8ed2314..b57ef9f4187 100755
--- a/Meta/build-root-filesystem.sh
+++ b/Meta/build-root-filesystem.sh
@@ -134,7 +134,7 @@ ln -s VisualBuilder mnt/bin/vb
 ln -s WidgetGallery mnt/bin/wg
 ln -s TextEditor mnt/bin/te
 ln -s HexEditor mnt/bin/he
-ln -s PaintBrush mnt/bin/pb
+ln -s PixelPaint mnt/bin/pp
 ln -s QuickShow mnt/bin/qs
 ln -s Piano mnt/bin/pi
 ln -s SystemDialog mnt/bin/sd