Renaming from 1.1 to 1.0

NPD namespace changes
UI progress

+# baseURI: http://www.energistics.org/schemas/abstract
+# imports: http://www.linkedmodel.org/schema/dtype
+# imports: http://www.linkedmodel.org/schema/vaem
+
+@prefix abstract:  <http://www.energistics.org/schemas/abstract#> .
+@prefix dc:      <http://purl.org/dc/elements/1.1/> .
+@prefix dtype:   <http://www.linkedmodel.org/schema/dtype#> .
+@prefix owl:     <http://www.w3.org/2002/07/owl#> .
+@prefix rdf:     <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rdfs:    <http://www.w3.org/2000/01/rdf-schema#> .
+@prefix skos:    <http://www.w3.org/2004/02/skos/core#> .
+@prefix vaem:    <http://www.linkedmodel.org/schema/vaem#> .
+@prefix xsd:     <http://www.w3.org/2001/XMLSchema#> .
+
+dc:description
+      rdfs:label "description"^^xsd:string .
+
+<http://www.energistics.org/schemas/abstract>
+      rdf:type owl:Ontology ;
+      owl:imports <http://www.linkedmodel.org/schema/vaem> , <http://www.linkedmodel.org/schema/dtype> ;
+      owl:versionInfo "Created with TopBraid Composer from the XML Schema http://www.energistics.org/schemas/abstract"^^xsd:string .
+
+abstract:AbstractContextualObject
+      rdf:type owl:Class ;
+      rdfs:label "Abstract contextual object"^^xsd:string ;
+      rdfs:subClassOf abstract:AbstractObject ;
+      dc:description "Substitution group for contextual objects."^^xsd:string .
+
+abstract:AbstractDataObject
+      rdf:type owl:Class ;
+      rdfs:label "Abstract data object"^^xsd:string ;
+      rdfs:subClassOf abstract:AbstractObject ;
+      dc:description "Substitution group for normative data objects."^^xsd:string .
+
+abstract:AbstractObject
+      rdf:type owl:Class ;
+      rdfs:label "Abstract object"^^xsd:string ;
+      dc:description """The intended abstract supertype of all schema roots 
+			that may be a member of a substitution group (whether contextual or data).
+			The type of root global elements should be extended from this type and the 
+			root global element should be declared to be a member of one of the above substitution groups."""^^xsd:string .
+
+skos:prefLabel
+      rdf:type owl:AnnotationProperty ;
+      rdfs:label "pref label"^^xsd:string .

+# Saved by TopBraid on Mon Aug 08 15:10:22 BST 2011
+# baseURI: http://www.reportinghub.no/ep/schema/1.1/activity-purpose
+# imports: http://www.reportinghub.no/ep/schema/1.1/activity
+# imports: http://purl.org/dc/elements/1.1/
+# imports: http://www.w3.org/2004/02/skos/core
+# imports: http://spinrdf.org/spin
+# imports: http://purl.org/dc/terms/
+
+@prefix :        <http://www.reportinghub.no/ep/schema/1.1/activity-purpose#> .
+@prefix owl:     <http://www.w3.org/2002/07/owl#> .
+@prefix rdf:     <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rdfs:    <http://www.w3.org/2000/01/rdf-schema#> .
+@prefix sp:      <http://spinrdf.org/sp#> .
+@prefix spin:    <http://spinrdf.org/spin#> .
+@prefix spl:     <http://spinrdf.org/spl#> .
+@prefix xsd:     <http://www.w3.org/2001/XMLSchema#> .
+
+<http://www.reportinghub.no/ep/schema/1.1/activity-purpose>
+      rdf:type owl:Ontology ;
+      owl:imports <http://purl.org/dc/elements/1.1/> , <http://purl.org/dc/terms/> , <http://www.w3.org/2004/02/skos/core> , <http://spinrdf.org/spin> , <http://www.reportinghub.no/ep/schema/1.1/activity> ;
+      owl:versionInfo "Created with TopBraid Composer"^^xsd:string .
+
+:DailyDrillingActivityPurposeType
+      rdf:type rdfs:Class ;
+      rdfs:label "daily drilling activity purpose type"^^xsd:string ;
+      rdfs:subClassOf owl:Class .
+
+:Completion--bopwellheadequipment
+      rdf:type :DailyDrillingActivityPurposeType ;
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#DrillingActivity> .
+
+:Completion--circulatingconditioning
+      rdf:type :DailyDrillingActivityPurposeType ;
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#DrillingActivity> .
+
+:Completion--completionstring
+      rdf:type :DailyDrillingActivityPurposeType ;
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#DrillingActivity> .
+
+:Completion--flow
+      rdf:type :DailyDrillingActivityPurposeType ;
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#DrillingActivity> .
+
+:Completion--hydraulicworkover
+      rdf:type :DailyDrillingActivityPurposeType ;
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#DrillingActivity> .
+
+:Completion--mill
+      rdf:type :DailyDrillingActivityPurposeType ;
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#DrillingActivity> .
+
+:Completion--other
+      rdf:type :DailyDrillingActivityPurposeType ;
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#DrillingActivity> .
+
+:Completion--perforate
+      rdf:type :DailyDrillingActivityPurposeType ;
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#DrillingActivity> .
+
+:Completion--rigupdown
+      rdf:type :DailyDrillingActivityPurposeType ;
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#DrillingActivity> .
+
+:Completion--sandcontrol
+      rdf:type :DailyDrillingActivityPurposeType ;
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#DrillingActivity> .
+
+:Completion--stimulate
+      rdf:type :DailyDrillingActivityPurposeType ;
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#DrillingActivity> .
+
+:Completion--testscsssv
+      rdf:type :DailyDrillingActivityPurposeType ;
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#DrillingActivity> .
+
+:Completion--wait
+      rdf:type :DailyDrillingActivityPurposeType ;
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#DrillingActivity> .
+
+:Completion--wireline
+      rdf:type :DailyDrillingActivityPurposeType ;
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#DrillingActivity> .
+
+:Drilling--bopactivities
+      rdf:type :DailyDrillingActivityPurposeType ;
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#DrillingActivity> .
+
+:Drilling--bopwellheadequipment
+      rdf:type :DailyDrillingActivityPurposeType ;
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#DrillingActivity> .
+
+:Drilling--casing
+      rdf:type :DailyDrillingActivityPurposeType ;
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#DrillingActivity> .
+
+:Drilling--circulatingconditioning
+      rdf:type :DailyDrillingActivityPurposeType ;
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#DrillingActivity> .
+
+:Drilling--drill
+      rdf:type :DailyDrillingActivityPurposeType ;
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#DrillingActivity> .
+
+:Drilling--drive
+      rdf:type :DailyDrillingActivityPurposeType ;
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#DrillingActivity> .
+
+:Drilling--holeopen
+      rdf:type :DailyDrillingActivityPurposeType ;
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#DrillingActivity> .
+
+:Drilling--mill
+      rdf:type :DailyDrillingActivityPurposeType ;
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#DrillingActivity> .
+
+:Drilling--other
+      rdf:type :DailyDrillingActivityPurposeType ;
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#DrillingActivity> .
+
+:Drilling--pressuredetection
+      rdf:type :DailyDrillingActivityPurposeType ;
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#DrillingActivity> .
+
+:Drilling--ream
+      rdf:type :DailyDrillingActivityPurposeType ;
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#DrillingActivity> .
+
+:Drilling--rigupdown
+      rdf:type :DailyDrillingActivityPurposeType ;
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#DrillingActivity> .
+
+:Drilling--survey
+      rdf:type :DailyDrillingActivityPurposeType ;
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#DrillingActivity> .
+
+:Drilling--trip
+      rdf:type :DailyDrillingActivityPurposeType ;
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#DrillingActivity> .
+
+:Drilling--underream
+      rdf:type :DailyDrillingActivityPurposeType ;
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#DrillingActivity> .
+
+:Drilling--wait
+      rdf:type :DailyDrillingActivityPurposeType ;
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#DrillingActivity> .
+
+:Formationevaluation--circulatingconditioning
+      rdf:type :DailyDrillingActivityPurposeType ;
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#DrillingActivity> .
+
+:Formationevaluation--circulationsamples
+      rdf:type :DailyDrillingActivityPurposeType ;
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#DrillingActivity> .
+
+:Formationevaluation--core
+      rdf:type :DailyDrillingActivityPurposeType ;
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#DrillingActivity> .
+
+:Formationevaluation--drillstemtest
+      rdf:type :DailyDrillingActivityPurposeType ;
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#DrillingActivity> .
+
+:Formationevaluation--log
+      rdf:type :DailyDrillingActivityPurposeType ;
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#DrillingActivity> .
+
+:Formationevaluation--other
+      rdf:type :DailyDrillingActivityPurposeType ;
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#DrillingActivity> .
+
+:Formationevaluation--productiontest
+      rdf:type :DailyDrillingActivityPurposeType ;
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#DrillingActivity> .
+
+:Formationevaluation--rftfit
+      rdf:type :DailyDrillingActivityPurposeType ;
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#DrillingActivity> .
+
+:Formationevaluation--rigupdown
+      rdf:type :DailyDrillingActivityPurposeType ;
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#DrillingActivity> .
+
+:Formationevaluation--trip
+      rdf:type :DailyDrillingActivityPurposeType ;
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#DrillingActivity> .
+
+:Formationevaluation--wait
+      rdf:type :DailyDrillingActivityPurposeType ;
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#DrillingActivity> .
+
+:Interruption--fish
+      rdf:type :DailyDrillingActivityPurposeType ;
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#DrillingActivity> .
+
+:Interruption--lostcirculation
+      rdf:type :DailyDrillingActivityPurposeType ;
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#DrillingActivity> .
+
+:Interruption--maintain
+      rdf:type :DailyDrillingActivityPurposeType ;
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#DrillingActivity> .
+
+:Interruption--mill
+      rdf:type :DailyDrillingActivityPurposeType ;
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#DrillingActivity> .
+
+:Interruption--other
+      rdf:type :DailyDrillingActivityPurposeType ;
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#DrillingActivity> .
+
+:Interruption--repair
+      rdf:type :DailyDrillingActivityPurposeType ;
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#DrillingActivity> .
+
+:Interruption--rigupdown
+      rdf:type :DailyDrillingActivityPurposeType ;
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#DrillingActivity> .
+
+:Interruption--sidetrack
+      rdf:type :DailyDrillingActivityPurposeType ;
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#DrillingActivity> .
+
+:Interruption--wait
+      rdf:type :DailyDrillingActivityPurposeType ;
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#DrillingActivity> .
+
+:Interruption--waitingonweather
+      rdf:type :DailyDrillingActivityPurposeType ;
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#DrillingActivity> .
+
+:Interruption--wellcontrol
+      rdf:type :DailyDrillingActivityPurposeType ;
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#DrillingActivity> .
+
+:Moving--anchor
+      rdf:type :DailyDrillingActivityPurposeType ;
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#DrillingActivity> .
+
+:Moving--jack
+      rdf:type :DailyDrillingActivityPurposeType ;
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#DrillingActivity> .
+
+:Moving--position
+      rdf:type :DailyDrillingActivityPurposeType ;
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#DrillingActivity> .
+
+:Moving--skid
+      rdf:type :DailyDrillingActivityPurposeType ;
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#DrillingActivity> .
+
+:Moving--transit
+      rdf:type :DailyDrillingActivityPurposeType ;
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#DrillingActivity> .
+
+:Plugabandon--cementplug
+      rdf:type :DailyDrillingActivityPurposeType ;
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#DrillingActivity> .
+
+:Plugabandon--circulatingconditioning
+      rdf:type :DailyDrillingActivityPurposeType ;
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#DrillingActivity> .
+
+:Plugabandon--cut
+      rdf:type :DailyDrillingActivityPurposeType ;
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#DrillingActivity> .
+
+:Plugabandon--equipmentrecovery
+      rdf:type :DailyDrillingActivityPurposeType ;
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#DrillingActivity> .
+
+:Plugabandon--mechanicalplug
+      rdf:type :DailyDrillingActivityPurposeType ;
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#DrillingActivity> .
+
+:Plugabandon--mill
+      rdf:type :DailyDrillingActivityPurposeType ;
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#DrillingActivity> .
+
+:Plugabandon--other
+      rdf:type :DailyDrillingActivityPurposeType ;
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#DrillingActivity> .
+
+:Plugabandon--perforate
+      rdf:type :DailyDrillingActivityPurposeType ;
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#DrillingActivity> .
+
+:Plugabandon--rigupdown
+      rdf:type :DailyDrillingActivityPurposeType ;
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#DrillingActivity> .
+
+:Plugabandon--squeeze
+      rdf:type :DailyDrillingActivityPurposeType ;
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#DrillingActivity> .
+
+:Plugabandon--trip
+      rdf:type :DailyDrillingActivityPurposeType ;
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#DrillingActivity> .
+
+:Plugabandon--wait
+      rdf:type :DailyDrillingActivityPurposeType ;
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#DrillingActivity> .
+
+:Workover--bopwellheadequipment
+      rdf:type :DailyDrillingActivityPurposeType ;
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#DrillingActivity> .
+
+:Workover--circulatingconditioning
+      rdf:type :DailyDrillingActivityPurposeType ;
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#DrillingActivity> .
+
+:Workover--completionstring
+      rdf:type :DailyDrillingActivityPurposeType ;
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#DrillingActivity> .
+
+:Workover--flow
+      rdf:type :DailyDrillingActivityPurposeType ;
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#DrillingActivity> .
+
+:Workover--hydraulicworkover
+      rdf:type :DailyDrillingActivityPurposeType ;
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#DrillingActivity> .
+
+:Workover--mill
+      rdf:type :DailyDrillingActivityPurposeType ;
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#DrillingActivity> .
+
+:Workover--other
+      rdf:type :DailyDrillingActivityPurposeType ;
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#DrillingActivity> .
+
+:Workover--perforate
+      rdf:type :DailyDrillingActivityPurposeType ;
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#DrillingActivity> .
+
+:Workover--rigupdown
+      rdf:type :DailyDrillingActivityPurposeType ;
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#DrillingActivity> .
+
+:Workover--sandcontrol
+      rdf:type :DailyDrillingActivityPurposeType ;
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#DrillingActivity> .
+
+:Workover--stimulate
+      rdf:type :DailyDrillingActivityPurposeType ;
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#DrillingActivity> .
+
+:Workover--testscsssv
+      rdf:type :DailyDrillingActivityPurposeType ;
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#DrillingActivity> .
+
+:Workover--wait
+      rdf:type :DailyDrillingActivityPurposeType ;
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#DrillingActivity> .
+
+:Workover--wireline
+      rdf:type :DailyDrillingActivityPurposeType ;
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/activity#DrillingActivity> .

+# Saved by TopBraid on Tue Aug 09 15:23:56 BST 2011
+# baseURI: http://www.reportinghub.no/ep/schema/1.1/activity
+# imports: http://www.linkedmodel.org/1.2/schema/vaem
+# imports: http://www.linkedmodel.org/1.1/schema/ordered
+# imports: http://www.reportinghub.no/ep/schema/equipment
+# imports: http://www.reportinghub.no/ep/schema/1.1/core
+# imports: http://www.reportinghub.no/ep/schema/well
+
+@prefix :        <http://www.reportinghub.no/ep/schema/1.1/activity#> .
+@prefix ep-activity:  <http://www.reportinghub.no/ep/schema/activity#> .
+@prefix owl:     <http://www.w3.org/2002/07/owl#> .
+@prefix rdf:     <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rdfs:    <http://www.w3.org/2000/01/rdf-schema#> .
+@prefix xsd:     <http://www.w3.org/2001/XMLSchema#> .
+
+<http://www.reportinghub.no/ep/schema/1.1/activity>
+      rdf:type owl:Ontology ;
+      owl:imports <http://www.reportinghub.no/ep/schema/well> , <http://www.reportinghub.no/ep/schema/equipment> , <http://www.linkedmodel.org/1.1/schema/ordered> , <http://www.linkedmodel.org/1.2/schema/vaem> , <http://www.reportinghub.no/ep/schema/1.1/core> ;
+      owl:versionInfo "Created with TopBraid Composer"^^xsd:string .
+
+ep-activity:Activity
+      rdf:type owl:Class ;
+      rdfs:label "Activity"^^xsd:string ;
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/core#PhysicalThing> ;
+      rdfs:subClassOf
+              [ rdf:type owl:Restriction ;
+                owl:maxCardinality "1"^^xsd:nonNegativeInteger ;
+                owl:onProperty ep-activity:finishedAt
+              ] ;
+      rdfs:subClassOf
+              [ rdf:type owl:Restriction ;
+                owl:maxCardinality "1"^^xsd:nonNegativeInteger ;
+                owl:onProperty ep-activity:startedAt
+              ] ;
+      rdfs:subClassOf
+              [ rdf:type owl:Restriction ;
+                owl:allValuesFrom ep-activity:Activity ;
+                owl:onProperty <http://www.linkedmodel.org/schema/ordered#after>
+              ] ;
+      rdfs:subClassOf
+              [ rdf:type owl:Restriction ;
+                owl:allValuesFrom ep-activity:Activity ;
+                owl:onProperty <http://www.linkedmodel.org/schema/ordered#before>
+              ] ;
+      rdfs:subClassOf
+              [ rdf:type owl:Restriction ;
+                owl:allValuesFrom ep-activity:Activity ;
+                owl:onProperty <http://www.linkedmodel.org/schema/ordered#overlaps>
+              ] ;
+      rdfs:subClassOf
+              [ rdf:type owl:Restriction ;
+                owl:allValuesFrom ep-activity:Activity ;
+                owl:onProperty <http://www.linkedmodel.org/schema/ordered#during>
+              ] .
+
+ep-activity:DailyDrillingActivity
+      rdf:type owl:Class ;
+      rdfs:label "Daily drilling activity"^^xsd:string ;
+      rdfs:subClassOf ep-activity:DrillingActivity ;
+      rdfs:subClassOf
+              [ rdf:type owl:Restriction ;
+                owl:allValuesFrom ep-activity:Activity ;
+                owl:onProperty <http://www.reportinghub.no/ep/schema/core#hasPart>
+              ] ;
+      rdfs:subClassOf
+              [ rdf:type owl:Restriction ;
+                owl:allValuesFrom ep-activity:DrillingActivity ;
+                owl:onProperty <http://www.linkedmodel.org/schema/ordered#first>
+              ] ;
+      rdfs:subClassOf
+              [ rdf:type owl:Restriction ;
+                owl:maxCardinality "1"^^xsd:nonNegativeInteger ;
+                owl:onProperty <http://www.linkedmodel.org/schema/ordered#first>
+              ] ;
+      rdfs:subClassOf
+              [ rdf:type owl:Restriction ;
+                owl:allValuesFrom <http://www.reportinghub.no/ep/schema/well#AllOrPartOfTheLifeOfAWellBore> ;
+                owl:onProperty ep-activity:onWellBore
+              ] ;
+      rdfs:subClassOf
+              [ rdf:type owl:Restriction ;
+                owl:allValuesFrom ep-activity:DrillingActivity ;
+                owl:onProperty <http://www.linkedmodel.org/schema/ordered#last>
+              ] .
+
+ep-activity:DailyDrillingReportFinalisationType
+      rdf:type rdfs:Class ;
+      rdfs:label "daily drilling report finalisation type"^^xsd:string ;
+      rdfs:subClassOf owl:Class .
+
+ep-activity:DailyProductionActivity
+      rdf:type owl:Class ;
+      rdfs:label "Daily production activity"^^xsd:string ;
+      rdfs:subClassOf ep-activity:ProductionActivity ;
+      rdfs:subClassOf
+              [ rdf:type owl:Restriction ;
+                owl:allValuesFrom ep-activity:ProductionActivity ;
+                owl:onProperty ep-activity:hasSubActivity
+              ] .
+
+ep-activity:Drill-bypass
+      rdf:type ep-activity:WellBoreDrillingType ;
+      rdfs:label "drill bypass"^^xsd:string ;
+      rdfs:subClassOf ep-activity:DrillingActivity .
+
+ep-activity:Drill-initial
+      rdf:type ep-activity:WellBoreDrillingType ;
+      rdfs:label "drill initial"^^xsd:string ;
+      rdfs:subClassOf ep-activity:DrillingActivity .
+
+ep-activity:Drill-re-entry
+      rdf:type ep-activity:WellBoreDrillingType ;
+      rdfs:label "drill re-entry"^^xsd:string ;
+      rdfs:subClassOf ep-activity:DrillingActivity .
+
+ep-activity:Drill-re-spud
+      rdf:type ep-activity:WellBoreDrillingType ;
+      rdfs:label "drill re-spud"^^xsd:string ;
+      rdfs:subClassOf ep-activity:DrillingActivity .
+
+ep-activity:Drill-redrill
+      rdf:type ep-activity:WellBoreDrillingType ;
+      rdfs:label "redrill"^^xsd:string ;
+      rdfs:subClassOf ep-activity:DrillingActivity .
+
+ep-activity:Drill-sidetrack
+      rdf:type ep-activity:WellBoreDrillingType ;
+      rdfs:label "drill sidetrack"^^xsd:string ;
+      rdfs:subClassOf ep-activity:DrillingActivity .
+
+ep-activity:DrillingActivity
+      rdf:type owl:Class ;
+      rdfs:label "Drilling activity"^^xsd:string ;
+      rdfs:subClassOf ep-activity:Activity .
+
+ep-activity:FormationIntegrityTest
+      rdf:type owl:Class , ep-activity:PressureTestType ;
+      rdfs:label "formation integrity test"^^xsd:string ;
+      rdfs:subClassOf ep-activity:WellBorePressureTest ;
+      owl:disjointWith ep-activity:LeakOffTest .
+
+ep-activity:LeakOffTest
+      rdf:type owl:Class , ep-activity:PressureTestType ;
+      rdfs:label "leak-off test"^^xsd:string ;
+      rdfs:subClassOf ep-activity:WellBorePressureTest ;
+      owl:disjointWith ep-activity:FormationIntegrityTest .
+
+ep-activity:MonthlyDrillingActivity
+      rdf:type owl:Class ;
+      rdfs:label "Weekly drilling activity"^^xsd:string ;
+      rdfs:subClassOf ep-activity:DrillingActivity ;
+      rdfs:subClassOf
+              [ rdf:type owl:Restriction ;
+                owl:allValuesFrom ep-activity:WeeklyDrillingActivity ;
+                owl:onProperty ep-activity:hasSubActivity
+              ] .
+
+ep-activity:MonthlyProductionActivity
+      rdf:type owl:Class ;
+      rdfs:label "Monthly production activity"^^xsd:string ;
+      rdfs:subClassOf ep-activity:ProductionActivity ;
+      rdfs:subClassOf
+              [ rdf:type owl:Restriction ;
+                owl:allValuesFrom ep-activity:WeeklyProductionActivity ;
+                owl:onProperty ep-activity:hasSubActivity
+              ] .
+
+ep-activity:OffshoreActivity
+      rdf:type owl:Class ;
+      rdfs:label "Offshore activity"^^xsd:string ;
+      rdfs:subClassOf ep-activity:Activity .
+
+ep-activity:OffshoreWellActivity
+      rdf:type owl:Class ;
+      rdfs:label "Offshore well activity"^^xsd:string ;
+      rdfs:subClassOf ep-activity:OffshoreActivity ;
+      rdfs:subClassOf
+              [ rdf:type owl:Restriction ;
+                owl:cardinality "1"^^xsd:nonNegativeInteger ;
+                owl:onProperty ep-activity:onWell
+              ] ;
+      rdfs:subClassOf
+              [ rdf:type owl:Restriction ;
+                owl:cardinality "1"^^xsd:nonNegativeInteger ;
+                owl:onProperty ep-activity:onRig
+              ] ;
+      rdfs:subClassOf
+              [ rdf:type owl:Restriction ;
+                owl:allValuesFrom <http://www.reportinghub.no/ep/schema/well#Well> ;
+                owl:onProperty ep-activity:onWell
+              ] .
+
+ep-activity:PressureTestType
+      rdf:type rdfs:Class ;
+      rdfs:label "pressure test type"^^xsd:string ;
+      rdfs:subClassOf owl:Class .
+
+ep-activity:ProductionActivity
+      rdf:type owl:Class ;
+      rdfs:label "Production activity"^^xsd:string ;
+      rdfs:subClassOf ep-activity:Activity .
+
+ep-activity:WeeklyDrillingActivity
+      rdf:type owl:Class ;
+      rdfs:label "Weekly drilling activity"^^xsd:string ;
+      rdfs:subClassOf ep-activity:DrillingActivity ;
+      rdfs:subClassOf
+              [ rdf:type owl:Restriction ;
+                owl:allValuesFrom ep-activity:DailyDrillingActivity ;
+                owl:onProperty ep-activity:hasSubActivity
+              ] .
+
+ep-activity:WeeklyProductionActivity
+      rdf:type owl:Class ;
+      rdfs:label "Weekly production activity"^^xsd:string ;
+      rdfs:subClassOf ep-activity:ProductionActivity ;
+      rdfs:subClassOf
+              [ rdf:type owl:Restriction ;
+                owl:allValuesFrom ep-activity:DailyProductionActivity ;
+                owl:onProperty ep-activity:hasSubActivity
+              ] .
+
+ep-activity:WellBoreDrillingType
+      rdf:type rdfs:Class ;
+      rdfs:label "well bore drilling type"^^xsd:string ;
+      rdfs:subClassOf owl:Class .
+
+ep-activity:WellBorePressureTest
+      rdf:type owl:Class ;
+      rdfs:label "well bore pressure test"^^xsd:string ;
+      rdfs:subClassOf ep-activity:Activity .
+
+ep-activity:createdAt
+      rdf:type owl:DatatypeProperty , owl:FunctionalProperty ;
+      rdfs:label "created at"^^xsd:string ;
+      rdfs:range <http://www.linkedmodel.org/schema/vaem#dateUnion> .
+
+ep-activity:finishedAt
+      rdf:type owl:DatatypeProperty ;
+      rdfs:label "finished at"^^xsd:string ;
+      rdfs:range <http://www.linkedmodel.org/schema/vaem#dateUnion> .
+
+ep-activity:hasSubActivity
+      rdf:type owl:ObjectProperty ;
+      rdfs:label "has sub activity"^^xsd:string .
+
+ep-activity:onRig
+      rdf:type owl:ObjectProperty ;
+      rdfs:label "on rig"^^xsd:string .
+
+ep-activity:onWell
+      rdf:type owl:ObjectProperty ;
+      rdfs:label "on well"^^xsd:string .
+
+ep-activity:onWellBore
+      rdf:type owl:ObjectProperty , owl:FunctionalProperty ;
+      rdfs:label "on WellBore"^^xsd:string .
+
+ep-activity:reportOn
+      rdf:type owl:ObjectProperty ;
+      rdfs:label "report on"^^xsd:string .
+
+ep-activity:startedAt
+      rdf:type owl:DatatypeProperty ;
+      rdfs:label "started at"^^xsd:string ;
+      rdfs:range <http://www.linkedmodel.org/schema/vaem#dateUnion> .
+
+ep-activity:wellBoreDrillingType
+      rdf:type owl:ObjectProperty , owl:FunctionalProperty ;
+      rdfs:domain ep-activity:DrillingActivity ;
+      rdfs:label "has sub activity"^^xsd:string ;
+      rdfs:range ep-activity:WellBoreDrillingType ;
+      rdfs:subPropertyOf rdf:type .
+
+<http://www.reportinghub.no/ep/schema/report#FinalDailyDrillingReport>
+      rdf:type ep-activity:DailyDrillingReportFinalisationType .
+
+<http://www.reportinghub.no/ep/schema/report#NormalDailyDrillingReport>
+      rdf:type ep-activity:DailyDrillingReportFinalisationType .
+
+<http://www.reportinghub.no/ep/schema/report#PreliminaryDailyDrillingReport>
+      rdf:type ep-activity:DailyDrillingReportFinalisationType .

