diff --git a/Applications/Piano/main.cpp b/Applications/Piano/main.cpp
index 8f294eaa58..4be57b21c2 100644
--- a/Applications/Piano/main.cpp
+++ b/Applications/Piano/main.cpp
@@ -27,7 +27,7 @@
 
 #include "AudioEngine.h"
 #include "MainWidget.h"
-#include <LibAudio/AClientConnection.h>
+#include <LibAudio/ClientConnection.h>
 #include <LibCore/File.h>
 #include <LibGUI/GAboutDialog.h>
 #include <LibGUI/GAction.h>
diff --git a/Applications/SoundPlayer/PlaybackManager.h b/Applications/SoundPlayer/PlaybackManager.h
index 7365000cf5..5ed9cfed51 100644
--- a/Applications/SoundPlayer/PlaybackManager.h
+++ b/Applications/SoundPlayer/PlaybackManager.h
@@ -27,8 +27,8 @@
 #pragma once
 
 #include <AK/Vector.h>
-#include <LibAudio/AClientConnection.h>
-#include <LibAudio/AWavLoader.h>
+#include <LibAudio/ClientConnection.h>
+#include <LibAudio/WavLoader.h>
 #include <LibCore/Timer.h>
 
 #define PLAYBACK_MANAGER_BUFFER_SIZE 64 * KB
diff --git a/Applications/SoundPlayer/SampleWidget.cpp b/Applications/SoundPlayer/SampleWidget.cpp
index d02369e477..69e4958e99 100644
--- a/Applications/SoundPlayer/SampleWidget.cpp
+++ b/Applications/SoundPlayer/SampleWidget.cpp
@@ -25,7 +25,7 @@
  */
 
 #include "SampleWidget.h"
-#include <LibAudio/ABuffer.h>
+#include <LibAudio/Buffer.h>
 #include <LibGUI/GPainter.h>
 #include <LibM/math.h>
 
diff --git a/Applications/SoundPlayer/main.cpp b/Applications/SoundPlayer/main.cpp
index a26f969d6e..df7ed3cdf2 100644
--- a/Applications/SoundPlayer/main.cpp
+++ b/Applications/SoundPlayer/main.cpp
@@ -25,7 +25,7 @@
  */
 
 #include "SoundPlayerWidget.h"
-#include <LibAudio/AClientConnection.h>
+#include <LibAudio/ClientConnection.h>
 #include <LibGfx/CharacterBitmap.h>
 #include <LibGUI/GAboutDialog.h>
 #include <LibGUI/GAction.h>
diff --git a/Libraries/LibAudio/ABuffer.h b/Libraries/LibAudio/Buffer.h
similarity index 100%
rename from Libraries/LibAudio/ABuffer.h
rename to Libraries/LibAudio/Buffer.h
diff --git a/Libraries/LibAudio/AClientConnection.cpp b/Libraries/LibAudio/ClientConnection.cpp
similarity index 98%
rename from Libraries/LibAudio/AClientConnection.cpp
rename to Libraries/LibAudio/ClientConnection.cpp
index b31565c57c..ffb5eac114 100644
--- a/Libraries/LibAudio/AClientConnection.cpp
+++ b/Libraries/LibAudio/ClientConnection.cpp
@@ -25,8 +25,8 @@
  */
 
 #include <AK/SharedBuffer.h>
