LibCore: Remove leading C from filenames

56 files changed, 103 insertions, 103 deletions

diff --git a/Libraries/LibCore/CArgsParser.cpp b/Libraries/LibCore/ArgsParser.cpp
index e73bfb4f63..d8fb2609f5 100644
--- a/Libraries/LibCore/CArgsParser.cpp
+++ b/Libraries/LibCore/ArgsParser.cpp
@@ -24,8 +24,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "CArgsParser.h"
 #include <AK/StringBuilder.h>
+#include <LibCore/ArgsParser.h>
 #include <getopt.h>
 #include <limits.h>
 #include <stdio.h>
diff --git a/Libraries/LibCore/CArgsParser.h b/Libraries/LibCore/ArgsParser.h
index 69520e7002..69520e7002 100644
--- a/Libraries/LibCore/CArgsParser.h
+++ b/Libraries/LibCore/ArgsParser.h
diff --git a/Libraries/LibCore/CConfigFile.cpp b/Libraries/LibCore/ConfigFile.cpp
index c5a463efed..19e42469f4 100644
--- a/Libraries/LibCore/CConfigFile.cpp
+++ b/Libraries/LibCore/ConfigFile.cpp
@@ -25,9 +25,9 @@
  */
 
 #include <AK/StringBuilder.h>
-#include <LibCore/CConfigFile.h>
-#include <LibCore/CFile.h>
-#include <LibCore/CUserInfo.h>
+#include <LibCore/ConfigFile.h>
+#include <LibCore/File.h>
+#include <LibCore/UserInfo.h>
 #include <pwd.h>
 #include <stdio.h>
 #include <unistd.h>
