tag/Tag*: rename several source files

77 files changed, 100 insertions, 100 deletions

diff --git a/src/IcyMetaDataParser.cxx b/src/IcyMetaDataParser.cxx
index 867fedde0..bc2d3b357 100644
--- a/src/IcyMetaDataParser.cxx
+++ b/src/IcyMetaDataParser.cxx
@@ -20,7 +20,7 @@
 #include "config.h"
 #include "IcyMetaDataParser.hxx"
 #include "tag/Tag.hxx"
-#include "tag/TagBuilder.hxx"
+#include "tag/Builder.hxx"
 #include "util/Domain.hxx"
 #include "util/StringView.hxx"
 #include "Log.hxx"
diff --git a/src/Main.cxx b/src/Main.cxx
index e4aa2cbba..eb9e65300 100644
--- a/src/Main.cxx
+++ b/src/Main.cxx
@@ -32,7 +32,7 @@
 #include "client/ClientList.hxx"
 #include "command/AllCommands.hxx"
 #include "Partition.hxx"
-#include "tag/TagConfig.hxx"
+#include "tag/Config.hxx"
 #include "ReplayGainGlobal.hxx"
 #include "Idle.hxx"
 #include "Log.hxx"
diff --git a/src/SongSave.cxx b/src/SongSave.cxx
index ace38d4fe..92e1c83a3 100644
--- a/src/SongSave.cxx
+++ b/src/SongSave.cxx
@@ -25,7 +25,7 @@
 #include "fs/io/TextFile.hxx"
 #include "fs/io/BufferedOutputStream.hxx"
 #include "tag/Tag.hxx"
-#include "tag/TagBuilder.hxx"
+#include "tag/Builder.hxx"
 #include "util/StringUtil.hxx"
 #include "util/RuntimeError.hxx"
 
diff --git a/src/SongUpdate.cxx b/src/SongUpdate.cxx
index b41a1eb32..1075c09df 100644
--- a/src/SongUpdate.cxx
+++ b/src/SongUpdate.cxx
@@ -26,7 +26,7 @@
 #include "util/UriUtil.hxx"
 #include "fs/AllocatedPath.hxx"
 #include "fs/FileInfo.hxx"
-#include "tag/TagBuilder.hxx"
+#include "tag/Builder.hxx"
 #include "TagFile.hxx"
 #include "TagStream.hxx"
 
diff --git a/src/TagFile.cxx b/src/TagFile.cxx
index 46a18a353..0bb4c9193 100644
--- a/src/TagFile.cxx
+++ b/src/TagFile.cxx
@@ -20,8 +20,8 @@
 #include "config.h"
 #include "TagFile.hxx"
 #include "tag/Generic.hxx"
-#include "tag/TagHandler.hxx"
-#include "tag/TagBuilder.hxx"
+#include "tag/Handler.hxx"
+#include "tag/Builder.hxx"
 #include "fs/Path.hxx"
 #include "decoder/DecoderList.hxx"
 #include "decoder/DecoderPlugin.hxx"
diff --git a/src/TagStream.cxx b/src/TagStream.cxx
index 595a456ac..27263f140 100644
--- a/src/TagStream.cxx
+++ b/src/TagStream.cxx
@@ -20,8 +20,8 @@
 #include "config.h"
 #include "TagStream.hxx"
 #include "tag/Generic.hxx"
-#include "tag/TagHandler.hxx"
-#include "tag/TagBuilder.hxx"
+#include "tag/Handler.hxx"
+#include "tag/Builder.hxx"
 #include "util/MimeType.hxx"
 #include "util/UriUtil.hxx"
 #include "decoder/DecoderList.hxx"
diff --git a/src/command/AllCommands.cxx b/src/command/AllCommands.cxx
index 1c08bc9a1..e9546b915 100644
--- a/src/command/AllCommands.cxx
+++ b/src/command/AllCommands.cxx
@@ -33,7 +33,7 @@
 #include "NeighborCommands.hxx"
 #include "OtherCommands.hxx"
 #include "Permission.hxx"
-#include "tag/TagType.h"
+#include "tag/Type.h"
 #include "Partition.hxx"
 #include "client/Client.hxx"
 #include "client/Response.hxx"
diff --git a/src/command/FileCommands.cxx b/src/command/FileCommands.cxx
index 51bde6eb6..898761de1 100644
--- a/src/command/FileCommands.cxx
+++ b/src/command/FileCommands.cxx
@@ -28,7 +28,7 @@
 #include "client/Response.hxx"
 #include "util/CharUtil.hxx"
 #include "util/UriUtil.hxx"
-#include "tag/TagHandler.hxx"
+#include "tag/Handler.hxx"
 #include "tag/Generic.hxx"
 #include "TagStream.hxx"
 #include "TagFile.hxx"
diff --git a/src/command/OtherCommands.cxx b/src/command/OtherCommands.cxx
index a579f90bd..81a7cf94f 100644
--- a/src/command/OtherCommands.cxx
+++ b/src/command/OtherCommands.cxx
@@ -30,7 +30,7 @@
 #include "SongPrint.hxx"
 #include "TagPrint.hxx"
 #include "TagStream.hxx"
-#include "tag/TagHandler.hxx"
+#include "tag/Handler.hxx"
 #include "TimePrint.hxx"
 #include "decoder/DecoderPrint.hxx"
 #include "ls.hxx"
diff --git a/src/db/Interface.hxx b/src/db/Interface.hxx
index 4e01c42ce..9f8f5837b 100644
--- a/src/db/Interface.hxx
+++ b/src/db/Interface.hxx
@@ -21,7 +21,7 @@
 #define MPD_DATABASE_INTERFACE_HXX
 
 #include "Visitor.hxx"
-#include "tag/TagType.h"
+#include "tag/Type.h"
 #include "tag/Mask.hxx"
 #include "Compiler.h"
 
