Merge branch 'MPR_08-31'

@@ -72,13 +72,13 @@ ep-eqt:ClassOfSupplyDefinedByAManufacturer
       rdfs:subClassOf owl:Class .
 
 ep-eqt:Compressor
-      rdf:type owl:Class , ep-fac:ProductionFacilityType ;
+      rdf:type owl:Class ;
       rdfs:comment "equipment that is a compressor"^^xsd:string ;
       rdfs:label "compressor"^^xsd:string ;
       rdfs:subClassOf ep-eqt:Equipment .
 
 ep-eqt:Controller-lift
-      rdf:type owl:Class , ep-fac:ProductionFacilityType ;
+      rdf:type owl:Class ;
       rdfs:comment "deprecated - same as ep-prodeqt:Controller"^^xsd:string ;
       rdfs:label "controller - lift"^^xsd:string ;
       rdfs:subClassOf ep-eqt:Equipment .
@@ -153,15 +153,20 @@ ep-eqt:Liner
       rdfs:subClassOf ep-eqt:CasingLinerTubing ;
       owl:disjointWith ep-eqt:Tubing , ep-eqt:Casing .
 
+ep-eqt:Manifold
+      rdf:type owl:Class ;
+      rdfs:label "manifold"^^xsd:string ;
+      rdfs:subClassOf ep-eqt:Equipment .
+
 ep-eqt:Manifold-injection
-      rdf:type owl:Class , ep-fac:ProductionFacilityType ;
+      rdf:type owl:Class ;
       rdfs:label "manifold - injection"^^xsd:string ;
-      rdfs:subClassOf ep-eqt:Equipment .
+      rdfs:subClassOf ep-eqt:Manifold .
 
 ep-eqt:Manifold-production
-      rdf:type owl:Class , ep-fac:ProductionFacilityType ;
+      rdf:type owl:Class ;
       rdfs:label "manifold - production"^^xsd:string ;
-      rdfs:subClassOf ep-eqt:Equipment .
+      rdfs:subClassOf ep-eqt:Manifold .
 
 ep-eqt:PipeOutsideDiameterAPI_5CTClass
       rdf:type rdfs:Class ;
@@ -180,7 +185,7 @@ ep-eqt:ProductionCasing
       owl:disjointWith ep-eqt:TopCasing , ep-eqt:IntermediateCasing .
 
 ep-eqt:Separator
-      rdf:type owl:Class , ep-fac:ProductionFacilityType ;
+      rdf:type owl:Class ;
       rdfs:comment "equipment that is a separator"^^xsd:string ;
       rdfs:label "separator"^^xsd:string ;
       rdfs:subClassOf ep-eqt:Equipment .
@@ -191,7 +196,7 @@ ep-eqt:SteelGradeAPI_5CTClass
       rdfs:subClassOf owl:Class .
 
 ep-eqt:Tank
-      rdf:type owl:Class , ep-fac:ProductionFacilityType ;
+      rdf:type owl:Class ;
       rdfs:comment "equipment that is a tank"^^xsd:string ;
       rdfs:label "tank"^^xsd:string ;
       rdfs:subClassOf ep-eqt:Equipment .

@@ -17,9 +17,9 @@
       owl:versionInfo "0.1.0"^^xsd:string .
 
 ep-fac:Completion
-      rdf:type ep-fac:ProductionFacilityType , owl:Class ;
+      rdf:type owl:Class ;
       rdfs:label "completion"^^xsd:string ;
-      rdfs:subClassOf ep-fac:TemporalPartOfACompletion .
+      rdfs:subClassOf ep-fac:Facility .
 
 ep-fac:Facility
       rdf:type owl:Class ;
@@ -27,16 +27,15 @@ ep-fac:Facility
       rdfs:subClassOf ep-core:PhysicalObject .
 
 ep-fac:Field
-      rdf:type ep-fac:ProductionFacilityType , owl:Class ;
+      rdf:type owl:Class ;
       rdfs:comment "facility that is a field"^^xsd:string ;
-      rdfs:label "field"^^xsd:string ;
-      rdfs:subClassOf ep-fac:TemporalPartOfAField .
+      rdfs:label "field"^^xsd:string .
 
 ep-fac:FixedFacility
-      rdf:type ep-fac:FixedOrMoveableFacilityType , owl:DeprecatedClass ;
+      rdf:type owl:DeprecatedClass , ep-fac:FixedOrMoveableFacilityType ;
       rdfs:comment "facility that has been build and that is intended to remain in one place"^^xsd:string ;
       rdfs:label "fixed facility"^^xsd:string ;
-      rdfs:subClassOf ep-fac:TemporalPartOfAFixedFacility .
+      rdfs:subClassOf ep-fac:Facility .
 
 ep-fac:FixedOrMoveableFacilityType
       rdf:type rdfs:Class ;
