Clean up individuals

@@ -13,7 +13,7 @@
 @prefix xsd:     <http://www.w3.org/2001/XMLSchema#> .
 
 :     rdf:type owl:Ontology ;
-      owl:imports ILAP: , <http://data.posccaesar.org/ilap/refdata/NORSOK/Z-014/SCCS> .
+      owl:imports <http://data.posccaesar.org/ilap/refdata/NORSOK/Z-014/SCCS> , ILAP: .
 
 ILAP:
       rdf:type owl:Ontology ;
@@ -27,11 +27,6 @@ ILAP:Active
       rdf:type ILAP:Status ;
       rdfs:label "Active"^^xsd:string .
 
-ILAP:ActivityInPlan_1
-      ILAP:hasActivityResponsibleOrganization
-              <http://data.posccaesar.org/brreg/R-1345df43-1ddc-42ac-9ce0-c33f3a7a6d29> ;
-      ILAP:hasPlatform <http://data.posccaesar.org/npd/facts/Facility-271385> .
-
 ILAP:ActivityWBS_1
       ILAP:hasWBSProjectType
               ILAP:CAPEX ;
@@ -109,8 +104,8 @@ ILAP:DG7
       rdfs:label "DG7"^^xsd:string .
 
 ILAP:Development
-      rdf:type ILAP:PlanPhase , ILAP:PlanLifecycleStage ;
-      rdfs:label "Development"^^xsd:string , "Develop"^^xsd:string .
+      rdf:type ILAP:PlanLifecycleStage , ILAP:PlanPhase ;
+      rdfs:label "Develop"^^xsd:string , "Development"^^xsd:string .
 
 ILAP:DisasterRecovery
       rdf:type ILAP:PlanObjectiveType ;
@@ -125,7 +120,7 @@ ILAP:DrillingAndWell
       rdfs:label "Drilling and well"^^xsd:string .
 
 ILAP:Exploration
-      rdf:type ILAP:PlanPhase , ILAP:PlanLifecycleStage ;
+      rdf:type ILAP:PlanLifecycleStage , ILAP:PlanPhase ;
       rdfs:label "Exploration"^^xsd:string .
 
 ILAP:Facility
@@ -237,7 +232,7 @@ ILAP:OPEX
       rdfs:label "OPEX"^^xsd:string .
 
 ILAP:Operation
-      rdf:type ILAP:PlanPhase , ILAP:PlanLifecycleStage ;
+      rdf:type ILAP:PlanLifecycleStage , ILAP:PlanPhase ;
       rdfs:label "Operation"^^xsd:string .
 
 ILAP:OperationAndMaintenance
@@ -253,13 +248,12 @@ ILAP:Planned
       rdfs:label "Planned"^^xsd:string .
 
 ILAP:PlannedActivity_1
-      rdf:type ILAP:PlannedActivity ;
-      rdfs:label "Planned activity 1"^^xsd:string ;
-      ILAP:hasActivityWBSelement
-              ILAP:ActivityWBS_1 .
+      ILAP:hasActivityResponsibleOrganization
+              <http://data.posccaesar.org/brreg/R-1345df43-1ddc-42ac-9ce0-c33f3a7a6d29> ;
+      ILAP:hasPlatform <http://data.posccaesar.org/npd/facts/Facility-271385> .
 
 ILAP:Planning
-      rdf:type ILAP:PlanPhase , ILAP:PlanLifecycleStage ;
+      rdf:type ILAP:PlanLifecycleStage , ILAP:PlanPhase ;
       rdfs:label "Planning"^^xsd:string .
 
 ILAP:Primavera
@@ -287,7 +281,7 @@ ILAP:Released
       rdfs:label "Released"^^xsd:string .
 
 ILAP:Removal
-      rdf:type ILAP:PlanPhase , ILAP:PlanLifecycleStage ;
+      rdf:type ILAP:PlanLifecycleStage , ILAP:PlanPhase ;
       rdfs:label "Removal"^^xsd:string .
 
 ILAP:Renewal
@@ -323,14 +317,14 @@ ILAP:Scheduled
       rdfs:label "Scheduled"^^xsd:string .
 
 ILAP:ShutdownAndDecommisioning
-      rdf:type ILAP:PlanPhase , ILAP:PlanLifecycleStage ;
+      rdf:type ILAP:PlanLifecycleStage , ILAP:PlanPhase ;
       rdfs:label "Shutdown and decommisioning"^^xsd:string .
 
 ILAP:StandardFreeWeekendPeriod
       rdf:type ILAP:CalendarFreePeriodWeekRepeat ;
       rdfs:label "Standard free weekend period"^^xsd:string ;
       ILAP:hasCalendarPeriodFreeDay
-              ILAP:Saturday , ILAP:Sunday .
+              ILAP:Sunday , ILAP:Saturday .
 
 ILAP:StandardWorkWeekdayPeriod
       rdf:type ILAP:CalendarWorkPeriodWeekRepeat ;
@@ -449,12 +443,12 @@ ILAP:hasWorkTaskResponsible
 <http://data.posccaesar.org/npd/ontology/ilap-interface/Facility>
       rdf:type owl:Class ;
       rdfs:label "Facility"^^xsd:string ;
-      rdfs:subClassOf owl:Thing , ILAP:Facility .
+      rdfs:subClassOf ILAP:Facility , owl:Thing .
 
 rdl:RDS282149
       rdf:type owl:Class ;
       rdfs:label "RDS282149"^^xsd:string ;
-      rdfs:subClassOf owl:Thing , ILAP:ResponsibleOrganization .
+      rdfs:subClassOf ILAP:ResponsibleOrganization , owl:Thing .
 
 <http://www.ilap.no/codes/NORSOK/Z-014/CORCoding#A>
       rdfs:subClassOf <http://data.posccaesar.org/sccs/CORcode> .

@@ -12,9 +12,9 @@ UC1:  rdf:type owl:Ontology ;
       owl:imports <http://data.posccaesar.org/NCS_PLANNING/> ;
       owl:versionInfo "Created with TopBraid Composer"^^xsd:string .
 
-UC1:PlannedActivity_1
+ILAP:PlannedActivity_2
       rdf:type ILAP:PlannedActivity ;
-      rdfs:label "Planned activity 1"^^xsd:string ;
+      rdfs:label "Planned activity 2"^^xsd:string ;
       ILAP:hasActivityContractor
               <http://data.posccaesar.org/brreg/R-5db3751d-41d9-4516-a8e9-2b73a7df656b> ;
       ILAP:hasActivityOperator