diff --git a/src/db/UniqueTags.hxx b/src/db/UniqueTags.hxx
index efb2a089d..d50be564f 100644
--- a/src/db/UniqueTags.hxx
+++ b/src/db/UniqueTags.hxx
@@ -21,7 +21,7 @@
 #define MPD_DB_UNIQUE_TAGS_HXX
 
 #include "Visitor.hxx"
-#include "tag/TagType.h"
+#include "tag/Type.h"
 #include "tag/Mask.hxx"
 
 class Database;
diff --git a/src/db/plugins/ProxyDatabasePlugin.cxx b/src/db/plugins/ProxyDatabasePlugin.cxx
index b3df1d28e..50c092fa8 100644
--- a/src/db/plugins/ProxyDatabasePlugin.cxx
+++ b/src/db/plugins/ProxyDatabasePlugin.cxx
@@ -31,7 +31,7 @@
 #include "SongFilter.hxx"
 #include "Compiler.h"
 #include "config/Block.hxx"
-#include "tag/TagBuilder.hxx"
+#include "tag/Builder.hxx"
 #include "tag/Tag.hxx"
 #include "util/ScopeExit.hxx"
 #include "util/RuntimeError.hxx"
diff --git a/src/db/plugins/upnp/Directory.cxx b/src/db/plugins/upnp/Directory.cxx
index 444cf1a73..806f49c1a 100644
--- a/src/db/plugins/upnp/Directory.cxx
+++ b/src/db/plugins/upnp/Directory.cxx
@@ -22,8 +22,8 @@
 #include "lib/upnp/Util.hxx"
 #include "lib/expat/ExpatParser.hxx"
 #include "Tags.hxx"
-#include "tag/TagBuilder.hxx"
-#include "tag/TagTable.hxx"
+#include "tag/Builder.hxx"
+#include "tag/Table.hxx"
 #include "util/NumberParser.hxx"
 #include "util/StringView.hxx"
 
