11 files changed, 17 insertions, 17 deletions
diff --git a/Libraries/LibGfx/GraphicsBitmap.cpp b/Libraries/LibGfx/Bitmap.cpp
index d48cfa7d03..55d2cbc98d 100644
--- a/Libraries/LibGfx/GraphicsBitmap.cpp
+++ b/Libraries/LibGfx/Bitmap.cpp
@@ -25,7 +25,7 @@
  */
 
 #include <AK/MappedFile.h>
-#include <LibGfx/GraphicsBitmap.h>
+#include <LibGfx/Bitmap.h>
 #include <LibGfx/PNGLoader.h>
 #include <errno.h>
 #include <fcntl.h>
diff --git a/Libraries/LibGfx/GraphicsBitmap.h b/Libraries/LibGfx/Bitmap.h
index 7c64eafd1b..7c64eafd1b 100644
--- a/Libraries/LibGfx/GraphicsBitmap.h
+++ b/Libraries/LibGfx/Bitmap.h
diff --git a/Libraries/LibGfx/Emoji.cpp b/Libraries/LibGfx/Emoji.cpp
index bb0fc3910e..530a6716aa 100644
--- a/Libraries/LibGfx/Emoji.cpp
+++ b/Libraries/LibGfx/Emoji.cpp
@@ -27,7 +27,7 @@
 #include <AK/HashMap.h>
 #include <AK/String.h>
 #include <LibGfx/Emoji.h>
-#include <LibGfx/GraphicsBitmap.h>
+#include <LibGfx/Bitmap.h>
 
 namespace Gfx {
 
diff --git a/Libraries/LibGfx/Font.cpp b/Libraries/LibGfx/Font.cpp
index d8ea312793..ddfb4705d1 100644
--- a/Libraries/LibGfx/Font.cpp
+++ b/Libraries/LibGfx/Font.cpp
@@ -26,7 +26,7 @@
 
 #include "Font.h"
 #include "Emoji.h"
-#include "GraphicsBitmap.h"
+#include "Bitmap.h"
 #include <AK/BufferStream.h>
 #include <AK/MappedFile.h>
 #include <AK/StdLibExtras.h>
diff --git a/Libraries/LibGfx/GIFLoader.cpp b/Libraries/LibGfx/GIFLoader.cpp
index 8ec1a052ee..84da808835 100644
--- a/Libraries/LibGfx/GIFLoader.cpp
+++ b/Libraries/LibGfx/GIFLoader.cpp
@@ -42,7 +42,7 @@ RefPtr<Gfx::Bitmap> load_gif(const StringView& path)
         return nullptr;
     auto bitmap = load_gif_impl((const u8*)mapped_file.data(), mapped_file.size());
     if (bitmap)
-        bitmap->set_mmap_name(String::format("GraphicsBitmap [%dx%d] - Decoded GIF: %s", bitmap->width(), bitmap->height(), canonicalized_path(path).characters()));
+        bitmap->set_mmap_name(String::format("Gfx::Bitmap [%dx%d] - Decoded GIF: %s", bitmap->width(), bitmap->height(), canonicalized_path(path).characters()));
     return bitmap;
 }
 
@@ -50,7 +50,7 @@ RefPtr<Gfx::Bitmap> load_gif_from_memory(const u8* data, size_t length)
 {
     auto bitmap = load_gif_impl(data, length);
     if (bitmap)
-        bitmap->set_mmap_name(String::format("GraphicsBitmap [%dx%d] - Decoded GIF: <memory>", bitmap->width(), bitmap->height()));
+        bitmap->set_mmap_name(String::format("Gfx::Bitmap [%dx%d] - Decoded GIF: <memory>", bitmap->width(), bitmap->height()));
     return bitmap;
 }
 
