diff --git a/abstractattachment.cpp b/abstractattachment.cpp
index be3538d..96c4095 100644
--- a/abstractattachment.cpp
+++ b/abstractattachment.cpp
@@ -12,7 +12,7 @@
 using namespace std;
 using namespace IoUtilities;
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \class Media::StreamDataBlock
diff --git a/abstractattachment.h b/abstractattachment.h
index ea20b0a..d77d706 100644
--- a/abstractattachment.h
+++ b/abstractattachment.h
@@ -1,5 +1,5 @@
-#ifndef MEDIA_ABSTRACTATTACHMENT_H
-#define MEDIA_ABSTRACTATTACHMENT_H
+#ifndef TAG_PARSER_ABSTRACTATTACHMENT_H
+#define TAG_PARSER_ABSTRACTATTACHMENT_H
 
 #include "./diagnostics.h"
 
@@ -8,7 +8,7 @@
 #include <functional>
 #include <memory>
 
-namespace Media {
+namespace TagParser {
 
 class MediaFileInfo;
 
@@ -272,4 +272,4 @@ inline bool AbstractAttachment::isEmpty() const
 
 } // namespace Media
 
-#endif // MEDIA_ABSTRACTATTACHMENT_H
+#endif // TAG_PARSER_ABSTRACTATTACHMENT_H
diff --git a/abstractchapter.cpp b/abstractchapter.cpp
index 5dfd399..dadb765 100644
--- a/abstractchapter.cpp
+++ b/abstractchapter.cpp
@@ -5,7 +5,7 @@
 using namespace std;
 using namespace ChronoUtilities;
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \class Media::AbstractChapter
diff --git a/abstractchapter.h b/abstractchapter.h
index 1dfd8f5..deb5309 100644
--- a/abstractchapter.h
+++ b/abstractchapter.h
@@ -1,5 +1,5 @@
-#ifndef MEDIA_ABSTRACTCHAPTER_H
-#define MEDIA_ABSTRACTCHAPTER_H
+#ifndef TAG_PARSER_ABSTRACTCHAPTER_H
+#define TAG_PARSER_ABSTRACTCHAPTER_H
 
 #include "./localeawarestring.h"
 
@@ -8,7 +8,7 @@
 #include <string>
 #include <vector>
 
-namespace Media {
+namespace TagParser {
 
 class Diagnostics;
 
@@ -127,4 +127,4 @@ inline std::size_t AbstractChapter::nestedChapterCount() const
 
 } // namespace Media
 
-#endif // MEDIA_ABSTRACTCHAPTER_H
+#endif // TAG_PARSER_ABSTRACTCHAPTER_H
diff --git a/abstractcontainer.cpp b/abstractcontainer.cpp
index 2500032..6d9f4f0 100644
--- a/abstractcontainer.cpp
+++ b/abstractcontainer.cpp
@@ -6,7 +6,7 @@ using namespace ChronoUtilities;
 using namespace ConversionUtilities;
 using namespace IoUtilities;
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \class Media::AbstractContainer
diff --git a/abstractcontainer.h b/abstractcontainer.h
index b5df4b6..963a6ee 100644
--- a/abstractcontainer.h
+++ b/abstractcontainer.h
@@ -1,5 +1,5 @@
-#ifndef MEDIA_ABSTRACTCONTAINER_H
-#define MEDIA_ABSTRACTCONTAINER_H
+#ifndef TAG_PARSER_ABSTRACTCONTAINER_H
+#define TAG_PARSER_ABSTRACTCONTAINER_H
 
 #include "./exceptions.h"
 #include "./tagtarget.h"
@@ -16,7 +16,7 @@ class BinaryReader;
 class BinaryWriter;
 }
 
-namespace Media {
+namespace TagParser {
 
 class Tag;
 class AbstractTrack;
@@ -312,4 +312,4 @@ inline uint32 AbstractContainer::timeScale() const
 
 }
 
-#endif // MEDIA_ABSTRACTCONTAINER_H
+#endif // TAG_PARSER_ABSTRACTCONTAINER_H
diff --git a/abstracttrack.cpp b/abstracttrack.cpp
index 92a3bea..bf5d927 100644
--- a/abstracttrack.cpp
+++ b/abstracttrack.cpp
@@ -11,7 +11,7 @@ using namespace ConversionUtilities;
 using namespace ChronoUtilities;
 using namespace IoUtilities;
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \class Media::AbstractTrack
diff --git a/abstracttrack.h b/abstracttrack.h
index c344466..233c54f 100644
--- a/abstracttrack.h
+++ b/abstracttrack.h
@@ -1,5 +1,5 @@
-#ifndef ABSTRACTTRACK_H
-#define ABSTRACTTRACK_H
+#ifndef TAG_PARSER_ABSTRACTTRACK_H
+#define TAG_PARSER_ABSTRACTTRACK_H
 
 #include "./diagnostics.h"
 #include "./size.h"
@@ -16,7 +16,7 @@
 #include <iosfwd>
 #include <string>
 
-namespace Media {
+namespace TagParser {
 
 class MpegAudioFrameStream;
 class WaveAudioStream;
@@ -305,7 +305,7 @@ inline MediaType AbstractTrack::mediaType() const
  */
 inline const char *AbstractTrack::mediaTypeName() const
 {
-    return ::Media::mediaTypeName(m_mediaType);
+    return ::TagParser::mediaTypeName(m_mediaType);
 }
 
 /*!
@@ -686,4 +686,4 @@ inline bool AbstractTrack::isHeaderValid() const
 
 }
 
-#endif // ABSTRACTTRACK_H
+#endif // TAG_PARSER_ABSTRACTTRACK_H
diff --git a/adts/adtsframe.cpp b/adts/adtsframe.cpp
index aade003..eff1e3b 100644
--- a/adts/adtsframe.cpp
+++ b/adts/adtsframe.cpp
@@ -7,7 +7,7 @@
 using namespace std;
 using namespace IoUtilities;
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \class Media::AdtsFrame
diff --git a/adts/adtsframe.h b/adts/adtsframe.h
index 8ce0b22..42ea7ea 100644
--- a/adts/adtsframe.h
+++ b/adts/adtsframe.h
@@ -1,5 +1,5 @@
-#ifndef MEDIA_ADTSFRAME_H
-#define MEDIA_ADTSFRAME_H
+#ifndef TAG_PARSER_ADTSFRAME_H
+#define TAG_PARSER_ADTSFRAME_H
 
 #include "../global.h"
 
@@ -9,7 +9,7 @@ namespace IoUtilities {
 class BinaryReader;
 }
 
-namespace Media {
+namespace TagParser {
 
 class TAG_PARSER_EXPORT AdtsFrame
 {
@@ -148,4 +148,4 @@ inline uint16 AdtsFrame::crc() const
 
 } // namespace Media
 
-#endif // MEDIA_ADTSFRAME_H
+#endif // TAG_PARSER_ADTSFRAME_H
diff --git a/adts/adtsstream.cpp b/adts/adtsstream.cpp
index a0bc4b6..6d6477a 100644
--- a/adts/adtsstream.cpp
+++ b/adts/adtsstream.cpp
@@ -8,7 +8,7 @@
 
 using namespace std;
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \class Media::AdtsStream
diff --git a/adts/adtsstream.h b/adts/adtsstream.h
index c0f81a6..e3483da 100644
--- a/adts/adtsstream.h
+++ b/adts/adtsstream.h
@@ -1,11 +1,11 @@
-#ifndef MEDIA_ADTSSTREAM_H
-#define MEDIA_ADTSSTREAM_H
+#ifndef TAG_PARSER_ADTSSTREAM_H
+#define TAG_PARSER_ADTSSTREAM_H
 
 #include "./adtsframe.h"
 
 #include "../abstracttrack.h"
 
-namespace Media {
+namespace TagParser {
 
 class TAG_PARSER_EXPORT AdtsStream : public AbstractTrack
 {
@@ -41,4 +41,4 @@ inline TrackType AdtsStream::type() const
 
 } // namespace Media
 
-#endif // MEDIA_ADTSSTREAM_H
+#endif // TAG_PARSER_ADTSSTREAM_H
diff --git a/aspectratio.cpp b/aspectratio.cpp
index 3f801e3..c2c5e51 100644
--- a/aspectratio.cpp
+++ b/aspectratio.cpp
@@ -2,7 +2,7 @@
 
 using namespace std;
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \struct Media::AspectRatio
diff --git a/aspectratio.h b/aspectratio.h
index c298f9a..5e087a9 100644
--- a/aspectratio.h
+++ b/aspectratio.h
@@ -1,11 +1,11 @@
-#ifndef MEDIA_ASPECTRATIO_H
-#define MEDIA_ASPECTRATIO_H
+#ifndef TAG_PARSER_ASPECTRATIO_H
+#define TAG_PARSER_ASPECTRATIO_H
 
 #include "./global.h"
 
 #include <c++utilities/conversion/types.h>
 
-namespace Media {
+namespace TagParser {
 
 struct TAG_PARSER_EXPORT AspectRatio {
     constexpr AspectRatio();
@@ -56,4 +56,4 @@ constexpr bool AspectRatio::isExtended() const
 
 }
 
-#endif // MEDIA_ASPECTRATIO_H
+#endif // TAG_PARSER_ASPECTRATIO_H
diff --git a/avc/avcconfiguration.cpp b/avc/avcconfiguration.cpp
index b31e3c6..d138cb4 100644
--- a/avc/avcconfiguration.cpp
+++ b/avc/avcconfiguration.cpp
@@ -8,7 +8,7 @@
 using namespace std;
 using namespace IoUtilities;
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \class AvcConfiguration
diff --git a/avc/avcconfiguration.h b/avc/avcconfiguration.h
index 8a9a470..44b1a0f 100644
--- a/avc/avcconfiguration.h
+++ b/avc/avcconfiguration.h
@@ -1,11 +1,11 @@
-#ifndef AVCCONFIGURATION_H
-#define AVCCONFIGURATION_H
+#ifndef TAG_PARSER_AVCCONFIGURATION_H
+#define TAG_PARSER_AVCCONFIGURATION_H
 
 #include "./avcinfo.h"
 
 #include <vector>
 
-namespace Media {
+namespace TagParser {
 
 class MediaFormat;
 
@@ -34,4 +34,4 @@ inline AvcConfiguration::AvcConfiguration() :
 
 }
 
-#endif // AVCCONFIGURATION_H
+#endif // TAG_PARSER_AVCCONFIGURATION_H
diff --git a/avc/avcinfo.cpp b/avc/avcinfo.cpp
index 3f217d4..ac94f11 100644
--- a/avc/avcinfo.cpp
+++ b/avc/avcinfo.cpp
@@ -12,7 +12,7 @@
 using namespace std;
 using namespace IoUtilities;
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \struct Media::SpsInfo
diff --git a/avc/avcinfo.h b/avc/avcinfo.h
index b4eb987..80cee91 100644
--- a/avc/avcinfo.h
+++ b/avc/avcinfo.h
@@ -1,5 +1,5 @@
-#ifndef AVCINFO_H
-#define AVCINFO_H
+#ifndef TAG_PARSER_AVCINFO_H
+#define TAG_PARSER_AVCINFO_H
 
 #include "../margin.h"
 #include "../size.h"
@@ -10,7 +10,7 @@ class BinaryReader;
 class BitReader;
 }
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \brief Type used to store unsigned integer values using golomb coding.
@@ -194,4 +194,4 @@ inline AvcFrame::AvcFrame() :
 
 }
 
-#endif // AVCINFO_H
+#endif // TAG_PARSER_AVCINFO_H
diff --git a/avi/bitmapinfoheader.cpp b/avi/bitmapinfoheader.cpp
index 2be22ba..229e60e 100644
--- a/avi/bitmapinfoheader.cpp
+++ b/avi/bitmapinfoheader.cpp
@@ -4,7 +4,7 @@
 
 using namespace IoUtilities;
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \class Media::BitmapInfoHeader
diff --git a/avi/bitmapinfoheader.h b/avi/bitmapinfoheader.h
index b70b23a..e8ee59a 100644
--- a/avi/bitmapinfoheader.h
+++ b/avi/bitmapinfoheader.h
@@ -1,5 +1,5 @@
-#ifndef MEDIA_BITMAPINFOHEADER_H
-#define MEDIA_BITMAPINFOHEADER_H
+#ifndef TAG_PARSER_BITMAPINFOHEADER_H
+#define TAG_PARSER_BITMAPINFOHEADER_H
 
 #include "../global.h"
 
@@ -9,7 +9,7 @@ namespace IoUtilities {
 class BinaryReader;
 }
 
-namespace Media {
+namespace TagParser {
 
 class TAG_PARSER_EXPORT BitmapInfoHeader
 {
@@ -33,4 +33,4 @@ public:
 
 } // namespace Media
 
-#endif // MEDIA_BITMAPINFOHEADER_H
+#endif // TAG_PARSER_BITMAPINFOHEADER_H
diff --git a/backuphelper.cpp b/backuphelper.cpp
index 470a834..e58f8cb 100644
--- a/backuphelper.cpp
+++ b/backuphelper.cpp
@@ -21,7 +21,7 @@ using namespace std;
 using namespace ConversionUtilities;
 using namespace IoUtilities;
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \namespace Media::BackupHelper
diff --git a/backuphelper.h b/backuphelper.h
index 10b282b..6a41f6d 100644
--- a/backuphelper.h
+++ b/backuphelper.h
@@ -1,11 +1,11 @@
-#ifndef BACKUPHELPER_H
-#define BACKUPHELPER_H
+#ifndef TAG_PARSER_BACKUPHELPER_H
+#define TAG_PARSER_BACKUPHELPER_H
 
 #include "./global.h"
 
 #include <c++utilities/io/nativefilestream.h>
 
-namespace Media {
+namespace TagParser {
 
 class MediaFileInfo;
 class Diagnostics;
@@ -21,4 +21,4 @@ TAG_PARSER_EXPORT void handleFailureAfterFileModified(MediaFileInfo &mediaFileIn
 
 }
 
-#endif // BACKUPHELPER_H
+#endif // TAG_PARSER_BACKUPHELPER_H
diff --git a/basicfileinfo.cpp b/basicfileinfo.cpp
index 237a097..867b968 100644
--- a/basicfileinfo.cpp
+++ b/basicfileinfo.cpp
@@ -13,7 +13,7 @@ using namespace std;
  *        file name, extension, directory and size for a specified file.
  */
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \brief Constructs a new BasicFileInfo for the specified file.
diff --git a/basicfileinfo.h b/basicfileinfo.h
index 536e7fb..b8cd70f 100644
--- a/basicfileinfo.h
+++ b/basicfileinfo.h
@@ -1,5 +1,5 @@
-#ifndef BASICFILEINFO_H
-#define BASICFILEINFO_H
+#ifndef TAG_PARSER_BASICFILEINFO_H
+#define TAG_PARSER_BASICFILEINFO_H
 
 #include "./global.h"
 
@@ -8,7 +8,7 @@
 
 #include <string>
 
-namespace Media {
+namespace TagParser {
 
 class TAG_PARSER_EXPORT BasicFileInfo
 {
@@ -132,4 +132,4 @@ inline void BasicFileInfo::reportPathChanged(const std::string &newPath)
 
 }
 
-#endif // BASICFILEINFO_H
+#endif // TAG_PARSER_BASICFILEINFO_H
diff --git a/caseinsensitivecomparer.h b/caseinsensitivecomparer.h
index 00c7a40..18b3299 100644
--- a/caseinsensitivecomparer.h
+++ b/caseinsensitivecomparer.h
@@ -1,5 +1,5 @@
-#ifndef CASEINSENSITIVECOMPARER
-#define CASEINSENSITIVECOMPARER
+#ifndef TAG_PARSER_CASEINSENSITIVECOMPARER
+#define TAG_PARSER_CASEINSENSITIVECOMPARER
 
 #include "./global.h"
 
@@ -7,7 +7,7 @@
 
 #include <iostream>
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \brief The CaseInsensitiveCharComparer struct defines a method for case-insensivive character comparsion (less).
@@ -38,5 +38,5 @@ struct TAG_PARSER_EXPORT CaseInsensitiveStringComparer
 
 }
 
-#endif // CASEINSENSITIVECOMPARER
+#endif // TAG_PARSER_CASEINSENSITIVECOMPARER
 
diff --git a/diagnostics.cpp b/diagnostics.cpp
index 1d9661f..6ece6cc 100644
--- a/diagnostics.cpp
+++ b/diagnostics.cpp
@@ -2,7 +2,7 @@
 
 using namespace std;
 
-namespace Media {
+namespace TagParser {
 
 const char *diagLevelName(DiagLevel diagLevel)
 {
diff --git a/diagnostics.h b/diagnostics.h
index 70db060..44c2bb7 100644
--- a/diagnostics.h
+++ b/diagnostics.h
@@ -8,7 +8,7 @@
 #include <string>
 #include <vector>
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \brief Specifies the level of the diagnostic message.
diff --git a/exceptions.cpp b/exceptions.cpp
index 71a3e3b..39dd0b9 100644
--- a/exceptions.cpp
+++ b/exceptions.cpp
@@ -2,7 +2,7 @@
 
 using namespace std;
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \class Media::Failure
diff --git a/exceptions.h b/exceptions.h
index f0121e3..ba72dc2 100644
--- a/exceptions.h
+++ b/exceptions.h
@@ -1,12 +1,12 @@
-#ifndef MEDIA_EXCEPTIONS_H
-#define MEDIA_EXCEPTIONS_H
+#ifndef TAG_PARSER_EXCEPTIONS_H
+#define TAG_PARSER_EXCEPTIONS_H
 
 #include "./global.h"
 
 #include <stdexcept>
 #include <string>
 
-namespace Media {
+namespace TagParser {
 
 class TAG_PARSER_EXPORT Failure : public std::exception
 {
@@ -76,4 +76,4 @@ public:
 
 }
 
-#endif // MEDIA_EXCEPTIONS_H
+#endif // TAG_PARSER_EXCEPTIONS_H
diff --git a/fieldbasedtag.h b/fieldbasedtag.h
index f9b5fd0..ee74d6c 100644
--- a/fieldbasedtag.h
+++ b/fieldbasedtag.h
@@ -1,12 +1,12 @@
-#ifndef FIELDBASEDTAG_H
-#define FIELDBASEDTAG_H
+#ifndef TAG_PARSER_FIELDBASEDTAG_H
+#define TAG_PARSER_FIELDBASEDTAG_H
 
 #include "./tag.h"
 
 #include <map>
 #include <functional>
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \class Media::FieldMapBasedTagTraits
@@ -197,7 +197,7 @@ bool FieldMapBasedTag<ImplementationType>::internallySetValue(const IdentifierTy
  * \sa Tag::setValue()
  */
 template <class ImplementationType>
-bool FieldMapBasedTag<ImplementationType>::setValue(const IdentifierType &id, const Media::TagValue &value)
+bool FieldMapBasedTag<ImplementationType>::setValue(const IdentifierType &id, const TagParser::TagValue &value)
 {
     return static_cast<ImplementationType *>(this)->internallySetValue(id, value);
 }
@@ -414,4 +414,4 @@ void FieldMapBasedTag<ImplementationType>::ensureTextValuesAreProperlyEncoded()
 
 }
 
-#endif // FIELDBASEDTAG_H
+#endif // TAG_PARSER_FIELDBASEDTAG_H
diff --git a/flac/flacmetadata.cpp b/flac/flacmetadata.cpp
index f73f512..a2239bd 100644
--- a/flac/flacmetadata.cpp
+++ b/flac/flacmetadata.cpp
@@ -15,7 +15,7 @@ using namespace std;
 using namespace ConversionUtilities;
 using namespace IoUtilities;
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \class Media::FlacMetaDataBlockHeader
diff --git a/flac/flacmetadata.h b/flac/flacmetadata.h
index 6c56d71..214aab9 100644
--- a/flac/flacmetadata.h
+++ b/flac/flacmetadata.h
@@ -1,5 +1,5 @@
-#ifndef MEDIA_FLACMETADATAHEADER_H
-#define MEDIA_FLACMETADATAHEADER_H
+#ifndef TAG_PARSER_FLACMETADATAHEADER_H
+#define TAG_PARSER_FLACMETADATAHEADER_H
 
 #include "../global.h"
 
@@ -7,7 +7,7 @@
 
 #include <iostream>
 
-namespace Media {
+namespace TagParser {
 
 class TagValue;
 
@@ -311,4 +311,4 @@ inline TagValue &FlacMetaDataBlockPicture::value()
 
 }
 
-#endif // MEDIA_FLACMETADATAHEADER_H
+#endif // TAG_PARSER_FLACMETADATAHEADER_H
diff --git a/flac/flacstream.cpp b/flac/flacstream.cpp
index cdc1e64..ef79df5 100644
--- a/flac/flacstream.cpp
+++ b/flac/flacstream.cpp
@@ -18,7 +18,7 @@ using namespace IoUtilities;
 using namespace ConversionUtilities;
 using namespace ChronoUtilities;
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \class Media::FlacStream
diff --git a/flac/flacstream.h b/flac/flacstream.h
index 3c9e9e6..65f06fb 100644
--- a/flac/flacstream.h
+++ b/flac/flacstream.h
@@ -1,12 +1,12 @@
-#ifndef FLACSTREAM_H
-#define FLACSTREAM_H
+#ifndef TAG_PARSER_FLACSTREAM_H
+#define TAG_PARSER_FLACSTREAM_H
 
 #include "../abstracttrack.h"
 
 #include <iosfwd>
 #include <memory>
 
-namespace Media {
+namespace TagParser {
 
 class MediaFileInfo;
 class VorbisComment;
@@ -72,4 +72,4 @@ inline uint32 FlacStream::streamOffset() const
 
 }
 
-#endif // FLACSTREAM_H
+#endif // TAG_PARSER_FLACSTREAM_H
diff --git a/flac/flactooggmappingheader.cpp b/flac/flactooggmappingheader.cpp
index deb5fc2..364d25d 100644
--- a/flac/flactooggmappingheader.cpp
+++ b/flac/flactooggmappingheader.cpp
@@ -9,7 +9,7 @@
 using namespace std;
 using namespace ConversionUtilities;
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \class Media::FlacToOggMappingHeader
diff --git a/flac/flactooggmappingheader.h b/flac/flactooggmappingheader.h
index f5e475e..f7ec322 100644
--- a/flac/flactooggmappingheader.h
+++ b/flac/flactooggmappingheader.h
@@ -1,9 +1,9 @@
-#ifndef MEDIA_FLACIDENTIFICATIONHEADER_H
-#define MEDIA_FLACIDENTIFICATIONHEADER_H
+#ifndef TAG_PARSER_FLACIDENTIFICATIONHEADER_H
+#define TAG_PARSER_FLACIDENTIFICATIONHEADER_H
 
 #include "./flacmetadata.h"
 
-namespace Media {
+namespace TagParser {
 
 class OggIterator;
 
@@ -69,4 +69,4 @@ inline const FlacMetaDataBlockStreamInfo &FlacToOggMappingHeader::streamInfo() c
 
 }
 
-#endif // MEDIA_FLACIDENTIFICATIONHEADER_H
+#endif // TAG_PARSER_FLACIDENTIFICATIONHEADER_H
diff --git a/genericcontainer.h b/genericcontainer.h
index 8ec63fc..f01a83d 100644
--- a/genericcontainer.h
+++ b/genericcontainer.h
@@ -1,5 +1,5 @@
-#ifndef MEDIA_GENERICCONTAINER_H
-#define MEDIA_GENERICCONTAINER_H
+#ifndef TAG_PARSER_GENERICCONTAINER_H
+#define TAG_PARSER_GENERICCONTAINER_H
 
 #include "./abstractcontainer.h"
 
@@ -8,7 +8,7 @@
 #include <vector>
 #include <memory>
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \class Media::GenericContainer
@@ -376,4 +376,4 @@ void GenericContainer<FileInfoType, TagType, TrackType, ElementType>::reset()
 
 } // namespace Media
 
-#endif // MEDIA_GENERICCONTAINER_H
+#endif // TAG_PARSER_GENERICCONTAINER_H
diff --git a/genericfileelement.h b/genericfileelement.h
index d1b07d7..2a4a053 100644
--- a/genericfileelement.h
+++ b/genericfileelement.h
@@ -1,5 +1,5 @@
-#ifndef GENERICFILEELEMENT_H
-#define GENERICFILEELEMENT_H
+#ifndef TAG_PARSER_GENERICFILEELEMENT_H
+#define TAG_PARSER_GENERICFILEELEMENT_H
 
 #include "./progressfeedback.h"
 #include "./exceptions.h"
@@ -20,7 +20,7 @@ class BinaryWriter;
 
 }
 
-namespace Media {
+namespace TagParser {
 
 class Diagnostics;
 
@@ -921,4 +921,4 @@ constexpr byte GenericFileElement<ImplementationType>::minimumElementSize()
 
 }
 
-#endif // GENERICFILEELEMENT_H
+#endif // TAG_PARSER_GENERICFILEELEMENT_H
diff --git a/generictagfield.h b/generictagfield.h
index 73c0b30..a3c4a4e 100644
--- a/generictagfield.h
+++ b/generictagfield.h
@@ -1,9 +1,9 @@
-#ifndef TAGFIELD_H
-#define TAGFIELD_H
+#ifndef TAG_PARSER_TAGFIELD_H
+#define TAG_PARSER_TAGFIELD_H
 
 #include "./tagvalue.h"
 
-namespace Media {
+namespace TagParser {
 
 template <class implementationType>
 class TagField;
@@ -300,4 +300,4 @@ inline void TagField<ImplementationType>::cleared()
 
 }
 
-#endif // TAGFIELD_H
+#endif // TAG_PARSER_TAGFIELD_H
diff --git a/id3/id3genres.cpp b/id3/id3genres.cpp
index c78476d..9e7a80f 100644
--- a/id3/id3genres.cpp
+++ b/id3/id3genres.cpp
@@ -2,7 +2,7 @@
 
 using namespace std;
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \class Id3Genres
diff --git a/id3/id3genres.h b/id3/id3genres.h
index 6e99b2a..dcf644b 100644
--- a/id3/id3genres.h
+++ b/id3/id3genres.h
@@ -1,5 +1,5 @@
-#ifndef ID3GENRES_H
-#define ID3GENRES_H
+#ifndef TAG_PARSER_ID3GENRES_H
+#define TAG_PARSER_ID3GENRES_H
 
 #include "../global.h"
 
@@ -7,7 +7,7 @@
 
 #include <string>
 
-namespace Media
+namespace TagParser
 {
 
 class TAG_PARSER_EXPORT Id3Genres
@@ -49,4 +49,4 @@ constexpr bool Id3Genres::isIndexSupported(int index)
 
 }
 
-#endif // ID3GENRES_H
+#endif // TAG_PARSER_ID3GENRES_H
diff --git a/id3/id3v1tag.cpp b/id3/id3v1tag.cpp
index b4bc5e4..d90c3f0 100644
--- a/id3/id3v1tag.cpp
+++ b/id3/id3v1tag.cpp
@@ -11,7 +11,7 @@
 using namespace std;
 using namespace ConversionUtilities;
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \class Media::Id3v1Tag
diff --git a/id3/id3v1tag.h b/id3/id3v1tag.h
index ac68eec..a6fe6ec 100644
--- a/id3/id3v1tag.h
+++ b/id3/id3v1tag.h
@@ -1,9 +1,9 @@
-#ifndef ID3V1TAG_H
-#define ID3V1TAG_H
+#ifndef TAG_PARSER_ID3V1TAG_H
+#define TAG_PARSER_ID3V1TAG_H
 
 #include "../tag.h"
 
-namespace Media
+namespace TagParser
 {
 
 class Diagnostics;
@@ -45,4 +45,4 @@ private:
 
 }
 
-#endif // ID3V1TAG_H
+#endif // TAG_PARSER_ID3V1TAG_H
diff --git a/id3/id3v2frame.cpp b/id3/id3v2frame.cpp
index fba127a..eae0fc0 100644
--- a/id3/id3v2frame.cpp
+++ b/id3/id3v2frame.cpp
@@ -19,7 +19,7 @@ using namespace ConversionUtilities;
 using namespace ChronoUtilities;
 using namespace IoUtilities;
 
-namespace Media {
+namespace TagParser {
 
 namespace Id3v2TextEncodingBytes {
 enum Id3v2TextEncodingByte : byte
diff --git a/id3/id3v2frame.h b/id3/id3v2frame.h
index a522237..086a878 100644
--- a/id3/id3v2frame.h
+++ b/id3/id3v2frame.h
@@ -1,5 +1,5 @@
-#ifndef ID3V2FRAME_H
-#define ID3V2FRAME_H
+#ifndef TAG_PARSER_ID3V2FRAME_H
+#define TAG_PARSER_ID3V2FRAME_H
 
 #include "./id3v2frameids.h"
 
@@ -14,7 +14,7 @@
 #include <iosfwd>
 #include <vector>
 
-namespace Media
+namespace TagParser
 {
 
 class Id3v2Frame;
@@ -342,4 +342,4 @@ inline std::string Id3v2Frame::fieldIdToString(Id3v2Frame::IdentifierType id)
 
 }
 
-#endif // ID3V2FRAME_H
+#endif // TAG_PARSER_ID3V2FRAME_H
diff --git a/id3/id3v2frameids.cpp b/id3/id3v2frameids.cpp
index 6a90ff5..94bd7e4 100644
--- a/id3/id3v2frameids.cpp
+++ b/id3/id3v2frameids.cpp
@@ -2,7 +2,7 @@
 
 #include "../exceptions.h"
 
-namespace Media
+namespace TagParser
 {
 
 /*!
diff --git a/id3/id3v2frameids.h b/id3/id3v2frameids.h
index 8b629b4..7043236 100644
--- a/id3/id3v2frameids.h
+++ b/id3/id3v2frameids.h
@@ -1,11 +1,11 @@
-#ifndef ID3V2FRAMEIDS_H
-#define ID3V2FRAMEIDS_H
+#ifndef TAG_PARSER_ID3V2FRAMEIDS_H
+#define TAG_PARSER_ID3V2FRAMEIDS_H
 
 #include <c++utilities/conversion/types.h>
 
 #include <string>
 
-namespace Media {
+namespace TagParser {
 
 namespace Id3v2FrameIds {
 enum KnownValue : uint32 {
@@ -93,4 +93,4 @@ inline bool isTextFrame(uint32 id)
 }
 
 }
-#endif // ID3V2FRAMEIDS_H
+#endif // TAG_PARSER_ID3V2FRAMEIDS_H
diff --git a/id3/id3v2tag.cpp b/id3/id3v2tag.cpp
index 6ad605a..c4fc860 100644
--- a/id3/id3v2tag.cpp
+++ b/id3/id3v2tag.cpp
@@ -11,7 +11,7 @@ using namespace std;
 using namespace IoUtilities;
 using namespace ConversionUtilities;
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \class Media::Id3v2Tag
diff --git a/id3/id3v2tag.h b/id3/id3v2tag.h
index 58cfcdf..d336818 100644
--- a/id3/id3v2tag.h
+++ b/id3/id3v2tag.h
@@ -1,5 +1,5 @@
-#ifndef ID3V2TAG_H
-#define ID3V2TAG_H
+#ifndef TAG_PARSER_ID3V2TAG_H
+#define TAG_PARSER_ID3V2TAG_H
 
 #include "./id3v2frame.h"
 
@@ -7,7 +7,7 @@
 
 #include <map>
 
-namespace Media
+namespace TagParser
 {
 
 class Id3v2Tag;
@@ -226,4 +226,4 @@ inline uint32 Id3v2Tag::paddingSize() const
 
 }
 
-#endif // ID3V2TAG_H
+#endif // TAG_PARSER_ID3V2TAG_H
diff --git a/localeawarestring.cpp b/localeawarestring.cpp
index 154d2b4..92d3758 100644
--- a/localeawarestring.cpp
+++ b/localeawarestring.cpp
@@ -2,7 +2,7 @@
 
 using namespace std;
 
-namespace Media {
+namespace TagParser {
 
 
 
diff --git a/localeawarestring.h b/localeawarestring.h
index c87432b..0fbfa4c 100644
--- a/localeawarestring.h
+++ b/localeawarestring.h
@@ -1,12 +1,12 @@
-#ifndef MEDIA_LOCALEAWARESTRING_H
-#define MEDIA_LOCALEAWARESTRING_H
+#ifndef TAG_PARSER_LOCALEAWARESTRING_H
+#define TAG_PARSER_LOCALEAWARESTRING_H
 
 #include "./global.h"
 
 #include <string>
 #include <vector>
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \brief The LocaleAwareString class is a standard string with locale information (languages, countries).
@@ -82,4 +82,4 @@ inline std::vector<std::string> &LocaleAwareString::countries()
 
 } // namespace Media
 
-#endif // MEDIA_LOCALEAWARESTRING_H
+#endif // TAG_PARSER_LOCALEAWARESTRING_H
diff --git a/margin.h b/margin.h
index 68b4fd4..6d96ebd 100644
--- a/margin.h
+++ b/margin.h
@@ -1,5 +1,5 @@
-#ifndef MARGIN_H
-#define MARGIN_H
+#ifndef TAG_PARSER_MARGIN_H
+#define TAG_PARSER_MARGIN_H
 
 #include "./global.h"
 
@@ -8,7 +8,7 @@
 
 #include <string>
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \brief The Margin class defines the four margins of a rectangle.
@@ -127,4 +127,4 @@ inline std::string Margin::toString() const
 
 }
 
-#endif // MARGIN_H
+#endif // TAG_PARSER_MARGIN_H
diff --git a/matroska/ebmlelement.cpp b/matroska/ebmlelement.cpp
index 74cded3..1c01e54 100644
--- a/matroska/ebmlelement.cpp
+++ b/matroska/ebmlelement.cpp
@@ -21,7 +21,7 @@ using namespace IoUtilities;
 using namespace ConversionUtilities;
 
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \class Media::EbmlElement
diff --git a/matroska/ebmlelement.h b/matroska/ebmlelement.h
index 2cf06ae..0ac8ca1 100644
--- a/matroska/ebmlelement.h
+++ b/matroska/ebmlelement.h
@@ -1,5 +1,5 @@
-#ifndef EBMLELEMENT_H
-#define EBMLELEMENT_H
+#ifndef TAG_PARSER_EBMLELEMENT_H
+#define TAG_PARSER_EBMLELEMENT_H
 
 #include "./ebmlid.h"
 #include "./matroskaid.h"
@@ -13,7 +13,7 @@
 #include <iostream>
 #include <memory>
 
-namespace Media {
+namespace TagParser {
 
 class EbmlElement;
 class MatroskaContainer;
@@ -130,4 +130,4 @@ inline uint64 EbmlElement::firstChildOffset() const
 }
 
 
-#endif // EBMLELEMENT_H
+#endif // TAG_PARSER_EBMLELEMENT_H
diff --git a/matroska/ebmlid.h b/matroska/ebmlid.h
index 05ea075..6b62704 100644
--- a/matroska/ebmlid.h
+++ b/matroska/ebmlid.h
@@ -1,9 +1,9 @@
-#ifndef EBMLID_H
-#define EBMLID_H
+#ifndef TAG_PARSER_EBMLID_H
+#define TAG_PARSER_EBMLID_H
 
 #include <c++utilities/conversion/types.h>
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \brief Encapsulates all EBML ID values.
@@ -67,4 +67,4 @@ enum SignatureElementListSlotIds
 
 }
 
-#endif // EBMLID_H
+#endif // TAG_PARSER_EBMLID_H
diff --git a/matroska/matroskaattachment.cpp b/matroska/matroskaattachment.cpp
index 2f9f37d..9fd3ce5 100644
--- a/matroska/matroskaattachment.cpp
+++ b/matroska/matroskaattachment.cpp
@@ -12,7 +12,7 @@ using namespace std;
 using namespace ConversionUtilities;
 using namespace IoUtilities;
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \class Media::MatroskaAttachment
diff --git a/matroska/matroskaattachment.h b/matroska/matroskaattachment.h
index a0b0325..b2e2bab 100644
--- a/matroska/matroskaattachment.h
+++ b/matroska/matroskaattachment.h
@@ -1,9 +1,9 @@
-#ifndef MEDIA_MATROSKAATTACHMENT_H
-#define MEDIA_MATROSKAATTACHMENT_H
+#ifndef TAG_PARSER_MATROSKAATTACHMENT_H
+#define TAG_PARSER_MATROSKAATTACHMENT_H
 
 #include "../abstractattachment.h"
 
-namespace Media {
+namespace TagParser {
 
 class EbmlElement;
 class MatroskaAttachment;
@@ -90,4 +90,4 @@ inline MatroskaAttachmentMaker MatroskaAttachment::prepareMaking(Diagnostics &di
 
 } // namespace Media
 
-#endif // MEDIA_MATROSKAATTACHMENT_H
+#endif // TAG_PARSER_MATROSKAATTACHMENT_H
diff --git a/matroska/matroskachapter.cpp b/matroska/matroskachapter.cpp
index 61404a5..c8ac390 100644
--- a/matroska/matroskachapter.cpp
+++ b/matroska/matroskachapter.cpp
@@ -12,7 +12,7 @@ using namespace std;
 using namespace ChronoUtilities;
 using namespace ConversionUtilities;
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \class MatroskaChapter
diff --git a/matroska/matroskachapter.h b/matroska/matroskachapter.h
index 008f304..cbe5997 100644
--- a/matroska/matroskachapter.h
+++ b/matroska/matroskachapter.h
@@ -1,11 +1,11 @@
-#ifndef MEDIA_MATROSKACHAPTER_H
-#define MEDIA_MATROSKACHAPTER_H
+#ifndef TAG_PARSER_MATROSKACHAPTER_H
+#define TAG_PARSER_MATROSKACHAPTER_H
 
 #include "../abstractchapter.h"
 
 #include <memory>
 
-namespace Media {
+namespace TagParser {
 
 class EbmlElement;
 
@@ -47,4 +47,4 @@ inline std::size_t MatroskaChapter::nestedChapterCount() const
 
 } // namespace Media
 
-#endif // MEDIA_MATROSKACHAPTER_H
+#endif // TAG_PARSER_MATROSKACHAPTER_H
diff --git a/matroska/matroskacontainer.cpp b/matroska/matroskacontainer.cpp
index c33c7c8..bcb330d 100644
--- a/matroska/matroskacontainer.cpp
+++ b/matroska/matroskacontainer.cpp
@@ -31,7 +31,7 @@ using namespace IoUtilities;
 using namespace ConversionUtilities;
 using namespace ChronoUtilities;
 
-namespace Media {
+namespace TagParser {
 
 constexpr const char appInfo[] = APP_NAME " v" APP_VERSION;
 constexpr uint64 appInfoElementDataSize = sizeof(appInfo) - 1;
diff --git a/matroska/matroskacontainer.h b/matroska/matroskacontainer.h
index 424176c..9c743f4 100644
--- a/matroska/matroskacontainer.h
+++ b/matroska/matroskacontainer.h
@@ -1,5 +1,5 @@
-#ifndef MATROSKACONTAINER_H
-#define MATROSKACONTAINER_H
+#ifndef TAG_PARSER_MATROSKACONTAINER_H
+#define TAG_PARSER_MATROSKACONTAINER_H
 
 #include "./ebmlelement.h"
 #include "./matroskatag.h"
@@ -15,7 +15,7 @@
 #include <string>
 #include <vector>
 
-namespace Media {
+namespace TagParser {
 
 class MatroskaSeekInfo;
 class MatroskaEditionEntry;
diff --git a/matroska/matroskacues.cpp b/matroska/matroskacues.cpp
index 74b5103..6886bb9 100644
--- a/matroska/matroskacues.cpp
+++ b/matroska/matroskacues.cpp
@@ -6,7 +6,7 @@
 using namespace std;
 using namespace ConversionUtilities;
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \class MatroskaOffsetStates
diff --git a/matroska/matroskacues.h b/matroska/matroskacues.h
index 21d087e..6bb388d 100644
--- a/matroska/matroskacues.h
+++ b/matroska/matroskacues.h
@@ -1,12 +1,12 @@
-#ifndef MEDIA_MATROSKACUES_H
-#define MEDIA_MATROSKACUES_H
+#ifndef TAG_PARSER_MATROSKACUES_H
+#define TAG_PARSER_MATROSKACUES_H
 
 #include "./ebmlelement.h"
 
 #include <unordered_map>
 #include <ostream>
 
-namespace Media {
+namespace TagParser {
 
 class TAG_PARSER_EXPORT MatroskaOffsetStates
 {
@@ -113,4 +113,4 @@ inline void MatroskaCuePositionUpdater::clear()
 
 } // namespace Media
 
-#endif // MEDIA_MATROSKACUES_H
+#endif // TAG_PARSER_MATROSKACUES_H
diff --git a/matroska/matroskaeditionentry.cpp b/matroska/matroskaeditionentry.cpp
index 11d2946..956d1db 100644
--- a/matroska/matroskaeditionentry.cpp
+++ b/matroska/matroskaeditionentry.cpp
@@ -13,7 +13,7 @@
 using namespace std;
 using namespace ConversionUtilities;
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \class MatroskaEditionEntry
diff --git a/matroska/matroskaeditionentry.h b/matroska/matroskaeditionentry.h
index e4a1c47..9a5ff8b 100644
--- a/matroska/matroskaeditionentry.h
+++ b/matroska/matroskaeditionentry.h
@@ -1,9 +1,9 @@
-#ifndef MEDIA_MATROSKAEDITIONENTRY_H
-#define MEDIA_MATROSKAEDITIONENTRY_H
+#ifndef TAG_PARSER_MATROSKAEDITIONENTRY_H
+#define TAG_PARSER_MATROSKAEDITIONENTRY_H
 
 #include "./matroskachapter.h"
 
-namespace Media {
+namespace TagParser {
 
 class EbmlElement;
 
@@ -84,4 +84,4 @@ inline const std::vector<std::unique_ptr<MatroskaChapter> > &MatroskaEditionEntr
 
 } // namespace Media
 
-#endif // MEDIA_MATROSKAEDITIONENTRY_H
+#endif // TAG_PARSER_MATROSKAEDITIONENTRY_H
diff --git a/matroska/matroskaid.cpp b/matroska/matroskaid.cpp
index e3d89d8..2550011 100644
--- a/matroska/matroskaid.cpp
+++ b/matroska/matroskaid.cpp
@@ -1,7 +1,7 @@
 #include "./ebmlid.h"
 #include "./matroskaid.h"
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \brief Encapsulates the most common Matroska element IDs.
diff --git a/matroska/matroskaid.h b/matroska/matroskaid.h
index 970e721..b12287b 100644
--- a/matroska/matroskaid.h
+++ b/matroska/matroskaid.h
@@ -1,11 +1,11 @@
-#ifndef MATROSKAIDS_H
-#define MATROSKAIDS_H
+#ifndef TAG_PARSER_MATROSKAIDS_H
+#define TAG_PARSER_MATROSKAIDS_H
 
 #include "../global.h"
 
 #include <c++utilities/conversion/types.h>
 
-namespace Media {
+namespace TagParser {
 
 namespace MatroskaIds {
 
@@ -537,4 +537,4 @@ TAG_PARSER_EXPORT MatroskaElementLevel matroskaIdLevel(uint32 matroskaId);
 
 }
 
-#endif // MATROSKAIDS_H
+#endif // TAG_PARSER_MATROSKAIDS_H
diff --git a/matroska/matroskaseekinfo.cpp b/matroska/matroskaseekinfo.cpp
index 2334b08..2c12d45 100644
--- a/matroska/matroskaseekinfo.cpp
+++ b/matroska/matroskaseekinfo.cpp
@@ -12,7 +12,7 @@
 using namespace std;
 using namespace ConversionUtilities;
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \class Media::MatroskaSeekInfo
diff --git a/matroska/matroskaseekinfo.h b/matroska/matroskaseekinfo.h
index 41c28f8..2d5a64b 100644
--- a/matroska/matroskaseekinfo.h
+++ b/matroska/matroskaseekinfo.h
@@ -1,11 +1,11 @@
-#ifndef MEDIA_MATROSKASEEKINFO_H
-#define MEDIA_MATROSKASEEKINFO_H
+#ifndef TAG_PARSER_MATROSKASEEKINFO_H
+#define TAG_PARSER_MATROSKASEEKINFO_H
 
 #include "./ebmlelement.h"
 
 #include <utility>
 
-namespace Media {
+namespace TagParser {
 
 class TAG_PARSER_EXPORT MatroskaSeekInfo
 {
@@ -69,4 +69,4 @@ inline std::vector<std::pair<EbmlElement::IdentifierType, uint64> > &MatroskaSee
 
 }
 
-#endif // MEDIA_MATROSKASEEKINFO_H
+#endif // TAG_PARSER_MATROSKASEEKINFO_H
diff --git a/matroska/matroskatag.cpp b/matroska/matroskatag.cpp
index 3f0737e..67964da 100644
--- a/matroska/matroskatag.cpp
+++ b/matroska/matroskatag.cpp
@@ -10,7 +10,7 @@
 using namespace std;
 using namespace ConversionUtilities;
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \class Media::MatroskaTag
diff --git a/matroska/matroskatag.h b/matroska/matroskatag.h
index 6b5d9b1..26a34b0 100644
--- a/matroska/matroskatag.h
+++ b/matroska/matroskatag.h
@@ -1,12 +1,12 @@
-#ifndef MEDIA_MATROSKATAG_H
-#define MEDIA_MATROSKATAG_H
+#ifndef TAG_PARSER_MATROSKATAG_H
+#define TAG_PARSER_MATROSKATAG_H
 
 #include "./matroskatagfield.h"
 #include "./matroskatagid.h"
 
 #include "../fieldbasedtag.h"
 
-namespace Media {
+namespace TagParser {
 
 class EbmlElement;
 class MatroskaTag;
@@ -107,4 +107,4 @@ inline bool MatroskaTag::canEncodingBeUsed(TagTextEncoding encoding) const
 
 }
 
-#endif // MEDIA_MATROSKATAG_H
+#endif // TAG_PARSER_MATROSKATAG_H
diff --git a/matroska/matroskatagfield.cpp b/matroska/matroskatagfield.cpp
index 69ac171..96c16a8 100644
--- a/matroska/matroskatagfield.cpp
+++ b/matroska/matroskatagfield.cpp
@@ -12,7 +12,7 @@ using namespace std;
 using namespace IoUtilities;
 using namespace ConversionUtilities;
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \class Media::MatroskaTagField
diff --git a/matroska/matroskatagfield.h b/matroska/matroskatagfield.h
index 1382533..1f592cb 100644
--- a/matroska/matroskatagfield.h
+++ b/matroska/matroskatagfield.h
@@ -1,9 +1,9 @@
-#ifndef MEDIA_MATROSKATAGFIELD_H
-#define MEDIA_MATROSKATAGFIELD_H
+#ifndef TAG_PARSER_MATROSKATAGFIELD_H
+#define TAG_PARSER_MATROSKATAGFIELD_H
 
 #include "../generictagfield.h"
 
-namespace Media {
+namespace TagParser {
 
 class EbmlElement;
 class MatroskaTagField;
@@ -130,4 +130,4 @@ inline void MatroskaTagField::cleared()
 
 }
 
-#endif // MEDIA_MATROSKATAGFIELD_H
+#endif // TAG_PARSER_MATROSKATAGFIELD_H
diff --git a/matroska/matroskatagid.cpp b/matroska/matroskatagid.cpp
index 913da8f..157fe93 100644
--- a/matroska/matroskatagid.cpp
+++ b/matroska/matroskatagid.cpp
@@ -2,7 +2,7 @@
 
 using namespace std;
 
-namespace Media {
+namespace TagParser {
 
 namespace MatroskaTagIds {
 
diff --git a/matroska/matroskatagid.h b/matroska/matroskatagid.h
index 4da1e46..501c727 100644
--- a/matroska/matroskatagid.h
+++ b/matroska/matroskatagid.h
@@ -1,9 +1,9 @@
-#ifndef MEDIA_MATROSKATAGIDS_H
-#define MEDIA_MATROSKATAGIDS_H
+#ifndef TAG_PARSER_MATROSKATAGIDS_H
+#define TAG_PARSER_MATROSKATAGIDS_H
 
 #include "../tagtarget.h"
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \brief Encapsulates Matroska tag IDs.
@@ -169,7 +169,7 @@ inline TAG_PARSER_EXPORT const char *mood() {
     return "MOOD";
 }
 inline TAG_PARSER_EXPORT const char *originalMediaType() {
-    return "ORIGINAL_MEDIA_TYPE";
+    return "ORIGINAL_TAG_PARSER_TYPE";
 }
 inline TAG_PARSER_EXPORT const char *contentType() {
     return "CONTENT_TYPE";
@@ -386,4 +386,4 @@ inline TAG_PARSER_EXPORT uint64 matroskaTagTargetLevelValue(TagTargetLevel targe
 
 } // namespace Media
 
-#endif // MEDIA_MATROSKATAGIDS_H
+#endif // TAG_PARSER_MATROSKATAGIDS_H
diff --git a/matroska/matroskatrack.cpp b/matroska/matroskatrack.cpp
index 94ac3d8..6d82120 100644
--- a/matroska/matroskatrack.cpp
+++ b/matroska/matroskatrack.cpp
@@ -21,7 +21,7 @@
 using namespace std;
 using namespace ConversionUtilities;
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \class Media::MatroskaTrack
@@ -500,7 +500,7 @@ void MatroskaTrack::internalParseHeader(Diagnostics &diag)
         break;
     case GeneralMediaFormat::Avc:
         if((codecPrivateElement = m_trackElement->childById(MatroskaIds::CodecPrivate, diag))) {
-            auto avcConfig = make_unique<Media::AvcConfiguration>();
+            auto avcConfig = make_unique<TagParser::AvcConfiguration>();
             try {
                 m_istream->seekg(codecPrivateElement->dataOffset());
                 avcConfig->parse(m_reader, codecPrivateElement->dataSize());
diff --git a/matroska/matroskatrack.h b/matroska/matroskatrack.h
index 44e60aa..2bc9640 100644
--- a/matroska/matroskatrack.h
+++ b/matroska/matroskatrack.h
@@ -1,9 +1,9 @@
-#ifndef MEDIA_MATROSKATRACK_H
-#define MEDIA_MATROSKATRACK_H
+#ifndef TAG_PARSER_MATROSKATRACK_H
+#define TAG_PARSER_MATROSKATRACK_H
 
 #include "../abstracttrack.h"
 
-namespace Media {
+namespace TagParser {
 
 class EbmlElement;
 class MatroskaContainer;
@@ -103,4 +103,4 @@ inline void MatroskaTrack::makeHeader(std::ostream &stream, Diagnostics &diag) c
 
 }
 
-#endif // MEDIA_MATROSKATRACK_H
+#endif // TAG_PARSER_MATROSKATRACK_H
diff --git a/mediafileinfo.cpp b/mediafileinfo.cpp
index f9f6864..7de83d9 100644
--- a/mediafileinfo.cpp
+++ b/mediafileinfo.cpp
@@ -57,7 +57,7 @@ using namespace ChronoUtilities;
  * \brief Contains utility classes helping to read and write streams.
  */
 
-namespace Media {
+namespace TagParser {
 
 #ifdef FORCE_FULL_PARSE_DEFAULT
 # define MEDIAINFO_CPP_FORCE_FULL_PARSE true
@@ -747,7 +747,7 @@ const char *MediaFileInfo::containerFormatAbbreviation() const
     default:
         ;
     }
-    return Media::containerFormatAbbreviation(m_containerFormat, mediaType, version);
+    return TagParser::containerFormatAbbreviation(m_containerFormat, mediaType, version);
 }
 
 /*!
@@ -772,7 +772,7 @@ const char *MediaFileInfo::mimeType() const
     default:
         mediaType = MediaType::Unknown;
     }
-    return Media::containerMimeType(m_containerFormat, mediaType);
+    return TagParser::containerMimeType(m_containerFormat, mediaType);
 }
 
 /*!
diff --git a/mediafileinfo.h b/mediafileinfo.h
index 2917746..e234f74 100644
--- a/mediafileinfo.h
+++ b/mediafileinfo.h
@@ -1,5 +1,5 @@
-#ifndef MEDIAINFO_H
-#define MEDIAINFO_H
+#ifndef TAG_PARSER_MEDIAINFO_H
+#define TAG_PARSER_MEDIAINFO_H
 
 #include "./signature.h"
 #include "./basicfileinfo.h"
@@ -9,7 +9,7 @@
 #include <unordered_set>
 #include <memory>
 
-namespace Media {
+namespace TagParser {
 
 class Tag;
 class Id3v1Tag;
@@ -95,9 +95,9 @@ public:
     ParsingStatus tracksParsingStatus() const;
     std::size_t trackCount() const;
     std::vector<AbstractTrack *> tracks() const;
-    bool hasTracksOfType(Media::MediaType type) const;
+    bool hasTracksOfType(TagParser::MediaType type) const;
     ChronoUtilities::TimeSpan duration() const;
-    std::unordered_set<std::string> availableLanguages(Media::MediaType type = Media::MediaType::Audio) const;
+    std::unordered_set<std::string> availableLanguages(TagParser::MediaType type = TagParser::MediaType::Audio) const;
     std::string technicalSummary() const;
     bool areTracksSupported() const;
     // ... the tags
@@ -229,7 +229,7 @@ inline ContainerFormat MediaFileInfo::containerFormat() const
  */
 inline const char *MediaFileInfo::containerFormatName() const
 {
-    return Media::containerFormatName(m_containerFormat);
+    return TagParser::containerFormatName(m_containerFormat);
 }
 
 /*!
@@ -244,7 +244,7 @@ inline const char *MediaFileInfo::containerFormatName() const
  */
 inline const char *MediaFileInfo::containerFormatSubversion() const
 {
-    return Media::containerFormatSubversion(m_containerFormat);
+    return TagParser::containerFormatSubversion(m_containerFormat);
 }
 
 /*!
@@ -593,4 +593,4 @@ inline void MediaFileInfo::setForceIndexPosition(bool forceIndexPosition)
 
 }
 
-#endif // MEDIAINFO_H
+#endif // TAG_PARSER_MEDIAINFO_H
diff --git a/mediaformat.cpp b/mediaformat.cpp
index 2669af0..19b168e 100644
--- a/mediaformat.cpp
+++ b/mediaformat.cpp
@@ -1,6 +1,6 @@
 #include "./mediaformat.h"
 
-namespace Media {
+namespace TagParser {
 
 using namespace SubFormats;
 
diff --git a/mediaformat.h b/mediaformat.h
index a404958..770b62c 100644
--- a/mediaformat.h
+++ b/mediaformat.h
@@ -1,11 +1,11 @@
-#ifndef MEDIAFORMAT_H
-#define MEDIAFORMAT_H
+#ifndef TAG_PARSER_MEDIAFORMAT_H
+#define TAG_PARSER_MEDIAFORMAT_H
 
 #include "./global.h"
 
 #include <utility>
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \brief The MediaType enum specifies the type of media data (audio, video, text, ...).
@@ -328,5 +328,5 @@ inline MediaFormat::operator bool() const
 
 }
 
-#endif // MEDIAFORMAT_H
+#endif // TAG_PARSER_MEDIAFORMAT_H
 
diff --git a/mp4/mp4atom.cpp b/mp4/mp4atom.cpp
index 00fce60..0a289db 100644
--- a/mp4/mp4atom.cpp
+++ b/mp4/mp4atom.cpp
@@ -17,7 +17,7 @@ using namespace std;
 using namespace IoUtilities;
 using namespace ConversionUtilities;
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \class Media::Mp4Atom
diff --git a/mp4/mp4atom.h b/mp4/mp4atom.h
index 4c3660f..3217593 100644
--- a/mp4/mp4atom.h
+++ b/mp4/mp4atom.h
@@ -1,5 +1,5 @@
-#ifndef MP4ATOM_H
-#define MP4ATOM_H
+#ifndef TAG_PARSER_MP4ATOM_H
+#define TAG_PARSER_MP4ATOM_H
 
 #include "./mp4ids.h"
 
@@ -12,7 +12,7 @@
 #include <iostream>
 #include <memory>
 
-namespace Media
+namespace TagParser
 {
 
 class Mp4Atom;
@@ -89,4 +89,4 @@ inline void Mp4Atom::addHeaderSize(uint64 &dataSize)
 
 }
 
-#endif // MP4ATOM_H
+#endif // TAG_PARSER_MP4ATOM_H
diff --git a/mp4/mp4container.cpp b/mp4/mp4container.cpp
index 49cc679..867662a 100644
--- a/mp4/mp4container.cpp
+++ b/mp4/mp4container.cpp
@@ -22,7 +22,7 @@ using namespace IoUtilities;
 using namespace ConversionUtilities;
 using namespace ChronoUtilities;
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \class Media::Mp4Container
diff --git a/mp4/mp4container.h b/mp4/mp4container.h
index c3c771e..43d3014 100644
--- a/mp4/mp4container.h
+++ b/mp4/mp4container.h
@@ -1,5 +1,5 @@
-#ifndef MEDIA_MP4CONTAINER_H
-#define MEDIA_MP4CONTAINER_H
+#ifndef TAG_PARSER_MP4CONTAINER_H
+#define TAG_PARSER_MP4CONTAINER_H
 
 #include "./mp4atom.h"
 #include "./mp4tag.h"
@@ -12,7 +12,7 @@
 #include <memory>
 #include <vector>
 
-namespace Media {
+namespace TagParser {
 
 class MediaFileInfo;
 
@@ -56,4 +56,4 @@ inline bool Mp4Container::isFragmented() const
 
 }
 
-#endif // MEDIA_MP4CONTAINER_H
+#endif // TAG_PARSER_MP4CONTAINER_H
diff --git a/mp4/mp4ids.cpp b/mp4/mp4ids.cpp
index e94bb28..76e57a7 100644
--- a/mp4/mp4ids.cpp
+++ b/mp4/mp4ids.cpp
@@ -2,7 +2,7 @@
 
 #include "../mediaformat.h"
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \brief Encapsulates the most common MP4 atom IDs.
diff --git a/mp4/mp4ids.h b/mp4/mp4ids.h
index b6d204f..5c3c1ef 100644
--- a/mp4/mp4ids.h
+++ b/mp4/mp4ids.h
@@ -1,11 +1,11 @@
-#ifndef MP4TAGATOMNAMES_H
-#define MP4TAGATOMNAMES_H
+#ifndef TAG_PARSER_MP4IDS_H
+#define TAG_PARSER_MP4IDS_H
 
 #include "../global.h"
 
 #include <c++utilities/conversion/types.h>
 
-namespace Media
+namespace TagParser
 {
 
 class MediaFormat;
@@ -712,4 +712,4 @@ enum class CountryCode
 
 }
 
-#endif // MP4TAGATOMNAMES_H
+#endif // TAG_PARSER_MP4IDS_H
diff --git a/mp4/mp4tag.cpp b/mp4/mp4tag.cpp
index 55c6dd5..c7f7b58 100644
--- a/mp4/mp4tag.cpp
+++ b/mp4/mp4tag.cpp
@@ -12,7 +12,7 @@ using namespace std;
 using namespace IoUtilities;
 using namespace ConversionUtilities;
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \class Media::Mp4ExtendedFieldId
diff --git a/mp4/mp4tag.h b/mp4/mp4tag.h
index 2f2ec28..a9233af 100644
--- a/mp4/mp4tag.h
+++ b/mp4/mp4tag.h
@@ -1,11 +1,11 @@
-#ifndef MP4TAG_H
-#define MP4TAG_H
+#ifndef TAG_PARSER_MP4TAG_H
+#define TAG_PARSER_MP4TAG_H
 
 #include "./mp4tagfield.h"
 
 #include "../fieldbasedtag.h"
 
-namespace Media
+namespace TagParser
 {
 
 class Mp4Atom;
@@ -176,4 +176,4 @@ inline bool Mp4Tag::setValue(const std::string &mean, const std::string &name, c
 
 }
 
-#endif // MP4TAG_H
+#endif // TAG_PARSER_MP4TAG_H
diff --git a/mp4/mp4tagfield.cpp b/mp4/mp4tagfield.cpp
index 2b985c9..c1c11f0 100644
--- a/mp4/mp4tagfield.cpp
+++ b/mp4/mp4tagfield.cpp
@@ -17,7 +17,7 @@ using namespace std;
 using namespace IoUtilities;
 using namespace ConversionUtilities;
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \class Media::Mp4TagField
diff --git a/mp4/mp4tagfield.h b/mp4/mp4tagfield.h
index 4348a90..137e499 100644
--- a/mp4/mp4tagfield.h
+++ b/mp4/mp4tagfield.h
@@ -1,5 +1,5 @@
-#ifndef MP4TAGATOM_H
-#define MP4TAGATOM_H
+#ifndef TAG_PARSER_MP4TAGATOM_H
+#define TAG_PARSER_MP4TAGATOM_H
 
 #include "../generictagfield.h"
 
@@ -9,7 +9,7 @@
 #include <vector>
 #include <sstream>
 
-namespace Media
+namespace TagParser
 {
 
 /*!
@@ -239,4 +239,4 @@ inline std::string Mp4TagField::fieldIdToString(Mp4TagField::IdentifierType id)
 
 }
 
-#endif // MP4TAGATOM_H
+#endif // TAG_PARSER_MP4TAGATOM_H
diff --git a/mp4/mp4track.cpp b/mp4/mp4track.cpp
index 02c76a5..ce60e1d 100644
--- a/mp4/mp4track.cpp
+++ b/mp4/mp4track.cpp
@@ -26,7 +26,7 @@ using namespace IoUtilities;
 using namespace ConversionUtilities;
 using namespace ChronoUtilities;
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \brief The TrackHeaderInfo struct holds information about the present track header (tkhd atom) and
@@ -1638,7 +1638,7 @@ void Mp4Track::internalParseHeader(Diagnostics &diag)
                 // parse AVC configuration
                 if(Mp4Atom *avcConfigAtom = esDescParentAtom->childById(Mp4AtomIds::AvcConfiguration, diag)) {
                     m_istream->seekg(avcConfigAtom->dataOffset());
-                    m_avcConfig = make_unique<Media::AvcConfiguration>();
+                    m_avcConfig = make_unique<TagParser::AvcConfiguration>();
                     try {
                         m_avcConfig->parse(reader, avcConfigAtom->dataSize());
                         addInfo(*m_avcConfig, *this);
diff --git a/mp4/mp4track.h b/mp4/mp4track.h
index 7ad30cc..56a5ac8 100644
--- a/mp4/mp4track.h
+++ b/mp4/mp4track.h
@@ -1,12 +1,12 @@
-#ifndef MP4TRACK_H
-#define MP4TRACK_H
+#ifndef TAG_PARSER_MP4TRACK_H
+#define TAG_PARSER_MP4TRACK_H
 
 #include "../abstracttrack.h"
 
 #include <vector>
 #include <memory>
 
-namespace Media
+namespace TagParser
 {
 
 class Mp4Atom;
@@ -141,7 +141,7 @@ public:
     // methods to read the "index" (chunk offsets and sizes)
     std::vector<uint64> readChunkOffsets(bool parseFragments, Diagnostics &diag);
     std::vector<std::tuple<uint32, uint32, uint32> > readSampleToChunkTable(Diagnostics &diag);
-    std::vector<uint64> readChunkSizes(Media::Diagnostics &diag);
+    std::vector<uint64> readChunkSizes(TagParser::Diagnostics &diag);
 
     // methods to make the track header
     void bufferTrackAtoms(Diagnostics &diag);
@@ -259,4 +259,4 @@ inline const AvcConfiguration *Mp4Track::avcConfiguration() const
 
 }
 
-#endif // MP4TRACK_H
+#endif // TAG_PARSER_MP4TRACK_H
diff --git a/mp4/mpeg4descriptor.cpp b/mp4/mpeg4descriptor.cpp
index 3d18db8..87a40b9 100644
--- a/mp4/mpeg4descriptor.cpp
+++ b/mp4/mpeg4descriptor.cpp
@@ -9,7 +9,7 @@
 using namespace std;
 using namespace ConversionUtilities;
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \class Media::Mpeg4Descriptor
diff --git a/mp4/mpeg4descriptor.h b/mp4/mpeg4descriptor.h
index fee7e30..999b9e2 100644
--- a/mp4/mpeg4descriptor.h
+++ b/mp4/mpeg4descriptor.h
@@ -1,11 +1,11 @@
-#ifndef MPEG4DESCRIPTOR_H
-#define MPEG4DESCRIPTOR_H
+#ifndef TAG_PARSER_MPEG4DESCRIPTOR_H
+#define TAG_PARSER_MPEG4DESCRIPTOR_H
 
 #include "../genericfileelement.h"
 
 #include <memory>
 
-namespace Media {
+namespace TagParser {
 
 class Mp4Container;
 class Mpeg4Descriptor;
@@ -81,4 +81,4 @@ inline uint64 Mpeg4Descriptor::firstChildOffset() const
 
 }
 
-#endif // MPEG4DESCRIPTOR_H
+#endif // TAG_PARSER_MPEG4DESCRIPTOR_H
diff --git a/mpegaudio/mpegaudioframe.cpp b/mpegaudio/mpegaudioframe.cpp
index 24ec883..b297c4f 100644
--- a/mpegaudio/mpegaudioframe.cpp
+++ b/mpegaudio/mpegaudioframe.cpp
@@ -7,7 +7,7 @@
 using namespace std;
 using namespace IoUtilities;
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \brief Returns the string representation for the specified \a channelMode.
diff --git a/mpegaudio/mpegaudioframe.h b/mpegaudio/mpegaudioframe.h
index 1ab3897..2c1452a 100644
--- a/mpegaudio/mpegaudioframe.h
+++ b/mpegaudio/mpegaudioframe.h
@@ -1,5 +1,5 @@
-#ifndef MP3FRAMEAUDIOSTREAM_H
-#define MP3FRAMEAUDIOSTREAM_H
+#ifndef TAG_PARSER_MP3FRAMEAUDIOSTREAM_H
+#define TAG_PARSER_MP3FRAMEAUDIOSTREAM_H
 
 #include "../global.h"
 
@@ -11,7 +11,7 @@ namespace IoUtilities {
 class BinaryReader;
 }
 
-namespace Media
+namespace TagParser
 {
 
 /*!
@@ -238,4 +238,4 @@ inline uint32 MpegAudioFrame::xingQualityIndicator() const
 
 }
 
-#endif // MP3FRAMEAUDIOSTREAM_H
+#endif // TAG_PARSER_MP3FRAMEAUDIOSTREAM_H
diff --git a/mpegaudio/mpegaudioframestream.cpp b/mpegaudio/mpegaudioframestream.cpp
index d6fedd6..30dc563 100644
--- a/mpegaudio/mpegaudioframestream.cpp
+++ b/mpegaudio/mpegaudioframestream.cpp
@@ -10,7 +10,7 @@ using namespace IoUtilities;
 using namespace ConversionUtilities;
 using namespace ChronoUtilities;
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \class Media::MpegAudioFrameStream
diff --git a/mpegaudio/mpegaudioframestream.h b/mpegaudio/mpegaudioframestream.h
index 19540e1..9a93613 100644
--- a/mpegaudio/mpegaudioframestream.h
+++ b/mpegaudio/mpegaudioframestream.h
@@ -1,5 +1,5 @@
-#ifndef MPEGAUDIOFRAMESTREAM_H
-#define MPEGAUDIOFRAMESTREAM_H
+#ifndef TAG_PARSER_MPEGAUDIOFRAMESTREAM_H
+#define TAG_PARSER_MPEGAUDIOFRAMESTREAM_H
 
 #include "./mpegaudioframe.h"
 
@@ -7,7 +7,7 @@
 
 #include <list>
 
-namespace Media
+namespace TagParser
 {
 
 class TAG_PARSER_EXPORT MpegAudioFrameStream : public AbstractTrack
diff --git a/ogg/oggcontainer.cpp b/ogg/oggcontainer.cpp
index 59b5e47..60aadfd 100644
--- a/ogg/oggcontainer.cpp
+++ b/ogg/oggcontainer.cpp
@@ -16,7 +16,7 @@ using namespace std;
 using namespace IoUtilities;
 using namespace ConversionUtilities;
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \class Media::OggVorbisComment
diff --git a/ogg/oggcontainer.h b/ogg/oggcontainer.h
index fb8f297..c55b56c 100644
--- a/ogg/oggcontainer.h
+++ b/ogg/oggcontainer.h
@@ -1,5 +1,5 @@
-#ifndef MEDIA_OGGCONTAINER_H
-#define MEDIA_OGGCONTAINER_H
+#ifndef TAG_PARSER_OGGCONTAINER_H
+#define TAG_PARSER_OGGCONTAINER_H
 
 #include "./oggpage.h"
 #include "./oggstream.h"
@@ -17,7 +17,7 @@ template<std::size_t bufferSize>
 class CopyHelper;
 }
 
-namespace Media {
+namespace TagParser {
 
 class MediaFileInfo;
 class OggContainer;
@@ -182,4 +182,4 @@ inline void OggContainer::setChecksumValidationEnabled(bool enabled)
 
 }
 
-#endif // MEDIA_OGGCONTAINER_H
+#endif // TAG_PARSER_OGGCONTAINER_H
diff --git a/ogg/oggiterator.cpp b/ogg/oggiterator.cpp
index 24d628f..4b6cbeb 100644
--- a/ogg/oggiterator.cpp
+++ b/ogg/oggiterator.cpp
@@ -10,7 +10,7 @@
 using namespace std;
 using namespace IoUtilities;
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \class Media::OggIterator
diff --git a/ogg/oggiterator.h b/ogg/oggiterator.h
index 479dc64..7ac8e0e 100644
--- a/ogg/oggiterator.h
+++ b/ogg/oggiterator.h
@@ -1,12 +1,12 @@
-#ifndef MEDIA_OGGITERATOR_H
-#define MEDIA_OGGITERATOR_H
+#ifndef TAG_PARSER_OGGITERATOR_H
+#define TAG_PARSER_OGGITERATOR_H
 
 #include "./oggpage.h"
 
 #include <iosfwd>
 #include <vector>
 
-namespace Media {
+namespace TagParser {
 
 class TAG_PARSER_EXPORT OggIterator
 {
@@ -326,4 +326,4 @@ inline bool OggIterator::matchesFilter(const OggPage &page)
 
 }
 
-#endif // MEDIA_OGGITERATOR_H
+#endif // TAG_PARSER_OGGITERATOR_H
diff --git a/ogg/oggpage.cpp b/ogg/oggpage.cpp
index 7854a9a..9b4e91b 100644
--- a/ogg/oggpage.cpp
+++ b/ogg/oggpage.cpp
@@ -9,7 +9,7 @@ using namespace std;
 using namespace IoUtilities;
 using namespace ConversionUtilities;
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \class Media::OggPage
diff --git a/ogg/oggpage.h b/ogg/oggpage.h
index 2ad18a8..7a029e2 100644
--- a/ogg/oggpage.h
+++ b/ogg/oggpage.h
@@ -1,5 +1,5 @@
-#ifndef OGGPAGE_H
-#define OGGPAGE_H
+#ifndef TAG_PARSER_OGGPAGE_H
+#define TAG_PARSER_OGGPAGE_H
 
 #include "../global.h"
 
@@ -9,7 +9,7 @@
 #include <numeric>
 #include <iosfwd>
 
-namespace Media {
+namespace TagParser {
 
 class TAG_PARSER_EXPORT OggPage
 {
@@ -253,4 +253,4 @@ inline uint64 OggPage::dataOffset(byte segmentIndex) const
 
 }
 
-#endif // OGGPAGE_H
+#endif // TAG_PARSER_OGGPAGE_H
diff --git a/ogg/oggstream.cpp b/ogg/oggstream.cpp
index 0ff883e..a14ae98 100644
--- a/ogg/oggstream.cpp
+++ b/ogg/oggstream.cpp
@@ -21,7 +21,7 @@ using namespace std;
 using namespace std::placeholders;
 using namespace ChronoUtilities;
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \class Media::OggStream
diff --git a/ogg/oggstream.h b/ogg/oggstream.h
index 18c7c73..a3ec882 100644
--- a/ogg/oggstream.h
+++ b/ogg/oggstream.h
@@ -1,11 +1,11 @@
-#ifndef MEDIA_OGGSTREAM_H
-#define MEDIA_OGGSTREAM_H
+#ifndef TAG_PARSER_OGGSTREAM_H
+#define TAG_PARSER_OGGSTREAM_H
 
 #include "./oggpage.h"
 
 #include "../abstracttrack.h"
 
-namespace Media {
+namespace TagParser {
 
 class OggContainer;
 class OggIterator;
@@ -44,4 +44,4 @@ inline TrackType OggStream::type() const
 
 }
 
-#endif // MEDIA_OGGSTREAM_H
+#endif // TAG_PARSER_OGGSTREAM_H
diff --git a/opus/opusidentificationheader.cpp b/opus/opusidentificationheader.cpp
index 65f5983..1830f6b 100644
--- a/opus/opusidentificationheader.cpp
+++ b/opus/opusidentificationheader.cpp
@@ -9,7 +9,7 @@
 using namespace std;
 using namespace ConversionUtilities;
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \class Media::OpusIdentificationHeader
diff --git a/opus/opusidentificationheader.h b/opus/opusidentificationheader.h
index 6cf56a1..a26ff74 100644
--- a/opus/opusidentificationheader.h
+++ b/opus/opusidentificationheader.h
@@ -1,11 +1,11 @@
-#ifndef MEDIA_OPUSIDENTIFICATIONHEADER_H
-#define MEDIA_OPUSIDENTIFICATIONHEADER_H
+#ifndef TAG_PARSER_OPUSIDENTIFICATIONHEADER_H
+#define TAG_PARSER_OPUSIDENTIFICATIONHEADER_H
 
 #include "../global.h"
 
 #include <c++utilities/conversion/types.h>
 
-namespace Media {
+namespace TagParser {
 
 class OggIterator;
 
@@ -106,4 +106,4 @@ inline byte OpusIdentificationHeader::channelMap() const
 
 }
 
-#endif // MEDIA_OPUSIDENTIFICATIONHEADER_H
+#endif // TAG_PARSER_OPUSIDENTIFICATIONHEADER_H
diff --git a/positioninset.h b/positioninset.h
index 54bb775..f5aef90 100644
--- a/positioninset.h
+++ b/positioninset.h
@@ -1,5 +1,5 @@
-#ifndef POSITIONINSET_H
-#define POSITIONINSET_H
+#ifndef TAG_PARSER_POSITIONINSET_H
+#define TAG_PARSER_POSITIONINSET_H
 
 #include "./global.h"
 
@@ -8,7 +8,7 @@
 
 #include <string>
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \class Media::PositionInSet
@@ -120,4 +120,4 @@ StringType PositionInSet::toString() const
 
 }
 
-#endif // POSITIONINSET_H
+#endif // TAG_PARSER_POSITIONINSET_H
diff --git a/progressfeedback.cpp b/progressfeedback.cpp
index 01443ec..b24b28d 100644
--- a/progressfeedback.cpp
+++ b/progressfeedback.cpp
@@ -2,7 +2,7 @@
 
 using namespace std;
 
-namespace Media {
+namespace TagParser {
 
 
 
diff --git a/progressfeedback.h b/progressfeedback.h
index cfcf300..a08bc9f 100644
--- a/progressfeedback.h
+++ b/progressfeedback.h
@@ -9,7 +9,7 @@
 #include <string>
 #include <functional>
 
-namespace Media {
+namespace TagParser {
 
 template<typename ActualProgressFeedback>
 class BasicProgressFeedback
diff --git a/signature.cpp b/signature.cpp
index 4f6a4b7..b0a01a6 100644
--- a/signature.cpp
+++ b/signature.cpp
@@ -5,7 +5,7 @@
 
 using namespace ConversionUtilities;
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \brief Holds 64-bit signatures.
diff --git a/signature.h b/signature.h
index 063fc23..9c8b3da 100644
--- a/signature.h
+++ b/signature.h
@@ -1,11 +1,11 @@
-#ifndef SIGNATURE_H
-#define SIGNATURE_H
+#ifndef TAG_PARSER_SIGNATURE_H
+#define TAG_PARSER_SIGNATURE_H
 
 #include "./mediaformat.h"
 
 #include <c++utilities/conversion/types.h>
 
-namespace Media {
+namespace TagParser {
 
 DECLARE_ENUM_CLASS(TagTargetLevel, byte);
 
@@ -75,4 +75,4 @@ TAG_PARSER_EXPORT uint64 containerTargetLevelValue(ContainerFormat containerForm
 
 }
 
-#endif // SIGNATURE_H
+#endif // TAG_PARSER_SIGNATURE_H
diff --git a/size.cpp b/size.cpp
index 9b38057..d24cb54 100644
--- a/size.cpp
+++ b/size.cpp
@@ -1,6 +1,6 @@
 #include "./size.h"
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \brief Returns an abbreviation for the current instance, eg. 720p for sizes greather than 1280×720
diff --git a/size.h b/size.h
index 7c183f7..18a2d50 100644
--- a/size.h
+++ b/size.h
@@ -1,5 +1,5 @@
-#ifndef SIZE_H
-#define SIZE_H
+#ifndef TAG_PARSER_SIZE_H
+#define TAG_PARSER_SIZE_H
 
 #include "./global.h"
 
@@ -8,7 +8,7 @@
 
 #include <string>
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \brief The Size class defines the size of a two-dimensional object using integer point precision.
@@ -127,4 +127,4 @@ inline std::string Size::toString() const
 
 }
 
-#endif // SIZE_H
+#endif // TAG_PARSER_SIZE_H
diff --git a/tag.cpp b/tag.cpp
index 81d5e6e..ae4ac28 100644
--- a/tag.cpp
+++ b/tag.cpp
@@ -2,7 +2,7 @@
 
 using namespace std;
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \class Media::Tag
diff --git a/tag.h b/tag.h
index c5ceaa1..77b52f2 100644
--- a/tag.h
+++ b/tag.h
@@ -1,5 +1,5 @@
-#ifndef TAG_H
-#define TAG_H
+#ifndef TAG_PARSER_TAG_H
+#define TAG_PARSER_TAG_H
 
 #include "./tagvalue.h"
 #include "./tagtarget.h"
@@ -10,7 +10,7 @@
 #include <type_traits>
 #include <string>
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \brief Specifies the tag type.
@@ -415,4 +415,4 @@ inline bool Tag::supportsMimeType(KnownField ) const
 
 }
 
-#endif // TAG_H
+#endif // TAG_PARSER_TAG_H
diff --git a/tagtarget.cpp b/tagtarget.cpp
index fa222c1..48b1680 100644
--- a/tagtarget.cpp
+++ b/tagtarget.cpp
@@ -9,7 +9,7 @@
 using namespace std;
 using namespace ConversionUtilities;
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \brief Returns a string representation for the specified \a tagTargetLevel.
diff --git a/tagtarget.h b/tagtarget.h
index 9158313..65d491e 100644
--- a/tagtarget.h
+++ b/tagtarget.h
@@ -1,5 +1,5 @@
-#ifndef MEDIA_TAGTARGET_H
-#define MEDIA_TAGTARGET_H
+#ifndef TAG_PARSER_TAGTARGET_H
+#define TAG_PARSER_TAGTARGET_H
 
 #include "./global.h"
 
@@ -9,7 +9,7 @@
 #include <vector>
 #include <functional>
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \brief The TagTargetLevel enum specifies tag target levels.
@@ -222,4 +222,4 @@ inline std::string TagTarget::toString(const std::function<TagTargetLevel(uint64
 
 }
 
-#endif // MEDIA_TAGTARGET_H
+#endif // TAG_PARSER_TAGTARGET_H
diff --git a/tagvalue.cpp b/tagvalue.cpp
index 9dc6eb6..bbe6317 100644
--- a/tagvalue.cpp
+++ b/tagvalue.cpp
@@ -15,7 +15,7 @@ using namespace std;
 using namespace ConversionUtilities;
 using namespace ChronoUtilities;
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \class Media::TagValue
diff --git a/tagvalue.h b/tagvalue.h
index 7e2c539..2bd96d2 100644
--- a/tagvalue.h
+++ b/tagvalue.h
@@ -1,5 +1,5 @@
-#ifndef TAGVALUE_H
-#define TAGVALUE_H
+#ifndef TAG_PARSER_TAGVALUE_H
+#define TAG_PARSER_TAGVALUE_H
 
 #include "./positioninset.h"
 
@@ -11,7 +11,7 @@
 #include <string>
 #include <memory>
 
-namespace Media {
+namespace TagParser {
 
 class Tag;
 class Id3v2Frame;
@@ -493,4 +493,4 @@ inline TagTextEncoding TagValue::descriptionEncoding() const
 
 }
 
-#endif // TAGVALUE_H
+#endif // TAG_PARSER_TAGVALUE_H
diff --git a/tests/helper.cpp b/tests/helper.cpp
index 392cfdc..6d82650 100644
--- a/tests/helper.cpp
+++ b/tests/helper.cpp
@@ -5,9 +5,9 @@ namespace TestUtilities {
 /*!
  * \brief Prints a TagTextEncoding to enable CPPUNIT_ASSERT_EQUAL for tag values.
  */
-std::ostream &operator <<(std::ostream &os, const Media::TagTextEncoding &encoding)
+std::ostream &operator <<(std::ostream &os, const TagParser::TagTextEncoding &encoding)
 {
-    using namespace Media;
+    using namespace TagParser;
     switch(encoding) {
     case TagTextEncoding::Unspecified:
         return os << "unspecified";
diff --git a/tests/helper.h b/tests/helper.h
index cfac546..e9544fd 100644
--- a/tests/helper.h
+++ b/tests/helper.h
@@ -9,20 +9,20 @@
 
 namespace TestUtilities {
 
-std::ostream &operator <<(std::ostream &os, const Media::TagTextEncoding &encoding);
+std::ostream &operator <<(std::ostream &os, const TagParser::TagTextEncoding &encoding);
 
 /*!
  * \brief Prints a TagValue UTF-8 encoded to enable CPPUNIT_ASSERT_EQUAL for tag values.
  */
-inline std::ostream &operator <<(std::ostream &os, const Media::TagValue &tagValue)
+inline std::ostream &operator <<(std::ostream &os, const TagParser::TagValue &tagValue)
 {
-    return os << tagValue.toString(Media::TagTextEncoding::Utf8) << " (encoding: " << tagValue.dataEncoding() << ")";
+    return os << tagValue.toString(TagParser::TagTextEncoding::Utf8) << " (encoding: " << tagValue.dataEncoding() << ")";
 }
 
 /*!
  * \brief Prints a PositionInSet to enable using it in CPPUNIT_ASSERT_EQUAL.
  */
-inline std::ostream &operator <<(std::ostream &os, const Media::PositionInSet &pos)
+inline std::ostream &operator <<(std::ostream &os, const TagParser::PositionInSet &pos)
 {
     return os << pos.toString();
 }
@@ -30,7 +30,7 @@ inline std::ostream &operator <<(std::ostream &os, const Media::PositionInSet &p
 /*!
  * \brief Prints a Size to enable using it in CPPUNIT_ASSERT_EQUAL.
  */
-inline std::ostream &operator <<(std::ostream &os, const Media::Size &size)
+inline std::ostream &operator <<(std::ostream &os, const TagParser::Size &size)
 {
     return os << size.toString();
 }
@@ -38,7 +38,7 @@ inline std::ostream &operator <<(std::ostream &os, const Media::Size &size)
 /*!
  * \brief Prints a DiagMessage to enable using it in CPPUNIT_ASSERT_EQUAL.
  */
-inline std::ostream &operator <<(std::ostream &os, const Media::DiagMessage &diagMessage)
+inline std::ostream &operator <<(std::ostream &os, const TagParser::DiagMessage &diagMessage)
 {
     return os << diagMessage.levelName() << ':' << ' ' << diagMessage.message() << ' ' << '(' << diagMessage.context() << ')';
 }
diff --git a/tests/mediafileinfo.cpp b/tests/mediafileinfo.cpp
index 3357148..ea15aab 100644
--- a/tests/mediafileinfo.cpp
+++ b/tests/mediafileinfo.cpp
@@ -14,7 +14,7 @@ using namespace TestUtilities;
 #include <cstdio>
 
 using namespace std;
-using namespace Media;
+using namespace TagParser;
 using namespace IoUtilities;
 using namespace TestUtilities::Literals;
 
diff --git a/tests/overall.h b/tests/overall.h
index f94d798..39fbbc6 100644
--- a/tests/overall.h
+++ b/tests/overall.h
@@ -23,7 +23,7 @@ using namespace ConversionUtilities;
 using namespace IoUtilities;
 using namespace TestUtilities;
 using namespace TestUtilities::Literals;
-using namespace Media;
+using namespace TagParser;
 
 using namespace CPPUNIT_NS;
 
diff --git a/tests/tagvalue.cpp b/tests/tagvalue.cpp
index fddac8b..a3f418f 100644
--- a/tests/tagvalue.cpp
+++ b/tests/tagvalue.cpp
@@ -12,7 +12,7 @@ using namespace TestUtilities;
 #include <cppunit/extensions/HelperMacros.h>
 
 using namespace std;
-using namespace Media;
+using namespace TagParser;
 using namespace ConversionUtilities;
 using namespace ChronoUtilities;
 
diff --git a/tests/testfilecheck.cpp b/tests/testfilecheck.cpp
index 2d747cf..cee867a 100644
--- a/tests/testfilecheck.cpp
+++ b/tests/testfilecheck.cpp
@@ -15,7 +15,7 @@ using namespace std;
 using namespace ConversionUtilities;
 using namespace IoUtilities;
 using namespace TestUtilities;
-using namespace Media;
+using namespace TagParser;
 
 using namespace CPPUNIT_NS;
 
diff --git a/tests/utils.cpp b/tests/utils.cpp
index 4221f0f..7a11dc5 100644
--- a/tests/utils.cpp
+++ b/tests/utils.cpp
@@ -21,7 +21,7 @@ using namespace TestUtilities;
 #include <cstdio>
 
 using namespace std;
-using namespace Media;
+using namespace TagParser;
 using namespace ConversionUtilities;
 using namespace IoUtilities;
 using namespace TestUtilities::Literals;
diff --git a/vorbis/vorbiscomment.cpp b/vorbis/vorbiscomment.cpp
index 8aa83be..a85f731 100644
--- a/vorbis/vorbiscomment.cpp
+++ b/vorbis/vorbiscomment.cpp
@@ -17,7 +17,7 @@ using namespace std;
 using namespace IoUtilities;
 using namespace ConversionUtilities;
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \class Media::VorbisComment
diff --git a/vorbis/vorbiscomment.h b/vorbis/vorbiscomment.h
index cfa3eb3..d9189a7 100644
--- a/vorbis/vorbiscomment.h
+++ b/vorbis/vorbiscomment.h
@@ -1,5 +1,5 @@
-#ifndef MEDIA_VORBISCOMMENT_H
-#define MEDIA_VORBISCOMMENT_H
+#ifndef TAG_PARSER_VORBISCOMMENT_H
+#define TAG_PARSER_VORBISCOMMENT_H
 
 #include "./vorbiscommentfield.h"
 
@@ -7,7 +7,7 @@
 #include "../fieldbasedtag.h"
 #include "../mediaformat.h"
 
-namespace Media {
+namespace TagParser {
 
 class OggIterator;
 class VorbisComment;
@@ -91,4 +91,4 @@ inline void VorbisComment::setVendor(const TagValue &vendor)
 
 }
 
-#endif // MEDIA_VORBISCOMMENT_H
+#endif // TAG_PARSER_VORBISCOMMENT_H
diff --git a/vorbis/vorbiscommentfield.cpp b/vorbis/vorbiscommentfield.cpp
index 8ba52fc..4b07e0a 100644
--- a/vorbis/vorbiscommentfield.cpp
+++ b/vorbis/vorbiscommentfield.cpp
@@ -23,7 +23,7 @@ using namespace std;
 using namespace IoUtilities;
 using namespace ConversionUtilities;
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \class Media::VorbisCommentField
diff --git a/vorbis/vorbiscommentfield.h b/vorbis/vorbiscommentfield.h
index 74a9838..378bfe4 100644
--- a/vorbis/vorbiscommentfield.h
+++ b/vorbis/vorbiscommentfield.h
@@ -1,5 +1,5 @@
-#ifndef MEDIA_VORBISCOMMENTFIELD_H
-#define MEDIA_VORBISCOMMENTFIELD_H
+#ifndef TAG_PARSER_VORBISCOMMENTFIELD_H
+#define TAG_PARSER_VORBISCOMMENTFIELD_H
 
 #include "../generictagfield.h"
 
@@ -8,7 +8,7 @@ class BinaryReader;
 class BinaryWriter;
 }
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \brief The VorbisCommentFlags enum specifies flags which controls parsing and making of Vorbis comments.
@@ -115,4 +115,4 @@ inline void VorbisCommentField::cleared()
 
 }
 
-#endif // MEDIA_VORBISCOMMENTFIELD_H
+#endif // TAG_PARSER_VORBISCOMMENTFIELD_H
diff --git a/vorbis/vorbiscommentids.h b/vorbis/vorbiscommentids.h
index 0ae4a0e..dc4a7aa 100644
--- a/vorbis/vorbiscommentids.h
+++ b/vorbis/vorbiscommentids.h
@@ -1,9 +1,9 @@
-#ifndef MEDIA_VORBISCOMMENTIDS_H
-#define MEDIA_VORBISCOMMENTIDS_H
+#ifndef TAG_PARSER_VORBISCOMMENTIDS_H
+#define TAG_PARSER_VORBISCOMMENTIDS_H
 
 #include "../global.h"
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \brief Encapsulates Vorbis comment IDs.
@@ -74,7 +74,7 @@ inline TAG_PARSER_EXPORT const char *genre() {
     return "GENRE";
 }
 inline TAG_PARSER_EXPORT const char *originalMediaType() {
-    return "ORIGINAL_MEDIA_TYPE";
+    return "ORIGINAL_TAG_PARSER_TYPE";
 }
 inline TAG_PARSER_EXPORT const char *contentType() {
     return "CONTENT_TYPE";
@@ -123,4 +123,4 @@ inline TAG_PARSER_EXPORT const char *cover() {
 
 }
 
-#endif // MEDIA_VORBISCOMMENTIDS_H
+#endif // TAG_PARSER_VORBISCOMMENTIDS_H
diff --git a/vorbis/vorbisidentificationheader.cpp b/vorbis/vorbisidentificationheader.cpp
index f2c2f85..ea2825c 100644
--- a/vorbis/vorbisidentificationheader.cpp
+++ b/vorbis/vorbisidentificationheader.cpp
@@ -10,7 +10,7 @@
 using namespace std;
 using namespace ConversionUtilities;
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \class Media::VorbisIdentificationHeader
diff --git a/vorbis/vorbisidentificationheader.h b/vorbis/vorbisidentificationheader.h
index 51b8fca..674ee2c 100644
--- a/vorbis/vorbisidentificationheader.h
+++ b/vorbis/vorbisidentificationheader.h
@@ -1,11 +1,11 @@
-#ifndef MEDIA_VORBISIDENTIFICATIONHEADER_H
-#define MEDIA_VORBISIDENTIFICATIONHEADER_H
+#ifndef TAG_PARSER_VORBISIDENTIFICATIONHEADER_H
+#define TAG_PARSER_VORBISIDENTIFICATIONHEADER_H
 
 #include "../global.h"
 
 #include <c++utilities/conversion/types.h>
 
-namespace Media {
+namespace TagParser {
 
 class OggIterator;
 
@@ -92,4 +92,4 @@ inline byte VorbisIdentificationHeader::framingFlag() const
 
 }
 
-#endif // MEDIA_VORBISIDENTIFICATIONHEADER_H
+#endif // TAG_PARSER_VORBISIDENTIFICATIONHEADER_H
diff --git a/vorbis/vorbispackagetypes.h b/vorbis/vorbispackagetypes.h
index ce1098a..e995e2a 100644
--- a/vorbis/vorbispackagetypes.h
+++ b/vorbis/vorbispackagetypes.h
@@ -1,9 +1,9 @@
-#ifndef VORBISPACKAGETYPES_H
-#define VORBISPACKAGETYPES_H
+#ifndef TAG_PARSER_VORBISPACKAGETYPES_H
+#define TAG_PARSER_VORBISPACKAGETYPES_H
 
 #include <c++utilities/conversion/types.h>
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \brief Encapsulates known Vorbis package type IDs.
@@ -18,4 +18,4 @@ enum KnownType : byte {
 
 }
 
-#endif // VORBISPACKAGETYPES_H
+#endif // TAG_PARSER_VORBISPACKAGETYPES_H
diff --git a/wav/waveaudiostream.cpp b/wav/waveaudiostream.cpp
index 5557f9d..56fcdf2 100644
--- a/wav/waveaudiostream.cpp
+++ b/wav/waveaudiostream.cpp
@@ -11,7 +11,7 @@
 using namespace std;
 using namespace ChronoUtilities;
 
-namespace Media {
+namespace TagParser {
 
 /*!
  * \class Media::WaveFormatHeader
diff --git a/wav/waveaudiostream.h b/wav/waveaudiostream.h
index afd67fb..5857849 100644
--- a/wav/waveaudiostream.h
+++ b/wav/waveaudiostream.h
@@ -1,9 +1,9 @@
-#ifndef WAVEAUDIOSTREAM_H
-#define WAVEAUDIOSTREAM_H
+#ifndef TAG_PARSER_WAVEAUDIOSTREAM_H
+#define TAG_PARSER_WAVEAUDIOSTREAM_H
 
 #include "../abstracttrack.h"
 
-namespace Media
+namespace TagParser
 {
 
 class TAG_PARSER_EXPORT WaveFormatHeader
@@ -50,4 +50,4 @@ private:
 
 }
 
-#endif // WAVEAUDIOSTREAM_H
+#endif // TAG_PARSER_WAVEAUDIOSTREAM_H