diff --git a/Makefile.am b/Makefile.am
index a2a45084e..08e08c012 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1376,11 +1376,11 @@ OUTPUT_API_SRC = \
 	src/output/MultipleOutputs.cxx src/output/MultipleOutputs.hxx \
 	src/output/SharedPipeConsumer.cxx src/output/SharedPipeConsumer.hxx \
 	src/output/Source.cxx src/output/Source.hxx \
-	src/output/OutputThread.cxx \
+	src/output/Thread.cxx \
 	src/output/Domain.cxx src/output/Domain.hxx \
 	src/output/Control.cxx src/output/Control.hxx \
-	src/output/OutputState.cxx src/output/OutputState.hxx \
-	src/output/OutputPrint.cxx src/output/OutputPrint.hxx \
+	src/output/State.cxx src/output/State.hxx \
+	src/output/Print.cxx src/output/Print.hxx \
 	src/output/OutputCommand.cxx src/output/OutputCommand.hxx \
 	src/output/OutputPlugin.cxx src/output/OutputPlugin.hxx \
 	src/output/Finish.cxx \
diff --git a/src/StateFile.cxx b/src/StateFile.cxx
index 7035e0e12..6be355431 100644
--- a/src/StateFile.cxx
+++ b/src/StateFile.cxx
@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "StateFile.hxx"
-#include "output/OutputState.hxx"
+#include "output/State.hxx"
 #include "queue/PlaylistState.hxx"
 #include "fs/io/TextFile.hxx"
 #include "fs/io/FileOutputStream.hxx"
diff --git a/src/command/OutputCommands.cxx b/src/command/OutputCommands.cxx
index 1aa7c0e31..4ce03131d 100644
--- a/src/command/OutputCommands.cxx
+++ b/src/command/OutputCommands.cxx
@@ -20,7 +20,7 @@
 #include "config.h"
 #include "OutputCommands.hxx"
 #include "Request.hxx"
-#include "output/OutputPrint.hxx"
+#include "output/Print.hxx"
 #include "output/OutputCommand.hxx"
 #include "client/Client.hxx"
 #include "client/Response.hxx"
diff --git a/src/output/OutputPrint.cxx b/src/output/Print.cxx
similarity index 97%
rename from src/output/OutputPrint.cxx
rename to src/output/Print.cxx
index a87f276c6..f24d09eda 100644
--- a/src/output/OutputPrint.cxx
+++ b/src/output/Print.cxx
@@ -23,7 +23,7 @@
  */
 
 #include "config.h"
-#include "OutputPrint.hxx"
+#include "Print.hxx"
 #include "MultipleOutputs.hxx"
 #include "Internal.hxx"
 #include "client/Response.hxx"
diff --git a/src/output/OutputPrint.hxx b/src/output/Print.hxx
similarity index 100%
rename from src/output/OutputPrint.hxx
rename to src/output/Print.hxx
diff --git a/src/output/OutputState.cxx b/src/output/State.cxx
similarity index 98%
rename from src/output/OutputState.cxx
rename to src/output/State.cxx
index c822f7a74..b57f8ce4d 100644
--- a/src/output/OutputState.cxx
+++ b/src/output/State.cxx
@@ -23,7 +23,7 @@
  */
 
 #include "config.h"
-#include "OutputState.hxx"
+#include "State.hxx"
 #include "MultipleOutputs.hxx"
 #include "Internal.hxx"
 #include "Domain.hxx"
diff --git a/src/output/OutputState.hxx b/src/output/State.hxx
similarity index 100%
rename from src/output/OutputState.hxx
rename to src/output/State.hxx
diff --git a/src/output/OutputThread.cxx b/src/output/Thread.cxx
similarity index 100%
rename from src/output/OutputThread.cxx
rename to src/output/Thread.cxx