diff --git a/src/db/plugins/upnp/Tags.cxx b/src/db/plugins/upnp/Tags.cxx
index 72432dba1..02ab10a03 100644
--- a/src/db/plugins/upnp/Tags.cxx
+++ b/src/db/plugins/upnp/Tags.cxx
@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "Tags.hxx"
-#include "tag/TagTable.hxx"
+#include "tag/Table.hxx"
 
 const struct tag_table upnp_tags[] = {
 	{ "upnp:artist", TAG_ARTIST },
diff --git a/src/db/plugins/upnp/UpnpDatabasePlugin.cxx b/src/db/plugins/upnp/UpnpDatabasePlugin.cxx
index 4dbfe30c6..5c31e5cf3 100644
--- a/src/db/plugins/upnp/UpnpDatabasePlugin.cxx
+++ b/src/db/plugins/upnp/UpnpDatabasePlugin.cxx
@@ -33,8 +33,8 @@
 #include "db/LightSong.hxx"
 #include "db/Stats.hxx"
 #include "config/Block.hxx"
-#include "tag/TagBuilder.hxx"
-#include "tag/TagTable.hxx"
+#include "tag/Builder.hxx"
+#include "tag/Table.hxx"
 #include "fs/Traits.hxx"
 #include "Log.hxx"
 #include "SongFilter.hxx"
diff --git a/src/decoder/plugins/AdPlugDecoderPlugin.cxx b/src/decoder/plugins/AdPlugDecoderPlugin.cxx
index 03ff9b6a7..d3a8ecd55 100644
--- a/src/decoder/plugins/AdPlugDecoderPlugin.cxx
+++ b/src/decoder/plugins/AdPlugDecoderPlugin.cxx
@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "AdPlugDecoderPlugin.h"
-#include "tag/TagHandler.hxx"
+#include "tag/Handler.hxx"
 #include "../DecoderAPI.hxx"
 #include "CheckAudioFormat.hxx"
 #include "fs/Path.hxx"
diff --git a/src/decoder/plugins/AudiofileDecoderPlugin.cxx b/src/decoder/plugins/AudiofileDecoderPlugin.cxx
index e58676d01..c01426f71 100644
--- a/src/decoder/plugins/AudiofileDecoderPlugin.cxx
+++ b/src/decoder/plugins/AudiofileDecoderPlugin.cxx
@@ -22,7 +22,7 @@
 #include "../DecoderAPI.hxx"
 #include "input/InputStream.hxx"
 #include "CheckAudioFormat.hxx"
-#include "tag/TagHandler.hxx"
+#include "tag/Handler.hxx"
 #include "util/ScopeExit.hxx"
 #include "util/Domain.hxx"
 #include "Log.hxx"
diff --git a/src/decoder/plugins/DsdLib.cxx b/src/decoder/plugins/DsdLib.cxx
index 1fae21fd3..9fd19dfa8 100644
--- a/src/decoder/plugins/DsdLib.cxx
+++ b/src/decoder/plugins/DsdLib.cxx
@@ -27,7 +27,7 @@
 #include "DsdLib.hxx"
 #include "../DecoderAPI.hxx"
 #include "input/InputStream.hxx"
-#include "tag/TagId3.hxx"
+#include "tag/Id3Scan.hxx"
 
 #ifdef ENABLE_ID3TAG
 #include <id3tag.h>
diff --git a/src/decoder/plugins/DsdiffDecoderPlugin.cxx b/src/decoder/plugins/DsdiffDecoderPlugin.cxx
index 2c371559b..9abb1b06e 100644
--- a/src/decoder/plugins/DsdiffDecoderPlugin.cxx
+++ b/src/decoder/plugins/DsdiffDecoderPlugin.cxx
@@ -33,7 +33,7 @@
 #include "CheckAudioFormat.hxx"
 #include "util/bit_reverse.h"
 #include "system/ByteOrder.hxx"
-#include "tag/TagHandler.hxx"
+#include "tag/Handler.hxx"
 #include "DsdLib.hxx"
 #include "Log.hxx"
 
diff --git a/src/decoder/plugins/DsfDecoderPlugin.cxx b/src/decoder/plugins/DsfDecoderPlugin.cxx
index 243d73ec5..326b9593a 100644
--- a/src/decoder/plugins/DsfDecoderPlugin.cxx
+++ b/src/decoder/plugins/DsfDecoderPlugin.cxx
@@ -35,7 +35,7 @@
 #include "util/bit_reverse.h"
 #include "system/ByteOrder.hxx"
 #include "DsdLib.hxx"
-#include "tag/TagHandler.hxx"
+#include "tag/Handler.hxx"
 #include "Log.hxx"
 
 #include <string.h>
diff --git a/src/decoder/plugins/FaadDecoderPlugin.cxx b/src/decoder/plugins/FaadDecoderPlugin.cxx
index 8f52bf312..ee5df4b2f 100644
--- a/src/decoder/plugins/FaadDecoderPlugin.cxx
+++ b/src/decoder/plugins/FaadDecoderPlugin.cxx
@@ -23,7 +23,7 @@
 #include "../DecoderBuffer.hxx"
 #include "input/InputStream.hxx"
 #include "CheckAudioFormat.hxx"
-#include "tag/TagHandler.hxx"
+#include "tag/Handler.hxx"
 #include "util/ScopeExit.hxx"
 #include "util/ConstBuffer.hxx"
 #include "util/Domain.hxx"
diff --git a/src/decoder/plugins/FfmpegDecoderPlugin.cxx b/src/decoder/plugins/FfmpegDecoderPlugin.cxx
index 698645380..e5787bf09 100644
--- a/src/decoder/plugins/FfmpegDecoderPlugin.cxx
+++ b/src/decoder/plugins/FfmpegDecoderPlugin.cxx
@@ -32,8 +32,8 @@
 #include "FfmpegMetaData.hxx"
 #include "FfmpegIo.hxx"
 #include "pcm/Interleave.hxx"
-#include "tag/TagBuilder.hxx"
-#include "tag/TagHandler.hxx"
+#include "tag/Builder.hxx"
+#include "tag/Handler.hxx"
 #include "tag/ReplayGain.hxx"
 #include "tag/MixRamp.hxx"
 #include "input/InputStream.hxx"
diff --git a/src/decoder/plugins/FfmpegMetaData.cxx b/src/decoder/plugins/FfmpegMetaData.cxx
index 24eb0cc9c..74052160e 100644
--- a/src/decoder/plugins/FfmpegMetaData.cxx
+++ b/src/decoder/plugins/FfmpegMetaData.cxx
@@ -22,8 +22,8 @@
 
 #include "config.h"
 #include "FfmpegMetaData.hxx"
-#include "tag/TagTable.hxx"
-#include "tag/TagHandler.hxx"
+#include "tag/Table.hxx"
+#include "tag/Handler.hxx"
 
 extern "C" {
 #include <libavutil/dict.h>
diff --git a/src/decoder/plugins/FlacMetadata.cxx b/src/decoder/plugins/FlacMetadata.cxx
index 0d70a8e57..afecd06f7 100644
--- a/src/decoder/plugins/FlacMetadata.cxx
+++ b/src/decoder/plugins/FlacMetadata.cxx
@@ -21,9 +21,9 @@
 #include "FlacMetadata.hxx"
 #include "lib/xiph/XiphTags.hxx"
 #include "MixRampInfo.hxx"
-#include "tag/TagHandler.hxx"
-#include "tag/TagTable.hxx"
-#include "tag/TagBuilder.hxx"
+#include "tag/Handler.hxx"
+#include "tag/Table.hxx"
+#include "tag/Builder.hxx"
 #include "tag/Tag.hxx"
 #include "tag/VorbisComment.hxx"
 #include "tag/ReplayGain.hxx"
diff --git a/src/decoder/plugins/GmeDecoderPlugin.cxx b/src/decoder/plugins/GmeDecoderPlugin.cxx
index 53d4cfea2..2058dfde0 100644
--- a/src/decoder/plugins/GmeDecoderPlugin.cxx
+++ b/src/decoder/plugins/GmeDecoderPlugin.cxx
@@ -23,8 +23,8 @@
 #include "config/Block.cxx"
 #include "CheckAudioFormat.hxx"
 #include "DetachedSong.hxx"
-#include "tag/TagHandler.hxx"
-#include "tag/TagBuilder.hxx"
+#include "tag/Handler.hxx"
+#include "tag/Builder.hxx"
 #include "fs/Path.hxx"
 #include "fs/AllocatedPath.hxx"
 #include "util/ScopeExit.hxx"
diff --git a/src/decoder/plugins/MadDecoderPlugin.cxx b/src/decoder/plugins/MadDecoderPlugin.cxx
index 3134f2569..184d5b327 100644
--- a/src/decoder/plugins/MadDecoderPlugin.cxx
+++ b/src/decoder/plugins/MadDecoderPlugin.cxx
@@ -22,9 +22,9 @@
 #include "../DecoderAPI.hxx"
 #include "input/InputStream.hxx"
 #include "config/ConfigGlobal.hxx"
-#include "tag/TagId3.hxx"
-#include "tag/TagRva2.hxx"
-#include "tag/TagHandler.hxx"
+#include "tag/Id3Scan.hxx"
+#include "tag/Rva2.hxx"
+#include "tag/Handler.hxx"
 #include "tag/ReplayGain.hxx"
 #include "tag/MixRamp.hxx"
 #include "CheckAudioFormat.hxx"
diff --git a/src/decoder/plugins/MikmodDecoderPlugin.cxx b/src/decoder/plugins/MikmodDecoderPlugin.cxx
index e7cde4b26..788a13f73 100644
--- a/src/decoder/plugins/MikmodDecoderPlugin.cxx
+++ b/src/decoder/plugins/MikmodDecoderPlugin.cxx
@@ -20,7 +20,7 @@
 #include "config.h"
 #include "MikmodDecoderPlugin.hxx"
 #include "../DecoderAPI.hxx"
-#include "tag/TagHandler.hxx"
+#include "tag/Handler.hxx"
 #include "fs/Path.hxx"
 #include "util/Domain.hxx"
 #include "util/RuntimeError.hxx"
diff --git a/src/decoder/plugins/ModplugDecoderPlugin.cxx b/src/decoder/plugins/ModplugDecoderPlugin.cxx
index 408701210..544c0b55c 100644
--- a/src/decoder/plugins/ModplugDecoderPlugin.cxx
+++ b/src/decoder/plugins/ModplugDecoderPlugin.cxx
@@ -21,7 +21,7 @@
 #include "ModplugDecoderPlugin.hxx"
 #include "../DecoderAPI.hxx"
 #include "input/InputStream.hxx"
-#include "tag/TagHandler.hxx"
+#include "tag/Handler.hxx"
 #include "util/WritableBuffer.hxx"
 #include "util/Domain.hxx"
 #include "util/RuntimeError.hxx"
diff --git a/src/decoder/plugins/MpcdecDecoderPlugin.cxx b/src/decoder/plugins/MpcdecDecoderPlugin.cxx
index 08a5a3525..bcdf9c887 100644
--- a/src/decoder/plugins/MpcdecDecoderPlugin.cxx
+++ b/src/decoder/plugins/MpcdecDecoderPlugin.cxx
@@ -23,7 +23,7 @@
 #include "input/InputStream.hxx"
 #include "CheckAudioFormat.hxx"
 #include "pcm/Traits.hxx"
-#include "tag/TagHandler.hxx"
+#include "tag/Handler.hxx"
 #include "util/Domain.hxx"
 #include "util/Macros.hxx"
 #include "util/Clamp.hxx"
diff --git a/src/decoder/plugins/Mpg123DecoderPlugin.cxx b/src/decoder/plugins/Mpg123DecoderPlugin.cxx
index 4977ca9f3..b5aab241a 100644
--- a/src/decoder/plugins/Mpg123DecoderPlugin.cxx
+++ b/src/decoder/plugins/Mpg123DecoderPlugin.cxx
@@ -21,8 +21,8 @@
 #include "Mpg123DecoderPlugin.hxx"
 #include "../DecoderAPI.hxx"
 #include "CheckAudioFormat.hxx"
-#include "tag/TagHandler.hxx"
-#include "tag/TagBuilder.hxx"
+#include "tag/Handler.hxx"
+#include "tag/Builder.hxx"
 #include "tag/ReplayGain.hxx"
 #include "tag/MixRamp.hxx"
 #include "fs/Path.hxx"
diff --git a/src/decoder/plugins/OpusDecoderPlugin.cxx b/src/decoder/plugins/OpusDecoderPlugin.cxx
index b526259ff..7474bb2f2 100644
--- a/src/decoder/plugins/OpusDecoderPlugin.cxx
+++ b/src/decoder/plugins/OpusDecoderPlugin.cxx
@@ -29,8 +29,8 @@
 #include "decoder/Reader.hxx"
 #include "input/Reader.hxx"
 #include "OggCodec.hxx"
-#include "tag/TagHandler.hxx"
-#include "tag/TagBuilder.hxx"
+#include "tag/Handler.hxx"
+#include "tag/Builder.hxx"
 #include "input/InputStream.hxx"
 #include "util/RuntimeError.hxx"
 #include "Log.hxx"
diff --git a/src/decoder/plugins/OpusTags.cxx b/src/decoder/plugins/OpusTags.cxx
index 37419ed80..630ddb1f3 100644
--- a/src/decoder/plugins/OpusTags.cxx
+++ b/src/decoder/plugins/OpusTags.cxx
@@ -21,7 +21,7 @@
 #include "OpusTags.hxx"
 #include "OpusReader.hxx"
 #include "lib/xiph/XiphTags.hxx"
-#include "tag/TagHandler.hxx"
+#include "tag/Handler.hxx"
 #include "tag/Tag.hxx"
 #include "ReplayGainInfo.hxx"
 
diff --git a/src/decoder/plugins/SidplayDecoderPlugin.cxx b/src/decoder/plugins/SidplayDecoderPlugin.cxx
index 56dad0217..a83b5ad43 100644
--- a/src/decoder/plugins/SidplayDecoderPlugin.cxx
+++ b/src/decoder/plugins/SidplayDecoderPlugin.cxx
@@ -20,8 +20,8 @@
 #include "config.h"
 #include "SidplayDecoderPlugin.hxx"
 #include "../DecoderAPI.hxx"
-#include "tag/TagHandler.hxx"
-#include "tag/TagBuilder.hxx"
+#include "tag/Handler.hxx"
+#include "tag/Builder.hxx"
 #include "DetachedSong.hxx"
 #include "fs/Path.hxx"
 #include "fs/AllocatedPath.hxx"
diff --git a/src/decoder/plugins/SndfileDecoderPlugin.cxx b/src/decoder/plugins/SndfileDecoderPlugin.cxx
index 85ede0ec9..297dbe8a6 100644
--- a/src/decoder/plugins/SndfileDecoderPlugin.cxx
+++ b/src/decoder/plugins/SndfileDecoderPlugin.cxx
@@ -22,7 +22,7 @@
 #include "../DecoderAPI.hxx"
 #include "input/InputStream.hxx"
 #include "CheckAudioFormat.hxx"
-#include "tag/TagHandler.hxx"
+#include "tag/Handler.hxx"
 #include "util/Domain.hxx"
 #include "Log.hxx"
 
diff --git a/src/decoder/plugins/VorbisDecoderPlugin.cxx b/src/decoder/plugins/VorbisDecoderPlugin.cxx
index a01a92d31..be557a353 100644
--- a/src/decoder/plugins/VorbisDecoderPlugin.cxx
+++ b/src/decoder/plugins/VorbisDecoderPlugin.cxx
@@ -32,7 +32,7 @@
 #include "util/Macros.hxx"
 #include "util/ScopeExit.hxx"
 #include "CheckAudioFormat.hxx"
-#include "tag/TagHandler.hxx"
+#include "tag/Handler.hxx"
 #include "Log.hxx"
 
 #ifndef HAVE_TREMOR
diff --git a/src/decoder/plugins/WavpackDecoderPlugin.cxx b/src/decoder/plugins/WavpackDecoderPlugin.cxx
index 7473c2373..95b526e36 100644
--- a/src/decoder/plugins/WavpackDecoderPlugin.cxx
+++ b/src/decoder/plugins/WavpackDecoderPlugin.cxx
@@ -22,7 +22,7 @@
 #include "../DecoderAPI.hxx"
 #include "input/InputStream.hxx"
 #include "CheckAudioFormat.hxx"
-#include "tag/TagHandler.hxx"
+#include "tag/Handler.hxx"
 #include "fs/Path.hxx"
 #include "util/Macros.hxx"
 #include "util/Alloc.hxx"
diff --git a/src/decoder/plugins/WildmidiDecoderPlugin.cxx b/src/decoder/plugins/WildmidiDecoderPlugin.cxx
index 2f3bb6826..df62e69bd 100644
--- a/src/decoder/plugins/WildmidiDecoderPlugin.cxx
+++ b/src/decoder/plugins/WildmidiDecoderPlugin.cxx
@@ -20,7 +20,7 @@
 #include "config.h"
 #include "WildmidiDecoderPlugin.hxx"
 #include "../DecoderAPI.hxx"
-#include "tag/TagHandler.hxx"
+#include "tag/Handler.hxx"
 #include "util/Domain.hxx"
 #include "fs/AllocatedPath.hxx"
 #include "fs/FileSystem.hxx"
diff --git a/src/input/plugins/CurlInputPlugin.cxx b/src/input/plugins/CurlInputPlugin.cxx
index 8b0f5982c..77a7a30a8 100644
--- a/src/input/plugins/CurlInputPlugin.cxx
+++ b/src/input/plugins/CurlInputPlugin.cxx
@@ -29,7 +29,7 @@
 #include "../InputPlugin.hxx"
 #include "config/ConfigGlobal.hxx"
 #include "config/Block.hxx"
-#include "tag/TagBuilder.hxx"
+#include "tag/Builder.hxx"
 #include "event/Call.hxx"
 #include "event/Loop.hxx"
 #include "thread/Cond.hxx"
diff --git a/src/lib/xiph/VorbisComments.cxx b/src/lib/xiph/VorbisComments.cxx
index 289c73137..9ee18d4b7 100644
--- a/src/lib/xiph/VorbisComments.cxx
+++ b/src/lib/xiph/VorbisComments.cxx
@@ -20,9 +20,9 @@
 #include "config.h"
 #include "VorbisComments.hxx"
 #include "XiphTags.hxx"
-#include "tag/TagTable.hxx"
-#include "tag/TagHandler.hxx"
-#include "tag/TagBuilder.hxx"
+#include "tag/Table.hxx"
+#include "tag/Handler.hxx"
+#include "tag/Builder.hxx"
 #include "tag/VorbisComment.hxx"
 #include "tag/ReplayGain.hxx"
 #include "ReplayGainInfo.hxx"
diff --git a/src/lib/xiph/XiphTags.hxx b/src/lib/xiph/XiphTags.hxx
index 863946e40..bb7cb42a4 100644
--- a/src/lib/xiph/XiphTags.hxx
+++ b/src/lib/xiph/XiphTags.hxx
@@ -21,7 +21,7 @@
 #define MPD_XIPH_TAGS_HXX
 
 #include "check.h"
-#include "tag/TagTable.hxx"
+#include "tag/Table.hxx"
 
 extern const struct tag_table xiph_tags[];
 
diff --git a/src/output/plugins/httpd/IcyMetaDataServer.hxx b/src/output/plugins/httpd/IcyMetaDataServer.hxx
index fbcbbb8cc..2bf9d4781 100644
--- a/src/output/plugins/httpd/IcyMetaDataServer.hxx
+++ b/src/output/plugins/httpd/IcyMetaDataServer.hxx
@@ -20,7 +20,7 @@
 #ifndef MPD_ICY_META_DATA_SERVER_HXX
 #define MPD_ICY_META_DATA_SERVER_HXX
 
-#include "tag/TagType.h"
+#include "tag/Type.h"
 
 struct Tag;
 class Page;
diff --git a/src/playlist/PlaylistSong.cxx b/src/playlist/PlaylistSong.cxx
index ed41266e0..ae18b1b67 100644
--- a/src/playlist/PlaylistSong.cxx
+++ b/src/playlist/PlaylistSong.cxx
@@ -21,7 +21,7 @@
 #include "PlaylistSong.hxx"
 #include "SongLoader.hxx"
 #include "tag/Tag.hxx"
-#include "tag/TagBuilder.hxx"
+#include "tag/Builder.hxx"
 #include "fs/Traits.hxx"
 #include "util/UriUtil.hxx"
 #include "DetachedSong.hxx"
diff --git a/src/playlist/cue/CueParser.hxx b/src/playlist/cue/CueParser.hxx
index 6f6061a59..687a594bc 100644
--- a/src/playlist/cue/CueParser.hxx
+++ b/src/playlist/cue/CueParser.hxx
@@ -22,7 +22,7 @@
 
 #include "check.h"
 #include "DetachedSong.hxx"
-#include "tag/TagBuilder.hxx"
+#include "tag/Builder.hxx"
 #include "Compiler.h"
 
 #include <string>
diff --git a/src/playlist/plugins/AsxPlaylistPlugin.cxx b/src/playlist/plugins/AsxPlaylistPlugin.cxx
index 5b5fe114a..9398f6a2e 100644
--- a/src/playlist/plugins/AsxPlaylistPlugin.cxx
+++ b/src/playlist/plugins/AsxPlaylistPlugin.cxx
@@ -21,7 +21,7 @@
 #include "AsxPlaylistPlugin.hxx"
 #include "../PlaylistPlugin.hxx"
 #include "../MemorySongEnumerator.hxx"
-#include "tag/TagBuilder.hxx"
+#include "tag/Builder.hxx"
 #include "util/ASCII.hxx"
 #include "util/StringView.hxx"
 #include "lib/expat/ExpatParser.hxx"
diff --git a/src/playlist/plugins/EmbeddedCuePlaylistPlugin.cxx b/src/playlist/plugins/EmbeddedCuePlaylistPlugin.cxx
index 9046f35da..3be9c0652 100644
--- a/src/playlist/plugins/EmbeddedCuePlaylistPlugin.cxx
+++ b/src/playlist/plugins/EmbeddedCuePlaylistPlugin.cxx
@@ -28,7 +28,7 @@
 #include "../PlaylistPlugin.hxx"
 #include "../SongEnumerator.hxx"
 #include "../cue/CueParser.hxx"
-#include "tag/TagHandler.hxx"
+#include "tag/Handler.hxx"
 #include "tag/Generic.hxx"
 #include "DetachedSong.hxx"
 #include "TagFile.hxx"
diff --git a/src/playlist/plugins/ExtM3uPlaylistPlugin.cxx b/src/playlist/plugins/ExtM3uPlaylistPlugin.cxx
index 751eff4c3..1dededdd3 100644
--- a/src/playlist/plugins/ExtM3uPlaylistPlugin.cxx
+++ b/src/playlist/plugins/ExtM3uPlaylistPlugin.cxx
@@ -23,7 +23,7 @@
 #include "../SongEnumerator.hxx"
 #include "DetachedSong.hxx"
 #include "tag/Tag.hxx"
-#include "tag/TagBuilder.hxx"
+#include "tag/Builder.hxx"
 #include "util/StringUtil.hxx"
 #include "util/StringCompare.hxx"
 #include "input/TextInputStream.hxx"
diff --git a/src/playlist/plugins/PlsPlaylistPlugin.cxx b/src/playlist/plugins/PlsPlaylistPlugin.cxx
index 0fe30aa6b..0013d043b 100644
--- a/src/playlist/plugins/PlsPlaylistPlugin.cxx
+++ b/src/playlist/plugins/PlsPlaylistPlugin.cxx
@@ -24,7 +24,7 @@
 #include "input/TextInputStream.hxx"
 #include "input/InputStream.hxx"
 #include "DetachedSong.hxx"
-#include "tag/TagBuilder.hxx"
+#include "tag/Builder.hxx"
 #include "util/ASCII.hxx"
 #include "util/StringUtil.hxx"
 #include "util/DivideString.hxx"
diff --git a/src/playlist/plugins/RssPlaylistPlugin.cxx b/src/playlist/plugins/RssPlaylistPlugin.cxx
index 290ad3510..39f34b3a9 100644
--- a/src/playlist/plugins/RssPlaylistPlugin.cxx
+++ b/src/playlist/plugins/RssPlaylistPlugin.cxx
@@ -21,7 +21,7 @@
 #include "RssPlaylistPlugin.hxx"
 #include "../PlaylistPlugin.hxx"
 #include "../MemorySongEnumerator.hxx"
-#include "tag/TagBuilder.hxx"
+#include "tag/Builder.hxx"
 #include "util/ASCII.hxx"
 #include "util/StringView.hxx"
 #include "lib/expat/ExpatParser.hxx"
diff --git a/src/playlist/plugins/SoundCloudPlaylistPlugin.cxx b/src/playlist/plugins/SoundCloudPlaylistPlugin.cxx
index a4dcb1972..5ab8512cf 100644
--- a/src/playlist/plugins/SoundCloudPlaylistPlugin.cxx
+++ b/src/playlist/plugins/SoundCloudPlaylistPlugin.cxx
@@ -23,7 +23,7 @@
 #include "../MemorySongEnumerator.hxx"
 #include "config/Block.hxx"
 #include "input/InputStream.hxx"
-#include "tag/TagBuilder.hxx"
+#include "tag/Builder.hxx"
 #include "util/StringCompare.hxx"
 #include "util/Alloc.hxx"
 #include "util/Domain.hxx"
diff --git a/src/playlist/plugins/XspfPlaylistPlugin.cxx b/src/playlist/plugins/XspfPlaylistPlugin.cxx
index 6cfd9a783..5ddf901f3 100644
--- a/src/playlist/plugins/XspfPlaylistPlugin.cxx
+++ b/src/playlist/plugins/XspfPlaylistPlugin.cxx
@@ -23,7 +23,7 @@
 #include "../MemorySongEnumerator.hxx"
 #include "DetachedSong.hxx"
 #include "input/InputStream.hxx"
-#include "tag/TagBuilder.hxx"
+#include "tag/Builder.hxx"
 #include "util/StringView.hxx"
 #include "lib/expat/ExpatParser.hxx"
 #include "Log.hxx"
diff --git a/src/queue/PlaylistTag.cxx b/src/queue/PlaylistTag.cxx
index 248c46a28..2bbc61a7e 100644
--- a/src/queue/PlaylistTag.cxx
+++ b/src/queue/PlaylistTag.cxx
@@ -28,7 +28,7 @@
 #include "PlaylistError.hxx"
 #include "DetachedSong.hxx"
 #include "tag/Tag.hxx"
-#include "tag/TagBuilder.hxx"
+#include "tag/Builder.hxx"
 
 void
 playlist::AddSongIdTag(unsigned id, TagType tag_type, const char *value)
diff --git a/src/tag/ApeTag.cxx b/src/tag/ApeTag.cxx
index ebf988ee5..6e5a88a8f 100644
--- a/src/tag/ApeTag.cxx
+++ b/src/tag/ApeTag.cxx
@@ -21,8 +21,8 @@
 #include "ApeTag.hxx"
 #include "ApeLoader.hxx"
 #include "Tag.hxx"
-#include "TagTable.hxx"
-#include "TagHandler.hxx"
+#include "Table.hxx"
+#include "Handler.hxx"
 #include "util/StringView.hxx"
 
 #include <string>
diff --git a/src/tag/ApeTag.hxx b/src/tag/ApeTag.hxx
index 0586e530d..93b8ba126 100644
--- a/src/tag/ApeTag.hxx
+++ b/src/tag/ApeTag.hxx
@@ -20,7 +20,7 @@
 #ifndef MPD_APE_TAG_HXX
 #define MPD_APE_TAG_HXX
 
-#include "TagTable.hxx"
+#include "Table.hxx"
 
 class InputStream;
 struct TagHandler;
diff --git a/src/tag/TagBuilder.cxx b/src/tag/Builder.cxx
index 6d259dc54..57f176869 100644
--- a/src/tag/TagBuilder.cxx
+++ b/src/tag/Builder.cxx
@@ -18,10 +18,10 @@
  */
 
 #include "config.h"
-#include "TagBuilder.hxx"
+#include "Builder.hxx"
 #include "Settings.hxx"
-#include "TagPool.hxx"
-#include "TagString.hxx"
+#include "Pool.hxx"
+#include "FixString.hxx"
 #include "Tag.hxx"
 #include "util/WritableBuffer.hxx"
 #include "util/StringView.hxx"
diff --git a/src/tag/TagBuilder.hxx b/src/tag/Builder.hxx
index 43b4d71e7..b940515c6 100644
--- a/src/tag/TagBuilder.hxx
+++ b/src/tag/Builder.hxx
@@ -20,7 +20,7 @@
 #ifndef MPD_TAG_BUILDER_HXX
 #define MPD_TAG_BUILDER_HXX
 
-#include "TagType.h"
+#include "Type.h"
 #include "Chrono.hxx"
 #include "Compiler.h"
 
diff --git a/src/tag/TagConfig.cxx b/src/tag/Config.cxx
index 93f8675e5..8a691efd0 100644
--- a/src/tag/TagConfig.cxx
+++ b/src/tag/Config.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "config.h"
-#include "TagConfig.hxx"
+#include "Config.hxx"
 #include "Settings.hxx"
 #include "Tag.hxx"
 #include "config/ConfigGlobal.hxx"
diff --git a/src/tag/TagConfig.hxx b/src/tag/Config.hxx
index 47d1eb835..47d1eb835 100644
--- a/src/tag/TagConfig.hxx
+++ b/src/tag/Config.hxx
diff --git a/src/tag/TagString.cxx b/src/tag/FixString.cxx
index 8462c1fa1..b70118dc4 100644
--- a/src/tag/TagString.cxx
+++ b/src/tag/FixString.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "config.h"
-#include "TagString.hxx"
+#include "FixString.hxx"
 #include "util/Alloc.hxx"
 #include "util/WritableBuffer.hxx"
 #include "util/StringView.hxx"
diff --git a/src/tag/TagString.hxx b/src/tag/FixString.hxx
index 618d9640d..618d9640d 100644
--- a/src/tag/TagString.hxx
+++ b/src/tag/FixString.hxx
diff --git a/src/tag/Generic.cxx b/src/tag/Generic.cxx
index 852065d97..859f4382b 100644
--- a/src/tag/Generic.cxx
+++ b/src/tag/Generic.cxx
@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "Generic.hxx"
-#include "TagId3.hxx"
+#include "Id3Scan.hxx"
 #include "ApeTag.hxx"
 #include "fs/Path.hxx"
 #include "thread/Mutex.hxx"
diff --git a/src/tag/TagHandler.cxx b/src/tag/Handler.cxx
index 46e3e79b4..c04bddb72 100644
--- a/src/tag/TagHandler.cxx
+++ b/src/tag/Handler.cxx
@@ -18,8 +18,8 @@
  */
 
 #include "config.h"
-#include "TagHandler.hxx"
-#include "TagBuilder.hxx"
+#include "Handler.hxx"
+#include "Builder.hxx"
 #include "util/ASCII.hxx"
 
 #include <stdio.h>
diff --git a/src/tag/TagHandler.hxx b/src/tag/Handler.hxx
index a66d4d41c..8611cb5ba 100644
--- a/src/tag/TagHandler.hxx
+++ b/src/tag/Handler.hxx
@@ -21,7 +21,7 @@
 #define MPD_TAG_HANDLER_HXX
 
 #include "check.h"
-#include "TagType.h"
+#include "Type.h"
 #include "Chrono.hxx"
 
 #include <assert.h>
diff --git a/src/tag/TagId3.cxx b/src/tag/Id3Scan.cxx
index f9bf7e9b2..74433fa47 100644
--- a/src/tag/TagId3.cxx
+++ b/src/tag/Id3Scan.cxx
@@ -18,11 +18,11 @@
  */
 
 #include "config.h"
-#include "TagId3.hxx"
+#include "Id3Scan.hxx"
 #include "Id3Load.hxx"
-#include "TagHandler.hxx"
-#include "TagTable.hxx"
-#include "TagBuilder.hxx"
+#include "Handler.hxx"
+#include "Table.hxx"
+#include "Builder.hxx"
 #include "util/Alloc.hxx"
 #include "util/ScopeExit.hxx"
 #include "util/StringUtil.hxx"
diff --git a/src/tag/TagId3.hxx b/src/tag/Id3Scan.hxx
index 13300c0a2..21d86346c 100644
--- a/src/tag/TagId3.hxx
+++ b/src/tag/Id3Scan.hxx
@@ -17,8 +17,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef MPD_TAG_ID3_HXX
-#define MPD_TAG_ID3_HXX
+#ifndef MPD_TAG_ID3_SCAN_HXX
+#define MPD_TAG_ID3_SCAN_HXX
 
 #include "check.h"
 
diff --git a/src/tag/TagItem.hxx b/src/tag/Item.hxx
index f92269ad1..e3ff7b6a5 100644
--- a/src/tag/TagItem.hxx
+++ b/src/tag/Item.hxx
@@ -20,7 +20,7 @@
 #ifndef MPD_TAG_ITEM_HXX
 #define MPD_TAG_ITEM_HXX
 
-#include "TagType.h"
+#include "Type.h"
 
 /**
  * One tag value.  It is a mapping of #TagType to am arbitrary string
diff --git a/src/tag/TagNames.c b/src/tag/Names.c
index 9f470b094..6e5ebc2bc 100644
--- a/src/tag/TagNames.c
+++ b/src/tag/Names.c
@@ -18,7 +18,7 @@
  */
 
 #include "config.h"
-#include "TagType.h"
+#include "Type.h"
 
 const char *const tag_item_names[TAG_NUM_OF_ITEM_TYPES] = {
 	[TAG_ARTIST] = "Artist",
diff --git a/src/tag/TagPool.cxx b/src/tag/Pool.cxx
index fc5cd06aa..fa38d6526 100644
--- a/src/tag/TagPool.cxx
+++ b/src/tag/Pool.cxx
@@ -18,8 +18,8 @@
  */
 
 #include "config.h"
-#include "TagPool.hxx"
-#include "TagItem.hxx"
+#include "Pool.hxx"
+#include "Item.hxx"
 #include "util/Cast.hxx"
 #include "util/VarSize.hxx"
 #include "util/StringView.hxx"
diff --git a/src/tag/TagPool.hxx b/src/tag/Pool.hxx
index 3c4496ec6..927774d4e 100644
--- a/src/tag/TagPool.hxx
+++ b/src/tag/Pool.hxx
@@ -20,7 +20,7 @@
 #ifndef MPD_TAG_POOL_HXX
 #define MPD_TAG_POOL_HXX
 
-#include "TagType.h"
+#include "Type.h"
 #include "thread/Mutex.hxx"
 
 extern Mutex tag_pool_lock;
diff --git a/src/tag/TagRva2.cxx b/src/tag/Rva2.cxx
index d51a5cb2e..2291aa34d 100644
--- a/src/tag/TagRva2.cxx
+++ b/src/tag/Rva2.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "config.h"
-#include "TagRva2.hxx"
+#include "Rva2.hxx"
 #include "ReplayGainInfo.hxx"
 
 #include <id3tag.h>
diff --git a/src/tag/TagRva2.hxx b/src/tag/Rva2.hxx
index d30d2ad0f..d30d2ad0f 100644
--- a/src/tag/TagRva2.hxx
+++ b/src/tag/Rva2.hxx
diff --git a/src/tag/Set.cxx b/src/tag/Set.cxx
index 8becc4cf8..97aabef08 100644
--- a/src/tag/Set.cxx
+++ b/src/tag/Set.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "Set.hxx"
-#include "TagBuilder.hxx"
+#include "Builder.hxx"
 #include "Settings.hxx"
 
 #include <assert.h>
diff --git a/src/tag/Settings.hxx b/src/tag/Settings.hxx
index a6e573cee..01cd6af4e 100644
--- a/src/tag/Settings.hxx
+++ b/src/tag/Settings.hxx
@@ -21,7 +21,7 @@
 #define MPD_TAG_SETTINGS_HXX
 
 #include "Mask.hxx"
-#include "TagType.h"
+#include "Type.h"
 #include "Compiler.h"
 
 extern tag_mask_t global_tag_mask;
diff --git a/src/tag/TagTable.cxx b/src/tag/Table.cxx
index 74ef03521..d8ca1798b 100644
--- a/src/tag/TagTable.cxx
+++ b/src/tag/Table.cxx
@@ -17,7 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "TagTable.hxx"
+#include "Table.hxx"
 #include "util/ASCII.hxx"
 
 #include <string.h>
diff --git a/src/tag/TagTable.hxx b/src/tag/Table.hxx
index 3591fbb1d..3bda0f21f 100644
--- a/src/tag/TagTable.hxx
+++ b/src/tag/Table.hxx
@@ -20,7 +20,7 @@
 #ifndef MPD_TAG_TABLE_HXX
 #define MPD_TAG_TABLE_HXX
 
-#include "TagType.h"
+#include "Type.h"
 #include "Compiler.h"
 
 struct tag_table {
diff --git a/src/tag/Tag.cxx b/src/tag/Tag.cxx
index d2623793b..85732d2e8 100644
--- a/src/tag/Tag.cxx
+++ b/src/tag/Tag.cxx
@@ -19,8 +19,8 @@
 
 #include "config.h"
 #include "Tag.hxx"
-#include "TagPool.hxx"
-#include "TagBuilder.hxx"
+#include "Pool.hxx"
+#include "Builder.hxx"
 #include "util/ASCII.hxx"
 
 #include <assert.h>
diff --git a/src/tag/Tag.hxx b/src/tag/Tag.hxx
index 236793649..9320e767e 100644
--- a/src/tag/Tag.hxx
+++ b/src/tag/Tag.hxx
@@ -20,8 +20,8 @@
 #ifndef MPD_TAG_HXX
 #define MPD_TAG_HXX
 
-#include "TagType.h" // IWYU pragma: export
-#include "TagItem.hxx" // IWYU pragma: export
+#include "Type.h" // IWYU pragma: export
+#include "Item.hxx" // IWYU pragma: export
 #include "Chrono.hxx"
 #include "Compiler.h"
 
diff --git a/src/tag/TagType.h b/src/tag/Type.h
index e5a4ef1f7..e5a4ef1f7 100644
--- a/src/tag/TagType.h
+++ b/src/tag/Type.h