+# Saved by TopBraid on Tue Aug 09 15:02:54 BST 2011
+# baseURI: http://www.reportinghub.no/ep/schema/1.1/core
+# imports: http://www.linkedmodel.org/1.2/schema/vaem
+
+@prefix bindEP-NativeOWL:  <http://www.reportinghub.no/iso15926/bindEP-NativeOWL#> .
+@prefix ep-core:  <http://www.reportinghub.no/ep/schema/core#> .
+@prefix ep-core-1.1:  <http://www.reportinghub.no/ep/schema/1.1/core#> .
+@prefix owl:     <http://www.w3.org/2002/07/owl#> .
+@prefix rdf:     <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rdfs:    <http://www.w3.org/2000/01/rdf-schema#> .
+@prefix xsd:     <http://www.w3.org/2001/XMLSchema#> .
+
+<http://www.reportinghub.no/ep/schema/1.1/core>
+      rdf:type owl:Ontology ;
+      owl:imports <http://www.linkedmodel.org/1.2/schema/vaem> ;
+      owl:versionInfo "Created with TopBraid Composer"^^xsd:string .
+
+ep-core:PhysicalObject
+      rdf:type owl:Class ;
+      rdfs:label "physical object"^^xsd:string ;
+      rdfs:subClassOf ep-core:PhysicalThing .
+
+ep-core:PhysicalThing
+      rdf:type owl:Class ;
+      rdfs:label "physical thing"^^xsd:string ;
+      rdfs:subClassOf owl:Thing .
+
+ep-core:basisFor
+      rdf:type owl:ObjectProperty ;
+      rdfs:label "basis for"^^xsd:string .
+
+ep-core:derivedFrom
+      rdf:type owl:ObjectProperty , owl:TransitiveProperty ;
+      rdfs:label "derived from"^^xsd:string .
+
+ep-core:hasPart
+      rdf:type owl:TransitiveProperty ;
+      rdfs:domain ep-core:PhysicalThing ;
+      rdfs:label "has part"^^xsd:string ;
+      rdfs:range ep-core:PhysicalThing ;
+      owl:inverseOf ep-core:partOf .
+
+ep-core:hasTemporalPart
+      rdf:type owl:TransitiveProperty ;
+      rdfs:domain ep-core:PhysicalThing ;
+      rdfs:label "has temporal part"^^xsd:string ;
+      rdfs:range ep-core:PhysicalThing ;
+      rdfs:subPropertyOf ep-core:hasPart ;
+      owl:inverseOf ep-core:partOf .
+
+ep-core:name
+      rdf:type owl:DatatypeProperty ;
+      rdfs:label "name"^^xsd:string ;
+      rdfs:range xsd:string .
+
+ep-core:partOf
+      rdf:type owl:TransitiveProperty ;
+      rdfs:domain ep-core:PhysicalThing ;
+      rdfs:label "part of"^^xsd:string ;
+      rdfs:range ep-core:PhysicalThing ;
+      owl:inverseOf ep-core:hasPart .
+
+ep-core:temporalPartOf
+      rdf:type owl:TransitiveProperty ;
+      rdfs:domain ep-core:PhysicalThing ;
+      rdfs:label "temporal part of"^^xsd:string ;
+      rdfs:range ep-core:PhysicalThing ;
+      rdfs:subPropertyOf ep-core:hasPart ;
+      owl:inverseOf ep-core:hasTemporalPart .

+# Saved by TopBraid on Tue Aug 09 15:41:34 BST 2011
+# baseURI: http://www.reportinghub.no/ep/schema/equipment
+# imports: http://www.reportinghub.no/ep/schema/1.1/core
+
+@prefix :        <http://www.reportinghub.no/ep/schema/equipment#> .
+@prefix ep-eqt:  <http://www.reportinghub.no/ep/schema/equipment#> .
+@prefix owl:     <http://www.w3.org/2002/07/owl#> .
+@prefix rdf:     <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rdfs:    <http://www.w3.org/2000/01/rdf-schema#> .
+@prefix xsd:     <http://www.w3.org/2001/XMLSchema#> .
+
+<http://www.reportinghub.no/ep/schema/core#PhysicalThing>
+      rdfs:comment "Equivalent to ISO 15926-2 Possible Individual - DL"^^xsd:string .
+
+<http://www.reportinghub.no/ep/schema/equipment>
+      rdf:type owl:Ontology ;
+      owl:imports <http://www.reportinghub.no/ep/schema/1.1/core> ;
+      owl:versionInfo "Created with TopBraid Composer"^^xsd:string .
+
+ep-eqt:Equipment
+      rdf:type owl:Class ;
+      rdfs:label "Equipment"^^xsd:string ;
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/core#PhysicalObject> .

+# Saved by TopBraid on Tue Aug 09 14:35:50 BST 2011
+# baseURI: http://www.reportinghub.no/ep/schema/facility
+# imports: http://purl.org/dc/elements/1.1/
+# imports: http://www.reportinghub.no/ep/schema/1.1/core
+# imports: http://spinrdf.org/spin
+# imports: http://purl.org/dc/terms/
+
+@prefix :        <http://www.reportinghub.no/ep/schema/facility#> .
+@prefix owl:     <http://www.w3.org/2002/07/owl#> .
+@prefix rdf:     <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rdfs:    <http://www.w3.org/2000/01/rdf-schema#> .
+@prefix sp:      <http://spinrdf.org/sp#> .
+@prefix spin:    <http://spinrdf.org/spin#> .
+@prefix spl:     <http://spinrdf.org/spl#> .
+@prefix xsd:     <http://www.w3.org/2001/XMLSchema#> .
+
+<http://www.reportinghub.no/ep/schema/facility>
+      rdf:type owl:Ontology ;
+      owl:imports <http://www.reportinghub.no/ep/schema/1.1/core> , <http://purl.org/dc/elements/1.1/> , <http://purl.org/dc/terms/> , <http://spinrdf.org/spin> ;
+      owl:versionInfo "Created with TopBraid Composer"^^xsd:string .
+
+:Facility
+      rdf:type owl:Class ;
+      rdfs:label "facility"^^xsd:string ;
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/core#PhysicalObject> .
+
+:FixedFacility
+      rdf:type owl:DeprecatedClass ;
+      rdfs:subClassOf :Facility .
+
+:MoveableFacility
+      rdf:type owl:Class ;
+      rdfs:subClassOf :Facility .
+
+:Rig  rdf:type owl:Class ;
+      rdfs:subClassOf :Facility .
+
+:SubSurfaceFixedFacility
+      rdf:type owl:Class ;
+      rdfs:subClassOf :FixedFacility .
+
+:SurfaceFixedFacility
+      rdf:type owl:Class ;
+      rdfs:subClassOf :FixedFacility .

+# baseURI: http://www.reportinghub.no/ep/schema/organization
+# imports: http://purl.org/dc/elements/1.1/
+# imports: http://spinrdf.org/spin
+# imports: http://www.reportinghub.no/ep/schema/1.1/core
+
+@prefix ep-org:  <http://www.reportinghub.no/ep/schema/organization#> .
+@prefix owl:     <http://www.w3.org/2002/07/owl#> .
+@prefix rdf:     <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rdfs:    <http://www.w3.org/2000/01/rdf-schema#> .
+@prefix sp:      <http://spinrdf.org/sp#> .
+@prefix spin:    <http://spinrdf.org/spin#> .
+@prefix spl:     <http://spinrdf.org/spl#> .
+@prefix xsd:     <http://www.w3.org/2001/XMLSchema#> .
+
+<http://www.reportinghub.no/ep/schema/organization>
+      rdf:type owl:Ontology ;
+      owl:imports <http://spinrdf.org/spin> , <http://purl.org/dc/elements/1.1/> , <http://www.reportinghub.no/ep/schema/1.1/core> ;
+      owl:versionInfo "Created with TopBraid Composer"^^xsd:string .
+
+ep-org:Company
+      rdf:type owl:Class ;
+      rdfs:label "Company"^^xsd:string ;
+      rdfs:subClassOf ep-org:Organization .
+
+ep-org:Organization
+      rdf:type owl:Class ;
+      rdfs:label "organization"^^xsd:string ;
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/core#PhysicalObject> .

+# Saved by TopBraid on Mon Aug 08 14:39:14 BST 2011
+# baseURI: http://www.reportinghub.no/ep/schema/report
+# imports: http://www.reportinghub.no/ep/schema/1.1/activity
+# imports: http://www.reportinghub.no/ep/schema/1.1/core
+
+@prefix :        <http://www.reportinghub.no/ep/schema/report#> .
+@prefix ep-report:  <http://www.reportinghub.no/ep/schema/report#> .
+@prefix owl:     <http://www.w3.org/2002/07/owl#> .
+@prefix rdf:     <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rdfs:    <http://www.w3.org/2000/01/rdf-schema#> .
+@prefix xsd:     <http://www.w3.org/2001/XMLSchema#> .
+
+<http://www.reportinghub.no/ep/schema/report>
+      rdf:type owl:Ontology ;
+      owl:imports <http://www.reportinghub.no/ep/schema/1.1/activity> , <http://www.reportinghub.no/ep/schema/1.1/core> ;
+      owl:versionInfo "Created with TopBraid Composer"^^xsd:string .
+
+ep-report:DailyDrillingReport
+      rdf:type owl:Class ;
+      rdfs:subClassOf ep-report:Report .
+
+ep-report:FinalDailyDrillingReport
+      rdf:type owl:Class ;
+      rdfs:subClassOf ep-report:DailyDrillingReport .
+
+ep-report:NormalDailyDrillingReport
+      rdf:type owl:Class ;
+      rdfs:subClassOf ep-report:DailyDrillingReport .
+
+ep-report:PreliminaryDailyDrillingReport
+      rdf:type owl:Class ;
+      rdfs:subClassOf ep-report:DailyDrillingReport .
+
+ep-report:Report
+      rdf:type owl:Class ;
+      rdfs:subClassOf owl:Thing .

+# Saved by TopBraid on Tue Jul 26 01:03:35 CEST 2011
+# baseURI: http://www.reportinghub.no/1.1/schema/epvv
+# imports: http://www.linkedmodel.org/1.2/schema/vaem
+# imports: http://www.reportinghub.no/1.1/schema/epa
+# imports: http://www.linkedmodel.org/1.0/schema/dtype
+# imports: http://spinrdf.org/spin
+
+@prefix dtype:   <http://www.linkedmodel.org/schema/dtype#> .
+@prefix epvv:    <http://www.reportinghub.no/schema/epvv#> .
+@prefix epvv-1.1:  <http://www.reportinghub.no/1.1/schema/epvv#> .
+@prefix owl:     <http://www.w3.org/2002/07/owl#> .
+@prefix rdf:     <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rdfs:    <http://www.w3.org/2000/01/rdf-schema#> .
+@prefix sp:      <http://spinrdf.org/sp#> .
+@prefix spin:    <http://spinrdf.org/spin#> .
+@prefix spl:     <http://spinrdf.org/spl#> .
+@prefix xsd:     <http://www.w3.org/2001/XMLSchema#> .
+
+<http://www.reportinghub.no/1.1/schema/epvv>
+      rdf:type owl:Ontology ;
+      owl:imports <http://www.reportinghub.no/1.1/schema/epa> , <http://www.linkedmodel.org/1.0/schema/dtype> , <http://www.linkedmodel.org/1.2/schema/vaem> , <http://spinrdf.org/spin> ;
+      owl:versionInfo "TBD by RH"^^xsd:string .
+
+epvv:Discrepancy
+      rdf:type owl:Class ;
+      rdfs:label "Discrepancy"^^xsd:string ;
+      rdfs:subClassOf owl:Thing .
+
+epvv:ET_InvalidAttributeValue
+      rdf:type epvv:ErrorType ;
+      rdfs:label "invalid attribute value"^^xsd:string ;
+      dtype:value "invalid attribute value"^^xsd:string .
+
+epvv:ET_InvalidEndTime
+      rdf:type epvv:EnumeratedValue ;
+      rdfs:label "Invalid end time"^^xsd:string .
+
+epvv:ET_InvalidEnumeratedValue
+      rdf:type epvv:ErrorType ;
+      rdfs:label "invalid enumerated value"^^xsd:string ;
+      dtype:value "invalid enumerated value"^^xsd:string .
+
+epvv:ET_InvalidStartTime
+      rdf:type epvv:EnumeratedValue ;
+      rdfs:label "Invalid start time"^^xsd:string .
+
+epvv:ET_MissingAttribute
+      rdf:type epvv:ErrorType ;
+      rdfs:label "missing attribute"^^xsd:string ;
+      dtype:value "missing attribute"^^xsd:string .
+
+epvv:ET_TotalTimeLessThanReportingPeriod
+      rdf:type epvv:EnumeratedValue ;
+      rdfs:label "total time is less than reporting period"^^xsd:string .
+
+epvv:ET_TotalTimeMoreThanReportingPeriod
+      rdf:type epvv:EnumeratedValue ;
+      rdfs:label "total time is more than reporting period"^^xsd:string .
+
+epvv:EnumeratedValue
+      rdf:type owl:Class ;
+      rdfs:label "Enumerated value"^^xsd:string ;
+      rdfs:subClassOf dtype:EnumeratedValue .
+
+epvv:ErrorType
+      rdf:type owl:Class ;
+      rdfs:label "Error type"^^xsd:string ;
+      rdfs:subClassOf epvv:EnumeratedValue .
+
+epvv:Subject
+      rdf:type owl:Class ;
+      rdfs:label "Source location"^^xsd:string ;
+      rdfs:subClassOf owl:Thing .
+
+epvv:WarningType
+      rdf:type owl:Class ;
+      rdfs:label "Warning type"^^xsd:string ;
+      rdfs:subClassOf epvv:EnumeratedValue .
+
+epvv:hasSubject
+      rdf:type owl:ObjectProperty ;
+      rdfs:label "has subject"^^xsd:string .
+
+epvv:lineNumber
+      rdf:type owl:DatatypeProperty ;
+      rdfs:label "line number"^^xsd:string ;
+      rdfs:range xsd:integer .

+# Saved by TopBraid on Tue Aug 09 15:08:18 BST 2011
+# baseURI: http://www.reportinghub.no/ep/schema/well
+# imports: http://www.reportinghub.no/ep/schema/1.1/core
+
+@prefix :        <http://www.reportinghub.no/ep/schema/well#> .
+@prefix ep-well:  <http://www.reportinghub.no/ep/schema/well#> .
+@prefix owl:     <http://www.w3.org/2002/07/owl#> .
+@prefix rdf:     <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rdfs:    <http://www.w3.org/2000/01/rdf-schema#> .
+@prefix xsd:     <http://www.w3.org/2001/XMLSchema#> .
+
+<http://www.reportinghub.no/ep/schema/well>
+      rdf:type owl:Ontology ;
+      owl:imports <http://www.reportinghub.no/ep/schema/1.1/core> ;
+      owl:versionInfo "Created with TopBraid Composer"^^xsd:string .
+
+ep-well:AllOrPartOfTheLifeOfAWellBore
+      rdf:type owl:Class ;
+      rdfs:label "all or part of the life of a well bore"^^xsd:string ;
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/core#PhysicalObject> .
+
+ep-well:TemporalPartOfAWellBore
+      rdf:type owl:Class ;
+      rdfs:label "temporal part of a well bore"^^xsd:string ;
+      rdfs:subClassOf ep-well:AllOrPartOfTheLifeOfAWellBore .
+
+ep-well:Well
+      rdf:type owl:Class ;
+      rdfs:label "Well"^^xsd:string ;
+      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/core#PhysicalObject> ;
+      rdfs:subClassOf
+              [ rdf:type owl:Restriction ;
+                owl:allValuesFrom ep-well:WellBore ;
+                owl:onProperty <http://www.reportinghub.no/ep/schema/core#hasPart>
+              ] ;
+      rdfs:subClassOf
+              [ rdf:type owl:Restriction ;
+                owl:cardinality "1"^^xsd:nonNegativeInteger ;
+                owl:onProperty <http://www.reportinghub.no/ep/schema/core#name>
+              ] .
+
+ep-well:WellBore
+      rdf:type owl:Class ;
+      rdfs:label "well bore"^^xsd:string ;
+      rdfs:subClassOf ep-well:AllOrPartOfTheLifeOfAWellBore ;
+      rdfs:subClassOf
+              [ rdf:type owl:Restriction ;
+                owl:cardinality "1"^^xsd:nonNegativeInteger ;
+                owl:onProperty <http://www.reportinghub.no/ep/schema/core#name>
+              ] .