@@ -49,43 +48,43 @@ ep-fac:FixedOrMoveableRigType
       rdfs:subClassOf owl:Class .
 
 ep-fac:FixedRig
-      rdf:type ep-fac:FixedOrMoveableRigType , owl:Class ;
+      rdf:type owl:Class , ep-fac:FixedOrMoveableRigType ;
       rdfs:label "fixed rig"^^xsd:string ;
-      rdfs:subClassOf ep-fac:FixedFacility , ep-fac:Rig .
+      rdfs:subClassOf ep-fac:Rig , ep-fac:FixedFacility .
 
 ep-fac:Flowline
-      rdf:type ep-fac:ProductionFacilityType , owl:Class ;
+      rdf:type owl:Class ;
       rdfs:comment "facility that is a flowline"^^xsd:string ;
       rdfs:label "flowline"^^xsd:string ;
-      rdfs:subClassOf ep-fac:TemporalPartOfAFlowline .
+      rdfs:subClassOf ep-fac:Facility .
 
 ep-fac:Flowline-production
-      rdf:type ep-fac:ProductionFacilityType , owl:Class ;
+      rdf:type owl:Class ;
       rdfs:label "flowline - production"^^xsd:string ;
       rdfs:subClassOf ep-fac:Flowline .
 
 ep-fac:Lease
-      rdf:type ep-fac:ProductionFacilityType , owl:Class ;
+      rdf:type owl:Class ;
       rdfs:comment "facility that is defined by a lease"^^xsd:string ;
       rdfs:label "lease"^^xsd:string ;
       rdfs:subClassOf ep-fac:Facility .
 
 ep-fac:MoveableFacility
-      rdf:type ep-fac:FixedOrMoveableFacilityType , owl:Class ;
+      rdf:type owl:Class , ep-fac:FixedOrMoveableFacilityType ;
       rdfs:comment "facility that has been built and that is intended to be moved from place to place"^^xsd:string ;
       rdfs:label "moveable facility"^^xsd:string ;
-      rdfs:subClassOf ep-fac:TemporalPartOfAMoveableFacility .
+      rdfs:subClassOf ep-fac:Facility .
 
 ep-fac:MoveableRig
-      rdf:type ep-fac:FixedOrMoveableRigType , owl:Class ;
+      rdf:type owl:Class , ep-fac:FixedOrMoveableRigType ;
       rdfs:label "moveable rig"^^xsd:string ;
-      rdfs:subClassOf ep-fac:MoveableFacility , ep-fac:Rig .
+      rdfs:subClassOf ep-fac:Rig , ep-fac:MoveableFacility .
 
 ep-fac:Platform
-      rdf:type ep-fac:ProductionFacilityType , owl:Class ;
+      rdf:type owl:Class ;
       rdfs:comment "facility that is a platform"^^xsd:string ;
       rdfs:label "platform"^^xsd:string ;
-      rdfs:subClassOf ep-fac:TemporalPartOfAPlatform .
+      rdfs:subClassOf ep-fac:Facility .
 
 ep-fac:ProductionFacility
       rdf:type owl:Class ;
@@ -93,16 +92,11 @@ ep-fac:ProductionFacility
       rdfs:label "production facility"^^xsd:string ;
       rdfs:subClassOf ep-fac:TemporalPartOfAProductionFacility .
 
-ep-fac:ProductionFacilityType
-      rdf:type rdfs:Class ;
-      rdfs:label "production facility type"^^xsd:string ;
-      rdfs:subClassOf owl:Class .
-
 ep-fac:Reservoir
-      rdf:type ep-fac:ProductionFacilityType , owl:Class ;
+      rdf:type owl:Class ;
       rdfs:comment "facility that is a reservoir"^^xsd:string ;
       rdfs:label "reservoir"^^xsd:string ;
-      rdfs:subClassOf ep-fac:TemporalPartOfAReservoir .
+      rdfs:subClassOf ep-fac:Facility .
 
 ep-fac:Rig
       rdf:type owl:Class ;
@@ -130,66 +124,34 @@ ep-fac:SurroundingWater-meanSeaLevel
       rdfs:subClassOf ep-fac:SurroundingWater .
 
 ep-fac:Template
-      rdf:type ep-fac:ProductionFacilityType , owl:Class ;
+      rdf:type owl:Class ;
       rdfs:comment "equipment that is an ocean bottom template"^^xsd:string ;
       rdfs:label "template"^^xsd:string ;
-      rdfs:subClassOf ep-fac:TemporalPartOfATemplate .
-
-ep-fac:TemporalPartOfACompletion
-      rdf:type owl:Class ;
       rdfs:subClassOf ep-fac:Facility .
 
 ep-fac:TemporalPartOfAField
       rdf:type owl:Class ;
       rdfs:subClassOf ep-fac:Facility .
 
