diff --git a/matroska/KaxContexts.h b/matroska/KaxContexts.h
index b21b39d6..88e56672 100644
--- a/matroska/KaxContexts.h
+++ b/matroska/KaxContexts.h
@@ -15,42 +15,42 @@ using namespace libebml;
 
 namespace libmatroska {
 
-extern const EbmlSemanticContext MATROSKA_DLL_API KaxMatroska_Context;
-extern const EbmlSemanticContext MATROSKA_DLL_API KaxSegment_Context;
-extern const EbmlSemanticContext MATROSKA_DLL_API KaxAttachments_Context;
-extern const EbmlSemanticContext MATROSKA_DLL_API KaxAttached_Context;
-extern const EbmlSemanticContext MATROSKA_DLL_API KaxFileDescription_Context;
-extern const EbmlSemanticContext MATROSKA_DLL_API KaxFileName_Context;
-extern const EbmlSemanticContext MATROSKA_DLL_API KaxMimeType_Context;
-extern const EbmlSemanticContext MATROSKA_DLL_API KaxFileData_Context;
-extern const EbmlSemanticContext MATROSKA_DLL_API KaxChapters_Context;
-extern const EbmlSemanticContext MATROSKA_DLL_API KaxCluster_Context;
-extern const EbmlSemanticContext MATROSKA_DLL_API KaxTags_Context;
-extern const EbmlSemanticContext MATROSKA_DLL_API KaxTag_Context;
-extern const EbmlSemanticContext MATROSKA_DLL_API KaxBlockGroup_Context;
-extern const EbmlSemanticContext MATROSKA_DLL_API KaxReferencePriority_Context;
-extern const EbmlSemanticContext MATROSKA_DLL_API KaxReferenceBlock_Context;
-extern const EbmlSemanticContext MATROSKA_DLL_API KaxReferenceVirtual_Context;
-extern const EbmlSemanticContext MATROSKA_DLL_API KaxCues_Context;
-extern const EbmlSemanticContext MATROSKA_DLL_API KaxInfo_Context;
-extern const EbmlSemanticContext MATROSKA_DLL_API KaxSeekHead_Context;
-extern const EbmlSemanticContext MATROSKA_DLL_API KaxTracks_Context;
-extern const EbmlSemanticContext MATROSKA_DLL_API KaxTrackEntry_Context;
-extern const EbmlSemanticContext MATROSKA_DLL_API KaxTrackNumber_Context;
-extern const EbmlSemanticContext MATROSKA_DLL_API KaxTrackType_Context;
-extern const EbmlSemanticContext MATROSKA_DLL_API KaxTrackFlagEnabled_Context;
-extern const EbmlSemanticContext MATROSKA_DLL_API KaxTrackFlagDefault_Context;
-extern const EbmlSemanticContext MATROSKA_DLL_API KaxTrackFlagLacing_Context;
-extern const EbmlSemanticContext MATROSKA_DLL_API KaxTrackName_Context;
-extern const EbmlSemanticContext MATROSKA_DLL_API KaxTrackLanguage_Context;
-extern const EbmlSemanticContext MATROSKA_DLL_API KaxCodecID_Context;
-extern const EbmlSemanticContext MATROSKA_DLL_API KaxCodecPrivate_Context;
-extern const EbmlSemanticContext MATROSKA_DLL_API KaxCodecName_Context;
-extern const EbmlSemanticContext MATROSKA_DLL_API KaxCodecSettings_Context;
-extern const EbmlSemanticContext MATROSKA_DLL_API KaxCodecInfoURL_Context;
-extern const EbmlSemanticContext MATROSKA_DLL_API KaxCodecDownloadURL_Context;
-extern const EbmlSemanticContext MATROSKA_DLL_API KaxCodecDecodeAll_Context;
-extern const EbmlSemanticContext MATROSKA_DLL_API KaxTrackOverlay_Context;
+extern const EbmlSemanticContext MATROSKA_DLL_API Context_KaxMatroska;
+extern const EbmlSemanticContext MATROSKA_DLL_API Context_KaxSegment;
+extern const EbmlSemanticContext MATROSKA_DLL_API Context_KaxAttachments;
+extern const EbmlSemanticContext MATROSKA_DLL_API Context_KaxAttached;
+extern const EbmlSemanticContext MATROSKA_DLL_API Context_KaxFileDescription;
+extern const EbmlSemanticContext MATROSKA_DLL_API Context_KaxFileName;
+extern const EbmlSemanticContext MATROSKA_DLL_API Context_KaxMimeType;
+extern const EbmlSemanticContext MATROSKA_DLL_API Context_KaxFileData;
+extern const EbmlSemanticContext MATROSKA_DLL_API Context_KaxChapters;
+extern const EbmlSemanticContext MATROSKA_DLL_API Context_KaxCluster;
+extern const EbmlSemanticContext MATROSKA_DLL_API Context_KaxTags;
+extern const EbmlSemanticContext MATROSKA_DLL_API Context_KaxTag;
+extern const EbmlSemanticContext MATROSKA_DLL_API Context_KaxBlockGroup;
+extern const EbmlSemanticContext MATROSKA_DLL_API Context_KaxReferencePriority;
+extern const EbmlSemanticContext MATROSKA_DLL_API Context_KaxReferenceBlock;
+extern const EbmlSemanticContext MATROSKA_DLL_API Context_KaxReferenceVirtual;
+extern const EbmlSemanticContext MATROSKA_DLL_API Context_KaxCues;
+extern const EbmlSemanticContext MATROSKA_DLL_API Context_KaxInfo;
+extern const EbmlSemanticContext MATROSKA_DLL_API Context_KaxSeekHead;
+extern const EbmlSemanticContext MATROSKA_DLL_API Context_KaxTracks;
+extern const EbmlSemanticContext MATROSKA_DLL_API Context_KaxTrackEntry;
+extern const EbmlSemanticContext MATROSKA_DLL_API Context_KaxTrackNumber;
+extern const EbmlSemanticContext MATROSKA_DLL_API Context_KaxTrackType;
+extern const EbmlSemanticContext MATROSKA_DLL_API Context_KaxTrackFlagEnabled;
+extern const EbmlSemanticContext MATROSKA_DLL_API Context_KaxTrackFlagDefault;
+extern const EbmlSemanticContext MATROSKA_DLL_API Context_KaxTrackFlagLacing;
+extern const EbmlSemanticContext MATROSKA_DLL_API Context_KaxTrackName;
+extern const EbmlSemanticContext MATROSKA_DLL_API Context_KaxTrackLanguage;
+extern const EbmlSemanticContext MATROSKA_DLL_API Context_KaxCodecID;
+extern const EbmlSemanticContext MATROSKA_DLL_API Context_KaxCodecPrivate;
+extern const EbmlSemanticContext MATROSKA_DLL_API Context_KaxCodecName;
+extern const EbmlSemanticContext MATROSKA_DLL_API Context_KaxCodecSettings;
+extern const EbmlSemanticContext MATROSKA_DLL_API Context_KaxCodecInfoURL;
+extern const EbmlSemanticContext MATROSKA_DLL_API Context_KaxCodecDownloadURL;
+extern const EbmlSemanticContext MATROSKA_DLL_API Context_KaxCodecDecodeAll;
+extern const EbmlSemanticContext MATROSKA_DLL_API Context_KaxTrackOverlay;
 
 #define Context_KaxMatroska              KaxMatroska_Context
 #define Context_KaxSegment               KaxSegment_Context