diff --git a/.gitmodules b/.gitmodules
index 50f3c71..d28e137 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,14 +1,10 @@
 [submodule "NeTEx"]
 	path = NeTEx
-	url = https://github.com/NeTEx-CEN/NeTEx
+	url = https://github.com/TransmodelEcosystem/NeTEx
 	branch = v2.0
 	ignore = dirty
-[submodule "OJP"]
-	path = OJP
-	url = https://github.com/VDVde/OJP
-	ignore = dirty
 [submodule "SIRI"]
 	path = SIRI
-	url = https://github.com/Aurige/SIRI
-	branch = SIRI-for-OpRa
+	url = https://github.com/TransmodelEcosystem/SIRI
+	branch = v2.2
 	ignore = dirty
diff --git a/OJP b/OJP
deleted file mode 160000
index 482625c..0000000
--- a/OJP
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 482625caef9b099943d2c837dfa6aab5795d3606
diff --git a/xsd/opra_request.xsd b/xsd/opra_request.xsd
index 93764f7..ed1e15b 100644
--- a/xsd/opra_request.xsd
+++ b/xsd/opra_request.xsd
@@ -245,7 +245,7 @@
 	</xsd:complexType>
 	<xsd:element name="OpraSubscriptionRequest" type="OpraSubscriptionRequestStructure">
 		<xsd:annotation>
-			<xsd:documentation>General OpRa Subscription Request that subscribes to PublicationDelivery responses.</xsd:documentation>
+			<xsd:documentation>General OpRa Subscription Request that subscribes to PublicationDelivery deliveries.</xsd:documentation>
 		</xsd:annotation>
 	</xsd:element>
 	<xsd:complexType name="OpraSubscriptionRequestStructure">