-ep-fac:TemporalPartOfAFixedFacility
-      rdf:type owl:Class ;
-      rdfs:subClassOf ep-fac:Facility .
-
-ep-fac:TemporalPartOfAFlowline
-      rdf:type owl:Class ;
-      rdfs:subClassOf ep-fac:Facility .
-
-ep-fac:TemporalPartOfAMoveableFacility
-      rdf:type owl:Class ;
-      rdfs:subClassOf ep-fac:Facility .
-
-ep-fac:TemporalPartOfAPlatform
-      rdf:type owl:Class ;
-      rdfs:subClassOf ep-fac:Facility .
-
 ep-fac:TemporalPartOfAProductionFacility
       rdf:type owl:Class ;
       rdfs:comment "facility that is a temporal part of a production facility"^^xsd:string ;
       rdfs:label "temporal part of a production facility"^^xsd:string ;
       rdfs:subClassOf ep-fac:Facility .
 
-ep-fac:TemporalPartOfAReservoir
-      rdf:type owl:Class ;
-      rdfs:subClassOf ep-fac:Facility .
-
 ep-fac:TemporalPartOfARig
       rdf:type owl:Class ;
       rdfs:label "(temporal part of a) rig"^^xsd:string ;
       rdfs:subClassOf ep-fac:Facility .
 
-ep-fac:TemporalPartOfATemplate
-      rdf:type owl:Class ;
-      rdfs:subClassOf ep-fac:Facility .
-
-ep-fac:TemporalPartOfAZone
-      rdf:type owl:Class ;
-      rdfs:subClassOf ep-fac:Facility .
-
 ep-fac:Zone
-      rdf:type ep-fac:ProductionFacilityType , owl:Class ;
+      rdf:type owl:Class ;
       rdfs:comment "spatial part of a wellbore that is a zone"^^xsd:string ;
       rdfs:label "zone"^^xsd:string ;
-      rdfs:subClassOf ep-fac:TemporalPartOfAZone .
+      rdfs:subClassOf ep-fac:Facility .
 
 ep-fac:depthOfSurroundingWater
-      rdf:type owl:ObjectProperty , owl:FunctionalProperty , ep-core:Class_of_indirect_property ;
+      rdf:type ep-core:Class_of_indirect_property , owl:FunctionalProperty , owl:ObjectProperty ;
       rdfs:domain ep-fac:SurroundingWater ;
       rdfs:label "depth of surrounding water"^^xsd:string ;
       rdfs:range ep-core:Length .

@@ -37,22 +37,22 @@ ep-core:licenceBlockHasNpdPolygonPart
       rdfs:subPropertyOf ep-core:hasPart .
 
 ep-geo:AreaCoveredByBusinessArrangement
-      rdf:type ep-fac:ProductionFacilityType , owl:Class ;
+      rdf:type owl:Class ;
       rdfs:label "A part of the earth recognised in a Business Arrangement"^^xsd:string ;
       rdfs:subClassOf ep-geo:PartOfTheSurfaceOfTheEarth ;
-      owl:disjointWith ep-geo:LicenceBlock , ep-geo:State , ep-geo:County , ep-geo:PartOfSurfaceOfTheEarthSpecifiedAsPolygon , ep-geo:Country .
+      owl:disjointWith ep-geo:State , ep-geo:County , ep-geo:PartOfSurfaceOfTheEarthSpecifiedAsPolygon , ep-geo:Country , ep-geo:LicenceBlock .
 
 ep-geo:Country
-      rdf:type owl:Class , ep-fac:ProductionFacilityType ;
+      rdf:type owl:Class ;
       rdfs:label "country"^^xsd:string ;
       rdfs:subClassOf ep-geo:PartOfTheSurfaceOfTheEarth ;
-      owl:disjointWith ep-geo:AreaCoveredByBusinessArrangement , ep-geo:LicenceBlock , ep-geo:County , ep-geo:PartOfSurfaceOfTheEarthSpecifiedAsPolygon , ep-geo:State .
+      owl:disjointWith ep-geo:State , ep-geo:AreaCoveredByBusinessArrangement , ep-geo:LicenceBlock , ep-geo:County , ep-geo:PartOfSurfaceOfTheEarthSpecifiedAsPolygon .
 
 ep-geo:County
-      rdf:type owl:Class , ep-fac:ProductionFacilityType ;
+      rdf:type owl:Class ;
       rdfs:label "county"^^xsd:string ;
       rdfs:subClassOf ep-geo:PartOfTheSurfaceOfTheEarth ;