-# Saved by TopBraid on Tue Aug 09 14:47:57 BST 2011
 # baseURI: http://www.reportinghub.no/ep/spin/ddr-constraints
+# imports: http://spinrdf.org/spin
 # imports: http://www.reportinghub.no/ep/schema/1.1.1/ddr
 # imports: http://www.reportinghub.no/ep/schema/1.1/activity
-# imports: http://spinrdf.org/spin
-# imports: http://www.reportinghub.no/1.1/schema/npd
+# imports: http://www.reportinghub.no/npd/1.1/schema
 
 @prefix :        <http://www.reportinghub.no/ep/spin/ddr-constraints#> .
 @prefix owl:     <http://www.w3.org/2002/07/owl#> .
@@ -24,7 +23,7 @@
                           ] [ rdf:type sp:NamedGraph ;
                             sp:elements ([ rdf:type sp:NotExists ;
                                         sp:elements ([ sp:object _:b1 ;
-                                                    sp:predicate <http://www.reportinghub.no/schema/npd#name> ;
+                                                    sp:predicate <http://www.reportinghub.no/npd/schema#name> ;
                                                     sp:subject _:b2
                                                   ] [ sp:object <http://www.reportinghub.no/ep/schema/well#WellBore> ;
                                                     sp:predicate rdf:type ;
@@ -37,9 +36,9 @@
 
 <http://www.reportinghub.no/ep/spin/ddr-constraints>
       rdf:type owl:Ontology ;
-      owl:imports <http://www.reportinghub.no/1.1/schema/npd> , <http://www.reportinghub.no/ep/schema/1.1.1/ddr> , <http://spinrdf.org/spin> , <http://www.reportinghub.no/ep/schema/1.1/activity> ;
+      owl:imports <http://www.reportinghub.no/npd/1.1/schema> , <http://www.reportinghub.no/ep/schema/1.1/activity> , <http://spinrdf.org/spin> , <http://www.reportinghub.no/ep/schema/1.1.1/ddr> ;
       owl:versionInfo "Created with TopBraid Composer"^^xsd:string .
 
-_:b2  sp:varName "wellBore"^^xsd:string .
-
 _:b1  sp:varName "nameWellbore"^^xsd:string .
+
+_:b2  sp:varName "wellBore"^^xsd:string .

-# Saved by TopBraid on Tue Aug 09 14:47:57 BST 2011
 # baseURI: null
 
 @prefix composite:  <http://www.topbraid.org/2007/05/composite.owl#> .

 # baseURI: http://www.reportinghub.no/examples/npdi
-# imports: http://www.reportinghub.no/1.1/schema/npd
+# imports: http://www.reportinghub.no/npd/1.1/schema
 
 @prefix :        <http://www.reportinghub.no/examples/npdi#> .
 @prefix npd:     <http://www.reportinghub.no/schema/npd#> .
@@ -11,5 +11,5 @@
 
 <http://www.reportinghub.no/examples/npdi>
       rdf:type owl:Ontology ;
-      owl:imports <http://www.reportinghub.no/1.1/schema/npd> ;
+      owl:imports <http://www.reportinghub.no/npd/1.1/schema> ;
       owl:versionInfo "Created with TopBraid Composer"^^xsd:string .

-# Saved by TopBraid on Tue Aug 09 14:48:52 BST 2011
 # baseURI: http://www.reportinghub.no/1.1/schema/NPD-to-15926
-# imports: http://topbraid.org/spin/spinmapl
-# imports: http://www.reportinghub.no/1.1/schema/npd
-# imports: http://spinrdf.org/spin
 # imports: http://rds.posccaesar.org/2008/06/OWL/RDL
+# imports: http://spinrdf.org/spin
+# imports: http://topbraid.org/spin/spinmapl
+# imports: http://www.reportinghub.no/npd/1.1/schema
 
 @prefix afn:     <http://jena.hpl.hp.com/ARQ/function#> .
 @prefix dm:      <http://rds.posccaesar.org/2008/02/OWL/ISO-15926-2_2003#> .
@@ -22,7 +21,7 @@
 
 <http://www.reportinghub.no/1.1/schema/NPD-to-15926>
       rdf:type owl:Ontology ;
-      owl:imports <http://spinrdf.org/spin> , <http://topbraid.org/spin/spinmapl> , <http://www.reportinghub.no/1.1/schema/npd> , <http://rds.posccaesar.org/2008/06/OWL/RDL> ;
+      owl:imports <http://www.reportinghub.no/npd/1.1/schema> , <http://rds.posccaesar.org/2008/06/OWL/RDL> , <http://topbraid.org/spin/spinmapl> , <http://spinrdf.org/spin> ;
       owl:versionInfo "Created with TopBraid Composer"^^xsd:string .
 
 npdMap:ClassifyArrangedIndividual
@@ -53,7 +52,7 @@ npdMap:ClassifyArrangedIndividual
                           ] [ sp:object
                                     [ sp:varName "npdid"^^xsd:string
                                     ] ;
-                            sp:predicate npd:id ;
+                            sp:predicate <http://www.reportinghub.no/npd/schema#id> ;
                             sp:subject spin:_this
                           ] [ rdf:type sp:Bind ;
                             sp:expression "http://www.reportinghub.no/ep/" ;
@@ -147,7 +146,7 @@ npdMap:CreateIndividualWithNPDID
                             sp:subject _:b6
                           ]) ;
                 sp:where ([ sp:object _:b8 ;
-                            sp:predicate npd:id ;
+                            sp:predicate <http://www.reportinghub.no/npd/schema#id> ;
                             sp:subject spin:_this
                           ] [ sp:object _:b9 ;
                             sp:predicate rdf:type ;
@@ -224,11 +223,15 @@ npdMap:CreateIndividualWithNPDID
 ?wbIDCOIClsn is classification relationship from ?wbCOI to the RDL entry for wellbore identification code - RDS16622067"""^^xsd:string .
 
 npdMap:Licence_1
-      rdf:type npd:Licence ;
-      npd:id  "ABC123"^^xsd:string .
+      rdf:type <http://www.reportinghub.no/npd/schema#Licence> ;
+      <http://www.reportinghub.no/npd/schema#id>
+              "ABC123"^^xsd:string .
 
 <http://www.reportinghub.no/ep/schema/well#WellBore>
       spin:rule
+              [ rdf:type npdMap:ClassifyArrangedIndividual
+              ] ;
+      spin:rule
               [ rdf:type sp:Construct ;
                 rdfs:comment """This rule creates the WellBore and Well and joins them up using a composition relationship (dm:ArrangementOfIndividual)
 Note that because it uses the same URI production rule as other functions, we don't get repeated instances of the Well and WellBore...hopefully"""^^xsd:string ;
@@ -251,15 +254,15 @@ Note that because it uses the same URI production rule as other functions, we do
                 sp:where ([ sp:object
                                     [ sp:varName "npdid"^^xsd:string
                                     ] ;
-                            sp:predicate npd:id ;
+                            sp:predicate <http://www.reportinghub.no/npd/schema#id> ;
                             sp:subject spin:_this
                           ] [ sp:object _:b13 ;
-                            sp:predicate npd:partOfWell ;
+                            sp:predicate <http://www.reportinghub.no/npd/schema#partOfWell> ;
                             sp:subject spin:_this
                           ] [ sp:object
                                     [ sp:varName "wellName"^^xsd:string
                                     ] ;
-                            sp:predicate npd:name ;
+                            sp:predicate <http://www.reportinghub.no/npd/schema#name> ;
                             sp:subject _:b13
                           ] [ rdf:type sp:Bind ;
                             sp:expression "http://www.reportinghub.no/ep/" ;
@@ -285,19 +288,16 @@ Note that because it uses the same URI production rule as other functions, we do
                                     ] ;
                             sp:variable _:b12
                           ])
-              ] ;
-      spin:rule
-              [ rdf:type npdMap:ClassifyArrangedIndividual
               ] .
 
-npd:NpdIndividual
+<http://www.reportinghub.no/npd/schema#NPDIndividual>
       spin:rule
               [ rdf:type npdMap:CreateIndividualWithNPDID ;
                 sp:arg1 "\"Individual\""^^xsd:string
               ] .
 
 npd:WellBore_1
-      npd:drilledInProductionLicence
+      <http://www.reportinghub.no/npd/schema#drilledInProductionLicence>
               npdMap:Licence_1 .
 
 npd:wellDiskosType
@@ -306,32 +306,32 @@ npd:wellDiskosType
       rdfs:domain <http://www.reportinghub.no/ep/schema/well#Well> ;
       rdfs:range xsd:string .
 
-_:b13
-      sp:varName "well"^^xsd:string .
+_:b1  sp:varName "AI"^^xsd:string .
 
-_:b12
-      sp:varName "wellBoreComp"^^xsd:string .
+_:b2  sp:varName "AIClsn"^^xsd:string .
 
-_:b11
-      sp:varName "wellAI"^^xsd:string .
+_:b3  sp:varName "npdType"^^xsd:string .
 
-_:b10
-      sp:varName "wellBoreAI"^^xsd:string .
+_:b4  sp:varName "AI"^^xsd:string .
 
-_:b9  sp:varName "npdType"^^xsd:string .
+_:b5  sp:varName "npdCOI"^^xsd:string .
 
-_:b8  sp:varName "npdid"^^xsd:string .
+_:b6  sp:varName "npdExpStr"^^xsd:string .
 
 _:b7  sp:varName "npdCOIClsn"^^xsd:string .
 
-_:b6  sp:varName "npdExpStr"^^xsd:string .
+_:b8  sp:varName "npdid"^^xsd:string .
 
-_:b5  sp:varName "npdCOI"^^xsd:string .
+_:b9  sp:varName "npdType"^^xsd:string .
 
-_:b4  sp:varName "AI"^^xsd:string .
+_:b10
+      sp:varName "wellBoreAI"^^xsd:string .
 
-_:b3  sp:varName "npdType"^^xsd:string .
+_:b11
+      sp:varName "wellAI"^^xsd:string .
 
-_:b2  sp:varName "AIClsn"^^xsd:string .
+_:b12
+      sp:varName "wellBoreComp"^^xsd:string .
 
-_:b1  sp:varName "AI"^^xsd:string .
+_:b13
+      sp:varName "well"^^xsd:string .

-# Saved by TopBraid on Tue Aug 09 15:35:38 BST 2011
-# baseURI: http://www.reportinghub.no/1.1/schema/npd
-# imports: http://www.reportinghub.no/ep/schema/organization
+# baseURI: http://www.reportinghub.no/npd/1.1/schema
 # imports: http://www.reportinghub.no/ep/schema/facility
+# imports: http://www.reportinghub.no/ep/schema/organization
 # imports: http://www.reportinghub.no/ep/schema/well
 
 @prefix facility:  <http://www.reportinghub.no/ep/schema/facility#> .
-@prefix npd:     <http://www.reportinghub.no/schema/npd#> .
+@prefix npd:     <http://www.reportinghub.no/npd/schema#> .
 @prefix organization:  <http://www.reportinghub.no/ep/schema/organization#> .
 @prefix owl:     <http://www.w3.org/2002/07/owl#> .
 @prefix rdf:     <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
@@ -16,18 +15,13 @@
 @prefix spl:     <http://spinrdf.org/spl#> .
 @prefix xsd:     <http://www.w3.org/2001/XMLSchema#> .
 
-<http://www.reportinghub.no/1.1/schema/npd>
-      rdf:type owl:Ontology ;
-      owl:imports <http://www.reportinghub.no/ep/schema/organization> , <http://www.reportinghub.no/ep/schema/facility> , <http://www.reportinghub.no/ep/schema/well> ;
-      owl:versionInfo "Created with TopBraid Composer"^^xsd:string .
-
 <http://www.reportinghub.no/ep/schema/core#PhysicalThing>
       rdf:type owl:Class ;
       rdfs:comment "An individual (cringe) that has temporal extent. If Matthew and Chris ever found out about this, they'd string me up. - IB"^^xsd:string .
 
 facility:Facility
       rdf:type owl:Class ;
-      rdfs:subClassOf npd:NpdIndividual .
+      rdfs:subClassOf npd:NPDIndividual .
 
 facility:FixedFacility
       rdf:type owl:Class ;
@@ -48,7 +42,6 @@ facility:SurfaceFixedFacility
       rdfs:subClassOf facility:FixedFacility .
 
 organization:Company
-      rdf:type owl:Class ;
       rdfs:subClassOf npd:Individual .
 
 <http://www.reportinghub.no/ep/schema/well#Well>
@@ -58,12 +51,17 @@ organization:Company
 
 <http://www.reportinghub.no/ep/schema/well#WellBore>
       rdf:type owl:Class ;
-      rdfs:subClassOf npd:NpdIndividual , <http://www.reportinghub.no/ep/schema/well#AllOrPartOfTheLifeOfAWellBore> .
+      rdfs:subClassOf npd:NPDIndividual , <http://www.reportinghub.no/ep/schema/well#AllOrPartOfTheLifeOfAWellBore> .
+
+<http://www.reportinghub.no/npd/1.1/schema>
+      rdf:type owl:Ontology ;
+      owl:imports <http://www.reportinghub.no/ep/schema/well> , <http://www.reportinghub.no/ep/schema/facility> , <http://www.reportinghub.no/ep/schema/organization> ;
+      owl:versionInfo "Created with TopBraid Composer"^^xsd:string .
 
 npd:BusinessArrangementArea
       rdf:type owl:Class ;
       rdfs:comment "A business arrangement area in this context is an area which is a result of unitisations, sliding scale rules or other business arrangements which have altered the terms of the original production licence."^^xsd:string ;
-      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/core#PhysicalThing> , npd:NpdIndividual , npd:Owner .
+      rdfs:subClassOf npd:NPDIndividual , <http://www.reportinghub.no/ep/schema/core#PhysicalThing> , npd:Owner .
 
 npd:DAS_DecidedByTheLicensees
       rdf:type npd:DiscoveryActivityStatus ;
@@ -139,7 +137,7 @@ npd:DevelopmentWellBorePurpose
 npd:Discovery
       rdf:type owl:Class ;
       rdfs:comment "A discovery is a petroleum deposit or several petroleum deposits collectively, which have been discovered in the same well, in which through testing, sampling or logging there has been established a probability of the existence of mobile petroleum (includes both commercial and technical discovery)."^^xsd:string ;
-      rdfs:subClassOf npd:NpdIndividual .
+      rdfs:subClassOf npd:NPDIndividual .
 
 npd:DiscoveryActivityStatus
       rdf:type owl:Class ;
@@ -265,7 +263,7 @@ npd:FieldPart
 
 npd:FixedFacilityParent
       rdf:type owl:Class ;
-      rdfs:subClassOf npd:NpdIndividual .
+      rdfs:subClassOf npd:NPDIndividual .
 
 npd:FixedFacilityPhase
       rdf:type owl:Class ;
@@ -304,23 +302,23 @@ npd:Individual
       rdfs:subClassOf owl:Thing .
 
 npd:LS_Active
-      rdf:type npd:LicenseStatus ;
+      rdf:type npd:LicenceStatus ;
       rdfs:label "active"@en ;
       npd:code "ACTIVE"^^xsd:string .
 
 npd:LS_Inactive
-      rdf:type npd:LicenseStatus ;
+      rdf:type npd:LicenceStatus ;
       rdfs:label "inactive"@en ;
       npd:code "INACTIVE"^^xsd:string .
 
 npd:Licence
       rdf:type owl:Class ;
       rdfs:comment "Production licences are granted by the Ministry of Petroleum and Energy. Transfer of a production licence or participating interest in a production licence must be approved by the ministry."^^xsd:string ;
-      rdfs:subClassOf <http://www.reportinghub.no/ep/schema/core#PhysicalThing> , npd:NpdIndividual , npd:Owner .
+      rdfs:subClassOf npd:NPDIndividual , <http://www.reportinghub.no/ep/schema/core#PhysicalThing> , npd:Owner .
 
-npd:LicenseStatus
+npd:LicenceStatus
       rdf:type owl:Class ;
-      rdfs:label "License status"^^xsd:string ;
+      rdfs:label "Licence status"^^xsd:string ;
       rdfs:subClassOf npd:Enumeration ;
       owl:oneOf (npd:LS_Active npd:LS_Inactive) .
 
@@ -345,13 +343,13 @@ npd:MainNCSArea
       rdfs:subClassOf npd:Enumeration ;
       owl:oneOf (npd:MNA_NorthSea npd:MNA_NorwegianSea npd:MNA_BarentsSea) .
 
-npd:NpdIndividual
+npd:NPDIndividual
       rdf:type owl:Class ;
       rdfs:subClassOf npd:Individual .
 
 npd:OperatingCompany
       rdf:type owl:Class ;
-      rdfs:subClassOf organization:Company , npd:NpdIndividual .
+      rdfs:subClassOf npd:NPDIndividual , organization:Company .
 
 npd:Owner
       rdf:type owl:Class ;
@@ -393,7 +391,7 @@ npd:TUF
       rdfs:comment "TUF is an abbreviation for \"Transportation and Utilization Facilities\"."^^xsd:string ;
       rdfs:subClassOf facility:Facility , npd:FixedFacilityParent .
 
-npd:TufPart
+npd:TUFPart
       rdf:type owl:Class ;
       rdfs:comment "A part of a TUF"^^xsd:string ;
       rdfs:subClassOf npd:FixedFacilityParent .
@@ -600,7 +598,7 @@ npd:fixedFacilityPhase
 
 npd:id
       rdf:type owl:DatatypeProperty ;
-      rdfs:domain npd:NpdIndividual ;
+      rdfs:domain npd:NPDIndividual ;
       rdfs:range xsd:string .
 
 npd:licenceShared
@@ -608,11 +606,11 @@ npd:licenceShared
       rdfs:domain npd:ShareOfLicence ;
       rdfs:range npd:Licence .
 
-npd:licenseStatus
+npd:licenceStatus
       rdf:type owl:ObjectProperty ;
       rdfs:comment "corresponds to the Status field in the License table"^^xsd:string ;
       rdfs:domain npd:Licence ;
-      rdfs:range npd:LicenseStatus .
+      rdfs:range npd:LicenceStatus .
 
 npd:licensingActivity
       rdf:type owl:DatatypeProperty ;
@@ -642,9 +640,9 @@ npd:partOfField
       rdfs:domain npd:FieldPart ;
       rdfs:range npd:Field .
 
-npd:partOfTuf
+npd:partOfTUF
       rdf:type owl:ObjectProperty ;
-      rdfs:domain npd:TufPart ;
+      rdfs:domain npd:TUFPart ;
       rdfs:range npd:TUF .
 
 npd:partOfWell

-# Saved by TopBraid on Tue Aug 09 15:37:11 BST 2011
 # baseURI: http://www.reportinghub.no/spin/rh
-# imports: http://topbraid.org/spin/spinmapl
-# imports: http://www.reportinghub.no/1.1/schema/npd
 # imports: http://spinrdf.org/spin
+# imports: http://topbraid.org/spin/spinmapl
+# imports: http://www.reportinghub.no/npd/1.1/schema
 
 @prefix fn:      <http://www.w3.org/2005/xpath-functions#> .
 @prefix owl:     <http://www.w3.org/2002/07/owl#> .
@@ -48,7 +47,7 @@
 <http://www.reportinghub.no/spin/rh>
       rdf:type owl:Ontology ;
       rdfs:comment "A collection of SPIN functions and templates to support working with the ReportingHub schemas."^^xsd:string ;
-      owl:imports <http://topbraid.org/spin/spinmapl> , <http://spinrdf.org/spin> , <http://www.reportinghub.no/1.1/schema/npd> ;
+      owl:imports <http://www.reportinghub.no/npd/1.1/schema> , <http://spinrdf.org/spin> , <http://topbraid.org/spin/spinmapl> ;
       owl:versionInfo "0.1.0"^^xsd:string .
 
 rhspin:GetWellBoresOfWell
@@ -64,10 +63,10 @@ rhspin:GetWellBoresOfWell
                             sp:elements ([ sp:object
                                                 [ sp:varName "well"^^xsd:string
                                                 ] ;
-                                        sp:predicate <http://www.reportinghub.no/schema/npd#partOfWell> ;
+                                        sp:predicate <http://www.reportinghub.no/npd/schema#partOfWell> ;
                                         sp:subject _:b2
                                       ] [ sp:object _:b1 ;
-                                        sp:predicate <http://www.reportinghub.no/schema/npd#name> ;
+                                        sp:predicate <http://www.reportinghub.no/npd/schema#name> ;
                                         sp:subject _:b2
                                       ]) ;
                             sp:graphNameNode <https://www.reportinghub.no/data/npd>
@@ -147,16 +146,16 @@ rhspin:companyHasLicenceForWellBore
                                     ] ;
                             sp:variable _:b4
                           ] [ sp:object spin:_arg1 ;
-                            sp:predicate <http://www.reportinghub.no/schema/npd#shareHolder> ;
+                            sp:predicate <http://www.reportinghub.no/npd/schema#shareHolder> ;
                             sp:subject _:b5
                           ] [ sp:object _:b6 ;
-                            sp:predicate <http://www.reportinghub.no/schema/npd#licenceShared> ;
+                            sp:predicate <http://www.reportinghub.no/npd/schema#licenceShared> ;
                             sp:subject _:b5
-                          ] [ sp:object <http://www.reportinghub.no/schema/npd#LS_Active> ;
-                            sp:predicate <http://www.reportinghub.no/schema/npd#licenseStatus> ;
+                          ] [ sp:object <http://www.reportinghub.no/npd/schema#LS_Active> ;
+                            sp:predicate <http://www.reportinghub.no/npd/schema#licenceStatus> ;
                             sp:subject _:b6
                           ] [ sp:object _:b7 ;
-                            sp:predicate <http://www.reportinghub.no/schema/npd#startDate> ;
+                            sp:predicate <http://www.reportinghub.no/npd/schema#startDate> ;
                             sp:subject _:b6
                           ] [ rdf:type sp:Filter ;
                             sp:expression
@@ -165,7 +164,7 @@ rhspin:companyHasLicenceForWellBore
                                       sp:arg2 _:b4
                                     ]
                           ] [ sp:object _:b8 ;
-                            sp:predicate <http://www.reportinghub.no/schema/npd#endDate> ;
+                            sp:predicate <http://www.reportinghub.no/npd/schema#endDate> ;
                             sp:subject _:b6
                           ] [ rdf:type sp:Filter ;
                             sp:expression
@@ -174,7 +173,7 @@ rhspin:companyHasLicenceForWellBore
                                       sp:arg2 _:b4
                                     ]
                           ] [ sp:object _:b6 ;
-                            sp:predicate <http://www.reportinghub.no/schema/npd#drilledInProductionLicence> ;
+                            sp:predicate <http://www.reportinghub.no/npd/schema#drilledInProductionLicence> ;
                             sp:subject _:b3
                           ])
               ] ;
