diff --git a/spectool/schema_2_kaxsematic_cpp.xsl b/spectool/schema_2_kaxsematic_cpp.xsl
index 290e1341..37eceaa1 100644
--- a/spectool/schema_2_kaxsematic_cpp.xsl
+++ b/spectool/schema_2_kaxsematic_cpp.xsl
@@ -51,7 +51,7 @@
 #include "matroska/KaxBlockData.h"
 #include "matroska/KaxCuesData.h"
 
-START_LIBMATROSKA_NAMESPACE
+namespace libmatroska {
 <xsl:for-each select="ebml:element[not(starts-with(@path,'\EBML\'))]">
     <!-- sorting messes the detection of the previous element MATROSKA_VERSION state -->
     <!-- Maybe for each output we create we also create a counterpart call to check if the new MATROSKA_VERSION state that should be used -->
@@ -71,7 +71,7 @@ START_LIBMATROSKA_NAMESPACE
 <!-- <xsl:apply-templates select="ebml:element">
     <xsl:sort select="translate(@path, '\+', '\')" />
 </xsl:apply-templates> -->
-END_LIBMATROSKA_NAMESPACE
+} // namespace libmatroska
 </xsl:template>
   <xsl:template match="ebml:element">
     <xsl:variable name="plainPath">
diff --git a/spectool/schema_2_kaxsematic_h.xsl b/spectool/schema_2_kaxsematic_h.xsl
index b28b6314..f901ad95 100644
--- a/spectool/schema_2_kaxsematic_h.xsl
+++ b/spectool/schema_2_kaxsematic_h.xsl
@@ -55,9 +55,9 @@
 #include "ebml/EbmlMaster.h"
 #include "matroska/KaxDefines.h"
 
-using namespace LIBEBML_NAMESPACE;
+using namespace libebml;
 
-START_LIBMATROSKA_NAMESPACE
+namespace libmatroska {
 <xsl:for-each select="ebml:element[not(starts-with(@path,'\EBML\'))]">
     <!-- <xsl:sort select="translate(@path, '\+', '\')" /> -->
     <xsl:apply-templates select="."/>
@@ -70,7 +70,7 @@ START_LIBMATROSKA_NAMESPACE
     <!-- Output the enums after the IDs -->
     <xsl:call-template name="outputAllEnums"/>
 </xsl:for-each>
-END_LIBMATROSKA_NAMESPACE
+} // namespace libmatroska
 
 #endif // LIBMATROSKA_SEMANTIC_H
 </xsl:template>