diff --git a/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java b/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java
index 687aa5e8..8505010b 100644
--- a/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java
+++ b/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java
@@ -190,7 +190,7 @@ public class ZUGFeRD2PullProvider implements IXMLProvider {
 				+ "	<rsm:CIExchangedDocumentContext>\n" //$NON-NLS-1$
 				+ "		\n" //$NON-NLS-1$
 				+ "		<ram:GuidelineSpecifiedCIDocumentContextParameter>\n" //$NON-NLS-1$
-				+ "			<ram:ID>urn:ferd:CrossIndustryDocument:invoice:1p0:comfort</ram:ID>\n" //$NON-NLS-1$
+				+ "			<ram:ID>urn:cen.eu:en16931:2017:compliant:factur-x.eu:1p0:extended</ram:ID>\n" //$NON-NLS-1$
 				+ "		</ram:GuidelineSpecifiedCIDocumentContextParameter>\n" //$NON-NLS-1$
 				+ "	</rsm:CIExchangedDocumentContext>\n" //$NON-NLS-1$
 				+ "	<rsm:CIIHExchangedDocument>\n" //$NON-NLS-1$
diff --git a/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDImporter.java b/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDImporter.java
index 4babf3f9..45b56080 100644
--- a/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDImporter.java
+++ b/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDImporter.java
@@ -121,7 +121,7 @@ public class ZUGFeRDImporter {
 		}
 
 		factory = DocumentBuilderFactory.newInstance();
-		factory.setNamespaceAware(true); //otherwise we can not act namespace independend, i.e. use document.getElementsByTagNameNS("*",...
+		factory.setNamespaceAware(true); //otherwise we can not act namespace independently, i.e. use document.getElementsByTagNameNS("*",...
 		try {
 			builder = factory.newDocumentBuilder();
 		} catch (ParserConfigurationException ex3) {