-      owl:disjointWith ep-geo:AreaCoveredByBusinessArrangement , ep-geo:LicenceBlock , ep-geo:State , ep-geo:PartOfSurfaceOfTheEarthSpecifiedAsPolygon , ep-geo:Country .
+      owl:disjointWith ep-geo:Country , ep-geo:AreaCoveredByBusinessArrangement , ep-geo:LicenceBlock , ep-geo:State , ep-geo:PartOfSurfaceOfTheEarthSpecifiedAsPolygon .
 
 ep-geo:DestinationType
       rdf:type rdfs:Class ;
@@ -65,7 +65,7 @@ ep-geo:Harbour
       rdfs:subClassOf ep-geo:PartOfTheSurfaceOfTheEarth .
 
 ep-geo:LicenceBlock
-      rdf:type owl:Class , ep-fac:ProductionFacilityType ;
+      rdf:type owl:Class ;
       rdfs:comment "See RDL RDS13025226"^^xsd:string ;
       rdfs:label "Licence Block"^^xsd:string ;
       rdfs:subClassOf ep-geo:PartOfTheSurfaceOfTheEarth ;
@@ -87,10 +87,10 @@ ep-geo:PartOfTheSurfaceOfTheEarth
       rdfs:subClassOf ep-core:PhysicalObject .
 
 ep-geo:State
-      rdf:type owl:Class , ep-fac:ProductionFacilityType ;
+      rdf:type owl:Class ;
       rdfs:label "state"^^xsd:string ;
       rdfs:subClassOf ep-geo:PartOfTheSurfaceOfTheEarth ;
-      owl:disjointWith ep-geo:AreaCoveredByBusinessArrangement , ep-geo:LicenceBlock , ep-geo:County , ep-geo:PartOfSurfaceOfTheEarthSpecifiedAsPolygon , ep-geo:Country .
+      owl:disjointWith ep-geo:Country , ep-geo:AreaCoveredByBusinessArrangement , ep-geo:LicenceBlock , ep-geo:County , ep-geo:PartOfSurfaceOfTheEarthSpecifiedAsPolygon .
 
 ep-geo:Terminal
       rdf:type ep-geo:DestinationType , owl:Class ;

@@ -12,7 +12,7 @@
 
 <http://www.reportinghub.no/ep/schema/1.0/production-equipment>
       rdf:type owl:Ontology ;
-      owl:imports <http://www.reportinghub.no/ep/schema/1.0/equipment> , <http://www.reportinghub.no/ep/schema/1.0/production-facility> ;
+      owl:imports <http://www.reportinghub.no/ep/schema/1.0/production-facility> , <http://www.reportinghub.no/ep/schema/1.0/equipment> ;
       owl:versionInfo "Created with TopBraid Composer"^^xsd:string .
 
 <http://www.reportinghub.no/ep/schema/equipment#ChokeValve>
@@ -21,9 +21,6 @@
 <http://www.reportinghub.no/ep/schema/equipment#Controller-lift>
       rdfs:subClassOf ep-prodeqt:Controller .
 
-<http://www.reportinghub.no/ep/schema/equipment#Manifold>
-      rdfs:label "manifold"^^xsd:string .
-
 ep-prodeqt:BlockValve
       rdf:type owl:Class ;
       rdfs:comment "valve that is a block valve"^^xsd:string ;
@@ -31,7 +28,7 @@ ep-prodeqt:BlockValve
       rdfs:subClassOf ep-prodeqt:Valve .
 
 ep-prodeqt:Controller
-      rdf:type owl:Class , ep-prodfac:ProductionFacilityType ;
+      rdf:type owl:Class ;
       rdfs:comment "equipment that is a single lift gas controller"^^xsd:string ;
       rdfs:label "controller"^^xsd:string ;
       rdfs:subClassOf <http://www.reportinghub.no/ep/schema/equipment#Equipment> .
@@ -44,7 +41,7 @@ ep-prodeqt:DownHoleControlValve
 
 ep-prodeqt:FlowLine
       rdf:type owl:Class ;
-      rdfs:subClassOf ep-prodeqt:TemporalPartOfAFlowLine .
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/equipment#Equipment> .
 
 ep-prodeqt:FlowLine-Production
       rdf:type owl:Class ;
@@ -62,16 +59,7 @@ ep-prodeqt:GasLiftChoke
       rdfs:subClassOf <http://www.reportinghub.no/ep/schema/equipment#Equipment> .
 
 ep-prodeqt:Manifold
-      rdf:type owl:Class ;
-      rdfs:subClassOf ep-prodeqt:TemporalPartOfAManifold .
-
-ep-prodeqt:Manifold-Injection
-      rdf:type owl:Class ;
-      rdfs:subClassOf ep-prodeqt:Manifold .
-
-ep-prodeqt:Manifold-Production
-      rdf:type owl:Class ;
-      rdfs:subClassOf ep-prodeqt:Manifold .
+      rdf:type owl:Class .
 
 ep-prodeqt:PressureMeter
       rdf:type owl:Class ;
