diff --git a/xsd/opra_service/opra_all_services.xsd b/xsd/opra_service/opra_all_services.xsd
index 346639d..c1124e7 100644
--- a/xsd/opra_service/opra_all_services.xsd
+++ b/xsd/opra_service/opra_all_services.xsd
@@ -3,8 +3,8 @@
 <xsd:schema xmlns="https://transmodel-cen.eu/opra/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="https://transmodel-cen.eu/opra/1.0" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="opra_all_services">
 	<!-- OpRa functions, list added functions here -->
 	<xsd:include schemaLocation="opra_payload_delivery.xsd"/>
-	<xsd:include schemaLocation="opra_service_plannedService.xsd"/>
-	<xsd:include schemaLocation="opra_service_actualService.xsd"/>
+	<xsd:include schemaLocation="opra_service_plannedFrame.xsd"/>
+	<xsd:include schemaLocation="opra_service_actualFrame.xsd"/>
 	<xsd:include schemaLocation="opra_service_capacity.xsd"/>
 	<xsd:include schemaLocation="opra_service_fleetDimensions.xsd"/>
 	<xsd:include schemaLocation="opra_service_serviceDimensions.xsd"/>
diff --git a/xsd/opra_service/opra_service_actualService.xsd b/xsd/opra_service/opra_service_actualFrame.xsd
similarity index 82%
rename from xsd/opra_service/opra_service_actualService.xsd
rename to xsd/opra_service/opra_service_actualFrame.xsd
index 18a1503..7f09abf 100644
--- a/xsd/opra_service/opra_service_actualService.xsd
+++ b/xsd/opra_service/opra_service_actualFrame.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--Created with Liquid Studio (https://www.liquid-technologies.com)-->
-<xsd:schema xmlns="https://transmodel-cen.eu/opra/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="https://transmodel-cen.eu/opra/1.0" attributeFormDefault="unqualified" elementFormDefault="qualified" id="opra_service_actualService" version="1.0">
+<xsd:schema xmlns="https://transmodel-cen.eu/opra/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="https://transmodel-cen.eu/opra/1.0" attributeFormDefault="unqualified" elementFormDefault="qualified" id="opra_service_actualFrame" version="1.0">
 	<!-- ===Includes (OpRa)============================================================== -->
-	<xsd:include schemaLocation="opra_service_plannedService.xsd"/>
+	<xsd:include schemaLocation="opra_service_plannedFrame.xsd"/>
 	<!-- === Documentation ======================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -22,7 +22,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{https://transmodel-cen.eu/opra/1.0/xsd/opra_service/opra_service_actualService.xsd</Identifier>
+				<Identifier>{https://transmodel-cen.eu/opra/1.0/xsd/opra_service/opra_service_actualFrame.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Rights>Unclassified
 				</Rights>
@@ -47,31 +47,31 @@
 				<Type>Standard</Type>
 			</Metadata>
 		</xsd:appinfo>
-		<xsd:documentation>OpRa ACTUAL SERVICE Request / Discovery</xsd:documentation>
+		<xsd:documentation>OpRa ACTUAL FRAME Request / Discovery</xsd:documentation>
 	</xsd:annotation>
-	<xsd:element name="ActualServiceRequest" type="ActualServiceRequestStructure" substitutionGroup="OpraFunctionalRequest">
+	<xsd:element name="ActualFrameRequest" type="ActualFrameRequestStructure" substitutionGroup="OpraFunctionalRequest">
 		<xsd:annotation>
 			<xsd:documentation>A request element to get ACTUAL FRAMEs.</xsd:documentation>
 		</xsd:annotation>
 	</xsd:element>
-	<xsd:complexType name="ActualServiceRequestStructure">
+	<xsd:complexType name="ActualFrameRequestStructure">
 		<xsd:annotation>
 			<xsd:documentation>Type for the request element to get ACTUAL FRAMEs.</xsd:documentation>
 		</xsd:annotation>
 		<xsd:complexContent>
 			<xsd:extension base="OpraFunctionalRequestStructure">
-				<xsd:group ref="ActualServiceRequestGroup"/>
+				<xsd:group ref="ActualFrameRequestGroup"/>
 			</xsd:extension>
 		</xsd:complexContent>
 	</xsd:complexType>
-	<xsd:group name="ActualServiceRequestGroup">
+	<xsd:group name="ActualFrameRequestGroup">
 		<xsd:annotation>
 			<xsd:documentation>References that extend filtering capabilites of requests for ACTUAL FRAMEs.</xsd:documentation>
 		</xsd:annotation>
 		<xsd:sequence>
 			<xsd:element name="IncludeDifferencesOnly" type="xsd:boolean" minOccurs="0" default="false">
 				<xsd:annotation>
-					<xsd:documentation>Signals if only the differences between the PLANNED SERVICE and the ACTUAL SERVICE is requested within the frame of the request.</xsd:documentation>
+					<xsd:documentation>Signals if only the differences between the PLANNED FRAME and the ACTUAL FRAME is requested within the frame of the request.</xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
 			<xsd:group ref="NetexFilteringGroup"/>
diff --git a/xsd/opra_service/opra_service_plannedService.xsd b/xsd/opra_service/opra_service_plannedFrame.xsd
similarity index 89%
rename from xsd/opra_service/opra_service_plannedService.xsd
rename to xsd/opra_service/opra_service_plannedFrame.xsd
index 6e4cb64..fa0e32f 100644
--- a/xsd/opra_service/opra_service_plannedService.xsd
+++ b/xsd/opra_service/opra_service_plannedFrame.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--Created with Liquid Studio (https://www.liquid-technologies.com)-->
-<xsd:schema xmlns="https://transmodel-cen.eu/opra/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="https://transmodel-cen.eu/opra/1.0" attributeFormDefault="unqualified" elementFormDefault="qualified" id="opra_service_plannedService" version="1.0">
+<xsd:schema xmlns="https://transmodel-cen.eu/opra/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="https://transmodel-cen.eu/opra/1.0" attributeFormDefault="unqualified" elementFormDefault="qualified" id="opra_service_plannedFrame" version="1.0">
 	<!-- ===Includes (OpRa)============================================================== -->
 	<xsd:include schemaLocation="../opra_request.xsd"/>
 	<!-- === Documentation ======================================= -->
@@ -22,7 +22,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{https://transmodel-cen.eu/opra/1.0/xsd/opra_service/opra_service_plannedService.xsd</Identifier>
+				<Identifier>{https://transmodel-cen.eu/opra/1.0/xsd/opra_service/opra_service_plannedFrame.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Rights>Unclassified
 				</Rights>
@@ -47,24 +47,24 @@
 				<Type>Standard</Type>
 			</Metadata>
 		</xsd:appinfo>
-		<xsd:documentation>OpRa PLANNED SERVICE Request schema.</xsd:documentation>
+		<xsd:documentation>OpRa PLANNED FRAME Request schema.</xsd:documentation>
 	</xsd:annotation>
-	<xsd:element name="PlannedServiceRequest" type="PlannedServiceRequestStructure" substitutionGroup="OpraFunctionalRequest">
+	<xsd:element name="PlannedFrameRequest" type="PlannedFrameRequestStructure" substitutionGroup="OpraFunctionalRequest">
 		<xsd:annotation>
 			<xsd:documentation>A request element to get PLANNED FRAMEs.</xsd:documentation>
 		</xsd:annotation>
 	</xsd:element>
-	<xsd:complexType name="PlannedServiceRequestStructure">
+	<xsd:complexType name="PlannedFrameRequestStructure">
 		<xsd:annotation>
 			<xsd:documentation>Type for the request element to get PLANNED FRAMEs.</xsd:documentation>
 		</xsd:annotation>
 		<xsd:complexContent>
 			<xsd:extension base="OpraFunctionalRequestStructure">
-				<xsd:group ref="PlannedServiceRequestGroup"/>
+				<xsd:group ref="PlannedFrameRequestGroup"/>
 			</xsd:extension>
 		</xsd:complexContent>
 	</xsd:complexType>
-	<xsd:group name="PlannedServiceRequestGroup">
+	<xsd:group name="PlannedFrameRequestGroup">
 		<xsd:annotation>
 			<xsd:documentation>References that extend filtering capabilities of requests for PLANNED FRAMEs.</xsd:documentation>
 		</xsd:annotation>