diff --git a/Libraries/LibCore/CConfigFile.h b/Libraries/LibCore/ConfigFile.h
index 6a71ff9b88..6a71ff9b88 100644
--- a/Libraries/LibCore/CConfigFile.h
+++ b/Libraries/LibCore/ConfigFile.h
diff --git a/Libraries/LibCore/CDirIterator.cpp b/Libraries/LibCore/DirIterator.cpp
index 7da1460e50..066a30d818 100644
--- a/Libraries/LibCore/CDirIterator.cpp
+++ b/Libraries/LibCore/DirIterator.cpp
@@ -24,7 +24,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "CDirIterator.h"
+#include <LibCore/DirIterator.h>
 #include <errno.h>
 
 namespace Core {
diff --git a/Libraries/LibCore/CDirIterator.h b/Libraries/LibCore/DirIterator.h
index a7aa80f5c6..a7aa80f5c6 100644
--- a/Libraries/LibCore/CDirIterator.h
+++ b/Libraries/LibCore/DirIterator.h
diff --git a/Libraries/LibCore/CElapsedTimer.cpp b/Libraries/LibCore/ElapsedTimer.cpp
index 8d16722297..c117450367 100644
--- a/Libraries/LibCore/CElapsedTimer.cpp
+++ b/Libraries/LibCore/ElapsedTimer.cpp
@@ -26,7 +26,7 @@
 
 #include <AK/Assertions.h>
 #include <AK/Time.h>
-#include <LibCore/CElapsedTimer.h>
+#include <LibCore/ElapsedTimer.h>
 #include <sys/time.h>
 
 namespace Core {
diff --git a/Libraries/LibCore/CElapsedTimer.h b/Libraries/LibCore/ElapsedTimer.h
index 7db9ff0bb7..7db9ff0bb7 100644
--- a/Libraries/LibCore/CElapsedTimer.h
+++ b/Libraries/LibCore/ElapsedTimer.h
diff --git a/Libraries/LibCore/CEvent.cpp b/Libraries/LibCore/Event.cpp
index 99d752d264..67bdd3dff8 100644
--- a/Libraries/LibCore/CEvent.cpp
+++ b/Libraries/LibCore/Event.cpp
@@ -24,8 +24,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibCore/CEvent.h>
-#include <LibCore/CObject.h>
+#include <LibCore/Event.h>
+#include <LibCore/Object.h>
 
 namespace Core {
 
diff --git a/Libraries/LibCore/CEvent.h b/Libraries/LibCore/Event.h
index d3c7cc1f22..d3c7cc1f22 100644
--- a/Libraries/LibCore/CEvent.h
+++ b/Libraries/LibCore/Event.h
diff --git a/Libraries/LibCore/CEventLoop.cpp b/Libraries/LibCore/EventLoop.cpp
index 84d13eecd6..aae6d33a5c 100644
--- a/Libraries/LibCore/CEventLoop.cpp
+++ b/Libraries/LibCore/EventLoop.cpp
@@ -28,12 +28,12 @@
 #include <AK/JsonObject.h>
 #include <AK/JsonValue.h>
 #include <AK/Time.h>
-#include <LibCore/CEvent.h>
-#include <LibCore/CEventLoop.h>
-#include <LibCore/CLocalSocket.h>
-#include <LibCore/CNotifier.h>
-#include <LibCore/CObject.h>
-#include <LibCore/CSyscallUtils.h>
+#include <LibCore/Event.h>
+#include <LibCore/EventLoop.h>
+#include <LibCore/LocalSocket.h>
+#include <LibCore/Notifier.h>
+#include <LibCore/Object.h>
+#include <LibCore/SyscallUtils.h>
 #include <LibThread/Lock.h>
 #include <errno.h>
 #include <fcntl.h>
diff --git a/Libraries/LibCore/CEventLoop.h b/Libraries/LibCore/EventLoop.h
index 6c181b051d..388b21310b 100644
--- a/Libraries/LibCore/CEventLoop.h
+++ b/Libraries/LibCore/EventLoop.h
@@ -31,8 +31,8 @@
 #include <AK/OwnPtr.h>
 #include <AK/Vector.h>
 #include <AK/WeakPtr.h>
-#include <LibCore/CEvent.h>
-#include <LibCore/CLocalServer.h>
+#include <LibCore/Event.h>
+#include <LibCore/LocalServer.h>
 #include <LibThread/Lock.h>
 #include <sys/select.h>
 #include <sys/time.h>
diff --git a/Libraries/LibCore/CFile.cpp b/Libraries/LibCore/File.cpp
index 89a43bbe43..e5058f8dfb 100644
--- a/Libraries/LibCore/CFile.cpp
+++ b/Libraries/LibCore/File.cpp
@@ -24,7 +24,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibCore/CFile.h>
+#include <LibCore/File.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
diff --git a/Libraries/LibCore/CFile.h b/Libraries/LibCore/File.h
index 9c5da06f29..fd99805f85 100644
--- a/Libraries/LibCore/CFile.h
+++ b/Libraries/LibCore/File.h
@@ -27,7 +27,7 @@
 #pragma once
 
 #include <AK/String.h>
-#include <LibCore/CIODevice.h>
+#include <LibCore/IODevice.h>
 
 namespace Core {
 
diff --git a/Libraries/LibCore/CGzip.cpp b/Libraries/LibCore/Gzip.cpp
index 3e60cddc2d..27238d6c19 100644
--- a/Libraries/LibCore/CGzip.cpp
+++ b/Libraries/LibCore/Gzip.cpp
@@ -24,9 +24,9 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "CGzip.h"
 #include <AK/ByteBuffer.h>
 #include <AK/Optional.h>
+#include <LibCore/Gzip.h>
 #include <LibCore/puff.h>
 #include <limits.h>
 #include <stddef.h>
@@ -131,8 +131,8 @@ Optional<ByteBuffer> CGzip::decompress(const ByteBuffer& data)
         if (puff_ret == 0) {
             dbg() << "Gzip::decompress: Decompression success.";
             break;
-        } 
-        
+        }
+
         if (puff_ret == 1) {
             // FIXME: Find a better way of decompressing without needing to try over and over again.
             dbg() << "Gzip::decompress: Output buffer exhausted. Growing.";
diff --git a/Libraries/LibCore/CGzip.h b/Libraries/LibCore/Gzip.h
index 30478d5a53..30478d5a53 100644
--- a/Libraries/LibCore/CGzip.h
+++ b/Libraries/LibCore/Gzip.h
diff --git a/Libraries/LibCore/CHttpJob.cpp b/Libraries/LibCore/HttpJob.cpp
index 624ed73254..bfe9fe7e69 100644
--- a/Libraries/LibCore/CHttpJob.cpp
+++ b/Libraries/LibCore/HttpJob.cpp
@@ -24,10 +24,10 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibCore/CGzip.h>
-#include <LibCore/CHttpJob.h>
-#include <LibCore/CHttpResponse.h>
-#include <LibCore/CTCPSocket.h>
+#include <LibCore/Gzip.h>
+#include <LibCore/HttpJob.h>
+#include <LibCore/HttpResponse.h>
+#include <LibCore/TCPSocket.h>
 #include <stdio.h>
 #include <unistd.h>
 
diff --git a/Libraries/LibCore/CHttpJob.h b/Libraries/LibCore/HttpJob.h
index 549892c060..5c8203f906 100644
--- a/Libraries/LibCore/CHttpJob.h
+++ b/Libraries/LibCore/HttpJob.h
@@ -27,9 +27,9 @@
 #pragma once
 
 #include <AK/HashMap.h>
-#include <LibCore/CHttpRequest.h>
-#include <LibCore/CHttpResponse.h>
-#include <LibCore/CNetworkJob.h>
+#include <LibCore/HttpRequest.h>
+#include <LibCore/HttpResponse.h>
+#include <LibCore/NetworkJob.h>
 
 namespace Core {
 
diff --git a/Libraries/LibCore/CHttpRequest.cpp b/Libraries/LibCore/HttpRequest.cpp
index 99899427ac..006fea5be2 100644
--- a/Libraries/LibCore/CHttpRequest.cpp
+++ b/Libraries/LibCore/HttpRequest.cpp
@@ -25,8 +25,8 @@
  */
 
 #include <AK/StringBuilder.h>
-#include <LibCore/CHttpJob.h>
-#include <LibCore/CHttpRequest.h>
+#include <LibCore/HttpJob.h>
+#include <LibCore/HttpRequest.h>
 
 namespace Core {
 
diff --git a/Libraries/LibCore/CHttpRequest.h b/Libraries/LibCore/HttpRequest.h
index fe4feafd14..fe4feafd14 100644
--- a/Libraries/LibCore/CHttpRequest.h
+++ b/Libraries/LibCore/HttpRequest.h
diff --git a/Libraries/LibCore/CHttpResponse.cpp b/Libraries/LibCore/HttpResponse.cpp
index 064da3d2ba..aae66e6df8 100644
--- a/Libraries/LibCore/CHttpResponse.cpp
+++ b/Libraries/LibCore/HttpResponse.cpp
@@ -24,7 +24,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibCore/CHttpResponse.h>
+#include <LibCore/HttpResponse.h>
 
 namespace Core {
 
diff --git a/Libraries/LibCore/CHttpResponse.h b/Libraries/LibCore/HttpResponse.h
index 65d72f11ab..6af92dec31 100644
--- a/Libraries/LibCore/CHttpResponse.h
+++ b/Libraries/LibCore/HttpResponse.h
@@ -28,7 +28,7 @@
 
 #include <AK/HashMap.h>
 #include <AK/String.h>
-#include <LibCore/CNetworkResponse.h>
+#include <LibCore/NetworkResponse.h>
 
 namespace Core {
 
diff --git a/Libraries/LibCore/CIODevice.cpp b/Libraries/LibCore/IODevice.cpp
index 03666b0bfa..7b8edc1f57 100644
--- a/Libraries/LibCore/CIODevice.cpp
+++ b/Libraries/LibCore/IODevice.cpp
@@ -25,8 +25,8 @@
  */
 
 #include <AK/PrintfImplementation.h>
-#include <LibCore/CIODevice.h>
-#include <LibCore/CSyscallUtils.h>
+#include <LibCore/IODevice.h>
+#include <LibCore/SyscallUtils.h>
 #include <errno.h>
 #include <stdio.h>
 #include <sys/select.h>
diff --git a/Libraries/LibCore/CIODevice.h b/Libraries/LibCore/IODevice.h
index ac4d753e2b..68b4d9782a 100644
--- a/Libraries/LibCore/CIODevice.h
+++ b/Libraries/LibCore/IODevice.h
@@ -28,7 +28,7 @@
 
 #include <AK/ByteBuffer.h>
 #include <AK/StringView.h>
-#include <LibCore/CObject.h>
+#include <LibCore/Object.h>
 
 namespace Core {
 
diff --git a/Libraries/LibCore/CIODeviceStreamReader.h b/Libraries/LibCore/IODeviceStreamReader.h
index a7318ce8b7..0339c30272 100644
--- a/Libraries/LibCore/CIODeviceStreamReader.h
+++ b/Libraries/LibCore/IODeviceStreamReader.h
@@ -27,7 +27,7 @@
 #pragma once
 
 #include <AK/StdLibExtras.h>
-#include <LibCore/CIODevice.h>
+#include <LibCore/IODevice.h>
 
 namespace Core {
 
diff --git a/Libraries/LibCore/CLocalServer.cpp b/Libraries/LibCore/LocalServer.cpp
index 0f03ee0ab8..bdff0a39ab 100644
--- a/Libraries/LibCore/CLocalServer.cpp
+++ b/Libraries/LibCore/LocalServer.cpp
@@ -24,9 +24,9 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibCore/CLocalServer.h>
-#include <LibCore/CLocalSocket.h>
-#include <LibCore/CNotifier.h>
+#include <LibCore/LocalServer.h>
+#include <LibCore/LocalSocket.h>
+#include <LibCore/Notifier.h>
 #include <stdio.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
diff --git a/Libraries/LibCore/CLocalServer.h b/Libraries/LibCore/LocalServer.h
index 05ee7942ca..bd26d75dd3 100644
--- a/Libraries/LibCore/CLocalServer.h
+++ b/Libraries/LibCore/LocalServer.h
@@ -26,8 +26,8 @@
 
 #pragma once
 
-#include <LibCore/CNotifier.h>
-#include <LibCore/CObject.h>
+#include <LibCore/Notifier.h>
+#include <LibCore/Object.h>
 
 namespace Core {
 
diff --git a/Libraries/LibCore/CLocalSocket.cpp b/Libraries/LibCore/LocalSocket.cpp
index c9e92eceb8..533670b435 100644
--- a/Libraries/LibCore/CLocalSocket.cpp
+++ b/Libraries/LibCore/LocalSocket.cpp
@@ -24,7 +24,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibCore/CLocalSocket.h>
+#include <LibCore/LocalSocket.h>
 #include <errno.h>
 #include <sys/socket.h>
 
diff --git a/Libraries/LibCore/CLocalSocket.h b/Libraries/LibCore/LocalSocket.h
index 6d32bc3395..e5ea900b08 100644
--- a/Libraries/LibCore/CLocalSocket.h
+++ b/Libraries/LibCore/LocalSocket.h
@@ -27,7 +27,7 @@
 #pragma once
 
 #include <AK/Badge.h>
-#include <LibCore/CSocket.h>
+#include <LibCore/Socket.h>
 
 namespace Core {
 
diff --git a/Libraries/LibCore/Makefile b/Libraries/LibCore/Makefile
index 4f3ad8e5d8..2c57812c70 100644
--- a/Libraries/LibCore/Makefile
+++ b/Libraries/LibCore/Makefile
@@ -1,30 +1,30 @@
 OBJS = \
-    CArgsParser.o \
-    CIODevice.o \
-    CFile.o \
-    CSocket.o \
-    CLocalSocket.o \
-    CLocalServer.o \
-    CTCPSocket.o \
-    CTCPServer.o \
-    CUdpSocket.o \
-    CUdpServer.o \
-    CElapsedTimer.o \
-    CNotifier.o \
-    CHttpRequest.o \
-    CHttpResponse.o \
-    CHttpJob.o \
-    CNetworkJob.o \
-    CNetworkResponse.o \
-    CObject.o \
-    CTimer.o \
-    CEventLoop.o \
-    CConfigFile.o \
-    CEvent.o \
-    CProcessStatisticsReader.o \
-    CDirIterator.o \
-    CUserInfo.o \
-    CGzip.o \
+    ArgsParser.o \
+    IODevice.o \
+    File.o \
+    Socket.o \
+    LocalSocket.o \
+    LocalServer.o \
+    TCPSocket.o \
+    TCPServer.o \
+    UdpSocket.o \
+    UdpServer.o \
+    ElapsedTimer.o \
+    Notifier.o \
+    HttpRequest.o \
+    HttpResponse.o \
+    HttpJob.o \
+    NetworkJob.o \
+    NetworkResponse.o \
+    Object.o \
+    Timer.o \
+    EventLoop.o \
+    ConfigFile.o \
+    Event.o \
+    ProcessStatisticsReader.o \
+    DirIterator.o \
+    UserInfo.o \
+    Gzip.o \
     puff.o
 
 LIBRARY = libcore.a
diff --git a/Libraries/LibCore/CNetworkJob.cpp b/Libraries/LibCore/NetworkJob.cpp
index cc090bee20..6dcba639e0 100644
--- a/Libraries/LibCore/CNetworkJob.cpp
+++ b/Libraries/LibCore/NetworkJob.cpp
@@ -24,8 +24,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibCore/CNetworkJob.h>
-#include <LibCore/CNetworkResponse.h>
+#include <LibCore/NetworkJob.h>
+#include <LibCore/NetworkResponse.h>
 #include <stdio.h>
 
 //#define CNETWORKJOB_DEBUG
diff --git a/Libraries/LibCore/CNetworkJob.h b/Libraries/LibCore/NetworkJob.h
index 9c2dcad14c..e808ddc434 100644
--- a/Libraries/LibCore/CNetworkJob.h
+++ b/Libraries/LibCore/NetworkJob.h
@@ -27,7 +27,7 @@
 #pragma once
 
 #include <AK/Function.h>
-#include <LibCore/CObject.h>
+#include <LibCore/Object.h>
 
 namespace Core {
 
diff --git a/Libraries/LibCore/CNetworkResponse.cpp b/Libraries/LibCore/NetworkResponse.cpp
index f61b559129..70654c670d 100644
--- a/Libraries/LibCore/CNetworkResponse.cpp
+++ b/Libraries/LibCore/NetworkResponse.cpp
@@ -24,7 +24,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibCore/CNetworkResponse.h>
+#include <LibCore/NetworkResponse.h>
 
 namespace Core {
 
diff --git a/Libraries/LibCore/CNetworkResponse.h b/Libraries/LibCore/NetworkResponse.h
index d39e2832eb..d39e2832eb 100644
--- a/Libraries/LibCore/CNetworkResponse.h
+++ b/Libraries/LibCore/NetworkResponse.h
diff --git a/Libraries/LibCore/CNotifier.cpp b/Libraries/LibCore/Notifier.cpp
index a02f317d19..8dbe8f464b 100644
--- a/Libraries/LibCore/CNotifier.cpp
+++ b/Libraries/LibCore/Notifier.cpp
@@ -24,9 +24,9 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibCore/CEvent.h>
-#include <LibCore/CEventLoop.h>
-#include <LibCore/CNotifier.h>
+#include <LibCore/Event.h>
+#include <LibCore/EventLoop.h>
+#include <LibCore/Notifier.h>
 
 namespace Core {
 
diff --git a/Libraries/LibCore/CNotifier.h b/Libraries/LibCore/Notifier.h
index 9c21c3357a..fd40053284 100644
--- a/Libraries/LibCore/CNotifier.h
+++ b/Libraries/LibCore/Notifier.h
@@ -27,7 +27,7 @@
 #pragma once
 
 #include <AK/Function.h>
-#include <LibCore/CObject.h>
+#include <LibCore/Object.h>
 
 namespace Core {
 
diff --git a/Libraries/LibCore/CObject.cpp b/Libraries/LibCore/Object.cpp
index 9bb1245628..ad73176f4e 100644
--- a/Libraries/LibCore/CObject.cpp
+++ b/Libraries/LibCore/Object.cpp
@@ -27,9 +27,9 @@
 #include <AK/Assertions.h>
 #include <AK/JsonObject.h>
 #include <AK/kstdio.h>
-#include <LibCore/CEvent.h>
-#include <LibCore/CEventLoop.h>
-#include <LibCore/CObject.h>
+#include <LibCore/Event.h>
+#include <LibCore/EventLoop.h>
+#include <LibCore/Object.h>
 #include <stdio.h>
 
 namespace Core {
diff --git a/Libraries/LibCore/CObject.h b/Libraries/LibCore/Object.h
index bc86be1350..bc86be1350 100644
--- a/Libraries/LibCore/CObject.h
+++ b/Libraries/LibCore/Object.h
diff --git a/Libraries/LibCore/CProcessStatisticsReader.cpp b/Libraries/LibCore/ProcessStatisticsReader.cpp
index 815dc52f14..ed7616a9d0 100644
--- a/Libraries/LibCore/CProcessStatisticsReader.cpp
+++ b/Libraries/LibCore/ProcessStatisticsReader.cpp
@@ -27,8 +27,8 @@
 #include <AK/JsonArray.h>
 #include <AK/JsonObject.h>
 #include <AK/JsonValue.h>
-#include <LibCore/CFile.h>
-#include <LibCore/CProcessStatisticsReader.h>
+#include <LibCore/File.h>
+#include <LibCore/ProcessStatisticsReader.h>
 #include <pwd.h>
 #include <stdio.h>
 
diff --git a/Libraries/LibCore/CProcessStatisticsReader.h b/Libraries/LibCore/ProcessStatisticsReader.h
index d0850f2d48..d0850f2d48 100644
--- a/Libraries/LibCore/CProcessStatisticsReader.h
+++ b/Libraries/LibCore/ProcessStatisticsReader.h
diff --git a/Libraries/LibCore/CSocket.cpp b/Libraries/LibCore/Socket.cpp
index e16ef730ea..c2a5dc50e2 100644
--- a/Libraries/LibCore/CSocket.cpp
+++ b/Libraries/LibCore/Socket.cpp
@@ -24,8 +24,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibCore/CNotifier.h>
-#include <LibCore/CSocket.h>
+#include <LibCore/Notifier.h>
+#include <LibCore/Socket.h>
 #include <arpa/inet.h>
 #include <errno.h>
 #include <fcntl.h>
diff --git a/Libraries/LibCore/CSocket.h b/Libraries/LibCore/Socket.h
index 5538bbd2b8..1b372e5be9 100644
--- a/Libraries/LibCore/CSocket.h
+++ b/Libraries/LibCore/Socket.h
@@ -26,8 +26,8 @@
 
 #pragma once
 
-#include <LibCore/CIODevice.h>
-#include <LibCore/CSocketAddress.h>
+#include <LibCore/IODevice.h>
+#include <LibCore/SocketAddress.h>
 
 namespace Core {
 
diff --git a/Libraries/LibCore/CSocketAddress.h b/Libraries/LibCore/SocketAddress.h
index 3c0bfcf482..3c0bfcf482 100644
--- a/Libraries/LibCore/CSocketAddress.h
+++ b/Libraries/LibCore/SocketAddress.h
diff --git a/Libraries/LibCore/CSyscallUtils.h b/Libraries/LibCore/SyscallUtils.h
index 98563ae073..98563ae073 100644
--- a/Libraries/LibCore/CSyscallUtils.h
+++ b/Libraries/LibCore/SyscallUtils.h
diff --git a/Libraries/LibCore/CTCPServer.cpp b/Libraries/LibCore/TCPServer.cpp
index 4813d17d74..9a730325f4 100644
--- a/Libraries/LibCore/CTCPServer.cpp
+++ b/Libraries/LibCore/TCPServer.cpp
@@ -26,9 +26,9 @@
 
 #include <AK/IPv4Address.h>
 #include <AK/Types.h>
-#include <LibCore/CNotifier.h>
-#include <LibCore/CTCPServer.h>
-#include <LibCore/CTCPSocket.h>
+#include <LibCore/Notifier.h>
+#include <LibCore/TCPServer.h>
+#include <LibCore/TCPSocket.h>
 #include <stdio.h>
 #include <sys/socket.h>
 
diff --git a/Libraries/LibCore/CTCPServer.h b/Libraries/LibCore/TCPServer.h
index de76f8c374..d62c8f6ce8 100644
--- a/Libraries/LibCore/CTCPServer.h
+++ b/Libraries/LibCore/TCPServer.h
@@ -27,8 +27,8 @@
 #pragma once
 
 #include <AK/IPv4Address.h>
-#include <LibCore/CNotifier.h>
-#include <LibCore/CObject.h>
+#include <LibCore/Notifier.h>
+#include <LibCore/Object.h>
 
 namespace Core {
 
diff --git a/Libraries/LibCore/CTCPSocket.cpp b/Libraries/LibCore/TCPSocket.cpp
index cc47708438..2a61f34fcf 100644
--- a/Libraries/LibCore/CTCPSocket.cpp
+++ b/Libraries/LibCore/TCPSocket.cpp
@@ -24,7 +24,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibCore/CTCPSocket.h>
+#include <LibCore/TCPSocket.h>
 #include <errno.h>
 #include <sys/socket.h>
 
diff --git a/Libraries/LibCore/CTCPSocket.h b/Libraries/LibCore/TCPSocket.h
index e3168b3d8d..156fbe2b36 100644
--- a/Libraries/LibCore/CTCPSocket.h
+++ b/Libraries/LibCore/TCPSocket.h
@@ -27,7 +27,7 @@
 #pragma once
 
 #include <AK/Badge.h>
-#include <LibCore/CSocket.h>
+#include <LibCore/Socket.h>
 
 namespace Core {
 
diff --git a/Libraries/LibCore/CTimer.cpp b/Libraries/LibCore/Timer.cpp
index 40fdd38983..32d4eea23e 100644
--- a/Libraries/LibCore/CTimer.cpp
+++ b/Libraries/LibCore/Timer.cpp
@@ -24,7 +24,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibCore/CTimer.h>
+#include <LibCore/Timer.h>
 
 namespace Core {
 
diff --git a/Libraries/LibCore/CTimer.h b/Libraries/LibCore/Timer.h
index 76b44773ff..94319c7e50 100644
--- a/Libraries/LibCore/CTimer.h
+++ b/Libraries/LibCore/Timer.h
@@ -27,7 +27,7 @@
 #pragma once
 
 #include <AK/Function.h>
-#include <LibCore/CObject.h>
+#include <LibCore/Object.h>
 
 namespace Core {
 
diff --git a/Libraries/LibCore/CUdpServer.cpp b/Libraries/LibCore/UdpServer.cpp
index 82c0c2b574..6145115af8 100644
--- a/Libraries/LibCore/CUdpServer.cpp
+++ b/Libraries/LibCore/UdpServer.cpp
@@ -26,9 +26,9 @@
 
 #include <AK/IPv4Address.h>
 #include <AK/Types.h>
-#include <LibCore/CNotifier.h>
-#include <LibCore/CUdpServer.h>
-#include <LibCore/CUdpSocket.h>
+#include <LibCore/Notifier.h>
+#include <LibCore/UdpServer.h>
+#include <LibCore/UdpSocket.h>
 #include <stdio.h>
 #include <sys/socket.h>
 
diff --git a/Libraries/LibCore/CUdpServer.h b/Libraries/LibCore/UdpServer.h
index 99836304a8..3e7e085bbf 100644
--- a/Libraries/LibCore/CUdpServer.h
+++ b/Libraries/LibCore/UdpServer.h
@@ -27,8 +27,8 @@
 #pragma once
 
 #include <AK/IPv4Address.h>
-#include <LibCore/CNotifier.h>
-#include <LibCore/CObject.h>
+#include <LibCore/Notifier.h>
+#include <LibCore/Object.h>
 
 namespace Core {
 
diff --git a/Libraries/LibCore/CUdpSocket.cpp b/Libraries/LibCore/UdpSocket.cpp
index 95490b51db..fd0c2ccd7c 100644
--- a/Libraries/LibCore/CUdpSocket.cpp
+++ b/Libraries/LibCore/UdpSocket.cpp
@@ -24,7 +24,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibCore/CUdpSocket.h>
+#include <LibCore/UdpSocket.h>
 #include <errno.h>
 #include <sys/socket.h>
 
diff --git a/Libraries/LibCore/CUdpSocket.h b/Libraries/LibCore/UdpSocket.h
index 759e93fb18..ad18a2312b 100644
--- a/Libraries/LibCore/CUdpSocket.h
+++ b/Libraries/LibCore/UdpSocket.h
@@ -27,7 +27,7 @@
 #pragma once
 
 #include <AK/Badge.h>
-#include <LibCore/CSocket.h>
+#include <LibCore/Socket.h>
 
 namespace Core {
 
diff --git a/Libraries/LibCore/CUserInfo.cpp b/Libraries/LibCore/UserInfo.cpp
index db1785c072..284272be4e 100644
--- a/Libraries/LibCore/CUserInfo.cpp
+++ b/Libraries/LibCore/UserInfo.cpp
@@ -24,7 +24,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "CUserInfo.h"
+#include <LibCore/UserInfo.h>
 #include <pwd.h>
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/Libraries/LibCore/CUserInfo.h b/Libraries/LibCore/UserInfo.h
index d609cdbe59..d609cdbe59 100644
--- a/Libraries/LibCore/CUserInfo.h
+++ b/Libraries/LibCore/UserInfo.h