@@ -85,42 +73,18 @@ ep-prodeqt:RegulatingValve
       rdfs:label "regulating valve"^^xsd:string ;
       rdfs:subClassOf ep-prodeqt:Valve .
 
-ep-prodeqt:Separator
-      rdf:type owl:Class ;
-      rdfs:subClassOf ep-prodeqt:TemporalPartOfASeparator .
-
 ep-prodeqt:SleeveValve
       rdf:type owl:Class ;
       rdfs:comment "valve that is a sleeve valve"^^xsd:string ;
       rdfs:label "sleeve valve"^^xsd:string ;
       rdfs:subClassOf ep-prodeqt:Valve .
 
-ep-prodeqt:Tank
-      rdf:type owl:Class ;
-      rdfs:subClassOf ep-prodeqt:TemporalPartOfATank .
-
 ep-prodeqt:TemperatureMeter
       rdf:type owl:Class ;
       rdfs:comment "equipment that is a temperature meter"^^xsd:string ;
       rdfs:label "temperature meter"^^xsd:string ;
       rdfs:subClassOf <http://www.reportinghub.no/ep/schema/equipment#Equipment> .
 
-ep-prodeqt:TemporalPartOfAFlowLine
-      rdf:type owl:Class ;
-      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/equipment#Equipment> .
-
-ep-prodeqt:TemporalPartOfAManifold
-      rdf:type owl:Class ;
-      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/equipment#Equipment> .
-
-ep-prodeqt:TemporalPartOfASeparator
-      rdf:type owl:Class ;
-      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/equipment#Equipment> .
-
-ep-prodeqt:TemporalPartOfATank
-      rdf:type owl:Class ;
-      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/equipment#Equipment> .
-
 ep-prodeqt:Valve
       rdf:type owl:Class ;
       rdfs:comment "equipment item that is a valve"^^xsd:string ;
@@ -128,17 +92,17 @@ ep-prodeqt:Valve
       rdfs:subClassOf <http://www.reportinghub.no/ep/schema/equipment#Equipment> .
 
 ep-prodeqt:hasCaptain
-      rdf:type owl:ObjectProperty , owl:FunctionalProperty ;
+      rdf:type owl:FunctionalProperty , owl:ObjectProperty ;
       rdfs:label "has captain"^^xsd:string ;
       rdfs:range <http://www.reportinghub.no/ep/schema/organization#Person> .
 
 ep-prodeqt:hasValvePosition
-      rdf:type ep-core:Class_of_indirect_property , owl:FunctionalProperty , owl:ObjectProperty ;
+      rdf:type owl:ObjectProperty , owl:FunctionalProperty , ep-core:Class_of_indirect_property ;
       rdfs:domain ep-prodeqt:Valve ;
       rdfs:label "has valve position"^^xsd:string ;
       rdfs:range ep-core:Ratio .
 
 ep-prodfac:Pipeline
-      rdf:type ep-prodfac:ProductionFacilityType , owl:Class ;
+      rdf:type owl:Class ;
       rdfs:label "pipeline"^^xsd:string ;
       rdfs:subClassOf <http://www.reportinghub.no/ep/schema/facility#Facility> .

@@ -15,38 +15,41 @@
       owl:imports <http://www.reportinghub.no/ep/schema/1.0/facility> , <http://www.reportinghub.no/ep/schema/1.0/organization> , <http://www.reportinghub.no/ep/schema/1.0/production-well> ;
       owl:versionInfo "Created with TopBraid Composer"^^xsd:string .
 
-<http://www.reportinghub.no/ep/schema/equipment#ChokeValve>
-      rdf:type ep-prodfac:ProductionFacilityType .
-
 <http://www.reportinghub.no/ep/schema/equipment#Compressor>
-      rdf:type ep-prodfac:ProductionFacilityType .
+      rdf:type ep-prodfac:ReportingFacilityType .
 
 <http://www.reportinghub.no/ep/schema/equipment#Controller-lift>
-      rdf:type ep-prodfac:ProductionFacilityType .
+      rdf:type ep-prodfac:ReportingFacilityType .
+
+<http://www.reportinghub.no/ep/schema/equipment#Manifold-injection>
+      rdf:type ep-prodfac:ReportingFacilityType .
 
-<http://www.reportinghub.no/ep/schema/equipment#Manifold>
-      rdf:type ep-prodfac:ProductionFacilityType .
+<http://www.reportinghub.no/ep/schema/equipment#Manifold-production>
+      rdf:type ep-prodfac:ReportingFacilityType .
 
 <http://www.reportinghub.no/ep/schema/equipment#Separator>