diff --git a/Libraries/LibGfx/GIFLoader.h b/Libraries/LibGfx/GIFLoader.h
index b18eafa0b0..5f509402a3 100644
--- a/Libraries/LibGfx/GIFLoader.h
+++ b/Libraries/LibGfx/GIFLoader.h
@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include <LibGfx/GraphicsBitmap.h>
+#include <LibGfx/Bitmap.h>
 #include <LibGfx/ImageDecoder.h>
 
 namespace Gfx {
diff --git a/Libraries/LibGfx/Makefile b/Libraries/LibGfx/Makefile
index c7d4da3efc..96fc1a064d 100644
--- a/Libraries/LibGfx/Makefile
+++ b/Libraries/LibGfx/Makefile
@@ -1,18 +1,18 @@
 OBJS = \
+    Bitmap.o \
     CharacterBitmap.o \
     Color.o \
     DisjointRectSet.o \
+    Emoji.o \
     Font.o \
-    GraphicsBitmap.o \
-    Painter.o \
-    PNGLoader.o \
     GIFLoader.o \
     ImageDecoder.o \
+    PNGLoader.o \
+    Painter.o \
+    Palette.o \
     Rect.o \
     StylePainter.o \
-    SystemTheme.o \
-    Palette.o \
-    Emoji.o
+    SystemTheme.o
 
 LIBRARY = libgfx.a
 
diff --git a/Libraries/LibGfx/PNGLoader.cpp b/Libraries/LibGfx/PNGLoader.cpp
index f194adde89..0b293dbac7 100644
--- a/Libraries/LibGfx/PNGLoader.cpp
+++ b/Libraries/LibGfx/PNGLoader.cpp
@@ -179,7 +179,7 @@ RefPtr<Gfx::Bitmap> load_png(const StringView& path)
         return nullptr;
     auto bitmap = load_png_impl((const u8*)mapped_file.data(), mapped_file.size());
     if (bitmap)
-        bitmap->set_mmap_name(String::format("GraphicsBitmap [%dx%d] - Decoded PNG: %s", bitmap->width(), bitmap->height(), canonicalized_path(path).characters()));
+        bitmap->set_mmap_name(String::format("Gfx::Bitmap [%dx%d] - Decoded PNG: %s", bitmap->width(), bitmap->height(), canonicalized_path(path).characters()));
     return bitmap;
 }
 
@@ -187,7 +187,7 @@ RefPtr<Gfx::Bitmap> load_png_from_memory(const u8* data, size_t length)
 {
     auto bitmap = load_png_impl(data, length);
     if (bitmap)
-        bitmap->set_mmap_name(String::format("GraphicsBitmap [%dx%d] - Decoded PNG: <memory>", bitmap->width(), bitmap->height()));
+        bitmap->set_mmap_name(String::format("Gfx::Bitmap [%dx%d] - Decoded PNG: <memory>", bitmap->width(), bitmap->height()));
     return bitmap;
 }
 
diff --git a/Libraries/LibGfx/PNGLoader.h b/Libraries/LibGfx/PNGLoader.h
index c5217d5276..ec2e1ec03c 100644
--- a/Libraries/LibGfx/PNGLoader.h
+++ b/Libraries/LibGfx/PNGLoader.h
@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include <LibGfx/GraphicsBitmap.h>
+#include <LibGfx/Bitmap.h>
 #include <LibGfx/ImageDecoder.h>
 
 namespace Gfx {
diff --git a/Libraries/LibGfx/Painter.cpp b/Libraries/LibGfx/Painter.cpp
index 00c1e9d050..c6b0091bc5 100644
--- a/Libraries/LibGfx/Painter.cpp
+++ b/Libraries/LibGfx/Painter.cpp
@@ -27,7 +27,7 @@
 #include "Painter.h"
 #include "Emoji.h"
 #include "Font.h"
-#include "GraphicsBitmap.h"
+#include "Bitmap.h"
 #include <AK/Assertions.h>
 #include <AK/StdLibExtras.h>
 #include <AK/StringBuilder.h>
diff --git a/Libraries/LibGfx/StylePainter.cpp b/Libraries/LibGfx/StylePainter.cpp
index db5a99a095..6d086fd325 100644
--- a/Libraries/LibGfx/StylePainter.cpp
+++ b/Libraries/LibGfx/StylePainter.cpp
@@ -24,7 +24,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibGfx/GraphicsBitmap.h>
+#include <LibGfx/Bitmap.h>
 #include <LibGfx/Painter.h>
 #include <LibGfx/Palette.h>
 #include <LibGfx/StylePainter.h>