-#include <LibAudio/ABuffer.h>
-#include <LibAudio/AClientConnection.h>
+#include <LibAudio/Buffer.h>
+#include <LibAudio/ClientConnection.h>
 
 namespace Audio {
 
diff --git a/Libraries/LibAudio/AClientConnection.h b/Libraries/LibAudio/ClientConnection.h
similarity index 100%
rename from Libraries/LibAudio/AClientConnection.h
rename to Libraries/LibAudio/ClientConnection.h
diff --git a/Libraries/LibAudio/Makefile b/Libraries/LibAudio/Makefile
index ae2ec668ad..6a043b51b7 100644
--- a/Libraries/LibAudio/Makefile
+++ b/Libraries/LibAudio/Makefile
@@ -1,10 +1,10 @@
 OBJS = \
-    AClientConnection.o \
-    AWavLoader.o
+    ClientConnection.o \
+    WavLoader.o
 
 LIBRARY = libaudio.a
 
-AClientConnection.cpp: ../../Servers/AudioServer/AudioClientEndpoint.h
+ClientConnection.cpp: ../../Servers/AudioServer/AudioClientEndpoint.h
 ../../Servers/AudioServer/AudioClientEndpoint.h:
 	@flock $(dir $(@)) $(MAKE) -C $(dir $(@))
 
diff --git a/Libraries/LibAudio/AWavLoader.cpp b/Libraries/LibAudio/WavLoader.cpp
similarity index 99%
rename from Libraries/LibAudio/AWavLoader.cpp
rename to Libraries/LibAudio/WavLoader.cpp
index 32722d8aad..e100e8f7e7 100644
--- a/Libraries/LibAudio/AWavLoader.cpp
+++ b/Libraries/LibAudio/WavLoader.cpp
@@ -25,7 +25,7 @@
  */
 
 #include <AK/BufferStream.h>
-#include <LibAudio/AWavLoader.h>
+#include <LibAudio/WavLoader.h>
 #include <LibCore/File.h>
 #include <LibCore/IODeviceStreamReader.h>
 #include <limits>
diff --git a/Libraries/LibAudio/AWavLoader.h b/Libraries/LibAudio/WavLoader.h
similarity index 98%
rename from Libraries/LibAudio/AWavLoader.h
rename to Libraries/LibAudio/WavLoader.h
index 45d220f777..28ba8cf48b 100644
--- a/Libraries/LibAudio/AWavLoader.h
+++ b/Libraries/LibAudio/WavLoader.h
@@ -29,7 +29,7 @@
 #include <AK/RefPtr.h>
 #include <AK/String.h>
 #include <AK/StringView.h>
-#include <LibAudio/ABuffer.h>
+#include <LibAudio/Buffer.h>
 #include <LibCore/File.h>
 
 namespace AK {
diff --git a/MenuApplets/Audio/main.cpp b/MenuApplets/Audio/main.cpp
index 82665f23c5..ed0c4071bc 100644
--- a/MenuApplets/Audio/main.cpp
+++ b/MenuApplets/Audio/main.cpp
@@ -24,7 +24,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibAudio/AClientConnection.h>
+#include <LibAudio/ClientConnection.h>
 #include <LibGUI/GApplication.h>
 #include <LibGUI/GPainter.h>
 #include <LibGUI/GWidget.h>
diff --git a/Servers/AudioServer/ASClientConnection.cpp b/Servers/AudioServer/ASClientConnection.cpp
index cdb4512434..49bd930860 100644
--- a/Servers/AudioServer/ASClientConnection.cpp
+++ b/Servers/AudioServer/ASClientConnection.cpp
@@ -28,7 +28,7 @@
 #include "ASMixer.h"
 #include "AudioClientEndpoint.h"
 #include <AK/SharedBuffer.h>
-#include <LibAudio/ABuffer.h>
+#include <LibAudio/Buffer.h>
 #include <LibCore/EventLoop.h>
 #include <errno.h>
 #include <stdio.h>
diff --git a/Servers/AudioServer/ASMixer.h b/Servers/AudioServer/ASMixer.h
index 174f22f6c9..d45b81529f 100644
--- a/Servers/AudioServer/ASMixer.h
+++ b/Servers/AudioServer/ASMixer.h
@@ -32,7 +32,7 @@
 #include <AK/Queue.h>
 #include <AK/RefCounted.h>
 #include <AK/WeakPtr.h>
-#include <LibAudio/ABuffer.h>
+#include <LibAudio/Buffer.h>
 #include <LibCore/File.h>
 #include <LibThread/Lock.h>
 #include <LibThread/Thread.h>
diff --git a/Userland/aplay.cpp b/Userland/aplay.cpp
index 174a7a9f22..b02ffbb1dd 100644
--- a/Userland/aplay.cpp
+++ b/Userland/aplay.cpp
@@ -24,9 +24,9 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibAudio/ABuffer.h>
-#include <LibAudio/AClientConnection.h>
-#include <LibAudio/AWavLoader.h>
+#include <LibAudio/Buffer.h>
+#include <LibAudio/ClientConnection.h>
+#include <LibAudio/WavLoader.h>
 #include <LibCore/EventLoop.h>
 #include <stdio.h>
 
diff --git a/Userland/avol.cpp b/Userland/avol.cpp
index 8fa51c3587..9e2362c51d 100644
--- a/Userland/avol.cpp
+++ b/Userland/avol.cpp
@@ -24,8 +24,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibAudio/ABuffer.h>
-#include <LibAudio/AClientConnection.h>
+#include <LibAudio/Buffer.h>
+#include <LibAudio/ClientConnection.h>
 #include <stdio.h>
 
 int main(int argc, char** argv)