-      rdf:type ep-prodfac:ProductionFacilityType .
+      rdf:type ep-prodfac:ReportingFacilityType .
 
 <http://www.reportinghub.no/ep/schema/equipment#Tank>
-      rdf:type ep-prodfac:ProductionFacilityType .
+      rdf:type ep-prodfac:ReportingFacilityType .
+
+<http://www.reportinghub.no/ep/schema/facility#Completion>
+      rdf:type ep-prodfac:ReportingFacilityType .
 
 <http://www.reportinghub.no/ep/schema/facility#Field>
-      rdf:type ep-prodfac:ProductionFacilityType .
+      rdf:type ep-prodfac:ReportingFacilityType .
 
 <http://www.reportinghub.no/ep/schema/facility#Flowline>
-      rdf:type ep-prodfac:ProductionFacilityType .
+      rdf:type ep-prodfac:ReportingFacilityType .
+
+<http://www.reportinghub.no/ep/schema/facility#Flowline-production>
+      rdf:type ep-prodfac:ReportingFacilityType .
 
 <http://www.reportinghub.no/ep/schema/facility#Lease>
-      rdf:type ep-prodfac:ProductionFacilityType .
+      rdf:type ep-prodfac:ReportingFacilityType .
 
 <http://www.reportinghub.no/ep/schema/facility#Platform>
-      rdf:type ep-prodfac:ProductionFacilityType .
-
-<http://www.reportinghub.no/ep/schema/facility#ProductionFacility>
-      rdf:type ep-prodfac:ProductionFacilityType .
+      rdf:type ep-prodfac:ReportingFacilityType .
 
 <http://www.reportinghub.no/ep/schema/facility#ProductionFacilityToDate>
       rdf:type owl:Class ;
@@ -55,10 +58,13 @@
       rdfs:subClassOf <http://www.reportinghub.no/ep/schema/facility#TemporalPartOfAProductionFacility> .
 
 <http://www.reportinghub.no/ep/schema/facility#Reservoir>
-      rdf:type ep-prodfac:ProductionFacilityType .
+      rdf:type ep-prodfac:ReportingFacilityType .
 
 <http://www.reportinghub.no/ep/schema/facility#Template>
-      rdf:type ep-prodfac:ProductionFacilityType .
+      rdf:type ep-prodfac:ReportingFacilityType .
+
+<http://www.reportinghub.no/ep/schema/facility#Zone>
+      rdf:type ep-prodfac:ReportingFacilityType .
 
 <http://www.reportinghub.no/ep/schema/facility#facilityOperator>
       rdf:type owl:ObjectProperty , owl:FunctionalProperty , ep-core:Class_of_indirect_property ;
@@ -67,63 +73,41 @@
       rdfs:range <http://www.reportinghub.no/ep/schema/organization#Organization> .
 
 <http://www.reportinghub.no/ep/schema/geography#Country>
-      rdf:type ep-prodfac:ProductionFacilityType .
-
-<http://www.reportinghub.no/ep/schema/geography#State>
-      rdf:type ep-prodfac:ProductionFacilityType .
-
-<http://www.reportinghub.no/ep/schema/geography#Terminal>
-      rdf:type ep-prodfac:ProductionFacilityType .
+      rdf:type ep-prodfac:ReportingFacilityType .
 
-<http://www.reportinghub.no/ep/schema/organization#CommercialEntity>
-      rdf:type ep-prodfac:ProductionFacilityType .
+<http://www.reportinghub.no/ep/schema/geography#County>
+      rdf:type ep-prodfac:ReportingFacilityType .
 
-<http://www.reportinghub.no/ep/schema/organization#Company>
-      rdf:type ep-prodfac:ProductionFacilityType .
-
-<http://www.reportinghub.no/ep/schema/production-equipment#BlockValve>
-      rdf:type ep-prodfac:ProductionFacilityType .
+<http://www.reportinghub.no/ep/schema/geography#State>
+      rdf:type ep-prodfac:ReportingFacilityType .
 
 <http://www.reportinghub.no/ep/schema/production-equipment#FlowMeter>
-      rdf:type ep-prodfac:ProductionFacilityType ;
       rdfs:label "flow meter"^^xsd:string .
 
-<http://www.reportinghub.no/ep/schema/production-equipment#PressureMeter>
-      rdf:type ep-prodfac:ProductionFacilityType .
-
-<http://www.reportinghub.no/ep/schema/production-equipment#RegulatingValve>
-      rdf:type ep-prodfac:ProductionFacilityType .
-
-<http://www.reportinghub.no/ep/schema/production-equipment#SleeveValve>
-      rdf:type ep-prodfac:ProductionFacilityType .
-
-<http://www.reportinghub.no/ep/schema/production-equipment#TemperatureMeter>
-      rdf:type ep-prodfac:ProductionFacilityType .
-
 ep-prodfac:Boat
       rdf:type owl:Class ;
       rdfs:subClassOf ep-prodfac:ShipOrBoat .
 
 ep-prodfac:Field-area