@@ -273,7 +272,7 @@ rhspin:licenceById
                 spl:predicate <http://spinrdf.org/arg#id> ;
                 spl:valueType xsd:string
               ] ;
-      spin:returnType <http://www.reportinghub.no/schema/npd#Licence> .
+      spin:returnType <http://www.reportinghub.no/npd/schema#Licence> .
 
 rhspin:normalizeString
       rdf:type spin:Function ;

-# Saved by TopBraid on Tue Aug 09 15:37:11 BST 2011
 # baseURI: null
 
 @prefix composite:  <http://www.topbraid.org/2007/05/composite.owl#> .

@@ -10,44 +10,40 @@
 			<td class="ddrSummaryLeft">
 			<rhswp:NameValuePair arg:name="Report Number:" arg:value="{ spl:object(?this, ?) }" />
 			<rhswp:NameValuePair arg:name="Wellbore:" arg:value="{# SELECT ?wellBoreName WHERE { ?reportOn iso15926:hasPart/ep-activity:onWellBore/iso15926:temporalPartOf/rdfs:label ?wellBoreName } }" />
-			<!-- 
-			<rhswp:NameValuePair arg:name="Status:" arg:value="{= spl:object(?this, ???) }" />
-			<rhswp:NameValuePair arg:name="Operator:" arg:value="{= spl:object(?this, ???) }" />
-			<rhswp:NameValuePair arg:name="Rig name:" arg:value="{= spl:object(?this, ???) }" />
-			<rhswp:NameValuePair arg:name="Spud date:" arg:value="{= spl:object(?this, ???) }" />
-			<rhswp:NameValuePair arg:name="Elevation RKB-MSL m:" arg:value="{= spl:object(?this, ???) }" />
-			<rhswp:NameValuePair arg:name="Tight well:" arg:value="{= spl:object(?this, ???) }" />
-			<rhswp:NameValuePair arg:name="Pressure psig:" arg:value="{= spl:object(?this, ???) }" />
-			<rhswp:NameValuePair arg:name="Fixed rig:" arg:value="{= spl:object(?this, ???) }" />
-			<rhswp:NameValuePair arg:name="Depth at Kick Off mMD:" arg:value="{= spl:object(?this, ???) }" />
-			<rhswp:NameValuePair arg:name="Plug Back Depth mMD:" arg:value="{= spl:object(?this, ???) }" />
-			<rhswp:NameValuePair arg:name="Penetration Rate m/h:" arg:value="{= spl:object(?this, ???) }" />
-			<rhswp:NameValuePair arg:name="Pressure Test Type:" arg:value="{= spl:object(?this, ???) }" />
-			<rhswp:NameValuePair arg:name="Depth At Formation Strength mMD:" arg:value="{= spl:object(?this, ???) }" />
-			<rhswp:NameValuePair arg:name="Dia Last Casing In:" arg:value="{= spl:object(?this, ???) }" />
-			<rhswp:NameValuePair arg:name="Depth At Last Casing MTVD:" arg:value="{= spl:object(?this, ???) }" />
-			-->
+			<rhswp:NameValuePair arg:name="Status:" arg:value="{= ui:label(spl:object(?this, rdf:type)) }" />
+			<rhswp:NameValuePair arg:name="Operator:" arg:value="{ spl:object(?this, ???) }" />
+			<rhswp:NameValuePair arg:name="Rig name:" arg:value="{ spl:object(?this, ???) }" />
+			<rhswp:NameValuePair arg:name="Spud date:" arg:value="{ spl:object(?this, ???) }" />
+			<rhswp:NameValuePair arg:name="Elevation RKB-MSL m:" arg:value="{ spl:object(?this, ???) }" />
+			<rhswp:NameValuePair arg:name="Tight well:" arg:value="{ spl:object(?this, ???) }" />
+			<rhswp:NameValuePair arg:name="Pressure psig:" arg:value="{ spl:object(?this, ???) }" />
+			<rhswp:NameValuePair arg:name="Fixed rig:" arg:value="{ spl:object(?this, ???) }" />
+			<rhswp:NameValuePair arg:name="Depth at Kick Off mMD:" arg:value="{ spl:object(?this, ???) }" />
+			<rhswp:NameValuePair arg:name="Plug Back Depth mMD:" arg:value="{ spl:object(?this, ???) }" />
+			<rhswp:NameValuePair arg:name="Penetration Rate m/h:" arg:value="{ spl:object(?this, ???) }" />
+			<rhswp:NameValuePair arg:name="Pressure Test Type:" arg:value="{ spl:object(?this, ???) }" />
+			<rhswp:NameValuePair arg:name="Depth At Formation Strength mMD:" arg:value="{ spl:object(?this, ???) }" />
+			<rhswp:NameValuePair arg:name="Dia Last Casing In:" arg:value="{ spl:object(?this, ???) }" />
+			<rhswp:NameValuePair arg:name="Depth At Last Casing MTVD:" arg:value="{ spl:object(?this, ???) }" />
 		</td>
 		<td class="ddrSummaryRight">
 			<rhswp:NameValuePair arg:name="Period:" arg:value="{= fn:concat(ui:label(spl:object(?reportOn, ep-activity:startedAt)), ' - ', ui:label(spl:object(?reportOn, ep-activity:finishedAt))) }" />
 			<rhswp:NameValuePair arg:name="Wellbore Id:" arg:value="{ SELECT ?wellBoreId WHERE { ?reportOn iso15926:hasPart/ep-activity:onWellBore/iso15926:temporalPartOf/??? ?wellBoreId } }" />
-			<rhswp:NameValuePair arg:name="Created date:" arg:value="{= spl:object(?this, ep-activity:createdAt) }" />
-			<!-- 
-			<rhswp:NameValuePair arg:name="Drilling contractor:" arg:value="{= spl:object(?this, ???) }" />
-			<rhswp:NameValuePair arg:name="NPD Rig Id:" arg:value="{= spl:object(?this, ???) }" />
-			<rhswp:NameValuePair arg:name="Date Well Complete:" arg:value="{= spl:object(?this, ???) }" />
-			<rhswp:NameValuePair arg:name="Water depth MSL m:" arg:value="{= spl:object(?this, ???) }" />
-			<rhswp:NameValuePair arg:name="High pressure - High temperature:" arg:value="{= spl:object(?this, ???) }" />
-			<rhswp:NameValuePair arg:name="Temprature degC:" arg:value="{= spl:object(?this, ???) }" />
-			<rhswp:NameValuePair arg:name="Wellbore type:" arg:value="{= spl:object(?this, ???) }" />
-			<rhswp:NameValuePair arg:name="Depth at Kick Off mTVD:" arg:value="{= spl:object(?this, ???) }" />
-			<rhswp:NameValuePair arg:name="Depth mTVD:" arg:value="{= spl:object(?this, ???) }" />
-			<rhswp:NameValuePair arg:name="Dist Drilled m:" arg:value="{= spl:object(?this, ???) }" />
-			<rhswp:NameValuePair arg:name="Hole Dia in:" arg:value="{= spl:object(?this, ???) }" />
-			<rhswp:NameValuePair arg:name="Formation Strength g/cm3:" arg:value="{= spl:object(?this, ???) }" />
-			<rhswp:NameValuePair arg:name="Depth At Formation Strength mTVD:" arg:value="{= spl:object(?this, ???) }" />
-			<rhswp:NameValuePair arg:name="Depth At Last Casting mMD:" arg:value="{= spl:object(?this, ???) }" />
-			-->
+			<rhswp:NameValuePair arg:name="Created date:" arg:value="{ spl:object(?this, ep-activity:createdAt) }" />
+			<rhswp:NameValuePair arg:name="Drilling contractor:" arg:value="{ spl:object(?this, ???) }" />
+			<rhswp:NameValuePair arg:name="NPD Rig Id:" arg:value="{ spl:object(?this, ???) }" />
+			<rhswp:NameValuePair arg:name="Date Well Complete:" arg:value="{ spl:object(?this, ???) }" />
+			<rhswp:NameValuePair arg:name="Water depth MSL m:" arg:value="{ spl:object(?this, ???) }" />
+			<rhswp:NameValuePair arg:name="High pressure - High temperature:" arg:value="{ spl:object(?this, ???) }" />
+			<rhswp:NameValuePair arg:name="Temprature degC:" arg:value="{ spl:object(?this, ???) }" />
+			<rhswp:NameValuePair arg:name="Wellbore type:" arg:value="{ spl:object(?this, ???) }" />
+			<rhswp:NameValuePair arg:name="Depth at Kick Off mTVD:" arg:value="{ spl:object(?this, ???) }" />
+			<rhswp:NameValuePair arg:name="Depth mTVD:" arg:value="{ spl:object(?this, ???) }" />
+			<rhswp:NameValuePair arg:name="Dist Drilled m:" arg:value="{ spl:object(?this, ???) }" />
+			<rhswp:NameValuePair arg:name="Hole Dia in:" arg:value="{ spl:object(?this, ???) }" />
+			<rhswp:NameValuePair arg:name="Formation Strength g/cm3:" arg:value="{ spl:object(?this, ???) }" />
+			<rhswp:NameValuePair arg:name="Depth At Formation Strength mTVD:" arg:value="{ spl:object(?this, ???) }" />
+			<rhswp:NameValuePair arg:name="Depth At Last Casting mMD:" arg:value="{ spl:object(?this, ???) }" />
 		</td>
 		</tr></table>
 	</body>

 # baseURI: http://www.reportinghub.no/swp/rh
 # imports: http://uispin.org/tui
+# imports: http://www.reportinghub.no/npd/1.1/schema
 # imports: http://www.reportinghub.no/spin/rh
 
 @prefix html:    <http://uispin.org/html#> .
@@ -23,7 +24,7 @@
 <http://www.reportinghub.no/swp/rh>
       rdf:type owl:Ontology ;
       rdfs:comment "SWP components and definitions for ReportingHub."^^xsd:string ;
-      owl:imports <http://uispin.org/tui> , <http://www.reportinghub.no/spin/rh> ;
+      owl:imports <http://www.reportinghub.no/npd/1.1/schema> , <http://www.reportinghub.no/spin/rh> , <http://uispin.org/tui> ;
       owl:versionInfo "0.1.0"^^xsd:string .
 
 rhswp:Elements
@@ -44,15 +45,15 @@ rhswp:NameValuePair
       rdfs:subClassOf rhswp:Elements ;
       spin:constraint
               [ rdf:type spl:Argument ;
-                rdfs:comment "The value to display."^^xsd:string ;
-                spl:predicate <http://spinrdf.org/arg#value>
-              ] ;
-      spin:constraint
-              [ rdf:type spl:Argument ;
                 rdfs:comment "The label of the value."^^xsd:string ;
                 spl:predicate <http://spinrdf.org/arg#name> ;
                 spl:valueType xsd:string
               ] ;