-      rdf:type ep-prodfac:ProductionFacilityType , owl:Class ;
+      rdf:type owl:Class ;
       rdfs:comment "area of ground that is above a field"^^xsd:string ;
       rdfs:label "field - area"^^xsd:string ;
       rdfs:subClassOf <http://www.reportinghub.no/ep/schema/facility#Field> .
 
 ep-prodfac:Field-group
-      rdf:type ep-prodfac:ProductionFacilityType , owl:Class ;
+      rdf:type owl:Class ;
       rdfs:comment "facility that is a set of fields"^^xsd:string ;
       rdfs:label "field - group"^^xsd:string ;
       rdfs:subClassOf <http://www.reportinghub.no/ep/schema/facility#Field> .
 
 ep-prodfac:Field-part
-      rdf:type ep-prodfac:ProductionFacilityType , owl:Class ;
+      rdf:type owl:Class ;
       rdfs:comment "facility that is part of a field"^^xsd:string ;
       rdfs:label "field - part"^^xsd:string ;
       rdfs:subClassOf <http://www.reportinghub.no/ep/schema/facility#Field> .
 
 ep-prodfac:Installation
-      rdf:type owl:Class , ep-prodfac:ProductionFacilityType ;
+      rdf:type owl:Class ;
       rdfs:label "installation"^^xsd:string ;
       rdfs:subClassOf <http://www.reportinghub.no/ep/schema/facility#Facility> .
 
@@ -136,23 +120,24 @@ ep-prodfac:Pipeline
       rdfs:comment "facility that is a pipeline"^^xsd:string .
 
 ep-prodfac:Plant
-      rdf:type ep-prodfac:ProductionFacilityType , owl:Class ;
+      rdf:type owl:Class ;
       rdfs:label "plant"^^xsd:string ;
       rdfs:subClassOf <http://www.reportinghub.no/ep/schema/facility#Facility> .
 
 ep-prodfac:Plant-processing
-      rdf:type ep-prodfac:ProductionFacilityType , owl:Class ;
+      rdf:type owl:Class ;
       rdfs:label "plant - processing"^^xsd:string ;
       rdfs:subClassOf ep-prodfac:Plant .
 
 ep-prodfac:ProcessingFacility
-      rdf:type ep-prodfac:ProductionFacilityType , owl:Class ;
+      rdf:type owl:Class ;
       rdfs:label "processing facility"^^xsd:string ;
       rdfs:subClassOf <http://www.reportinghub.no/ep/schema/facility#Facility> .
 
-ep-prodfac:ProductionFacilityType
+ep-prodfac:ReportingFacilityType
       rdf:type rdfs:Class ;
-      rdfs:label "production facility type"^^xsd:string ;
+      rdfs:comment "The set of classes that are enumerated as reporting facilities in the DPR schema. The list is extended in the MPR."^^xsd:string ;
+      rdfs:label "reporting facility type"^^xsd:string ;
       rdfs:subClassOf owl:Class .
 
 ep-prodfac:Ship
@@ -165,7 +150,7 @@ ep-prodfac:ShipOrBoat
       rdfs:subClassOf ep-prodfac:TemporalPartOfAShipOrBoat .
 
 ep-prodfac:StorageFacility
-      rdf:type ep-prodfac:ProductionFacilityType , owl:Class ;
+      rdf:type owl:Class ;
       rdfs:label "storage facility"^^xsd:string ;
       rdfs:subClassOf <http://www.reportinghub.no/ep/schema/facility#Facility> .
 
@@ -179,7 +164,7 @@ ep-prodfac:TemporalPartOfAShipOrBoat
       rdfs:subClassOf <http://www.reportinghub.no/ep/schema/facility#Facility> .
 
 ep-prodfac:TrunkLine
-      rdf:type owl:Class , ep-prodfac:ProductionFacilityType ;
+      rdf:type owl:Class ;
       rdfs:label "trunk line"^^xsd:string ;
       rdfs:subClassOf <http://www.reportinghub.no/ep/schema/facility#Facility> .
 
@@ -229,27 +214,23 @@ ep-prodfac:operatingTime
       rdfs:label "operating time"^^xsd:string ;
       rdfs:range ep-core:TimeDuration .
 