+      spin:constraint
+              [ rdf:type spl:Argument ;
+                rdfs:comment "The value to display."^^xsd:string ;
+                spl:predicate <http://spinrdf.org/arg#value>
+              ] ;
       ui:prototype
               [ rdf:type html:Table ;
                 html:class "nameValuePair"^^xsd:string ;
@@ -60,25 +61,25 @@ rhswp:NameValuePair
                         [ rdf:type html:Tr ;
                           ui:child
                                   [ rdf:type html:Td ;
-                                    html:class "nameValueValue"^^xsd:string ;
+                                    html:class "nameValueName"^^xsd:string ;
                                     ui:child
                                             [ rdf:type ui:TextNode ;
                                               ui:childIndex 0 ;
-                                              ui:text [ sp:varName "value"^^xsd:string
+                                              ui:text [ sp:varName "name"^^xsd:string
                                                       ]
                                             ] ;
-                                    ui:childIndex 1
+                                    ui:childIndex 0
                                   ] ;
                           ui:child
                                   [ rdf:type html:Td ;
-                                    html:class "nameValueName"^^xsd:string ;
+                                    html:class "nameValueValue"^^xsd:string ;
                                     ui:child
                                             [ rdf:type ui:TextNode ;
                                               ui:childIndex 0 ;
-                                              ui:text [ sp:varName "name"^^xsd:string
+                                              ui:text [ sp:varName "value"^^xsd:string
                                                       ]
                                             ] ;
-                                    ui:childIndex 0
+                                    ui:childIndex 1
                                   ] ;
                           ui:childIndex 0
                         ]

-# Saved by TopBraid on Tue Aug 09 15:36:54 BST 2011
 # baseURI: http://www.reportinghub.no/transform/spreadsheets2npd
-# imports: http://topbraid.org/spin/spinmapl
-# imports: file:///www.reportinghub.no/transform/npd/company
-# imports: file:///www.reportinghub.no/transform/npd/wbsha
-# imports: file:///www.reportinghub.no/transform/npd/wbdev
-# imports: http://www.reportinghub.no/1.1/schema/npd
-# imports: file:///www.reportinghub.no/transform/npd/field
-# imports: http://www.reportinghub.no/spin/rh
-# imports: file:///www.reportinghub.no/transform/npd/facilitymoveable
-# imports: file:///www.reportinghub.no/transform/npd/wbexp
-# imports: file:///www.reportinghub.no/transform/npd/licensee
 # imports: file:///www.reportinghub.no/transform/npd/baa
-# imports: file:///www.reportinghub.no/transform/npd/facilityfixed
+# imports: file:///www.reportinghub.no/transform/npd/baalicensee
+# imports: file:///www.reportinghub.no/transform/npd/company
 # imports: file:///www.reportinghub.no/transform/npd/discovery
+# imports: file:///www.reportinghub.no/transform/npd/facilityfixed
+# imports: file:///www.reportinghub.no/transform/npd/facilitymoveable
+# imports: file:///www.reportinghub.no/transform/npd/field
 # imports: file:///www.reportinghub.no/transform/npd/licence
-# imports: file:///www.reportinghub.no/transform/npd/baalicensee
+# imports: file:///www.reportinghub.no/transform/npd/licensee
+# imports: file:///www.reportinghub.no/transform/npd/tufoperator
+# imports: file:///www.reportinghub.no/transform/npd/wbdev
+# imports: file:///www.reportinghub.no/transform/npd/wbexp
 # imports: file:///www.reportinghub.no/transform/npd/wbid
+# imports: file:///www.reportinghub.no/transform/npd/wbsha
 # imports: http://spinrdf.org/spin
-# imports: file:///www.reportinghub.no/transform/npd/tufoperator
+# imports: http://topbraid.org/spin/spinmapl
+# imports: http://www.reportinghub.no/npd/1.1/schema
+# imports: http://www.reportinghub.no/spin/rh
 
 @prefix :        <http://www.reportinghub.no/transform/spreadsheets2npd#> .
 @prefix arg:     <http://spinrdf.org/arg#> .
@@ -56,22 +55,22 @@
                 spinmap:context :BAA-BusinessArrangementArea ;
                 spinmap:expression spin:_arg1 ;
                 spinmap:sourcePredicate1
-                        <file:///www.reportinghub.no/transform/npd/baa#baaNpdidBsnsArrArea> ;
+                        <file:///www.reportinghub.no/transform/npd/baa#baaName> ;
                 spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#id>
+                        <http://www.reportinghub.no/npd/schema#name>
               ] ;
       spinmap:rule
               [ rdf:type spinmap:Mapping-1-1 ;
                 spinmap:context :BAA-BusinessArrangementArea ;
                 spinmap:expression
-                        [ rdf:type spinmapl:resourceWithValue ;
-                          sp:arg1 spin:_arg1 ;
-                          spinmapl:predicate :baaKind
+                        [ rdf:type spif:parseDate ;
+                          arg:pattern "dd.MM.yyyy" ;
+                          sp:arg1 spin:_arg1
                         ] ;
                 spinmap:sourcePredicate1
-                        <file:///www.reportinghub.no/transform/npd/baa#baaKind> ;
+                        <file:///www.reportinghub.no/transform/npd/baa#baaDateValidTo> ;
                 spinmap:targetPredicate1
-                        rdf:type
+                        <http://www.reportinghub.no/npd/schema#endDate>
               ] ;
       spinmap:rule
               [ rdf:type spinmap:Mapping-1-1 ;
@@ -84,38 +83,43 @@
                 spinmap:sourcePredicate1
                         <file:///www.reportinghub.no/transform/npd/baa#baaDateValidFrom> ;
                 spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#startDate>
+                        <http://www.reportinghub.no/npd/schema#startDate>
               ] ;
       spinmap:rule
               [ rdf:type spinmap:Mapping-1-1 ;
                 spinmap:context :BAA-BusinessArrangementArea ;
                 spinmap:expression
-                        [ rdf:type spif:parseDate ;
-                          arg:pattern "dd.MM.yyyy" ;
-                          sp:arg1 spin:_arg1
+                        [ rdf:type spinmapl:resourceWithValue ;
+                          sp:arg1 spin:_arg1 ;
+                          spinmapl:predicate :baaKind
                         ] ;
                 spinmap:sourcePredicate1
-                        <file:///www.reportinghub.no/transform/npd/baa#baaDateValidTo> ;
+                        <file:///www.reportinghub.no/transform/npd/baa#baaKind> ;
                 spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#endDate>
+                        rdf:type
               ] ;
       spinmap:rule
               [ rdf:type spinmap:Mapping-1-1 ;
                 spinmap:context :BAA-BusinessArrangementArea ;
                 spinmap:expression spin:_arg1 ;
                 spinmap:sourcePredicate1
-                        <file:///www.reportinghub.no/transform/npd/baa#baaName> ;
+                        <file:///www.reportinghub.no/transform/npd/baa#baaNpdidBsnsArrArea> ;
                 spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#name>
+                        <http://www.reportinghub.no/npd/schema#id>
               ] .
 
 <file:///www.reportinghub.no/transform/npd/baalicensee#BAALicensee>
       spinmap:rule
-              [ rdf:type spinmap:Mapping-0-1 ;
+              [ rdf:type spinmap:Mapping-1-1 ;
                 spinmap:context :BAALicensee-ShareOfBAA ;
-                spinmap:expression <http://www.reportinghub.no/schema/npd#ShareOfBAA> ;
+                spinmap:expression
+                        [ rdf:type xsd:float ;
+                          sp:arg1 spin:_arg1
+                        ] ;
+                spinmap:sourcePredicate1
+                        <file:///www.reportinghub.no/transform/npd/baalicensee#baaLicenseeInterest> ;
                 spinmap:targetPredicate1
-                        rdf:type
+                        <http://www.reportinghub.no/npd/schema#percentageOfShare>
               ] ;
       spinmap:rule
               [ rdf:type spinmap:Mapping-1-1 ;
@@ -123,13 +127,13 @@
                 spinmap:expression
                         [ rdf:type spinmapl:resourceWithValue ;
                           sp:arg1 spin:_arg1 ;
-                          spinmapl:predicate <http://www.reportinghub.no/schema/npd#name> ;
-                          spinmapl:type <http://www.reportinghub.no/schema/npd#BusinessArrangementArea>
+                          spinmapl:predicate <http://www.reportinghub.no/npd/schema#name> ;
+                          spinmapl:type <http://www.reportinghub.no/ep/schema/organization#Company>
                         ] ;
                 spinmap:sourcePredicate1
-                        <file:///www.reportinghub.no/transform/npd/baalicensee#baaName> ;
+                        <file:///www.reportinghub.no/transform/npd/baalicensee#cmpLongName> ;
                 spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#baaShared>
+                        <http://www.reportinghub.no/npd/schema#shareHolder>
               ] ;
       spinmap:rule
               [ rdf:type spinmap:Mapping-1-1 ;
@@ -140,9 +144,9 @@
                           sp:arg1 spin:_arg1
                         ] ;
                 spinmap:sourcePredicate1
-                        <file:///www.reportinghub.no/transform/npd/baalicensee#baaLicenseeDateValidFrom> ;
+                        <file:///www.reportinghub.no/transform/npd/baalicensee#baaLicenseeDateValidTo> ;
                 spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#startDate>
+                        <http://www.reportinghub.no/npd/schema#endDate>
               ] ;
       spinmap:rule
               [ rdf:type spinmap:Mapping-1-1 ;
@@ -153,9 +157,9 @@
                           sp:arg1 spin:_arg1
                         ] ;
                 spinmap:sourcePredicate1
-                        <file:///www.reportinghub.no/transform/npd/baalicensee#baaLicenseeDateValidTo> ;
+                        <file:///www.reportinghub.no/transform/npd/baalicensee#baaLicenseeDateValidFrom> ;
                 spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#endDate>
+                        <http://www.reportinghub.no/npd/schema#startDate>
               ] ;
       spinmap:rule
               [ rdf:type spinmap:Mapping-1-1 ;
@@ -163,59 +167,57 @@
                 spinmap:expression
                         [ rdf:type spinmapl:resourceWithValue ;
                           sp:arg1 spin:_arg1 ;
-                          spinmapl:predicate <http://www.reportinghub.no/schema/npd#name> ;
-                          spinmapl:type <http://www.reportinghub.no/ep/schema/organization#Company>
+                          spinmapl:predicate <http://www.reportinghub.no/npd/schema#name> ;
+                          spinmapl:type <http://www.reportinghub.no/npd/schema#BusinessArrangementArea>
                         ] ;
                 spinmap:sourcePredicate1
-                        <file:///www.reportinghub.no/transform/npd/baalicensee#cmpLongName> ;
+                        <file:///www.reportinghub.no/transform/npd/baalicensee#baaName> ;
                 spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#shareHolder>
+                        <http://www.reportinghub.no/npd/schema#baaShared>
               ] ;
       spinmap:rule
-              [ rdf:type spinmap:Mapping-1-1 ;
+              [ rdf:type spinmap:Mapping-0-1 ;
                 spinmap:context :BAALicensee-ShareOfBAA ;
-                spinmap:expression
-                        [ rdf:type xsd:float ;
-                          sp:arg1 spin:_arg1
-                        ] ;
-                spinmap:sourcePredicate1
-                        <file:///www.reportinghub.no/transform/npd/baalicensee#baaLicenseeInterest> ;
+                spinmap:expression <http://www.reportinghub.no/npd/schema#ShareOfBAA> ;
                 spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#percentageOfShare>
+                        rdf:type
               ] .
 
 <file:///www.reportinghub.no/transform/npd/company#Company>
       spinmap:rule
               [ rdf:type spinmap:Mapping-1-1 ;
-                spinmap:context :Company-Company ;
+                spinmap:context :Company-ParentCompany ;
                 spinmap:expression spin:_arg1 ;
                 spinmap:sourcePredicate1
-                        <file:///www.reportinghub.no/transform/npd/company#cmpNpdidCompany> ;
+                        <file:///www.reportinghub.no/transform/npd/company#cmpGroup> ;
                 spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#id>
+                        <http://www.reportinghub.no/npd/schema#name>
               ] ;
       spinmap:rule
               [ rdf:type spinmap:Mapping-1-1 ;
-                spinmap:context :Company-Company ;
+                spinmap:context :Company-ParentCompany ;
                 spinmap:expression spin:_arg1 ;
                 spinmap:sourcePredicate1
-                        <file:///www.reportinghub.no/transform/npd/company#cmpShortName> ;
+                        <file:///www.reportinghub.no/transform/npd/company#cmpGroup> ;
                 spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#companyShortName>
+                        <http://www.reportinghub.no/npd/schema#companyShortName>
               ] ;
       spinmap:rule
               [ rdf:type spinmap:Mapping-1-1 ;
                 spinmap:context :Company-Company ;
-                spinmap:expression spin:_arg1 ;
+                spinmap:expression
+                        [ rdf:type rhspin:parentCompanyByName ;
+                          arg:name spin:_arg1
+                        ] ;
                 spinmap:sourcePredicate1
-                        <file:///www.reportinghub.no/transform/npd/company#cmpLongName> ;
+                        <file:///www.reportinghub.no/transform/npd/company#cmpGroup> ;
                 spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#name>
+                        <http://www.reportinghub.no/npd/schema#parentCompany>
               ] ;
       spinmap:rule
               [ rdf:type spinmap:Mapping-0-1 ;
-                spinmap:context :Company-Company ;
-                spinmap:expression <http://www.reportinghub.no/schema/npd#OperatingCompany> ;
+                spinmap:context :Company-ParentCompany ;
+                spinmap:expression <http://www.reportinghub.no/npd/schema#ParentCompany> ;
                 spinmap:targetPredicate1
                         rdf:type
               ] ;
@@ -226,53 +228,52 @@
                 spinmap:sourcePredicate1
                         <file:///www.reportinghub.no/transform/npd/company#cmpOrgNumberBrReg> ;
                 spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#organisationNumber>
+                        <http://www.reportinghub.no/npd/schema#organisationNumber>
               ] ;
       spinmap:rule
               [ rdf:type spinmap:Mapping-0-1 ;
-                spinmap:context :Company-ParentCompany ;
-                spinmap:expression <http://www.reportinghub.no/schema/npd#ParentCompany> ;
+                spinmap:context :Company-Company ;
+                spinmap:expression <http://www.reportinghub.no/npd/schema#OperatingCompany> ;
                 spinmap:targetPredicate1
                         rdf:type
               ] ;
       spinmap:rule
               [ rdf:type spinmap:Mapping-1-1 ;
                 spinmap:context :Company-Company ;
-                spinmap:expression
-                        [ rdf:type rhspin:parentCompanyByName ;
-                          arg:name spin:_arg1
-                        ] ;
+                spinmap:expression spin:_arg1 ;
                 spinmap:sourcePredicate1
-                        <file:///www.reportinghub.no/transform/npd/company#cmpGroup> ;
+                        <file:///www.reportinghub.no/transform/npd/company#cmpLongName> ;
                 spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#parentCompany>
+                        <http://www.reportinghub.no/npd/schema#name>
               ] ;
       spinmap:rule
               [ rdf:type spinmap:Mapping-1-1 ;
-                spinmap:context :Company-ParentCompany ;
+                spinmap:context :Company-Company ;
                 spinmap:expression spin:_arg1 ;
                 spinmap:sourcePredicate1
-                        <file:///www.reportinghub.no/transform/npd/company#cmpGroup> ;
+                        <file:///www.reportinghub.no/transform/npd/company#cmpShortName> ;
                 spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#companyShortName>
+                        <http://www.reportinghub.no/npd/schema#companyShortName>
               ] ;
       spinmap:rule
               [ rdf:type spinmap:Mapping-1-1 ;
-                spinmap:context :Company-ParentCompany ;
+                spinmap:context :Company-Company ;
                 spinmap:expression spin:_arg1 ;
                 spinmap:sourcePredicate1
-                        <file:///www.reportinghub.no/transform/npd/company#cmpGroup> ;
+                        <file:///www.reportinghub.no/transform/npd/company#cmpNpdidCompany> ;
                 spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#name>
+                        <http://www.reportinghub.no/npd/schema#id>
               ] .
 
 <file:///www.reportinghub.no/transform/npd/discovery#Discovery>
       spinmap:rule
-              [ rdf:type spinmap:Mapping-0-1 ;
+              [ rdf:type spinmap:Mapping-1-1 ;
                 spinmap:context :Discovery-Discovery ;
-                spinmap:expression <http://www.reportinghub.no/schema/npd#Discovery> ;
+                spinmap:expression spin:_arg1 ;
+                spinmap:sourcePredicate1
+                        <file:///www.reportinghub.no/transform/npd/discovery#dscName> ;
                 spinmap:targetPredicate1
-                        rdf:type
+                        <http://www.reportinghub.no/npd/schema#name>
               ] ;
       spinmap:rule
               [ rdf:type spinmap:Mapping-1-1 ;
@@ -280,39 +281,32 @@
                 spinmap:expression
                         [ rdf:type spinmapl:resourceWithValue ;
                           sp:arg1 spin:_arg1 ;
-                          spinmapl:predicate <http://www.reportinghub.no/schema/npd#code> ;
-                          spinmapl:type <http://www.reportinghub.no/schema/npd#MainNCSArea>
+                          spinmapl:predicate <http://www.reportinghub.no/npd/schema#code> ;
+                          spinmapl:type <http://www.reportinghub.no/npd/schema#DiscoveryActivityStatus>
                         ] ;
                 spinmap:sourcePredicate1
-                        <file:///www.reportinghub.no/transform/npd/discovery#nmaName> ;
+                        <file:///www.reportinghub.no/transform/npd/discovery#dscCurrentActivityStatus> ;
                 spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#discoveryMainNcsArea>
+                        <http://www.reportinghub.no/npd/schema#discoveryCurrentActivityStatus>
               ] ;
       spinmap:rule
-              [ rdf:type spinmap:Mapping-1-1 ;
+              [ rdf:type spinmap:Mapping-0-1 ;
                 spinmap:context :Discovery-Discovery ;
-                spinmap:expression
-                        [ rdf:type spinmapl:resourceWithValue ;
-                          sp:arg1 spin:_arg1 ;
-                          spinmapl:predicate <http://www.reportinghub.no/schema/npd#name> ;
-                          spinmapl:type <http://www.reportinghub.no/schema/npd#Owner>
-                        ] ;
-                spinmap:sourcePredicate1
-                        <file:///www.reportinghub.no/transform/npd/discovery#dscOwnerName> ;
+                spinmap:expression <http://www.reportinghub.no/npd/schema#Discovery> ;
                 spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#discoveryOwner>
+                        rdf:type
               ] ;
       spinmap:rule
               [ rdf:type spinmap:Mapping-1-1 ;
                 spinmap:context :Discovery-Discovery ;
                 spinmap:expression
-                        [ rdf:type xsd:integer ;
-                          sp:arg1 spin:_arg1
+                        [ rdf:type rhspin:wellBoreByName ;
+                          arg:wellBoreName spin:_arg1
                         ] ;
                 spinmap:sourcePredicate1
-                        <file:///www.reportinghub.no/transform/npd/discovery#dscDiscoveryYear> ;
+                        <file:///www.reportinghub.no/transform/npd/discovery#wlbName> ;
                 spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#discoveryYear>
+                        <http://www.reportinghub.no/npd/schema#discoveryWellBore>
               ] ;
       spinmap:rule
               [ rdf:type spinmap:Mapping-1-1 ;
@@ -320,46 +314,50 @@
                 spinmap:expression
                         [ rdf:type spinmapl:resourceWithValue ;
                           sp:arg1 spin:_arg1 ;
-                          spinmapl:predicate <http://www.reportinghub.no/schema/npd#name> ;
-                          spinmapl:type <http://www.reportinghub.no/ep/schema/organization#Company>
+                          spinmapl:predicate <http://www.reportinghub.no/npd/schema#code> ;
+                          spinmapl:type <http://www.reportinghub.no/npd/schema#HCType>
                         ] ;
                 spinmap:sourcePredicate1
-                        <file:///www.reportinghub.no/transform/npd/discovery#cmpLongName2> ;
+                        <file:///www.reportinghub.no/transform/npd/discovery#dscHcType> ;
                 spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#discoveryOperator>
+                        <http://www.reportinghub.no/npd/schema#discoveryHCType>
               ] ;
       spinmap:rule
               [ rdf:type spinmap:Mapping-1-1 ;
                 spinmap:context :Discovery-Discovery ;
                 spinmap:expression
-                        [ rdf:type rhspin:wellBoreByName ;
-                          arg:wellBoreName spin:_arg1
+                        [ rdf:type spinmapl:resourceWithValue ;
+                          sp:arg1 spin:_arg1 ;
+                          spinmapl:predicate <http://www.reportinghub.no/npd/schema#name> ;
+                          spinmapl:type <http://www.reportinghub.no/npd/schema#Owner>
                         ] ;
                 spinmap:sourcePredicate1
-                        <file:///www.reportinghub.no/transform/npd/discovery#wlbName> ;
+                        <file:///www.reportinghub.no/transform/npd/discovery#dscOwnerName> ;
                 spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#discoveryWellBore>
+                        <http://www.reportinghub.no/npd/schema#discoveryOwner>
               ] ;
       spinmap:rule
               [ rdf:type spinmap:Mapping-1-1 ;
                 spinmap:context :Discovery-Discovery ;
-                spinmap:expression
-                        [ rdf:type rhspin:fieldById ;
-                          arg:id  spin:_arg1
-                        ] ;
+                spinmap:expression spin:_arg1 ;
                 spinmap:sourcePredicate1
-                        <file:///www.reportinghub.no/transform/npd/discovery#fldNpdidField> ;
+                        <file:///www.reportinghub.no/transform/npd/discovery#dscNpdidDiscovery> ;
                 spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#discoveryField>
+                        <http://www.reportinghub.no/npd/schema#id>
               ] ;
       spinmap:rule
               [ rdf:type spinmap:Mapping-1-1 ;
                 spinmap:context :Discovery-Discovery ;
-                spinmap:expression spin:_arg1 ;
+                spinmap:expression
+                        [ rdf:type spinmapl:resourceWithValue ;
+                          sp:arg1 spin:_arg1 ;
+                          spinmapl:predicate <http://www.reportinghub.no/npd/schema#name> ;
+                          spinmapl:type <http://www.reportinghub.no/ep/schema/organization#Company>
+                        ] ;
                 spinmap:sourcePredicate1
-                        <file:///www.reportinghub.no/transform/npd/discovery#dscNpdidDiscovery> ;
+                        <file:///www.reportinghub.no/transform/npd/discovery#cmpLongName2> ;
                 spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#id>
+                        <http://www.reportinghub.no/npd/schema#discoveryOperator>
               ] ;
       spinmap:rule
               [ rdf:type spinmap:Mapping-1-1 ;
@@ -367,78 +365,81 @@
                 spinmap:expression
                         [ rdf:type spinmapl:resourceWithValue ;
                           sp:arg1 spin:_arg1 ;
-                          spinmapl:predicate <http://www.reportinghub.no/schema/npd#code> ;
-                          spinmapl:type <http://www.reportinghub.no/schema/npd#DiscoveryActivityStatus>
+                          spinmapl:predicate <http://www.reportinghub.no/npd/schema#code> ;
+                          spinmapl:type <http://www.reportinghub.no/npd/schema#MainNCSArea>
                         ] ;
                 spinmap:sourcePredicate1
-                        <file:///www.reportinghub.no/transform/npd/discovery#dscCurrentActivityStatus> ;
+                        <file:///www.reportinghub.no/transform/npd/discovery#nmaName> ;
                 spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#discoveryCurrentActivityStatus>
+                        <http://www.reportinghub.no/npd/schema#discoveryMainNcsArea>
               ] ;
       spinmap:rule
               [ rdf:type spinmap:Mapping-1-1 ;
                 spinmap:context :Discovery-Discovery ;
-                spinmap:expression spin:_arg1 ;
+                spinmap:expression
+                        [ rdf:type rhspin:fieldById ;
+                          arg:id  spin:_arg1
+                        ] ;
                 spinmap:sourcePredicate1
-                        <file:///www.reportinghub.no/transform/npd/discovery#dscName> ;
+                        <file:///www.reportinghub.no/transform/npd/discovery#fldNpdidField> ;
                 spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#name>
+                        <http://www.reportinghub.no/npd/schema#discoveryField>
               ] ;
       spinmap:rule
               [ rdf:type spinmap:Mapping-1-1 ;
                 spinmap:context :Discovery-Discovery ;
                 spinmap:expression
-                        [ rdf:type spinmapl:resourceWithValue ;
-                          sp:arg1 spin:_arg1 ;
-                          spinmapl:predicate <http://www.reportinghub.no/schema/npd#code> ;
-                          spinmapl:type <http://www.reportinghub.no/schema/npd#HCType>
+                        [ rdf:type xsd:integer ;
+                          sp:arg1 spin:_arg1
                         ] ;
                 spinmap:sourcePredicate1
-                        <file:///www.reportinghub.no/transform/npd/discovery#dscHcType> ;
+                        <file:///www.reportinghub.no/transform/npd/discovery#dscDiscoveryYear> ;
                 spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#discoveryHCType>
+                        <http://www.reportinghub.no/npd/schema#discoveryYear>
               ] .
 
 <file:///www.reportinghub.no/transform/npd/facilityfixed#FacilityFixed>
       spinmap:rule
               [ rdf:type spinmap:Mapping-1-1 ;
                 spinmap:context :FacilityFixed-FixedFacility ;
-                spinmap:expression spin:_arg1 ;
+                spinmap:expression
+                        [ rdf:type spinmapl:resourceWithValue ;
+                          sp:arg1 spin:_arg1 ;
+                          spinmapl:predicate <http://www.reportinghub.no/npd/schema#code> ;
+                          spinmapl:type <http://www.reportinghub.no/npd/schema#FixedFacilityPhase>
+                        ] ;
                 spinmap:sourcePredicate1
-                        <file:///www.reportinghub.no/transform/npd/facilityfixed#fclKind> ;
+                        <file:///www.reportinghub.no/transform/npd/facilityfixed#fclPhase> ;
                 spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#facilityKind>
+                        <http://www.reportinghub.no/npd/schema#fixedFacilityPhase>
               ] ;
       spinmap:rule
               [ rdf:type spinmap:Mapping-1-1 ;
                 spinmap:context :FacilityFixed-FixedFacility ;
                 spinmap:expression
-                        [ rdf:type spif:parseDate ;
-                          arg:pattern "dd.MM.yyyy" ;
-                          sp:arg1 spin:_arg1
+                        [ rdf:type spinmapl:resourceWithValue ;
+                          sp:arg1 spin:_arg1 ;
+                          spinmapl:predicate <http://www.reportinghub.no/npd/schema#id> ;
+                          spinmapl:type <http://www.reportinghub.no/npd/schema#FixedFacilityParent>
                         ] ;
                 spinmap:sourcePredicate1
-                        <file:///www.reportinghub.no/transform/npd/facilityfixed#fclStartupDate> ;
+                        <file:///www.reportinghub.no/transform/npd/facilityfixed#fclBelongsToS> ;
                 spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#startDate>
+                        <http://www.reportinghub.no/npd/schema#belongsTo>
               ] ;
       spinmap:rule
               [ rdf:type spinmap:Mapping-1-1 ;
                 spinmap:context :FacilityFixed-FixedFacility ;
-                spinmap:expression spin:_arg1 ;
-                spinmap:sourcePredicate1
-                        <file:///www.reportinghub.no/transform/npd/facilityfixed#fclName> ;
-                spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#name>
+                spinmap:expression
+                        [ rdf:type spinmapl:resourceWithValue ;
+                          sp:arg1 spin:_arg1 ;
+                          spinmapl:predicate <http://www.reportinghub.no/npd/schema#name> ;
+                          spinmapl:type <http://www.reportinghub.no/ep/schema/organization#Company>
                         ] ;
-      spinmap:rule
-              [ rdf:type spinmap:Mapping-1-1 ;
-                spinmap:context :FacilityFixed-FixedFacility ;
-                spinmap:expression spin:_arg1 ;
                 spinmap:sourcePredicate1
-                        <file:///www.reportinghub.no/transform/npd/facilityfixed#fclNpdidFacility> ;
+                        <file:///www.reportinghub.no/transform/npd/facilityfixed#fclCurrentOperatorName> ;
                 spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#id>
+                        <http://www.reportinghub.no/npd/schema#currentOperator>
               ] ;
       spinmap:rule
               [ rdf:type spinmap:Mapping-1-1 ;
@@ -460,62 +461,67 @@
       spinmap:rule
               [ rdf:type spinmap:Mapping-1-1 ;
                 spinmap:context :FacilityFixed-FixedFacility ;
-                spinmap:expression
-                        [ rdf:type spinmapl:resourceWithValue ;
-                          sp:arg1 spin:_arg1 ;
-                          spinmapl:predicate <http://www.reportinghub.no/schema/npd#name> ;
-                          spinmapl:type <http://www.reportinghub.no/ep/schema/organization#Company>
+                spinmap:expression spin:_arg1 ;
+                spinmap:sourcePredicate1
+                        <file:///www.reportinghub.no/transform/npd/facilityfixed#fclNpdidFacility> ;
+                spinmap:targetPredicate1
+                        <http://www.reportinghub.no/npd/schema#id>
               ] ;
+      spinmap:rule
+              [ rdf:type spinmap:Mapping-1-1 ;
+                spinmap:context :FacilityFixed-FixedFacility ;
+                spinmap:expression spin:_arg1 ;
                 spinmap:sourcePredicate1
-                        <file:///www.reportinghub.no/transform/npd/facilityfixed#fclCurrentOperatorName> ;
+                        <file:///www.reportinghub.no/transform/npd/facilityfixed#fclName> ;
                 spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#currentOperator>
+                        <http://www.reportinghub.no/npd/schema#name>
               ] ;
       spinmap:rule
               [ rdf:type spinmap:Mapping-1-1 ;
                 spinmap:context :FacilityFixed-FixedFacility ;
                 spinmap:expression
-                        [ rdf:type spinmapl:resourceWithValue ;
-                          sp:arg1 spin:_arg1 ;
-                          spinmapl:predicate <http://www.reportinghub.no/schema/npd#id> ;
-                          spinmapl:type <http://www.reportinghub.no/schema/npd#FixedFacilityParent>
+                        [ rdf:type spif:parseDate ;
+                          arg:pattern "dd.MM.yyyy" ;
+                          sp:arg1 spin:_arg1
                         ] ;
                 spinmap:sourcePredicate1
-                        <file:///www.reportinghub.no/transform/npd/facilityfixed#fclBelongsToS> ;
+                        <file:///www.reportinghub.no/transform/npd/facilityfixed#fclStartupDate> ;
                 spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#belongsTo>
+                        <http://www.reportinghub.no/npd/schema#startDate>
               ] ;
       spinmap:rule
               [ rdf:type spinmap:Mapping-1-1 ;
                 spinmap:context :FacilityFixed-FixedFacility ;
-                spinmap:expression
-                        [ rdf:type spinmapl:resourceWithValue ;
-                          sp:arg1 spin:_arg1 ;
-                          spinmapl:predicate <http://www.reportinghub.no/schema/npd#code> ;
-                          spinmapl:type <http://www.reportinghub.no/schema/npd#FixedFacilityPhase>
-                        ] ;
+                spinmap:expression spin:_arg1 ;
                 spinmap:sourcePredicate1
-                        <file:///www.reportinghub.no/transform/npd/facilityfixed#fclPhase> ;
+                        <file:///www.reportinghub.no/transform/npd/facilityfixed#fclKind> ;
                 spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#fixedFacilityPhase>
+                        <http://www.reportinghub.no/npd/schema#facilityKind>
               ] .
 
 <file:///www.reportinghub.no/transform/npd/facilitymoveable#FacilityMoveable>
       spinmap:rule
-              [ rdf:type spinmap:Mapping-0-1 ;
+              [ rdf:type spinmap:Mapping-1-1 ;
                 spinmap:context :FacilityMoveable-MoveableFacility ;
-                spinmap:expression <http://www.reportinghub.no/ep/schema/facility#MoveableFacility> ;
+                spinmap:expression
+                        [ rdf:type spinmapl:resourceWithValue ;
+                          sp:arg1 spin:_arg1 ;
+                          spinmapl:predicate <http://www.reportinghub.no/npd/schema#name> ;
+                          spinmapl:type <http://www.reportinghub.no/ep/schema/organization#Company>
+                        ] ;
+                spinmap:sourcePredicate1
+                        <file:///www.reportinghub.no/transform/npd/facilitymoveable#fclCurrentRespCompanyName> ;
                 spinmap:targetPredicate1
-                        rdf:type
+                        <http://www.reportinghub.no/npd/schema#currentlyResponsibleCompany>
               ] ;
       spinmap:rule
               [ rdf:type spinmap:Mapping-1-1 ;
                 spinmap:context :FacilityMoveable-MoveableFacility ;
                 spinmap:expression spin:_arg1 ;
                 spinmap:sourcePredicate1
-                        <file:///www.reportinghub.no/transform/npd/facilitymoveable#fclNpdidFacility> ;
+                        <file:///www.reportinghub.no/transform/npd/facilitymoveable#fclName> ;
                 spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#id>
+                        <http://www.reportinghub.no/npd/schema#name>
               ] ;
       spinmap:rule
               [ rdf:type spinmap:Mapping-1-1 ;
@@ -524,60 +530,65 @@
                 spinmap:sourcePredicate1
                         <file:///www.reportinghub.no/transform/npd/facilitymoveable#fclKind> ;
                 spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#facilityKind>
+                        <http://www.reportinghub.no/npd/schema#facilityKind>
               ] ;
       spinmap:rule
               [ rdf:type spinmap:Mapping-1-1 ;
                 spinmap:context :FacilityMoveable-MoveableFacility ;
                 spinmap:expression spin:_arg1 ;
                 spinmap:sourcePredicate1
-                        <file:///www.reportinghub.no/transform/npd/facilitymoveable#fclName> ;
+                        <file:///www.reportinghub.no/transform/npd/facilitymoveable#fclNpdidFacility> ;
                 spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#name>
+                        <http://www.reportinghub.no/npd/schema#id>
               ] ;
       spinmap:rule
-              [ rdf:type spinmap:Mapping-1-1 ;
+              [ rdf:type spinmap:Mapping-0-1 ;
                 spinmap:context :FacilityMoveable-MoveableFacility ;
-                spinmap:expression
-                        [ rdf:type spinmapl:resourceWithValue ;
-                          sp:arg1 spin:_arg1 ;
-                          spinmapl:predicate <http://www.reportinghub.no/schema/npd#name> ;
-                          spinmapl:type <http://www.reportinghub.no/ep/schema/organization#Company>
-                        ] ;
-                spinmap:sourcePredicate1
-                        <file:///www.reportinghub.no/transform/npd/facilitymoveable#fclCurrentRespCompanyName> ;
+                spinmap:expression <http://www.reportinghub.no/ep/schema/facility#MoveableFacility> ;
                 spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#currentlyResponsibleCompany>
+                        rdf:type
               ] .
 
 <file:///www.reportinghub.no/transform/npd/field#Field>
       spinmap:rule
-              [ rdf:type spinmap:Mapping-0-1 ;
+              [ rdf:type spinmap:Mapping-1-1 ;
                 spinmap:context :Field-Field ;
-                spinmap:expression <http://www.reportinghub.no/schema/npd#Field> ;
-                spinmap:targetPredicate1
-                        rdf:type
+                spinmap:expression
+                        [ rdf:type spinmapl:resourceWithValue ;
+                          sp:arg1 spin:_arg1 ;
+                          spinmapl:predicate <http://www.reportinghub.no/npd/schema#code> ;
+                          spinmapl:type <http://www.reportinghub.no/npd/schema#FieldActivityStatus>
+                        ] ;
+                spinmap:sourcePredicate1
+                        <file:///www.reportinghub.no/transform/npd/field#fldCurrentActivitySatus> ;
+                spinmap:targetPredicate1
+                        <http://www.reportinghub.no/npd/schema#currentActivityStatus>
               ] ;
       spinmap:rule
               [ rdf:type spinmap:Mapping-1-1 ;
                 spinmap:context :Field-Field ;
                 spinmap:expression
-                        [ rdf:type rhspin:companyById ;
-                          arg:id  spin:_arg1
+                        [ rdf:type spinmapl:resourceWithValue ;
+                          sp:arg1 spin:_arg1 ;
+                          spinmapl:predicate <http://www.reportinghub.no/npd/schema#id> ;
+                          spinmapl:type <http://www.reportinghub.no/npd/schema#Owner>
                         ] ;
                 spinmap:sourcePredicate1
-                        <file:///www.reportinghub.no/transform/npd/field#cmpNpdidCompany> ;
+                        <file:///www.reportinghub.no/transform/npd/field#fldNpdidOwner> ;
                 spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#fieldOperator>
+                        <http://www.reportinghub.no/npd/schema#fieldOwner>
               ] ;
       spinmap:rule
               [ rdf:type spinmap:Mapping-1-1 ;
                 spinmap:context :Field-Field ;
-                spinmap:expression spin:_arg1 ;
+                spinmap:expression
+                        [ rdf:type rhspin:wellBoreByName ;
+                          arg:wellBoreName spin:_arg1
+                        ] ;
                 spinmap:sourcePredicate1
-                        <file:///www.reportinghub.no/transform/npd/field#fldNpdidField> ;
+                        <file:///www.reportinghub.no/transform/npd/field#wlbName> ;
                 spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#id>
+                        <http://www.reportinghub.no/npd/schema#fieldDiscoveryWellBore>
               ] ;
       spinmap:rule
               [ rdf:type spinmap:Mapping-1-1 ;
@@ -586,89 +597,62 @@
                 spinmap:sourcePredicate1
                         <file:///www.reportinghub.no/transform/npd/field#fldName> ;
                 spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#name>
+                        <http://www.reportinghub.no/npd/schema#name>
               ] ;
       spinmap:rule
               [ rdf:type spinmap:Mapping-1-1 ;
                 spinmap:context :Field-Field ;
-                spinmap:expression
-                        [ rdf:type rhspin:wellBoreByName ;
-                          arg:wellBoreName spin:_arg1
-                        ] ;
+                spinmap:expression spin:_arg1 ;
                 spinmap:sourcePredicate1
-                        <file:///www.reportinghub.no/transform/npd/field#wlbName> ;
+                        <file:///www.reportinghub.no/transform/npd/field#fldNpdidField> ;
                 spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#fieldDiscoveryWellBore>
+                        <http://www.reportinghub.no/npd/schema#id>
               ] ;
       spinmap:rule
               [ rdf:type spinmap:Mapping-1-1 ;
                 spinmap:context :Field-Field ;
                 spinmap:expression
-                        [ rdf:type spinmapl:resourceWithValue ;
-                          sp:arg1 spin:_arg1 ;
-                          spinmapl:predicate <http://www.reportinghub.no/schema/npd#id> ;
-                          spinmapl:type <http://www.reportinghub.no/schema/npd#Owner>
+                        [ rdf:type rhspin:companyById ;
+                          arg:id  spin:_arg1
                         ] ;
                 spinmap:sourcePredicate1
-                        <file:///www.reportinghub.no/transform/npd/field#fldNpdidOwner> ;
+                        <file:///www.reportinghub.no/transform/npd/field#cmpNpdidCompany> ;
                 spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#fieldOwner>
+                        <http://www.reportinghub.no/npd/schema#fieldOperator>
               ] ;
       spinmap:rule
-              [ rdf:type spinmap:Mapping-1-1 ;
+              [ rdf:type spinmap:Mapping-0-1 ;
                 spinmap:context :Field-Field ;
-                spinmap:expression
-                        [ rdf:type spinmapl:resourceWithValue ;
-                          sp:arg1 spin:_arg1 ;
-                          spinmapl:predicate <http://www.reportinghub.no/schema/npd#code> ;
-                          spinmapl:type <http://www.reportinghub.no/schema/npd#FieldActivityStatus>
-                        ] ;
-                spinmap:sourcePredicate1
-                        <file:///www.reportinghub.no/transform/npd/field#fldCurrentActivitySatus> ;
+                spinmap:expression <http://www.reportinghub.no/npd/schema#Field> ;
                 spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#currentActivityStatus>
+                        rdf:type
               ] .
 
 <file:///www.reportinghub.no/transform/npd/licence#Licence>
       spinmap:rule
               [ rdf:type spinmap:Mapping-1-1 ;
                 spinmap:context :License-License ;
-                spinmap:expression
-                        [ rdf:type spinmapl:resourceWithValue ;
-                          sp:arg1 spin:_arg1 ;
-                          spinmapl:predicate <http://www.reportinghub.no/schema/npd#code> ;
-                          spinmapl:type <http://www.reportinghub.no/schema/npd#LicenseStatus>
-                        ] ;
+                spinmap:expression spin:_arg1 ;
                 spinmap:sourcePredicate1
-                        <file:///www.reportinghub.no/transform/npd/licence#prlStatus> ;
+                        <file:///www.reportinghub.no/transform/npd/licence#prlLicensingActivityName> ;
                 spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#licenseStatus>
+                        <http://www.reportinghub.no/npd/schema#licensingActivity>
               ] ;
       spinmap:rule
               [ rdf:type spinmap:Mapping-1-1 ;
                 spinmap:context :License-License ;
-                spinmap:expression
-                        [ rdf:type spif:parseDate ;
-                          arg:pattern "dd.MM.yyyy" ;
-                          sp:arg1 spin:_arg1
-                        ] ;
+                spinmap:expression spin:_arg1 ;
                 spinmap:sourcePredicate1
-                        <file:///www.reportinghub.no/transform/npd/licence#prlDateGranted> ;
+                        <file:///www.reportinghub.no/transform/npd/licence#prlName> ;
                 spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#startDate>
+                        <http://www.reportinghub.no/npd/schema#name>
               ] ;
       spinmap:rule
-              [ rdf:type spinmap:Mapping-1-1 ;
+              [ rdf:type spinmap:Mapping-0-1 ;
                 spinmap:context :License-License ;
-                spinmap:expression
-                        [ rdf:type spif:parseDate ;
-                          arg:pattern "dd.MM.yyyy" ;
-                          sp:arg1 spin:_arg1
-                        ] ;
-                spinmap:sourcePredicate1
-                        <file:///www.reportinghub.no/transform/npd/licence#prlDateValidTo> ;
+                spinmap:expression <http://www.reportinghub.no/npd/schema#Licence> ;
                 spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#endDate>
+                        rdf:type
               ] ;
       spinmap:rule
               [ rdf:type spinmap:Mapping-1-1 ;
@@ -677,58 +661,81 @@
                 spinmap:sourcePredicate1
                         <file:///www.reportinghub.no/transform/npd/licence#prlNpdidLicence> ;
                 spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#id>
+                        <http://www.reportinghub.no/npd/schema#id>
               ] ;
       spinmap:rule
-              [ rdf:type spinmap:Mapping-0-1 ;
+              [ rdf:type spinmap:Mapping-1-1 ;
                 spinmap:context :License-License ;
-                spinmap:expression <http://www.reportinghub.no/schema/npd#Licence> ;
+                spinmap:expression
+                        [ rdf:type spif:parseDate ;
+                          arg:pattern "dd.MM.yyyy" ;
+                          sp:arg1 spin:_arg1
+                        ] ;
+                spinmap:sourcePredicate1
+                        <file:///www.reportinghub.no/transform/npd/licence#prlDateValidTo> ;
                 spinmap:targetPredicate1
-                        rdf:type
+                        <http://www.reportinghub.no/npd/schema#endDate>
               ] ;
       spinmap:rule
               [ rdf:type spinmap:Mapping-1-1 ;
                 spinmap:context :License-License ;
-                spinmap:expression spin:_arg1 ;
+                spinmap:expression
+                        [ rdf:type spif:parseDate ;
+                          arg:pattern "dd.MM.yyyy" ;
+                          sp:arg1 spin:_arg1
+                        ] ;
                 spinmap:sourcePredicate1
-                        <file:///www.reportinghub.no/transform/npd/licence#prlName> ;
+                        <file:///www.reportinghub.no/transform/npd/licence#prlDateGranted> ;
                 spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#name>
+                        <http://www.reportinghub.no/npd/schema#startDate>
               ] ;
       spinmap:rule
               [ rdf:type spinmap:Mapping-1-1 ;
                 spinmap:context :License-License ;
-                spinmap:expression spin:_arg1 ;
+                spinmap:expression
+                        [ rdf:type spinmapl:resourceWithValue ;
+                          sp:arg1 spin:_arg1 ;
+                          spinmapl:predicate <http://www.reportinghub.no/npd/schema#code> ;
+                          spinmapl:type <http://www.reportinghub.no/npd/schema#LicenceStatus>
+                        ] ;
                 spinmap:sourcePredicate1
-                        <file:///www.reportinghub.no/transform/npd/licence#prlLicensingActivityName> ;
+                        <file:///www.reportinghub.no/transform/npd/licence#prlStatus> ;
                 spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#licensingActivity>
+                        <http://www.reportinghub.no/npd/schema#licenceStatus>
               ] .
 
 <file:///www.reportinghub.no/transform/npd/licensee#Licensee>
       spinmap:rule
+              [ rdf:type spinmap:Mapping-0-1 ;
+                spinmap:context :Licensee-ShareOfLicence ;
+                spinmap:expression <http://www.reportinghub.no/npd/schema#ShareOfLicence> ;
+                spinmap:targetPredicate1
+                        rdf:type
+              ] ;
+      spinmap:rule
               [ rdf:type spinmap:Mapping-1-1 ;
                 spinmap:context :Licensee-ShareOfLicence ;
                 spinmap:expression
-                        [ rdf:type rhspin:licenceById ;
-                          arg:id  spin:_arg1
+                        [ rdf:type spif:parseDate ;
+                          arg:pattern "dd.MM.yyyy" ;
+                          sp:arg1 spin:_arg1
                         ] ;
                 spinmap:sourcePredicate1
-                        <file:///www.reportinghub.no/transform/npd/licensee#prlNpdidLicence> ;
+                        <file:///www.reportinghub.no/transform/npd/licensee#prlLicenseeDateValidFrom> ;
                 spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#licenceShared>
+                        <http://www.reportinghub.no/npd/schema#startDate>
               ] ;
       spinmap:rule
               [ rdf:type spinmap:Mapping-1-1 ;
                 spinmap:context :Licensee-ShareOfLicence ;
                 spinmap:expression
-                        [ rdf:type xsd:float ;
-                          sp:arg1 spin:_arg1
+                        [ rdf:type rhspin:companyById ;
+                          arg:id  spin:_arg1
                         ] ;
                 spinmap:sourcePredicate1
-                        <file:///www.reportinghub.no/transform/npd/licensee#prlLicenseeInterest> ;
+                        <file:///www.reportinghub.no/transform/npd/licensee#cmpNpdidCompany> ;
                 spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#percentageOfShare>
+                        <http://www.reportinghub.no/npd/schema#shareHolder>
               ] ;
       spinmap:rule
               [ rdf:type spinmap:Mapping-1-1 ;
@@ -741,48 +748,42 @@
                 spinmap:sourcePredicate1
                         <file:///www.reportinghub.no/transform/npd/licensee#prlLicenseeDateValidTo> ;
                 spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#endDate>
+                        <http://www.reportinghub.no/npd/schema#endDate>
               ] ;
       spinmap:rule
               [ rdf:type spinmap:Mapping-1-1 ;
                 spinmap:context :Licensee-ShareOfLicence ;
                 spinmap:expression
-                        [ rdf:type rhspin:companyById ;
-                          arg:id  spin:_arg1
+                        [ rdf:type xsd:float ;
+                          sp:arg1 spin:_arg1
                         ] ;
                 spinmap:sourcePredicate1
-                        <file:///www.reportinghub.no/transform/npd/licensee#cmpNpdidCompany> ;
+                        <file:///www.reportinghub.no/transform/npd/licensee#prlLicenseeInterest> ;
                 spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#shareHolder>
+                        <http://www.reportinghub.no/npd/schema#percentageOfShare>
               ] ;
       spinmap:rule
               [ rdf:type spinmap:Mapping-1-1 ;
                 spinmap:context :Licensee-ShareOfLicence ;
                 spinmap:expression
-                        [ rdf:type spif:parseDate ;
-                          arg:pattern "dd.MM.yyyy" ;
-                          sp:arg1 spin:_arg1
+                        [ rdf:type rhspin:licenceById ;
+                          arg:id  spin:_arg1
                         ] ;
                 spinmap:sourcePredicate1
-                        <file:///www.reportinghub.no/transform/npd/licensee#prlLicenseeDateValidFrom> ;
-                spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#startDate>
-              ] ;
-      spinmap:rule
-              [ rdf:type spinmap:Mapping-0-1 ;
-                spinmap:context :Licensee-ShareOfLicence ;
-                spinmap:expression <http://www.reportinghub.no/schema/npd#ShareOfLicence> ;
+                        <file:///www.reportinghub.no/transform/npd/licensee#prlNpdidLicence> ;
                 spinmap:targetPredicate1
-                        rdf:type
+                        <http://www.reportinghub.no/npd/schema#licenceShared>
               ] .
 
 <file:///www.reportinghub.no/transform/npd/tufoperator#TUFOperator>
       spinmap:rule
-              [ rdf:type spinmap:Mapping-0-1 ;
+              [ rdf:type spinmap:Mapping-1-1 ;
                 spinmap:context :TUFOperator-TUF ;
-                spinmap:expression <http://www.reportinghub.no/schema/npd#TUF> ;
+                spinmap:expression spin:_arg1 ;
+                spinmap:sourcePredicate1
+                        <file:///www.reportinghub.no/transform/npd/tufoperator#tufName> ;
                 spinmap:targetPredicate1
-                        rdf:type
+                        <http://www.reportinghub.no/npd/schema#name>
               ] ;
       spinmap:rule
               [ rdf:type spinmap:Mapping-1-1 ;
@@ -791,39 +792,37 @@
                 spinmap:sourcePredicate1
                         <file:///www.reportinghub.no/transform/npd/tufoperator#tufNpdidTuf> ;
                 spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#id>
+                        <http://www.reportinghub.no/npd/schema#id>
               ] ;
       spinmap:rule
-              [ rdf:type spinmap:Mapping-1-1 ;
+              [ rdf:type spinmap:Mapping-0-1 ;
                 spinmap:context :TUFOperator-TUF ;
-                spinmap:expression spin:_arg1 ;
-                spinmap:sourcePredicate1
-                        <file:///www.reportinghub.no/transform/npd/tufoperator#tufName> ;
+                spinmap:expression <http://www.reportinghub.no/npd/schema#TUF> ;
                 spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#name>
+                        rdf:type
               ] .
 
 <file:///www.reportinghub.no/transform/npd/wbdev#WBDev>
       spinmap:rule
               [ rdf:type spinmap:Mapping-1-1 ;
                 spinmap:context :WBDev-WellBore ;
-                spinmap:expression spin:_arg1 ;
+                spinmap:expression
+                        [ rdf:type rhspin:wellByName ;
+                          arg:wellName spin:_arg1
+                        ] ;
                 spinmap:sourcePredicate1
-                        <file:///www.reportinghub.no/transform/npd/wbdev#wlbWellboreName> ;
+                        <file:///www.reportinghub.no/transform/npd/wbdev#wlbWell> ;
                 spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#name>
+                        <http://www.reportinghub.no/npd/schema#partOfWell>
               ] ;
       spinmap:rule
               [ rdf:type spinmap:Mapping-1-1 ;
-                spinmap:context :WBDev-WellBore ;
-                spinmap:expression
-                        [ rdf:type rhspin:wellByName ;
-                          arg:wellName spin:_arg1
-                        ] ;
+                spinmap:context :WBDev-Well ;
+                spinmap:expression spin:_arg1 ;
                 spinmap:sourcePredicate1
                         <file:///www.reportinghub.no/transform/npd/wbdev#wlbWell> ;
                 spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#partOfWell>
+                        <http://www.reportinghub.no/npd/schema#name>
               ] ;
       spinmap:rule
               [ rdf:type spinmap:Mapping-1-1 ;
@@ -832,81 +831,107 @@
                 spinmap:sourcePredicate1
                         <file:///www.reportinghub.no/transform/npd/wbdev#wlbWellType> ;
                 spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#wellBoreType>
+                        <http://www.reportinghub.no/npd/schema#wellBoreType>
+              ] ;
+      spinmap:rule
+              [ rdf:type spinmap:Mapping-1-1 ;
+                spinmap:context :WBDev-Well ;
+                spinmap:expression
+                        [ rdf:type rhspin:fieldById ;
+                          arg:id  spin:_arg1
+                        ] ;
+                spinmap:sourcePredicate1
+                        <file:///www.reportinghub.no/transform/npd/wbdev#fldNpdidField> ;
+                spinmap:targetPredicate1
+                        <http://www.reportinghub.no/npd/schema#wellPartOfField>
               ] ;
       spinmap:rule
               [ rdf:type spinmap:Mapping-1-1 ;
                 spinmap:context :WBDev-WellBore ;
-                spinmap:expression spin:_arg1 ;
+                spinmap:expression
+                        [ rdf:type rhspin:licenceById ;
+                          arg:id  spin:_arg1
+                        ] ;
                 spinmap:sourcePredicate1
-                        <file:///www.reportinghub.no/transform/npd/wbdev#wlbNpdidWellbore> ;
+                        <file:///www.reportinghub.no/transform/npd/wbdev#prlNpdidProductionLicence> ;
                 spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#id>
+                        <http://www.reportinghub.no/npd/schema#drilledInProductionLicence>
               ] ;
       spinmap:rule
               [ rdf:type spinmap:Mapping-1-1 ;
                 spinmap:context :WBDev-WellBore ;
                 spinmap:expression
-                        [ rdf:type spinmapl:resourceWithValue ;
-                          sp:arg1 spin:_arg1 ;
-                          spinmapl:predicate <http://www.reportinghub.no/schema/npd#code> ;
-                          spinmapl:type <http://www.reportinghub.no/schema/npd#DevelopmentWellBorePurpose>
+                        [ rdf:type spif:parseDate ;
+                          arg:pattern "dd.MM.yyyy"^^xsd:string ;
+                          sp:arg1 spin:_arg1
                         ] ;
                 spinmap:sourcePredicate1
-                        <file:///www.reportinghub.no/transform/npd/wbdev#wlbPurpose> ;
+                        <file:///www.reportinghub.no/transform/npd/wbdev#wlbEntryDate> ;
                 spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#wellBorePurpose>
+                        <http://www.reportinghub.no/npd/schema#startDate>
               ] ;
       spinmap:rule
               [ rdf:type spinmap:Mapping-0-1 ;
-                spinmap:context :WBDev-Well ;
-                spinmap:expression <http://www.reportinghub.no/ep/schema/well#Well> ;
+                spinmap:context :WBDev-WellBore ;
+                spinmap:expression <http://www.reportinghub.no/ep/schema/well#WellBore> ;
                 spinmap:targetPredicate1
                         rdf:type
               ] ;
       spinmap:rule
               [ rdf:type spinmap:Mapping-1-1 ;
-                spinmap:context :WBDev-Well ;
+                spinmap:context :WBDev-WellBore ;
                 spinmap:expression
-                        [ rdf:type rhspin:fieldById ;
+                        [ rdf:type rhspin:facilityById ;
                           arg:id  spin:_arg1
                         ] ;
                 spinmap:sourcePredicate1
-                        <file:///www.reportinghub.no/transform/npd/wbdev#fldNpdidField> ;
+                        <file:///www.reportinghub.no/transform/npd/wbdev#fclNpdidFacilityDrilling> ;
+                spinmap:targetPredicate1
+                        <http://www.reportinghub.no/npd/schema#drillingFacility>
+              ] ;
+      spinmap:rule
+              [ rdf:type spinmap:Mapping-1-1 ;
+                spinmap:context :WBDev-WellBore ;
+                spinmap:expression spin:_arg1 ;
+                spinmap:sourcePredicate1
+                        <file:///www.reportinghub.no/transform/npd/wbdev#wlbWellboreName> ;
                 spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#wellPartOfField>
+                        <http://www.reportinghub.no/npd/schema#name>
               ] ;
       spinmap:rule
               [ rdf:type spinmap:Mapping-1-1 ;
                 spinmap:context :WBDev-WellBore ;
                 spinmap:expression
-                        [ rdf:type rhspin:licenceById ;
+                        [ rdf:type rhspin:facilityById ;
                           arg:id  spin:_arg1
                         ] ;
                 spinmap:sourcePredicate1
-                        <file:///www.reportinghub.no/transform/npd/wbdev#prlNpdidProductionLicence> ;
+                        <file:///www.reportinghub.no/transform/npd/wbdev#fclNpdidFacilityProducing> ;
                 spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#drilledInProductionLicence>
+                        <http://www.reportinghub.no/npd/schema#productionFacility>
               ] ;
       spinmap:rule
-              [ rdf:type spinmap:Mapping-0-1 ;
+              [ rdf:type spinmap:Mapping-1-1 ;
                 spinmap:context :WBDev-WellBore ;
-                spinmap:expression <http://www.reportinghub.no/ep/schema/well#WellBore> ;
+                spinmap:expression spin:_arg1 ;
+                spinmap:sourcePredicate1
+                        <file:///www.reportinghub.no/transform/npd/wbdev#wlbNpdidWellbore> ;
                 spinmap:targetPredicate1
-                        rdf:type
+                        <http://www.reportinghub.no/npd/schema#id>
               ] ;
       spinmap:rule
               [ rdf:type spinmap:Mapping-1-1 ;
                 spinmap:context :WBDev-WellBore ;
                 spinmap:expression
-                        [ rdf:type spif:parseDate ;
-                          arg:pattern "dd.MM.yyyy"^^xsd:string ;
-                          sp:arg1 spin:_arg1
+                        [ rdf:type spinmapl:resourceWithValue ;
+                          sp:arg1 spin:_arg1 ;
+                          spinmapl:predicate <http://www.reportinghub.no/npd/schema#code> ;
+                          spinmapl:type <http://www.reportinghub.no/npd/schema#DevelopmentWellBorePurpose>
                         ] ;
                 spinmap:sourcePredicate1
-                        <file:///www.reportinghub.no/transform/npd/wbdev#wlbEntryDate> ;
+                        <file:///www.reportinghub.no/transform/npd/wbdev#wlbPurpose> ;
                 spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#startDate>
+                        <http://www.reportinghub.no/npd/schema#wellBorePurpose>
               ] ;
       spinmap:rule
               [ rdf:type spinmap:Mapping-1-1 ;
@@ -915,16 +940,14 @@
                 spinmap:sourcePredicate1
                         <file:///www.reportinghub.no/transform/npd/wbdev#wlbDrillPermit> ;
                 spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#wellBoreDrillPermit>
+                        <http://www.reportinghub.no/npd/schema#wellBoreDrillPermit>
               ] ;
       spinmap:rule
-              [ rdf:type spinmap:Mapping-1-1 ;
+              [ rdf:type spinmap:Mapping-0-1 ;
                 spinmap:context :WBDev-Well ;
-                spinmap:expression spin:_arg1 ;
-                spinmap:sourcePredicate1
-                        <file:///www.reportinghub.no/transform/npd/wbdev#wlbWell> ;
+                spinmap:expression <http://www.reportinghub.no/ep/schema/well#Well> ;
                 spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#name>
+                        rdf:type
               ] ;
       spinmap:rule
               [ rdf:type spinmap:Mapping-1-1 ;
@@ -932,13 +955,13 @@
                 spinmap:expression
                         [ rdf:type spinmapl:resourceWithValue ;
                           sp:arg1 spin:_arg1 ;
-                          spinmapl:predicate <http://www.reportinghub.no/schema/npd#code> ;
-                          spinmapl:type <http://www.reportinghub.no/schema/npd#WellBoreContent>
+                          spinmapl:predicate <http://www.reportinghub.no/npd/schema#name> ;
+                          spinmapl:type <http://www.reportinghub.no/ep/schema/organization#Company>
                         ] ;
                 spinmap:sourcePredicate1
-                        <file:///www.reportinghub.no/transform/npd/wbdev#wlbContent> ;
+                        <file:///www.reportinghub.no/transform/npd/wbdev#wlbDrillingOperator> ;
                 spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#wellBoreContent>
+                        <http://www.reportinghub.no/npd/schema#drillingOperator>
               ] ;
       spinmap:rule
               [ rdf:type spinmap:Mapping-1-1 ;
@@ -946,13 +969,13 @@
                 spinmap:expression
                         [ rdf:type spinmapl:resourceWithValue ;
                           sp:arg1 spin:_arg1 ;
-                          spinmapl:predicate <http://www.reportinghub.no/schema/npd#name> ;
-                          spinmapl:type <http://www.reportinghub.no/ep/schema/organization#Company>
+                          spinmapl:predicate <http://www.reportinghub.no/npd/schema#code> ;
+                          spinmapl:type <http://www.reportinghub.no/npd/schema#WellBoreContent>
                         ] ;
                 spinmap:sourcePredicate1
-                        <file:///www.reportinghub.no/transform/npd/wbdev#wlbDrillingOperator> ;
+                        <file:///www.reportinghub.no/transform/npd/wbdev#wlbContent> ;
                 spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#drillingOperator>
+                        <http://www.reportinghub.no/npd/schema#wellBoreContent>
               ] ;
       spinmap:rule
               [ rdf:type spinmap:Mapping-1-1 ;
@@ -965,42 +988,41 @@
                 spinmap:sourcePredicate1
                         <file:///www.reportinghub.no/transform/npd/wbdev#wlbCompletionDate> ;
                 spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#wellBoreCompletionDate>
-              ] ;
+                        <http://www.reportinghub.no/npd/schema#wellBoreCompletionDate>
+              ] .
+
+<file:///www.reportinghub.no/transform/npd/wbexp#WBExp>
       spinmap:rule
               [ rdf:type spinmap:Mapping-1-1 ;
-                spinmap:context :WBDev-WellBore ;
+                spinmap:context :WBExp-WellBore ;
                 spinmap:expression
-                        [ rdf:type rhspin:facilityById ;
-                          arg:id  spin:_arg1
+                        [ rdf:type spif:parseDate ;
+                          arg:pattern "dd.MM.yyyy"^^xsd:string ;
+                          sp:arg1 spin:_arg1
                         ] ;
                 spinmap:sourcePredicate1
-                        <file:///www.reportinghub.no/transform/npd/wbdev#fclNpdidFacilityDrilling> ;
+                        <file:///www.reportinghub.no/transform/npd/wbexp#wlbEntryDate> ;
                 spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#drillingFacility>
+                        <http://www.reportinghub.no/npd/schema#startDate>
               ] ;
       spinmap:rule
               [ rdf:type spinmap:Mapping-1-1 ;
-                spinmap:context :WBDev-WellBore ;
+                spinmap:context :WBExp-WellBore ;
                 spinmap:expression
-                        [ rdf:type rhspin:facilityById ;
+                        [ rdf:type rhspin:licenceById ;
                           arg:id  spin:_arg1
                         ] ;
                 spinmap:sourcePredicate1
-                        <file:///www.reportinghub.no/transform/npd/wbdev#fclNpdidFacilityProducing> ;
+                        <file:///www.reportinghub.no/transform/npd/wbexp#prlNpdidProductionLicence> ;
                 spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#productionFacility>
-              ] .
-
-<file:///www.reportinghub.no/transform/npd/wbexp#WBExp>
+                        <http://www.reportinghub.no/npd/schema#drilledInProductionLicence>
+              ] ;
       spinmap:rule
-              [ rdf:type spinmap:Mapping-1-1 ;
+              [ rdf:type spinmap:Mapping-0-1 ;
                 spinmap:context :WBExp-WellBore ;
-                spinmap:expression spin:_arg1 ;
-                spinmap:sourcePredicate1
-                        <file:///www.reportinghub.no/transform/npd/wbexp#wlbWellType> ;
+                spinmap:expression <http://www.reportinghub.no/ep/schema/well#WellBore> ;
                 spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#wellBoreType>
+                        rdf:type
               ] ;
       spinmap:rule
               [ rdf:type spinmap:Mapping-1-1 ;
@@ -1012,16 +1034,7 @@
                 spinmap:sourcePredicate1
                         <file:///www.reportinghub.no/transform/npd/wbexp#wlbWell> ;
                 spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#partOfWell>
-              ] ;
-      spinmap:rule
-              [ rdf:type spinmap:Mapping-1-1 ;
-                spinmap:context :WBExp-WellBore ;
-                spinmap:expression spin:_arg1 ;
-                spinmap:sourcePredicate1
-                        <file:///www.reportinghub.no/transform/npd/wbexp#wlbDrillPermit> ;
-                spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#wellBoreDrillPermit>
+                        <http://www.reportinghub.no/npd/schema#partOfWell>
               ] ;
       spinmap:rule
               [ rdf:type spinmap:Mapping-1-1 ;
@@ -1030,71 +1043,57 @@
                 spinmap:sourcePredicate1
                         <file:///www.reportinghub.no/transform/npd/wbexp#wlbNpdidWellbore> ;
                 spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#id>
+                        <http://www.reportinghub.no/npd/schema#id>
               ] ;
       spinmap:rule
               [ rdf:type spinmap:Mapping-1-1 ;
                 spinmap:context :WBExp-WellBore ;
                 spinmap:expression
-                        [ rdf:type rhspin:facilityById ;
-                          arg:id  spin:_arg1
+                        [ rdf:type spinmapl:resourceWithValue ;
+                          sp:arg1 spin:_arg1 ;
+                          spinmapl:predicate <http://www.reportinghub.no/npd/schema#name> ;
+                          spinmapl:type <http://www.reportinghub.no/ep/schema/organization#Company>
                         ] ;
                 spinmap:sourcePredicate1
-                        <file:///www.reportinghub.no/transform/npd/wbexp#fclNpdidFacilityDrilling> ;
+                        <file:///www.reportinghub.no/transform/npd/wbexp#wlbDrillingOperator> ;
                 spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#drillingFacility>
+                        <http://www.reportinghub.no/npd/schema#drillingOperator>
               ] ;
       spinmap:rule
               [ rdf:type spinmap:Mapping-1-1 ;
                 spinmap:context :WBExp-WellBore ;
                 spinmap:expression
-                        [ rdf:type rhspin:licenceById ;
-                          arg:id  spin:_arg1
+                        [ rdf:type spinmapl:resourceWithValue ;
+                          sp:arg1 spin:_arg1 ;
+                          spinmapl:predicate <http://www.reportinghub.no/npd/schema#code> ;
+                          spinmapl:type <http://www.reportinghub.no/npd/schema#ExplorationWellBorePurpose>
                         ] ;
                 spinmap:sourcePredicate1
-                        <file:///www.reportinghub.no/transform/npd/wbexp#prlNpdidProductionLicence> ;
-                spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#drilledInProductionLicence>
-              ] ;
-      spinmap:rule
-              [ rdf:type spinmap:Mapping-0-1 ;
-                spinmap:context :WBExp-Well ;
-                spinmap:expression <http://www.reportinghub.no/ep/schema/well#Well> ;
+                        <file:///www.reportinghub.no/transform/npd/wbexp#wlbPurpose> ;
                 spinmap:targetPredicate1
-                        rdf:type
+                        <http://www.reportinghub.no/npd/schema#wellBorePurpose>
               ] ;
       spinmap:rule
               [ rdf:type spinmap:Mapping-1-1 ;
-                spinmap:context :WBExp-Well ;
-                spinmap:expression
-                        [ rdf:type rhspin:fieldById ;
-                          arg:id  spin:_arg1
-                        ] ;
+                spinmap:context :WBExp-WellBore ;
+                spinmap:expression spin:_arg1 ;
                 spinmap:sourcePredicate1
-                        <file:///www.reportinghub.no/transform/npd/wbexp#fldNpdidField> ;
+                        <file:///www.reportinghub.no/transform/npd/wbexp#wlbDrillPermit> ;
                 spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#wellPartOfField>
+                        <http://www.reportinghub.no/npd/schema#wellBoreDrillPermit>
               ] ;
       spinmap:rule
               [ rdf:type spinmap:Mapping-1-1 ;
                 spinmap:context :WBExp-WellBore ;
                 spinmap:expression
-                        [ rdf:type spinmapl:resourceWithValue ;
-                          sp:arg1 spin:_arg1 ;
-                          spinmapl:predicate <http://www.reportinghub.no/schema/npd#code> ;
-                          spinmapl:type <http://www.reportinghub.no/schema/npd#WellBoreContent>
+                        [ rdf:type spif:parseDate ;
+                          arg:pattern "dd.MM.yyyy"^^xsd:string ;
+                          sp:arg1 spin:_arg1
                         ] ;
                 spinmap:sourcePredicate1
-                        <file:///www.reportinghub.no/transform/npd/wbexp#wlbContent> ;
-                spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#wellBoreContent>
-              ] ;
-      spinmap:rule
-              [ rdf:type spinmap:Mapping-0-1 ;
-                spinmap:context :WBExp-WellBore ;
-                spinmap:expression <http://www.reportinghub.no/ep/schema/well#WellBore> ;
+                        <file:///www.reportinghub.no/transform/npd/wbexp#wlbCompletionDate> ;
                 spinmap:targetPredicate1
-                        rdf:type
+                        <http://www.reportinghub.no/npd/schema#wellBoreCompletionDate>
               ] ;
       spinmap:rule
               [ rdf:type spinmap:Mapping-1-1 ;
@@ -1103,33 +1102,35 @@
                 spinmap:sourcePredicate1
                         <file:///www.reportinghub.no/transform/npd/wbexp#wlbWell> ;
                 spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#name>
+                        <http://www.reportinghub.no/npd/schema#name>
               ] ;
       spinmap:rule
               [ rdf:type spinmap:Mapping-1-1 ;
-                spinmap:context :WBExp-WellBore ;
+                spinmap:context :WBExp-Well ;
                 spinmap:expression
-                        [ rdf:type spif:parseDate ;
-                          arg:pattern "dd.MM.yyyy"^^xsd:string ;
-                          sp:arg1 spin:_arg1
+                        [ rdf:type rhspin:fieldById ;
+                          arg:id  spin:_arg1
                         ] ;
                 spinmap:sourcePredicate1
-                        <file:///www.reportinghub.no/transform/npd/wbexp#wlbCompletionDate> ;
+                        <file:///www.reportinghub.no/transform/npd/wbexp#fldNpdidField> ;
                 spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#wellBoreCompletionDate>
+                        <http://www.reportinghub.no/npd/schema#wellPartOfField>
               ] ;
       spinmap:rule
               [ rdf:type spinmap:Mapping-1-1 ;
                 spinmap:context :WBExp-WellBore ;
-                spinmap:expression
-                        [ rdf:type spif:parseDate ;
-                          arg:pattern "dd.MM.yyyy"^^xsd:string ;
-                          sp:arg1 spin:_arg1
-                        ] ;
+                spinmap:expression spin:_arg1 ;
                 spinmap:sourcePredicate1
-                        <file:///www.reportinghub.no/transform/npd/wbexp#wlbEntryDate> ;
+                        <file:///www.reportinghub.no/transform/npd/wbexp#wlbWellType> ;
+                spinmap:targetPredicate1
+                        <http://www.reportinghub.no/npd/schema#wellBoreType>
+              ] ;
+      spinmap:rule
+              [ rdf:type spinmap:Mapping-0-1 ;
+                spinmap:context :WBExp-Well ;
+                spinmap:expression <http://www.reportinghub.no/ep/schema/well#Well> ;
                 spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#startDate>
+                        rdf:type
               ] ;
       spinmap:rule
               [ rdf:type spinmap:Mapping-1-1 ;
@@ -1137,13 +1138,13 @@
                 spinmap:expression
                         [ rdf:type spinmapl:resourceWithValue ;
                           sp:arg1 spin:_arg1 ;
-                          spinmapl:predicate <http://www.reportinghub.no/schema/npd#code> ;
-                          spinmapl:type <http://www.reportinghub.no/schema/npd#ExplorationWellBorePurpose>
+                          spinmapl:predicate <http://www.reportinghub.no/npd/schema#code> ;
+                          spinmapl:type <http://www.reportinghub.no/npd/schema#WellBoreContent>
                         ] ;
                 spinmap:sourcePredicate1
-                        <file:///www.reportinghub.no/transform/npd/wbexp#wlbPurpose> ;
+                        <file:///www.reportinghub.no/transform/npd/wbexp#wlbContent> ;
                 spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#wellBorePurpose>
+                        <http://www.reportinghub.no/npd/schema#wellBoreContent>
               ] ;
       spinmap:rule
               [ rdf:type spinmap:Mapping-1-1 ;
@@ -1152,55 +1153,42 @@
                 spinmap:sourcePredicate1
                         <file:///www.reportinghub.no/transform/npd/wbexp#wlbWellboreName> ;
                 spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#name>
+                        <http://www.reportinghub.no/npd/schema#name>
               ] ;
       spinmap:rule
               [ rdf:type spinmap:Mapping-1-1 ;
                 spinmap:context :WBExp-WellBore ;
                 spinmap:expression
-                        [ rdf:type spinmapl:resourceWithValue ;
-                          sp:arg1 spin:_arg1 ;
-                          spinmapl:predicate <http://www.reportinghub.no/schema/npd#name> ;
-                          spinmapl:type <http://www.reportinghub.no/ep/schema/organization#Company>
+                        [ rdf:type rhspin:facilityById ;
+                          arg:id  spin:_arg1
                         ] ;
                 spinmap:sourcePredicate1
-                        <file:///www.reportinghub.no/transform/npd/wbexp#wlbDrillingOperator> ;
+                        <file:///www.reportinghub.no/transform/npd/wbexp#fclNpdidFacilityDrilling> ;
                 spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#drillingOperator>
+                        <http://www.reportinghub.no/npd/schema#drillingFacility>
               ] .
 
 <file:///www.reportinghub.no/transform/npd/wbid#WBId>
       spinmap:rule
-              [ rdf:type spinmap:Mapping-0-1 ;
-                spinmap:context :WBId-Well ;
-                spinmap:expression <http://www.reportinghub.no/ep/schema/well#Well> ;
-                spinmap:targetPredicate1
-                        rdf:type
-              ] ;
-      spinmap:rule
               [ rdf:type spinmap:Mapping-1-1 ;
-                spinmap:context :WBId-Well ;
-                spinmap:expression spin:_arg1 ;
+                spinmap:context :WBId-WellBore ;
+                spinmap:expression
+                        [ rdf:type rhspin:wellByName ;
+                          arg:wellName spin:_arg1
+                        ] ;
                 spinmap:sourcePredicate1
                         <file:///www.reportinghub.no/transform/npd/wbid#wlbWell> ;
                 spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#name>
-              ] ;
-      spinmap:rule
-              [ rdf:type spinmap:Mapping-0-1 ;
-                spinmap:context :WBId-WellBore ;
-                spinmap:expression <http://www.reportinghub.no/ep/schema/well#WellBore> ;
-                spinmap:targetPredicate1
-                        rdf:type
+                        <http://www.reportinghub.no/npd/schema#partOfWell>
               ] ;
       spinmap:rule
               [ rdf:type spinmap:Mapping-1-1 ;
                 spinmap:context :WBId-WellBore ;
                 spinmap:expression spin:_arg1 ;
                 spinmap:sourcePredicate1
-                        <file:///www.reportinghub.no/transform/npd/wbid#wlbNpdidWellbore> ;
+                        <file:///www.reportinghub.no/transform/npd/wbid#wlbWellboreName> ;
                 spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#id>
+                        <http://www.reportinghub.no/npd/schema#name>
               ] ;
       spinmap:rule
               [ rdf:type spinmap:Mapping-1-1 ;
@@ -1209,71 +1197,63 @@
                 spinmap:sourcePredicate1
                         <file:///www.reportinghub.no/transform/npd/wbid#wlbWellType> ;
                 spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#wellBoreType>
+                        <http://www.reportinghub.no/npd/schema#wellBoreType>
               ] ;
       spinmap:rule
               [ rdf:type spinmap:Mapping-1-1 ;
                 spinmap:context :WBId-WellBore ;
                 spinmap:expression spin:_arg1 ;
                 spinmap:sourcePredicate1
-                        <file:///www.reportinghub.no/transform/npd/wbid#wlbWellboreName> ;
+                        <file:///www.reportinghub.no/transform/npd/wbid#wlbNpdidWellbore> ;
                 spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#name>
+                        <http://www.reportinghub.no/npd/schema#id>
               ] ;
       spinmap:rule
-              [ rdf:type spinmap:Mapping-1-1 ;
+              [ rdf:type spinmap:Mapping-0-1 ;
                 spinmap:context :WBId-WellBore ;
-                spinmap:expression
-                        [ rdf:type rhspin:wellByName ;
-                          arg:wellName spin:_arg1
-                        ] ;
-                spinmap:sourcePredicate1
-                        <file:///www.reportinghub.no/transform/npd/wbid#wlbWell> ;
+                spinmap:expression <http://www.reportinghub.no/ep/schema/well#WellBore> ;
                 spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#partOfWell>
-              ] .
-
-<file:///www.reportinghub.no/transform/npd/wbsha#WBSha>
+                        rdf:type
+              ] ;
       spinmap:rule
               [ rdf:type spinmap:Mapping-1-1 ;
-                spinmap:context :WBSha-Well ;
+                spinmap:context :WBId-Well ;
                 spinmap:expression spin:_arg1 ;
                 spinmap:sourcePredicate1
-                        <file:///www.reportinghub.no/transform/npd/wbsha#wlbWell> ;
+                        <file:///www.reportinghub.no/transform/npd/wbid#wlbWell> ;
                 spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#name>
+                        <http://www.reportinghub.no/npd/schema#name>
               ] ;
       spinmap:rule
-              [ rdf:type spinmap:Mapping-1-1 ;
-                spinmap:context :WBSha-WellBore ;
-                spinmap:expression
-                        [ rdf:type spinmapl:resourceWithValue ;
-                          sp:arg1 spin:_arg1 ;
-                          spinmapl:predicate <http://www.reportinghub.no/schema/npd#name> ;
-                          spinmapl:type <http://www.reportinghub.no/ep/schema/organization#Company>
-                        ] ;
-                spinmap:sourcePredicate1
-                        <file:///www.reportinghub.no/transform/npd/wbsha#wlbDrillingOperator> ;
+              [ rdf:type spinmap:Mapping-0-1 ;
+                spinmap:context :WBId-Well ;
+                spinmap:expression <http://www.reportinghub.no/ep/schema/well#Well> ;
                 spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#drillingOperator>
-              ] ;
+                        rdf:type
+              ] .
+
+<file:///www.reportinghub.no/transform/npd/wbsha#WBSha>
       spinmap:rule
               [ rdf:type spinmap:Mapping-1-1 ;
                 spinmap:context :WBSha-WellBore ;
-                spinmap:expression spin:_arg1 ;
+                spinmap:expression
+                        [ rdf:type spif:parseDate ;
+                          arg:pattern "dd.MM.yyyy"^^xsd:string ;
+                          sp:arg1 spin:_arg1
+                        ] ;
                 spinmap:sourcePredicate1
-                        <file:///www.reportinghub.no/transform/npd/wbsha#wlbWellboreName> ;
+                        <file:///www.reportinghub.no/transform/npd/wbsha#wlbCompletionDate> ;
                 spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#name>
+                        <http://www.reportinghub.no/npd/schema#wellBoreCompletionDate>
               ] ;
       spinmap:rule
               [ rdf:type spinmap:Mapping-1-1 ;
                 spinmap:context :WBSha-WellBore ;
                 spinmap:expression spin:_arg1 ;
                 spinmap:sourcePredicate1
-                        <file:///www.reportinghub.no/transform/npd/wbsha#wlbNpdidWellbore> ;
+                        <file:///www.reportinghub.no/transform/npd/wbsha#wlbDrillPermit> ;
                 spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#id>
+                        <http://www.reportinghub.no/npd/schema#wellBoreDrillPermit>
               ] ;
       spinmap:rule
               [ rdf:type spinmap:Mapping-1-1 ;
@@ -1281,13 +1261,13 @@
                 spinmap:expression
                         [ rdf:type spinmapl:resourceWithValue ;
                           sp:arg1 spin:_arg1 ;
-                          spinmapl:predicate <http://www.reportinghub.no/schema/npd#name> ;
-                          spinmapl:type <http://www.reportinghub.no/schema/npd#Licence>
+                          spinmapl:predicate <http://www.reportinghub.no/npd/schema#name> ;
+                          spinmapl:type <http://www.reportinghub.no/ep/schema/organization#Company>
                         ] ;
                 spinmap:sourcePredicate1
-                        <file:///www.reportinghub.no/transform/npd/wbsha#wlbProductionLicence> ;
+                        <file:///www.reportinghub.no/transform/npd/wbsha#wlbDrillingOperator> ;
                 spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#drilledInProductionLicence>
+                        <http://www.reportinghub.no/npd/schema#drillingOperator>
               ] ;
       spinmap:rule
               [ rdf:type spinmap:Mapping-1-1 ;
@@ -1300,41 +1280,49 @@
                 spinmap:sourcePredicate1
                         <file:///www.reportinghub.no/transform/npd/wbsha#wlbEntryDate> ;
                 spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#startDate>
+                        <http://www.reportinghub.no/npd/schema#startDate>
               ] ;
       spinmap:rule
               [ rdf:type spinmap:Mapping-1-1 ;
                 spinmap:context :WBSha-WellBore ;
                 spinmap:expression
-                        [ rdf:type rhspin:wellByName ;
-                          arg:wellName spin:_arg1
+                        [ rdf:type spinmapl:resourceWithValue ;
+                          sp:arg1 spin:_arg1 ;
+                          spinmapl:predicate <http://www.reportinghub.no/npd/schema#name> ;
+                          spinmapl:type <http://www.reportinghub.no/npd/schema#Licence>
                         ] ;
                 spinmap:sourcePredicate1
-                        <file:///www.reportinghub.no/transform/npd/wbsha#wlbWell> ;
+                        <file:///www.reportinghub.no/transform/npd/wbsha#wlbProductionLicence> ;
+                spinmap:targetPredicate1
+                        <http://www.reportinghub.no/npd/schema#drilledInProductionLicence>
+              ] ;
+      spinmap:rule
+              [ rdf:type spinmap:Mapping-0-1 ;
+                spinmap:context :WBSha-Well ;
+                spinmap:expression <http://www.reportinghub.no/ep/schema/well#Well> ;
                 spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#partOfWell>
+                        rdf:type
               ] ;
       spinmap:rule
               [ rdf:type spinmap:Mapping-1-1 ;
                 spinmap:context :WBSha-WellBore ;
                 spinmap:expression
-                        [ rdf:type spif:parseDate ;
-                          arg:pattern "dd.MM.yyyy"^^xsd:string ;
-                          sp:arg1 spin:_arg1
+                        [ rdf:type rhspin:wellByName ;
+                          arg:wellName spin:_arg1
                         ] ;
                 spinmap:sourcePredicate1
-                        <file:///www.reportinghub.no/transform/npd/wbsha#wlbCompletionDate> ;
+                        <file:///www.reportinghub.no/transform/npd/wbsha#wlbWell> ;
                 spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#wellBoreCompletionDate>
+                        <http://www.reportinghub.no/npd/schema#partOfWell>
               ] ;
       spinmap:rule
               [ rdf:type spinmap:Mapping-1-1 ;
                 spinmap:context :WBSha-WellBore ;
                 spinmap:expression spin:_arg1 ;
                 spinmap:sourcePredicate1
-                        <file:///www.reportinghub.no/transform/npd/wbsha#wlbDrillPermit> ;
+                        <file:///www.reportinghub.no/transform/npd/wbsha#wlbWellboreName> ;
                 spinmap:targetPredicate1
-                        <http://www.reportinghub.no/schema/npd#wellBoreDrillPermit>
+                        <http://www.reportinghub.no/npd/schema#name>
               ] ;
       spinmap:rule
               [ rdf:type spinmap:Mapping-0-1 ;
@@ -1344,11 +1332,22 @@
                         rdf:type
               ] ;
       spinmap:rule
-              [ rdf:type spinmap:Mapping-0-1 ;
+              [ rdf:type spinmap:Mapping-1-1 ;
                 spinmap:context :WBSha-Well ;
-                spinmap:expression <http://www.reportinghub.no/ep/schema/well#Well> ;
+                spinmap:expression spin:_arg1 ;
+                spinmap:sourcePredicate1
+                        <file:///www.reportinghub.no/transform/npd/wbsha#wlbWell> ;
                 spinmap:targetPredicate1
-                        rdf:type
+                        <http://www.reportinghub.no/npd/schema#name>
+              ] ;
+      spinmap:rule
+              [ rdf:type spinmap:Mapping-1-1 ;
+                spinmap:context :WBSha-WellBore ;
+                spinmap:expression spin:_arg1 ;
+                spinmap:sourcePredicate1
+                        <file:///www.reportinghub.no/transform/npd/wbsha#wlbNpdidWellbore> ;
+                spinmap:targetPredicate1
+                        <http://www.reportinghub.no/npd/schema#id>
               ] .
 
 arg:well
@@ -1360,22 +1359,22 @@ arg:wellBoreName
 arg:wellName
       rdfs:subPropertyOf sp:arg .
 
-<http://www.reportinghub.no/schema/npd#ParcellBAA>
+<http://www.reportinghub.no/npd/schema#ParcellBAA>
       :baaKind "PARCELL"^^xsd:string .
 
-<http://www.reportinghub.no/schema/npd#SeismicAreaBAA>
+<http://www.reportinghub.no/npd/schema#SeismicAreaBAA>
       :baaKind "SEISMIC AREA"^^xsd:string .
 
-<http://www.reportinghub.no/schema/npd#SlidingScaleBAA>
+<http://www.reportinghub.no/npd/schema#SlidingScaleBAA>
       :baaKind "SLIDING SCALE"^^xsd:string .
 
-<http://www.reportinghub.no/schema/npd#UnitizedBAA>
+<http://www.reportinghub.no/npd/schema#UnitizedBAA>
       :baaKind "UNITIZED"^^xsd:string .
 
 <http://www.reportinghub.no/transform/spreadsheets2npd>
       rdf:type owl:Ontology ;
       rdfs:comment "Takes spreadsheets imported from the NPD fact pages and maps them into the NPD ontology."^^xsd:string ;
-      owl:imports <file:///www.reportinghub.no/transform/npd/licensee> , <file:///www.reportinghub.no/transform/npd/tufoperator> , <file:///www.reportinghub.no/transform/npd/wbexp> , <file:///www.reportinghub.no/transform/npd/wbid> , <file:///www.reportinghub.no/transform/npd/discovery> , <http://www.reportinghub.no/1.1/schema/npd> , <file:///www.reportinghub.no/transform/npd/field> , <file:///www.reportinghub.no/transform/npd/baalicensee> , <http://topbraid.org/spin/spinmapl> , <file:///www.reportinghub.no/transform/npd/wbsha> , <file:///www.reportinghub.no/transform/npd/licence> , <file:///www.reportinghub.no/transform/npd/facilityfixed> , <http://www.reportinghub.no/spin/rh> , <file:///www.reportinghub.no/transform/npd/baa> , <file:///www.reportinghub.no/transform/npd/facilitymoveable> , <file:///www.reportinghub.no/transform/npd/wbdev> , <file:///www.reportinghub.no/transform/npd/company> , <http://spinrdf.org/spin> ;
+      owl:imports <file:///www.reportinghub.no/transform/npd/licensee> , <file:///www.reportinghub.no/transform/npd/tufoperator> , <file:///www.reportinghub.no/transform/npd/wbexp> , <file:///www.reportinghub.no/transform/npd/wbid> , <file:///www.reportinghub.no/transform/npd/discovery> , <file:///www.reportinghub.no/transform/npd/field> , <file:///www.reportinghub.no/transform/npd/baalicensee> , <http://topbraid.org/spin/spinmapl> , <file:///www.reportinghub.no/transform/npd/wbsha> , <file:///www.reportinghub.no/transform/npd/licence> , <file:///www.reportinghub.no/transform/npd/facilityfixed> , <http://www.reportinghub.no/spin/rh> , <file:///www.reportinghub.no/transform/npd/baa> , <file:///www.reportinghub.no/transform/npd/facilitymoveable> , <http://www.reportinghub.no/npd/1.1/schema> , <file:///www.reportinghub.no/transform/npd/wbdev> , <file:///www.reportinghub.no/transform/npd/company> , <http://spinrdf.org/spin> ;
       owl:versionInfo "0.1.0"^^xsd:string .
 
 :BAA-BusinessArrangementArea
@@ -1385,7 +1384,7 @@ arg:wellName
               [ rdf:type :buildBAAURI ;
                 spinmap:source spinmap:_source
               ] ;
-      spinmap:targetClass <http://www.reportinghub.no/schema/npd#BusinessArrangementArea> .
+      spinmap:targetClass <http://www.reportinghub.no/npd/schema#BusinessArrangementArea> .
 
 :BAALicensee-ShareOfBAA
       rdf:type spinmap:Context ;
@@ -1396,7 +1395,7 @@ arg:wellName
                         [ sp:varName "source"^^xsd:string
                         ]
               ] ;
-      spinmap:targetClass <http://www.reportinghub.no/schema/npd#ShareOfBAA> .
+      spinmap:targetClass <http://www.reportinghub.no/npd/schema#ShareOfBAA> .
 
 :Company-Company
       rdf:type spinmap:Context ;
@@ -1405,7 +1404,7 @@ arg:wellName
               [ rdf:type :buildCompanyURI ;
                 spinmap:source spinmap:_source
               ] ;
-      spinmap:targetClass <http://www.reportinghub.no/schema/npd#OperatingCompany> .
+      spinmap:targetClass <http://www.reportinghub.no/npd/schema#OperatingCompany> .
 
 :Company-ParentCompany
       rdf:type spinmap:Context ;
@@ -1414,7 +1413,7 @@ arg:wellName
               [ rdf:type :buildParentCompanyURI ;
                 spinmap:source spinmap:_source
               ] ;
-      spinmap:targetClass <http://www.reportinghub.no/schema/npd#ParentCompany> .
+      spinmap:targetClass <http://www.reportinghub.no/npd/schema#ParentCompany> .
 
 :Discovery-Discovery
       rdf:type spinmap:Context ;
@@ -1423,7 +1422,7 @@ arg:wellName
               [ rdf:type :buildDiscoveryURI ;
                 spinmap:source spinmap:_source
               ] ;
-      spinmap:targetClass <http://www.reportinghub.no/schema/npd#Discovery> .
+      spinmap:targetClass <http://www.reportinghub.no/npd/schema#Discovery> .
 
 :FacilityFixed-FixedFacility
       rdf:type spinmap:Context ;
@@ -1452,7 +1451,7 @@ arg:wellName
               [ rdf:type :buildFieldURI ;
                 spinmap:source spinmap:_source
               ] ;
-      spinmap:targetClass <http://www.reportinghub.no/schema/npd#Field> .
+      spinmap:targetClass <http://www.reportinghub.no/npd/schema#Field> .
 
 :License-License
       rdf:type spinmap:Context ;
@@ -1461,7 +1460,7 @@ arg:wellName
               [ rdf:type :buildLicenceURI ;
                 spinmap:source spinmap:_source
               ] ;
-      spinmap:targetClass <http://www.reportinghub.no/schema/npd#Licence> .
+      spinmap:targetClass <http://www.reportinghub.no/npd/schema#Licence> .
 
 :Licensee-ShareOfLicence
       rdf:type spinmap:Context ;
@@ -1472,7 +1471,7 @@ arg:wellName
                         [ sp:varName "source"^^xsd:string
                         ]
               ] ;
-      spinmap:targetClass <http://www.reportinghub.no/schema/npd#ShareOfLicence> .
+      spinmap:targetClass <http://www.reportinghub.no/npd/schema#ShareOfLicence> .
 
 :TUFOperator-TUF
       rdf:type spinmap:Context ;
@@ -1481,7 +1480,7 @@ arg:wellName
               [ rdf:type :buildTUFURI ;
                 spinmap:source spinmap:_source
               ] ;
-      spinmap:targetClass <http://www.reportinghub.no/schema/npd#TUF> .
+      spinmap:targetClass <http://www.reportinghub.no/npd/schema#TUF> .
 
 :WBDev-Well
       rdf:type spinmap:Context ;

-# Saved by TopBraid on Tue Aug 09 15:36:54 BST 2011
 # baseURI: null
 
 @prefix composite:  <http://www.topbraid.org/2007/05/composite.owl#> .
@@ -13,11 +12,11 @@
 []    rdf:type inference:Configuration ;
       composite:child
               [ rdf:type <http://spinrdf.org/spin#TopSPIN> ;
-                composite:index "0"^^xsd:int
+                composite:index "1"^^xsd:int
               ] ;
       composite:child
               [ rdf:type <http://spinrdf.org/spin#TopSPIN> ;
-                composite:index "1"^^xsd:int
+                composite:index "0"^^xsd:int
               ] ;
       inference:completeMode
               "true"^^xsd:boolean ;

 <html>
 	<head>
-		<title>ReportingHub - Validate or Upload DDR</title>
+		<title>ReportingHub - Validate/Upload DDR</title>
 		<link href="lib/rh/rh.css" rel="stylesheet" type="text/css" />
 		<script type="text/javascript" src="lib/rh/jquery/jquery.js"></script>
 		<script type="text/javascript" src="lib/rh/jquery/jquery.form.js"></script>
@@ -36,7 +36,7 @@
 			<rhswp:Header />
 		
 			<div id="content">
-				<h3>Validate or Upload a Daily Drilling Report</h3>
+				<h3>Validate/Upload a Daily Drilling Report</h3>
 				<p>
 					Please select a DDR XML file:
 				</p>
@@ -51,7 +51,7 @@
 					<script>
 					
 						function updateAction() {
-							var newAction = $("#validateButton").attr("checked") ? "validate-report" : "submit-report";
+							var newAction = $("#validateButton").attr("checked") ? "validate-report" : "validate-and-upload-report";
 							$("#theForm").attr("action", newAction);
 						}
 					
@@ -64,7 +64,7 @@
 					<input type="submit" value="Submit" />
 				</form>
 				<br />
-				<div id="output" />
+				<div id="output"></div>
 			</div>
 		</div>
 	</body>