-<http://www.reportinghub.no/ep/schema/production-well#RockFormation>
-      rdf:type ep-prodfac:ProductionFacilityType .
-
-<http://www.reportinghub.no/ep/schema/production-well#TubingHead>
-      rdf:type ep-prodfac:ProductionFacilityType .
-
-<http://www.reportinghub.no/ep/schema/production-well#WellCompletion>
-      rdf:type ep-prodfac:ProductionFacilityType .
+<http://www.reportinghub.no/ep/schema/well#Cluster>
+      rdf:type ep-prodfac:ReportingFacilityType .
 
 <http://www.reportinghub.no/ep/schema/well#Well>
-      rdf:type ep-prodfac:ProductionFacilityType .
+      rdf:type ep-prodfac:ReportingFacilityType .
 
 <http://www.reportinghub.no/ep/schema/well#WellBore>
-      rdf:type ep-prodfac:ProductionFacilityType .
+      rdf:type ep-prodfac:ReportingFacilityType .
+
+<http://www.reportinghub.no/ep/schema/well#WellBoreBottom>
+      rdf:type ep-prodfac:ReportingFacilityType .
 
 <http://www.reportinghub.no/ep/schema/well#WellGroup>
-      rdf:type ep-prodfac:ProductionFacilityType .
+      rdf:type ep-prodfac:ReportingFacilityType .
 
 <http://www.reportinghub.no/ep/schema/well#WellHead>
-      rdf:type ep-prodfac:ProductionFacilityType .
+      rdf:type ep-prodfac:ReportingFacilityType .
 
 <http://www.reportinghub.no/np/schema/npd#Licence>
-      rdf:type ep-prodfac:ProductionFacilityType ;
       rdfs:label "licence"^^xsd:string .

@@ -17,8 +17,6 @@
       owl:imports <http://www.reportinghub.no/ep/schema/1.0/material> , <http://www.reportinghub.no/ep/schema/1.0/facility> , <http://www.reportinghub.no/ep/schema/1.0/equipment> , <http://www.reportinghub.no/ep/schema/1.0/core> ;
       owl:versionInfo "0.1.0"^^xsd:string .
 
-
-
 <http://www.reportinghub.no/ep/schema/material#Condensate>
       rdf:type ep-well:FluidComponentType .
 
@@ -50,12 +48,13 @@ ep-well:ClassOfWellBoreSectionBySize
       rdfs:subClassOf owl:Class .
 
 ep-well:Cluster
-      rdf:type owl:Class , ep-fac:ProductionFacilityType ;
+      rdf:type owl:Class ;
       rdfs:label "cluster"^^xsd:string ;
       rdfs:subClassOf ep-core:PhysicalObject .
 
 ep-well:FluidComponentType
       rdf:type rdfs:Class ;
+      rdfs:comment "The set of classes that are enumerated for the dominant component in a fluid sample in the DDR schema."^^xsd:string ;
       rdfs:label "fluid component type"^^xsd:string ;
       rdfs:subClassOf owl:Class .
 
@@ -181,12 +180,12 @@ ep-well:Wash
       owl:disjointWith ep-well:Spacer , ep-well:Slurry , ep-well:Mud .
 
 ep-well:Well
-      rdf:type owl:Class , ep-fac:ProductionFacilityType ;
+      rdf:type owl:Class ;
       rdfs:label "well (whole life)"^^xsd:string ;
       rdfs:subClassOf ep-well:TemporalPartOfAWell .
 
 ep-well:WellBore
-      rdf:type owl:Class , ep-fac:ProductionFacilityType ;
+      rdf:type owl:Class ;
       rdfs:label "wellbore (whole life)"^^xsd:string ;
       rdfs:subClassOf ep-well:TemporalPartOfAWellBore ;
       rdfs:subClassOf
@@ -196,7 +195,7 @@ ep-well:WellBore
               ] .
 
 ep-well:WellBoreBottom
-      rdf:type owl:Class , ep-fac:ProductionFacilityType ;
+      rdf:type owl:Class ;
       rdfs:label "wellbore bottom"^^xsd:string ;
       rdfs:subClassOf ep-well:SpatialPartOfAWellBore .
 
@@ -238,12 +237,12 @@ ep-well:WellBoreWithoutCirculation
       owl:disjointWith ep-well:WellBoreWithCirculation .
 
 ep-well:WellGroup
-      rdf:type owl:Class , ep-fac:ProductionFacilityType ;
+      rdf:type owl:Class ;
       rdfs:label "well group"^^xsd:string ;
       rdfs:subClassOf ep-core:PhysicalObject .
 
 ep-well:WellHead
-      rdf:type owl:Class , ep-fac:ProductionFacilityType ;
+      rdf:type owl:Class ;
       rdfs:label "well head"^^xsd:string ;
       rdfs:subClassOf ep-well:SpatialPartOfAWell .