Generalize subject predicates.

1 files changed, 325 insertions, 325 deletions

diff --git a/data/2014/europe.ttl b/data/2014/europe.ttl
index 52657dd..3982c21 100644
--- a/data/2014/europe.ttl
+++ b/data/2014/europe.ttl
@@ -23,7 +23,7 @@
 
 :trip a event:Event ;
 	rdfs:label "Siri & Jonas Europe trip" ;
-	event:agent :jonas, :siri ;
+	event:agent :person-jonas, :person-siri ;
 	foaf:based_near dbpedia:Europe ;
 	event:time [ a tl:Interval ;
 		tl:onTimeLine </timeline/floss> ;
@@ -31,14 +31,14 @@
 		tl:end "2014-03-31T23:59:59+01:00"^^xsd:dateTime
 	] .
 
-:debconfBcn2014 a event:Event ;
+:conference-minidebconf a event:Event ;
 	rdfs:label "MiniDebConf Barcelona 2014" ;
 	foaf:Homepage <http://bcn2014.mini.debconf.org/> ;
-	prog:organiser :debconfBcn2014Team ;
-	prog:sponsor :debian, :google ;
-	prog:speaker :siri ;
-	prog:support :jonas ;
-	prog:attendee :jonas, :siri ;
+	prog:organiser :team-minidebconf ;
+	prog:sponsor :org-debian, :org-google ;
+	prog:speaker :person-siri ;
+	prog:support :person-jonas ;
+	prog:attendee :person-jonas, :person-siri ;
 	event:place [ a geo:SpatialThing ;
 		rdfs:label "Faculty of Mathematics"@en, "Facultat de Matemàtiques"@es ;
 		spacerel:within dbpedia:University_of_Barcelona ;
@@ -54,65 +54,65 @@
 
 :programme a prog:Programme ;
 	prog:describes :trip ;
-	prog:streamed_by_subject :attendanceAll, :attendanceSplit ;
-#	prog:has_timeslot :slotWednesday5th, :slotThursday6th,
-#		:slotWednesday12th, :slotSaturday15th, :slotSunday16th,
-#		:slotMonday24th, :slotWednesday26th ;
+	prog:streamed_by_subject :concept-attendanceAll, :concept-attendanceSplit ;
+#	prog:has_timeslot :slot-wednesday5th, :slot-thursday6th,
+#		:slot-wednesday12th, :slot-saturday15th, :slot-sunday16th,
+#		:slot-monday24th, :slot-wednesday26th ;
 	prog:has_event :beginEpfsug, :beginDebconf, :beginGreens ;
-	prog:has_streamed_event :rideHolbækBrussels, :rideHolbækBrussels_2,
-		:rideHolbækBrusselsJonasEarly, :rideHolbækBrusselsJonasEarly_2,
-		:atBrusselsEarly, :atBrusselsEarlyJonas,
-		:rideBrusselsHolbækJonasEarly, :rideBrusselsHolbækJonasEarly_2,
-		:atBrusselsEarlyPickup, :rideBrusselsParis, :atParisEarly,
-		:rideParisBarcelona, :atBarcelonaVideo, :rideHolbækBarcelona,
-		:rideHolbækBarcelona_2, :atBarcelonaDay1, :atBarcelonaDay2,
-		:atBarcelonaDay1Siri, :atBarcelonaDay2Siri,
-		:rideBarcelonaParis, :rideBarcelonaHolbæk,
-		:rideBarcelonaHolbæk_2, :atParisLate, :rideParisBrussels,
-		:rideHolbækBrusselsJonasLate, :rideHolbækBrusselsJonasLate_2,
-		:atBrusselsLate, :atBrusselsLateJonas,
-		:rideBrusselsHolbæk, :rideBrusselsHolbæk_2,
-		:rideBrusselsHolbækJonasLate, :rideBrusselsHolbækJonasLate_2 .
-
-:rideHolbækBrussels a event:Event ;
+	prog:has_streamed_event :ride-holbækBrussels, :ride-holbækBrussels_2,
+		:ride-holbækBrusselsJonasEarly, :ride-holbækBrusselsJonasEarly_2,
+		:stay-brusselsEarly, :stay-brusselsEarlyJonas,
+		:ride-brusselsHolbækJonasEarly, :ride-brusselsHolbækJonasEarly_2,
+		:stay-brusselsEarlyPickup, :ride-brusselsParis, :stay-parisEarly,
+		:ride-parisBarcelona, :stay-barcelonaVideo, :ride-holbækBarcelona,
+		:ride-holbækBarcelona_2, :stay-barcelonaDay1, :stay-barcelonaDay2,
+		:stay-barcelonaDay1Siri, :stay-barcelonaDay2Siri,
+		:ride-barcelonaParis, :ride-barcelonaHolbæk,
+		:ride-barcelonaHolbæk_2, :stay-parisLate, :ride-parisBrussels,
+		:ride-holbækBrusselsJonasLate, :ride-holbækBrusselsJonasLate_2,
+		:stay-brusselsLate, :stay-brusselsLateJonas,
+		:ride-brusselsHolbæk, :ride-brusselsHolbæk_2,
+		:ride-brusselsHolbækJonasLate, :ride-brusselsHolbækJonasLate_2 .
+
+:ride-holbækBrussels a event:Event ;
 	rdfs:label "2 x train Holbæk→Brussels (Debian + EPFSUG)"@en ;
-	dcterms:subject :attendanceAll ;
+	dcterms:subject :concept-attendanceAll ;
 	event:time [ a tl:Interval ;
 		tl:onTimeLine </timeline/travel> ;
 		tl:start "2014-03-03T16:00:00+01:00"^^xsd:dateTime ;
 		tl:end "2014-03-03T23:59:59+01:00"^^xsd:dateTime
 	] .
 
-:rideHolbækBrussels_2 a event:Event ;
+:ride-holbækBrussels_2 a event:Event ;
 	rdfs:label "2 x train Holbæk→Brussels [continued...]"@en ;
-	dcterms:subject :attendanceAll ;
+	dcterms:subject :concept-attendanceAll ;
 	event:time [ a tl:Interval ;
 		tl:onTimeLine </timeline/travel> ;
 		tl:start "2014-03-04T00:00:00+01:00"^^xsd:dateTime ;
 		tl:end "2014-03-04T10:00:00+01:00"^^xsd:dateTime
 	] .
 
-:rideHolbækBrusselsJonasEarly a event:Event ;
+:ride-holbækBrusselsJonasEarly a event:Event ;
 	rdfs:label "1 x train Holbæk→Brussels (EPFSUG)"@en ;
-	dcterms:subject :attendanceSplit ;
+	dcterms:subject :concept-attendanceSplit ;
 	event:time [ a tl:Interval ;
 		tl:onTimeLine </timeline/travel> ;
 		tl:start "2014-03-03T16:00:00+01:00"^^xsd:dateTime ;
 		tl:end "2014-03-03T23:59:59+01:00"^^xsd:dateTime
 	] .
 
-:rideHolbækBrusselsJonasEarly_2 a event:Event ;
+:ride-holbækBrusselsJonasEarly_2 a event:Event ;
 	rdfs:label "1 x train Holbæk→Brussels [continued...]"@en ;
-	dcterms:subject :attendanceSplit ;
+	dcterms:subject :concept-attendanceSplit ;
 	event:time [ a tl:Interval ;
 		tl:onTimeLine </timeline/travel> ;
 		tl:start "2014-03-04T00:00:00+01:00"^^xsd:dateTime ;
 		tl:end "2014-03-04T10:00:00+01:00"^^xsd:dateTime
 	] .
 
-:atBrusselsEarly a event:Event ;
+:stay-brusselsEarly a event:Event ;
 	rdfs:label "Siri and Jonas attend EPFSUG event"@en ;
-	dcterms:subject :attendanceAll ;
+	dcterms:subject :concept-attendanceAll ;
 	event:based_near dbpedia:Barcelona ;
 	event:time [ a tl:Interval ;
 		tl:onTimeLine </timeline/travel> ;
@@ -120,9 +120,9 @@
 		tl:end "2014-03-05T23:59:59+01:00"^^xsd:dateTime
 	] .
 
-:atBrusselsEarlyJonas a event:Event ;
+:stay-brusselsEarlyJonas a event:Event ;
 	rdfs:label "Jonas attend EPFSUG event"@en ;
-	dcterms:subject :attendanceSplit ;
+	dcterms:subject :concept-attendanceSplit ;
 	event:based_near dbpedia:Barcelona ;
 	event:time [ a tl:Interval ;
 		tl:onTimeLine </timeline/travel> ;
@@ -130,27 +130,27 @@
 		tl:end "2014-03-05T23:59:59+01:00"^^xsd:dateTime
 	] .
 
-:rideBrusselsHolbækJonasEarly a event:Event ;
+:ride-brusselsHolbækJonasEarly a event:Event ;
 	rdfs:label "1 x train Brussels→Holbæk (EPFSUG)"@en ;
-	dcterms:subject :attendanceSplit ;
+	dcterms:subject :concept-attendanceSplit ;
 	event:time [ a tl:Interval ;
 		tl:onTimeLine </timeline/travel> ;
 		tl:start "2014-03-05T19:30:00+01:00"^^xsd:dateTime ;
 		tl:end "2014-03-05T23:59:59+01:00"^^xsd:dateTime
 	] .
 
-:rideBrusselsHolbækJonasEarly_2 a event:Event ;
+:ride-brusselsHolbækJonasEarly_2 a event:Event ;
 	rdfs:label "1 x train Brussels→Holbæk [continued...]"@en ;
-	dcterms:subject :attendanceSplit ;
+	dcterms:subject :concept-attendanceSplit ;
 	event:time [ a tl:Interval ;
 		tl:onTimeLine </timeline/travel> ;
 		tl:start "2014-03-06T00:00:00+01:00"^^xsd:dateTime ;
 		tl:end "2014-03-06T10:37:00+01:00"^^xsd:dateTime
 	] .
 
-:atBrusselsEarlyPickup a event:Event ;
+:stay-brusselsEarlyPickup a event:Event ;
 	rdfs:label "Siri and Jonas fetch gear used at FOSDEM"@en ;
-	dcterms:subject :attendanceAll ;
+	dcterms:subject :concept-attendanceAll ;
 	event:based_near dbpedia:Brussels ;
 	event:time [ a tl:Interval ;
 		tl:onTimeLine </timeline/travel> ;
@@ -158,18 +158,18 @@
 		tl:end "2014-03-06T09:30:00+01:00"^^xsd:dateTime
 	] .
 
-:rideBrusselsParis a event:Event ;
+:ride-brusselsParis a event:Event ;
 	rdfs:label "2 x train Brussels→Paris (Debian + FOSDEM)"@en ;
-	dcterms:subject :attendanceAll ;
+	dcterms:subject :concept-attendanceAll ;
 	event:time [ a tl:Interval ;
 		tl:onTimeLine </timeline/travel> ;
 		tl:start "2014-03-06T09:37:00+01:00"^^xsd:dateTime ;
 		tl:end "2014-03-06T10:59:00+01:00"^^xsd:dateTime
 	] .
 
-:atParisEarly a event:Event ;
+:stay-parisEarly a event:Event ;
 	rdfs:label "Siri and Jonas exchange gear at IRILL"@en ;
-	dcterms:subject :attendanceAll ;
+	dcterms:subject :concept-attendanceAll ;
 	event:based_near dbpedia:Paris ;
 	event:time [ a tl:Interval ;
 		tl:onTimeLine </timeline/travel> ;
@@ -177,18 +177,18 @@
 		tl:end "2014-03-06T14:00:00+01:00"^^xsd:dateTime
 	] .
 
-:rideParisBarcelona a event:Event ;
+:ride-parisBarcelona a event:Event ;
 	rdfs:label "2 x train Paris→Barcelona (Debian)"@en ;
-	dcterms:subject :attendanceAll ;
+	dcterms:subject :concept-attendanceAll ;
 	event:time [ a tl:Interval ;
 		tl:onTimeLine </timeline/travel> ;
 		tl:start "2014-03-11T14:07:00+01:00"^^xsd:dateTime ;
 		tl:end "2014-03-11T20:40:00+01:00"^^xsd:dateTime
 	] .
 
-:atBarcelonaVideo a event:Event ;
+:stay-barcelonaVideo a event:Event ;
 	rdfs:label "Siri and Jonas bring gear to campus"@en ;
-	dcterms:subject :attendanceAll ;
+	dcterms:subject :concept-attendanceAll ;
 	event:based_near dbpedia:Barcelona ;
 	event:time [ a tl:Interval ;
 		tl:onTimeLine </timeline/travel> ;
@@ -196,27 +196,27 @@
 		tl:end "2014-03-12T23:59:59+01:00"^^xsd:dateTime
 	] .
 
-:rideHolbækBarcelona a event:Event ;
+:ride-holbækBarcelona a event:Event ;
 	rdfs:label "1 x train Holbæk→Barcelona (Debian)"@en ;
-	dcterms:subject :attendanceSplit ;
+	dcterms:subject :concept-attendanceSplit ;
 	event:time [ a tl:Interval ;
 		tl:onTimeLine </timeline/travel> ;
 		tl:start "2014-03-13T16:00:00+01:00"^^xsd:dateTime ;
 		tl:end "2014-03-13T23:59:59+01:00"^^xsd:dateTime
 	] .
 
-:rideHolbækBarcelona_2 a event:Event ;
+:ride-holbækBarcelona_2 a event:Event ;
 	rdfs:label "1 x train Holbæk→Barcelona [continued...]"@en ;
-	dcterms:subject :attendanceSplit ;
+	dcterms:subject :concept-attendanceSplit ;
 	event:time [ a tl:Interval ;
 		tl:onTimeLine </timeline/travel> ;
 		tl:start "2014-03-14T00:00:00+01:00"^^xsd:dateTime ;
 		tl:end "2014-03-14T20:40:00+01:00"^^xsd:dateTime
 	] .
 
-:atBarcelonaDay1 a event:Event ;
+:stay-barcelonaDay1 a event:Event ;
 	rdfs:label "Siri and Jonas attend MiniDebconf"@en ;
-	dcterms:subject :attendanceAll ;
+	dcterms:subject :concept-attendanceAll ;
 	event:based_near dbpedia:Barcelona ;
 	event:time [ a tl:Interval ;
 		tl:onTimeLine </timeline/travel> ;
@@ -224,9 +224,9 @@
 		tl:end "2014-03-15T23:59:59+01:00"^^xsd:dateTime
 	] .
 
-:atBarcelonaDay2 a event:Event ;
+:stay-barcelonaDay2 a event:Event ;
 	rdfs:label "Siri and Jonas attend MiniDebconf"@en ;
-	dcterms:subject :attendanceAll ;
+	dcterms:subject :concept-attendanceAll ;
 	event:based_near dbpedia:Barcelona ;
 	event:time [ a tl:Interval ;
 		tl:onTimeLine </timeline/travel> ;
@@ -234,9 +234,9 @@
 		tl:end "2014-03-16T23:59:59+01:00"^^xsd:dateTime
 	] .
 
-:atBarcelonaDay1Siri a event:Event ;
+:stay-barcelonaDay1Siri a event:Event ;
 	rdfs:label "Siri attend MiniDebconf"@en ;
-	dcterms:subject :attendanceSplit ;
+	dcterms:subject :concept-attendanceSplit ;
 	event:based_near dbpedia:Barcelona ;
 	event:time [ a tl:Interval ;
 		tl:onTimeLine </timeline/travel> ;
@@ -244,9 +244,9 @@
 		tl:end "2014-03-15T23:59:59+01:00"^^xsd:dateTime
 	] .
 
-:atBarcelonaDay2Siri a event:Event ;
+:stay-barcelonaDay2Siri a event:Event ;
 	rdfs:label "Siri attend MiniDebconf"@en ;
-	dcterms:subject :attendanceSplit ;
+	dcterms:subject :concept-attendanceSplit ;
 	event:based_near dbpedia:Barcelona ;
 	event:time [ a tl:Interval ;
 		tl:onTimeLine </timeline/travel> ;
@@ -254,54 +254,54 @@
 		tl:end "2014-03-16T23:59:59+01:00"^^xsd:dateTime
 	] .
 
-:rideBarcelonaHolbæk a event:Event ;
+:ride-barcelonaHolbæk a event:Event ;
 	rdfs:label "1 x train Barcelona→Holbæk (Debian)"@en ;
-	dcterms:subject :attendanceSplit ;
+	dcterms:subject :concept-attendanceSplit ;
 	event:time [ a tl:Interval ;
 		tl:onTimeLine </timeline/travel> ;
 		tl:start "2014-03-17T09:20:00+01:00"^^xsd:dateTime ;
 		tl:end "2014-03-17T23:59:59+01:00"^^xsd:dateTime
 	] .
 
-:rideBarcelonaHolbæk_2 a event:Event ;
+:ride-barcelonaHolbæk_2 a event:Event ;
 	rdfs:label "1 x train Barcelona→Holbæk [continued...]"@en ;
-	dcterms:subject :attendanceSplit ;
+	dcterms:subject :concept-attendanceSplit ;
 	event:time [ a tl:Interval ;
 		tl:onTimeLine </timeline/travel> ;
 		tl:start "2014-03-18T00:00:00+01:00"^^xsd:dateTime ;
 		tl:end "2014-03-18T10:37:00+01:00"^^xsd:dateTime
 	] .
 
-:rideHolbækBrusselsJonasLate a event:Event ;
+:ride-holbækBrusselsJonasLate a event:Event ;
 	rdfs:label "1 x train Holbæk→Brussels (Greens/EFA)"@en ;
-	dcterms:subject :attendanceSplit ;
+	dcterms:subject :concept-attendanceSplit ;
 	event:time [ a tl:Interval ;
 		tl:onTimeLine </timeline/travel> ;
 		tl:start "2014-03-23T16:00:00+01:00"^^xsd:dateTime ;
 		tl:end "2014-03-23T23:59:59+01:00"^^xsd:dateTime
 	] .
 
-:rideHolbækBrusselsJonasLate_ a event:Event ;
+:ride-holbækBrusselsJonasLate_ a event:Event ;
 	rdfs:label "1 x train Holbæk→Brussels [continued...]"@en ;
-	dcterms:subject :attendanceSplit ;
+	dcterms:subject :concept-attendanceSplit ;
 	event:time [ a tl:Interval ;
 		tl:onTimeLine </timeline/travel> ;
 		tl:start "2014-03-24T00:00:00+01:00"^^xsd:dateTime ;
 		tl:end "2014-03-24T10:00:00+01:00"^^xsd:dateTime
 	] .
 
-:rideBarcelonaParis a event:Event ;
+:ride-barcelonaParis a event:Event ;
 	rdfs:label "2 x train Barcelona→Paris (Debian)"@en ;
-	dcterms:subject :attendanceAll ;
+	dcterms:subject :concept-attendanceAll ;
 	event:time [ a tl:Interval ;
 		tl:onTimeLine </timeline/travel> ;
 		tl:start "2014-03-24T09:20:00+01:00"^^xsd:dateTime ;
 		tl:end "2014-03-24T16:53:00+01:00"^^xsd:dateTime
 	] .
 
-:atParisLate a event:Event ;
+:stay-parisLate a event:Event ;
 	rdfs:label "Siri and Jonas bring gear to IRILL"@en ;
-	dcterms:subject :attendanceAll ;
+	dcterms:subject :concept-attendanceAll ;
 	event:based_near dbpedia:Paris ;
 	event:time [ a tl:Interval ;
 		tl:onTimeLine </timeline/travel> ;
@@ -309,18 +309,18 @@
 		tl:end "2014-03-24T18:00:00+01:00"^^xsd:dateTime
 	] .
 
-:rideParisBrussels a event:Event ;
+:ride-parisBrussels a event:Event ;
 	rdfs:label "2 x train Paris→Brussels (Debian + Greens/EFA)"@en ;
-	dcterms:subject :attendanceAll ;
+	dcterms:subject :concept-attendanceAll ;
 	event:time [ a tl:Interval ;
 		tl:onTimeLine </timeline/travel> ;
 		tl:start "2014-03-24T20:21:00+01:00"^^xsd:dateTime ;
 		tl:end "2014-03-24T21:47:00+01:00"^^xsd:dateTime
 	] .
 
-:atBrusselsLate a event:Event ;
+:stay-brusselsLate a event:Event ;
 	rdfs:label "Siri and Jonas attend Greens/EFA event"@en ;
-	dcterms:subject :attendanceAll ;
+	dcterms:subject :concept-attendanceAll ;
 	event:based_near dbpedia:Barcelona ;
 	event:time [ a tl:Interval ;
 		tl:onTimeLine </timeline/travel> ;
@@ -328,9 +328,9 @@
 		tl:end "2014-03-26T23:59:59+01:00"^^xsd:dateTime
 	] .
 
-:atBrusselsLateJonas a event:Event ;
+:stay-brusselsLateJonas a event:Event ;
 	rdfs:label "Jonas attend Greens/EFA event"@en ;
-	dcterms:subject :attendanceSplit ;
+	dcterms:subject :concept-attendanceSplit ;
 	event:based_near dbpedia:Barcelona ;
 	event:time [ a tl:Interval ;
 		tl:onTimeLine </timeline/travel> ;
@@ -338,85 +338,85 @@
 		tl:end "2014-03-26T23:59:59+01:00"^^xsd:dateTime
 	] .
 
-:rideBrusselsHolbæk a event:Event ;
+:ride-brusselsHolbæk a event:Event ;
 	rdfs:label "2 x train Brussels→Holbæk (Debian + Greens/EFA)"@en ;
-	dcterms:subject :attendanceAll ;
+	dcterms:subject :concept-attendanceAll ;
 	event:time [ a tl:Interval ;
 		tl:onTimeLine </timeline/travel> ;
 		tl:start "2014-03-26T19:30:00+01:00"^^xsd:dateTime ;
 		tl:end "2014-03-26T23:59:59+01:00"^^xsd:dateTime
 	] .
 
-:rideBrusselsHolbæk_2 a event:Event ;
+:ride-brusselsHolbæk_2 a event:Event ;
 	rdfs:label "2 x train Brussels→Holbæk [continued...]"@en ;
-	dcterms:subject :attendanceAll ;
+	dcterms:subject :concept-attendanceAll ;
 	event:time [ a tl:Interval ;
 		tl:onTimeLine </timeline/travel> ;
 		tl:start "2014-03-27T00:00:00+01:00"^^xsd:dateTime ;
 		tl:end "2014-03-27T10:37:00+01:00"^^xsd:dateTime
 	] .
 
-:rideBrusselsHolbækJonasLate a event:Event ;
+:ride-brusselsHolbækJonasLate a event:Event ;
 	rdfs:label "1 x train Brussels→Holbæk (Greens/EFA)"@en ;
-	dcterms:subject :attendanceSplit ;
+	dcterms:subject :concept-attendanceSplit ;
 	event:time [ a tl:Interval ;
 		tl:onTimeLine </timeline/travel> ;
 		tl:start "2014-03-26T19:30:00+01:00"^^xsd:dateTime ;
 		tl:end "2014-03-26T23:59:59+01:00"^^xsd:dateTime
 	] .
 
-:rideBrusselsHolbækJonasLate_2 a event:Event ;
+:ride-brusselsHolbækJonasLate_2 a event:Event ;
 	rdfs:label "1 x train Brussels→Holbæk [continued...]"@en ;
-	dcterms:subject :attendanceSplit ;
+	dcterms:subject :concept-attendanceSplit ;
 	event:time [ a tl:Interval ;
 		tl:onTimeLine </timeline/travel> ;
 		tl:start "2014-03-27T00:00:00+01:00"^^xsd:dateTime ;
 		tl:end "2014-03-27T10:37:00+01:00"^^xsd:dateTime
 	] .
 
-:slotWednesday5th a prog:TimeSlot ;
+:slot-wednesday5th a prog:TimeSlot ;
 	rdfs:label "EPFSUG event day"@en ;
 	event:time [ a tl:Interval ;
 		tl:start "2014-03-05T00:00:00+01:00"^^xsd:dateTime ;
 		tl:end "2014-03-05T23:59:59+01:00"^^xsd:dateTime
 	] .
 
-:slotThursday6th a prog:TimeSlot ;
+:slot-thursday6th a prog:TimeSlot ;
 	rdfs:label "Regular business day"@en ;
 	event:time [ a tl:Interval ;
 		tl:start "2014-03-06T08:30:00+01:00"^^xsd:dateTime ;
 		tl:end "2014-03-06T16:30:00+01:00"^^xsd:dateTime
 	] .
 
-:slotWednesday12th a prog:TimeSlot ;
+:slot-wednesday12th a prog:TimeSlot ;
 	rdfs:label "MiniDebconf deadline video gear arrival"@en ;
 	event:time [ a tl:Interval ;
 		tl:start "2014-03-12T00:00:00+01:00"^^xsd:dateTime ;
 		tl:end "2014-03-12T23:59:59+01:00"^^xsd:dateTime
 	] .
 
-:slotSaturday15th a prog:TimeSlot ;
+:slot-saturday15th a prog:TimeSlot ;
 	rdfs:label "MiniDebconf day #1"@en ;
 	event:time [ a tl:Interval ;
 		tl:start "2014-03-15T00:00:00+01:00"^^xsd:dateTime ;
 		tl:end "2014-03-15T23:59:59+01:00"^^xsd:dateTime
 	] .
 
-:slotSunday16th a prog:TimeSlot ;
+:slot-sunday16th a prog:TimeSlot ;
 	rdfs:label "MiniDebconf day #2"@en ;
 	event:time [ a tl:Interval ;
 		tl:start "2014-03-16T00:00:00+01:00"^^xsd:dateTime ;
 		tl:end "2014-03-16T23:59:59+01:00"^^xsd:dateTime
 	] .
 
-:slotMonday24th a prog:TimeSlot ;
+:slot-monday24th a prog:TimeSlot ;
 	rdfs:label "Regular business day"@en ;
 	event:time [ a tl:Interval ;
 		tl:start "2014-03-24T08:30:00+01:00"^^xsd:dateTime ;
 		tl:end "2014-03-24T16:30:00+01:00"^^xsd:dateTime
 	] .
 
-:slotWednesday26th a prog:TimeSlot ;
+:slot-wednesday26th a prog:TimeSlot ;
 	rdfs:label "Document Freedom Day"@en ;
 	event:time [ a tl:Interval ;
 		tl:start "2014-03-26T00:00:00+01:00"^^xsd:dateTime ;
@@ -425,537 +425,537 @@
 
 </timeline/floss> a tl:Timeline ;
 	rdfs:title "FLOSS events jointly involving Siri and Jonas"@en ;
-	event:agent :jonas, :siri .
+	event:agent :person-jonas, :person-siri .
 
-:attendanceAll a skos:Concept ;
+:concept-attendanceAll a skos:Concept ;
 	skos:prefLabel "Siri and Jonas attend all planned events together"@en .
 
-:attendanceSplit a skos:Concept ;
+:concept-attendanceSplit a skos:Concept ;
 	skos:prefLabel "Siri and Jonas attend different events"@en ;
 	rdfs:comment "time-limited sponsorship for Siri disqualify a shared travel route"@en .
 
-:jonas a foaf:Person ;
+:person-jonas a foaf:Person ;
 	foaf:name "Jonas Smedegaard" ;
 	foaf:Homepage <http://dr.jones.dk/> ;
 	owl:sameAs <http://dr.jones.dk/foaf#me> .
 
-:siri a foaf:Person ;
+:person-siri a foaf:Person ;
 	foaf:name "Siri Reiter" ;
 	foaf:Homepage <http://sirireiter.dk/> .
 
-:sponsorshipDebianJonas
+:subsidy-debianJonas
 	rdfs:label "Debian sponsorship Paris <-> Barcelona for Jonas"@en ;
 	rdfs:comment "depends on FOSDEM, Greens/EFA and EPFSUG sponsorships, and on Siri sponsored via same route"@en ;
-	payment:payer :debian ;
-	payment:payee :jonas ;
+	payment:payer :org-debian ;
+	payment:payee :person-jonas ;
 	payment:expenditureLine [ a payment:ExpenditureLine ;
-		payment:payment :offerSncfParisBarcelonaReturn ;
+		payment:payment :offer-sncfParisBarcelonaReturn ;
 		payment:netAmount "179.20"^^xsd:decimal
 	] ;
 	payment:totalNetAmount "179.20"^^xsd:decimal .
 
-:sponsorshipDebianJonasSplitTickets
+:subsidy-debianJonasSplitTickets
 	rdfs:label "Debian sponsorship Paris <-> Barcelona for Jonas"@en ;
 	rdfs:comment "depends on FOSDEM, Greens/EFA and EPFSUG sponsorships, and on Siri sponsored via same route"@en ;
-	payment:payer :debian ;
-	payment:payee :jonas ;
+	payment:payer :org-debian ;
+	payment:payee :person-jonas ;
 	payment:expenditureLine [ a payment:ExpenditureLine ;
-		payment:payment :offerSncfParisBarcelona ;
+		payment:payment :offer-sncfParisBarcelona ;
 		payment:netAmount "109.00"^^xsd:decimal
 #		payment:netAmount "125.70"^^xsd:decimal
 	], [ a payment:ExpenditureLine ;
-		payment:payment :offerSncfBarcelonaParis ;
+		payment:payment :offer-sncfBarcelonaParis ;
 		payment:netAmount "97.90"^^xsd:decimal
 #		payment:netAmount "125.70"^^xsd:decimal
 	] ;
 	payment:totalNetAmount "196.90"^^xsd:decimal .
 #	payment:totalNetAmount "251.40"^^xsd:decimal .
 
-:sponsorshipDebianJonasSoloEvent
+:subsidy-debianJonasSoloEvent
 	rdfs:label "Debian sponsorship Holbæk <-> Barcelona for Jonas"@en ;
 	rdfs:comment "depends on Siri sponsored via same route"@en ;
-	payment:payer :debian ;
-	payment:payee :jonas ;
+	payment:payer :org-debian ;
+	payment:payee :person-jonas ;
 	payment:expenditureLine [ a payment:ExpenditureLine ;
-		payment:payment :offerDbInterrail5 ;
+		payment:payment :offer-dbInterrail5 ;
 		payment:netAmount "239.00"^^xsd:decimal
 	] ;
 	payment:totalNetAmount "239.00"^^xsd:decimal .
 
-:sponsorshipDebianSiri
+:subsidy-debianSiri
 	rdfs:label "Debian sponsorship Holbæk <-> Barcelona for Siri"@en ;
 	rdfs:comment "independent from other sponsorships"@en ;
-	payment:payer :debian ;
-	payment:payee :siri ;
+	payment:payer :org-debian ;
+	payment:payee :person-siri ;
 	payment:expenditureLine [ a payment:ExpenditureLine ;
-		payment:payment :offerDbInterrail10 ;
+		payment:payment :offer-dbInterrail10 ;
 		payment:netAmount "339.00"^^xsd:decimal
 	] ;
 	payment:totalNetAmount "339.00"^^xsd:decimal .
 
-:sponsorshipDebianSiriSoloEvent
+:subsidy-debianSiriSoloEvent
 	rdfs:label "Debian sponsorship Holbæk <-> Barcelona for Siri"@en ;
 	rdfs:comment "independent from other sponsorships, but disqualifies Jonas"@en ;
-	payment:payer :debian ;
-	payment:payee :siri ;
+	payment:payer :org-debian ;
+	payment:payee :person-siri ;
 	payment:expenditureLine [ a payment:ExpenditureLine ;
-		payment:payment :offerDbInterrail5 ;
+		payment:payment :offer-dbInterrail5 ;
 		payment:netAmount "239.00"^^xsd:decimal
 	] ;
 	payment:totalNetAmount "239.00"^^xsd:decimal .
 
-:sponsorshipGreens
+:subsidy-greens
 	rdfs:label "Greens/EFA sponsorship Paris -> Brussels -> Holbæk for Jonas"@en ;
 	rdfs:comment "depends on Debian, FOSDEM and EPFSUG sponsorships"@en ;
-	payment:payer :greens ;
-	payment:payee :jonas ;
+	payment:payer :org-greens ;
+	payment:payee :person-jonas ;
 	payment:expenditureLine [ a payment:ExpenditureLine ;
-		payment:payment :offerSncfParisBrussels ;
+		payment:payment :offer-sncfParisBrussels ;
 		payment:netAmount "40.00"^^xsd:decimal
 #		payment:netAmount "81.00"^^xsd:decimal
 	], [ a payment:ExpenditureLine ;
-		payment:payment :offerDbBahncard25Probe ;
+		payment:payment :offer-dbBahncard25Probe ;
 		payment:netAmount "25.00"^^xsd:decimal
 	], [ a payment:ExpenditureLine ;
-		payment:payment :offerDbBrusselsCologneBahncard25 ;
+		payment:payment :offer-dbBrusselsCologneBahncard25 ;
 		payment:netAmount "14.20"^^xsd:decimal
 #		payment:netAmount "29.15"^^xsd:decimal
 	], [ a payment:ExpenditureLine ;
-		payment:payment :offerDbCologneHolbækBahncard25 ;
+		payment:payment :offer-dbCologneHolbækBahncard25 ;
 		payment:netAmount "63.25"^^xsd:decimal
 #		payment:netAmount "79.25"^^xsd:decimal
 	] ;
 	payment:totalNetAmount "142.45"^^xsd:decimal .
 #	payment:totalNetAmount "214.40"^^xsd:decimal .
 
-:sponsorshipGreensNoBahncard
+:subsidy-greensNoBahncard
 	rdfs:label "Greens/EFA sponsorship Paris -> Brussels -> Holbæk for Jonas"@en ;
 	rdfs:comment "depends on Debian, FOSDEM and EPFSUG sponsorships"@en ;
-	payment:payer :greens ;
-	payment:payee :jonas ;
+	payment:payer :org-greens ;
+	payment:payee :person-jonas ;
 	payment:expenditureLine [ a payment:ExpenditureLine ;
-		payment:payment :offerSncfParisBrussels ;
+		payment:payment :offer-sncfParisBrussels ;
 		payment:netAmount "40.00"^^xsd:decimal
 #		payment:netAmount "81.00"^^xsd:decimal
 	], [ a payment:ExpenditureLine ;
-		payment:payment :offerDbBrusselsCologne ;
+		payment:payment :offer-dbBrusselsCologne ;
 		payment:netAmount "19.00"^^xsd:decimal
 #		payment:netAmount "39.00"^^xsd:decimal
 	], [ a payment:ExpenditureLine ;
-		payment:payment :offerDbCologneHolbæk ;
+		payment:payment :offer-dbCologneHolbæk ;
 		payment:netAmount "79.00"^^xsd:decimal
 #		payment:netAmount "99.00"^^xsd:decimal
 	] ;
 	payment:totalNetAmount "117.45"^^xsd:decimal .
 #	payment:totalNetAmount "189.40"^^xsd:decimal .
 
-:sponsorshipGreensNoDebconf
+:subsidy-greensNoDebconf
 	rdfs:label "Greens/EFA sponsorship Brussels -> Holbæk for Jonas"@en ;
 	rdfs:comment "depends on EPFSUG sponsorship"@en ;
-	payment:payer :greens ;
-	payment:payee :jonas ;
+	payment:payer :org-greens ;
+	payment:payee :person-jonas ;
 	payment:expenditureLine [ a payment:ExpenditureLine ;
-		payment:payment :offerDbBahncard25Probe ;
+		payment:payment :offer-dbBahncard25Probe ;
 		payment:netAmount "25.00"^^xsd:decimal
 	], [ a payment:ExpenditureLine ;
-		payment:payment :offerDbBrusselsCologneBahncard25 ;
+		payment:payment :offer-dbBrusselsCologneBahncard25 ;
 		payment:netAmount "14.20"^^xsd:decimal
 #		payment:netAmount "29.15"^^xsd:decimal
 	], [ a payment:ExpenditureLine ;
-		payment:payment :offerDbCologneHolbækBahncard25 ;
+		payment:payment :offer-dbCologneHolbækBahncard25 ;
 		payment:netAmount "63.25"^^xsd:decimal
 #		payment:netAmount "79.25"^^xsd:decimal
 	] ;
 	payment:totalNetAmount "102.45"^^xsd:decimal .
 #	payment:totalNetAmount "133.40"^^xsd:decimal .
 
-:sponsorshipGreensNoDebconfEpfsugBahncard
+:subsidy-greensNoDebconfEpfsugBahncard
 	rdfs:label "Greens/EFA sponsorship Brussels -> Holbæk for Jonas"@en ;
 	rdfs:comment "depends on EPFSUG sponsorship incl. Bahncard 25"@en ;
-	payment:payer :greens ;
-	payment:payee :jonas ;
+	payment:payer :org-greens ;
+	payment:payee :person-jonas ;
 	payment:expenditureLine [ a payment:ExpenditureLine ;
-		payment:payment :offerDbBrusselsCologneBahncard25 ;
+		payment:payment :offer-dbBrusselsCologneBahncard25 ;
 		payment:netAmount "14.20"^^xsd:decimal
 #		payment:netAmount "29.15"^^xsd:decimal
 	], [ a payment:ExpenditureLine ;
-		payment:payment :offerDbCologneHolbækBahncard25 ;
+		payment:payment :offer-dbCologneHolbækBahncard25 ;
 		payment:netAmount "63.25"^^xsd:decimal
 #		payment:netAmount "79.25"^^xsd:decimal
 	] ;
 	payment:totalNetAmount "77.45"^^xsd:decimal .
 #	payment:totalNetAmount "108.40"^^xsd:decimal .
 
-:sponsorshipGreensSoloEvent
+:subsidy-greensSoloEvent
 	rdfs:label "Greens/EFA sponsorship Holbæk <-> Brussels for Jonas"@en ;
 	rdfs:comment "independent from other sponsorships"@en ;
-	payment:payer :greens ;
-	payment:payee :jonas ;
+	payment:payer :org-greens ;
+	payment:payee :person-jonas ;
 	payment:expenditureLine [ a payment:ExpenditureLine ;
-		payment:payment :offerDbBahncard25Probe ;
+		payment:payment :offer-dbBahncard25Probe ;
 		payment:netAmount "25.00"^^xsd:decimal
 	], [ a payment:ExpenditureLine ;
-		payment:payment :offerDbHolbækCologneBahncard25 ;
+		payment:payment :offer-dbHolbækCologneBahncard25 ;
 		payment:netAmount "63.25"^^xsd:decimal
 #		payment:netAmount "79.25"^^xsd:decimal
 	], [ a payment:ExpenditureLine ;
-		payment:payment :offerDbCologneBrusselsBahncard25 ;
+		payment:payment :offer-dbCologneBrusselsBahncard25 ;
 		payment:netAmount "14.20"^^xsd:decimal
 #		payment:netAmount "29.15"^^xsd:decimal
 	], [ a payment:ExpenditureLine ;
-		payment:payment :offerDbBrusselsCologneBahncard25 ;
+		payment:payment :offer-dbBrusselsCologneBahncard25 ;
 		payment:netAmount "14.20"^^xsd:decimal
 #		payment:netAmount "29.15"^^xsd:decimal
 	], [ a payment:ExpenditureLine ;
-		payment:payment :offerDbCologneHolbækBahncard25 ;
+		payment:payment :offer-dbCologneHolbækBahncard25 ;
 		payment:netAmount "63.25"^^xsd:decimal
 #		payment:netAmount "79.25"^^xsd:decimal
 	] ;
 	payment:totalNetAmount "179.90"^^xsd:decimal .
 #	payment:totalNetAmount "241.80"^^xsd:decimal .
 
-:sponsorshipGreensSoloEventNoBahncard
+:subsidy-greensSoloEventNoBahncard
 	rdfs:label "Greens/EFA sponsorship Holbæk <-> Brussels for Jonas"@en ;
 	rdfs:comment "independent from other sponsorships"@en ;
-	payment:payer :greens ;
-	payment:payee :jonas ;
+	payment:payer :org-greens ;
+	payment:payee :person-jonas ;
 	payment:expenditureLine [ a payment:ExpenditureLine ;
-		payment:payment :offerDbHolbækCologne ;
+		payment:payment :offer-dbHolbækCologne ;
 		payment:netAmount "79.00"^^xsd:decimal
 #		payment:netAmount "99.00"^^xsd:decimal
 	], [ a payment:ExpenditureLine ;
-		payment:payment :offerDbCologneBrussels ;
+		payment:payment :offer-dbCologneBrussels ;
 		payment:netAmount "19.00"^^xsd:decimal
 #		payment:netAmount "39.00"^^xsd:decimal
 	], [ a payment:ExpenditureLine ;
-		payment:payment :offerDbBrusselsCologne ;
+		payment:payment :offer-dbBrusselsCologne ;
 		payment:netAmount "19.00"^^xsd:decimal
 #		payment:netAmount "39.00"^^xsd:decimal
 	], [ a payment:ExpenditureLine ;
-		payment:payment :offerDbCologneHolbæk ;
+		payment:payment :offer-dbCologneHolbæk ;
 		payment:netAmount "79.00"^^xsd:decimal
 #		payment:netAmount "99.00"^^xsd:decimal
 	] ;
 	payment:totalNetAmount "196"^^xsd:decimal .
 #	payment:totalNetAmount "276"^^xsd:decimal .
 
-:sponsorshipGreensSoloEventComboticket
+:subsidy-greensSoloEventComboticket
 	rdfs:label "Greens/EFA sponsorship Holbæk <-> Brussels for Jonas"@en ;
 	rdfs:comment "independent from other sponsorships"@en ;
-	payment:payer :greens ;
-	payment:payee :jonas ;
+	payment:payer :org-greens ;
+	payment:payee :person-jonas ;
 	payment:expenditureLine [ a payment:ExpenditureLine ;
-		payment:payment :offerDsbHolbækBrusselsReturn ;
+		payment:payment :offer-dsbHolbækBrusselsReturn ;
 		payment:netAmount "274"^^xsd:decimal
 #		payment:netAmount "339"^^xsd:decimal
 	] ;
 	payment:totalNetAmount "274"^^xsd:decimal .
 #	payment:totalNetAmount "339"^^xsd:decimal .
 
-:sponsorshipEpfsug
+:subsidy-epfsug
 	rdfs:label "EPFSUG sponsorship Brussels -> Holbæk for Jonas"@en ;
 	rdfs:comment "depends on Greens/EFA sponsorships incl. Bahncard"@en ;
-	payment:payer :epfsug ;
-	payment:payee :jonas ;
+	payment:payer :org-epfsug ;
+	payment:payee :person-jonas ;
 	payment:expenditureLine [ a payment:ExpenditureLine ;
-		payment:payment :offerDbHolbækCologneBahncard25 ;
+		payment:payment :offer-dbHolbækCologneBahncard25 ;
 		payment:netAmount "63.25"^^xsd:decimal
 #		payment:netAmount "79.25"^^xsd:decimal
 	], [ a payment:ExpenditureLine ;
-		payment:payment :offerDbCologneBrusselsBahncard25 ;
+		payment:payment :offer-dbCologneBrusselsBahncard25 ;
 		payment:netAmount "14.20"^^xsd:decimal
 #		payment:netAmount "29.15"^^xsd:decimal
 	] ;
 	payment:totalNetAmount "77.45"^^xsd:decimal .
 #	payment:totalNetAmount "108.40"^^xsd:decimal .
 
-:sponsorshipEpfsugBahncard
+:subsidy-epfsugBahncard
 	rdfs:label "EPFSUG sponsorship Brussels -> Holbæk for Jonas"@en ;
 	rdfs:comment "depends on Greens/EFA sponsorships excl. Bahncard25"@en ;
-	payment:payer :epfsug ;
-	payment:payee :jonas ;
+	payment:payer :org-epfsug ;
+	payment:payee :person-jonas ;
 	payment:expenditureLine [ a payment:ExpenditureLine ;
-		payment:payment :offerDbBahncard25Probe ;
+		payment:payment :offer-dbBahncard25Probe ;
 		payment:netAmount "25.00"^^xsd:decimal
 	], [ a payment:ExpenditureLine ;
-		payment:payment :offerDbHolbækCologneBahncard25 ;
+		payment:payment :offer-dbHolbækCologneBahncard25 ;
 		payment:netAmount "63.25"^^xsd:decimal
 #		payment:netAmount "79.25"^^xsd:decimal
 	], [ a payment:ExpenditureLine ;
-		payment:payment :offerDbCologneBrusselsBahncard25 ;
+		payment:payment :offer-dbCologneBrusselsBahncard25 ;
 		payment:netAmount "14.20"^^xsd:decimal
 #		payment:netAmount "29.15"^^xsd:decimal
 	] ;
 	payment:totalNetAmount "102.45"^^xsd:decimal .
 #	payment:totalNetAmount "133.40"^^xsd:decimal .
 
-:sponsorshipEpfsugNoGoogle
+:subsidy-epfsugNoGoogle
 	rdfs:label "EPFSUG sponsorship Holbæk <-> Brussels for Jonas"@en ;
 	rdfs:comment "depends on Greens/EFA sponsorship incl. Bahncard"@en ;
-	payment:payer :epfsug ;
-	payment:payee :jonas ;
+	payment:payer :org-epfsug ;
+	payment:payee :person-jonas ;
 	payment:expenditureLine [ a payment:ExpenditureLine ;
-		payment:payment :offerDbHolbækCologneBahncard25 ;
+		payment:payment :offer-dbHolbækCologneBahncard25 ;
 		payment:netAmount "63.25"^^xsd:decimal
 #		payment:netAmount "79.25"^^xsd:decimal
 	], [ a payment:ExpenditureLine ;
-		payment:payment :offerDbCologneBrusselsBahncard25 ;
+		payment:payment :offer-dbCologneBrusselsBahncard25 ;
 		payment:netAmount "14.20"^^xsd:decimal
 #		payment:netAmount "29.15"^^xsd:decimal
 	], [ a payment:ExpenditureLine ;
-		payment:payment :offerDbBrusselsCologneBahncard25 ;
+		payment:payment :offer-dbBrusselsCologneBahncard25 ;
 		payment:netAmount "14.20"^^xsd:decimal
 #		payment:netAmount "29.15"^^xsd:decimal
 	], [ a payment:ExpenditureLine ;
-		payment:payment :offerDbCologneHolbækBahncard25 ;
+		payment:payment :offer-dbCologneHolbækBahncard25 ;
 		payment:netAmount "63.25"^^xsd:decimal
 #		payment:netAmount "79.25"^^xsd:decimal
 	] ;
 	payment:totalNetAmount "154.90"^^xsd:decimal .
 #	payment:totalNetAmount "216.80"^^xsd:decimal .
 
-:sponsorshipEpfsugSoloEvent
+:subsidy-epfsugSoloEvent
 	rdfs:label "EPFSUG sponsorship Holbæk <-> Brussels for Jonas"@en ;
 	rdfs:comment "independent from other sponsorships"@en ;
-	payment:payer :epfsug ;
-	payment:payee :jonas ;
+	payment:payer :org-epfsug ;
+	payment:payee :person-jonas ;
 	payment:expenditureLine [ a payment:ExpenditureLine ;
-		payment:payment :offerDbBahncard25Probe ;
+		payment:payment :offer-dbBahncard25Probe ;
 		payment:netAmount "25.00"^^xsd:decimal
 	], [ a payment:ExpenditureLine ;
-		payment:payment :offerDbHolbækCologneBahncard25 ;
+		payment:payment :offer-dbHolbækCologneBahncard25 ;
 		payment:netAmount "63.25"^^xsd:decimal
 #		payment:netAmount "79.25"^^xsd:decimal
 	], [ a payment:ExpenditureLine ;
-		payment:payment :offerDbCologneBrusselsBahncard25 ;
+		payment:payment :offer-dbCologneBrusselsBahncard25 ;
 		payment:netAmount "14.20"^^xsd:decimal
 #		payment:netAmount "29.15"^^xsd:decimal
 	], [ a payment:ExpenditureLine ;
-		payment:payment :offerDbBrusselsCologneBahncard25 ;
+		payment:payment :offer-dbBrusselsCologneBahncard25 ;
 		payment:netAmount "14.20"^^xsd:decimal
 #		payment:netAmount "29.15"^^xsd:decimal
 	], [ a payment:ExpenditureLine ;
-		payment:payment :offerDbCologneHolbækBahncard25 ;
+		payment:payment :offer-dbCologneHolbækBahncard25 ;
 		payment:netAmount "63.25"^^xsd:decimal
 #		payment:netAmount "79.25"^^xsd:decimal
 	] ;
 	payment:totalNetAmount "179.90"^^xsd:decimal .
 #	payment:totalNetAmount "241.80"^^xsd:decimal .
 
-:sponsorshipEpfsugSoloEventNoBahncard
+:subsidy-epfsugSoloEventNoBahncard
 	rdfs:label "EPFSUG sponsorship Holbæk <-> Brussels for Jonas"@en ;
 	rdfs:comment "independent from other sponsorships"@en ;
-	payment:payer :epfsug ;
-	payment:payee :jonas ;
+	payment:payer :org-epfsug ;
+	payment:payee :person-jonas ;
 	payment:expenditureLine [ a payment:ExpenditureLine ;
-		payment:payment :offerDbHolbækCologne ;
+		payment:payment :offer-dbHolbækCologne ;
 		payment:netAmount "79.00"^^xsd:decimal
 #		payment:netAmount "99.00"^^xsd:decimal
 	], [ a payment:ExpenditureLine ;
-		payment:payment :offerDbCologneBrussels ;
+		payment:payment :offer-dbCologneBrussels ;
 		payment:netAmount "19.00"^^xsd:decimal
 #		payment:netAmount "39.00"^^xsd:decimal
 	], [ a payment:ExpenditureLine ;
-		payment:payment :offerDbBrusselsCologne ;
+		payment:payment :offer-dbBrusselsCologne ;
 		payment:netAmount "19.00"^^xsd:decimal
 #		payment:netAmount "39.00"^^xsd:decimal
 	], [ a payment:ExpenditureLine ;
-		payment:payment :offerDbCologneHolbæk ;
+		payment:payment :offer-dbCologneHolbæk ;
 		payment:netAmount "79.00"^^xsd:decimal
 #		payment:netAmount "99.00"^^xsd:decimal
 	] ;
 	payment:totalNetAmount "196"^^xsd:decimal .
 #	payment:totalNetAmount "276"^^xsd:decimal .
 
-:sponsorshipEpfsugSoloEventComboticket
+:subsidy-epfsugSoloEventComboticket
 	rdfs:label "EPFSUG sponsorship Holbæk <-> Brussels for Jonas"@en ;
 	rdfs:comment "independent from other sponsorships"@en ;
-	payment:payer :epfsug ;
-	payment:payee :jonas ;
+	payment:payer :org-epfsug ;
+	payment:payee :person-jonas ;
 	payment:expenditureLine [ a payment:ExpenditureLine ;
-		payment:payment :offerDsbHolbækBrusselsReturn ;
+		payment:payment :offer-dsbHolbækBrusselsReturn ;
 		payment:netAmount "274"^^xsd:decimal
 #		payment:netAmount "339"^^xsd:decimal
 	] ;
 	payment:totalNetAmount "274"^^xsd:decimal .
 #	payment:totalNetAmount "339"^^xsd:decimal .
 
-:sponsorshipFosdem
+:subsidy-fosdem
 	rdfs:label "FOSDEM sponsorship Brussels -> Paris for Jonas"@en ;
 	rdfs:comment "depends on Debian, EPFSUG and Greens/EFA sponsorships"@en ;
-	payment:payer :fosdem ;
-	payment:payee :jonas ;
+	payment:payer :org-fosdem ;
+	payment:payee :person-jonas ;
 	payment:expenditureLine [ a payment:ExpenditureLine ;
-		payment:payment :offerSncfBrusselsParis ;
+		payment:payment :offer-sncfBrusselsParis ;
 		payment:netAmount "50.00"^^xsd:decimal
 #		payment:netAmount "81.00"^^xsd:decimal
 	] ;
 	payment:totalNetAmount "50.00"^^xsd:decimal .
 #	payment:totalNetAmount "81.00"^^xsd:decimal .
 
-:sponsorshipGoogle
+:subsidy-google
 	rdfs:comment "independent from other sponsorships"@en ;
-	payment:payer :google ;
-	payment:payee :siri ;
+	payment:payer :org-google ;
+	payment:payee :person-siri ;
 	payment:expenditureLine [ a payment:ExpenditureLine ;
-		payment:payment :offerDbInterrail10In20 ;
+		payment:payment :offer-dbInterrail10In20 ;
 		payment:netAmount "339.00"^^xsd:decimal
 	] ;
 	payment:totalNetAmount "339.00"^^xsd:decimal .
 
-:sponsorshipGoogle
+:subsidy-google
 	rdfs:comment "independent from other sponsorships, but disqualifies Jonas"@en ;
-	payment:payer :google ;
-	payment:payee :siri ;
+	payment:payer :org-google ;
+	payment:payee :person-siri ;
 	payment:expenditureLine [ a payment:ExpenditureLine ;
-		payment:payment :offerDbInterrail5In10 ;
+		payment:payment :offer-dbInterrail5In10 ;
 		payment:netAmount "239.00"^^xsd:decimal
 	] ;
 	payment:totalNetAmount "239.00"^^xsd:decimal .
 
-:debconfBcn2014Team a org:OrganizationalCollaboration ;
-	org:hasMember :debianWomen, :debconfGlobalTeam, :debconfVideoTeam ;
+:team-minidebconf a org:OrganizationalCollaboration ;
+	org:hasMember :org-debianWomen, :team-debconfGlobal, :team-debconfVideo ;
 	foaf:Homepage <https://wiki.debian.org/DebianWomen/Projects/MiniDebconf-Women/2014> .
 
-:debianWomen a org:OrganizationalCollaboration ;
-	org:hasMember :debian ;
+:org-debianWomen a org:OrganizationalCollaboration ;
+	org:hasMember :org-debian ;
 	foaf:Homepage <https://www.debian.org/women/> .
 
-:debconfGlobalTeam a org:OrganizationalCollaboration ;
-	org:hasMember :debian ;
+:team-debconfGlobal a org:OrganizationalCollaboration ;
+	org:hasMember :org-debian ;
 	foaf:Homepage <https://wiki.debian.org/Teams/DebConfGlobalTeam> .
 
-:debconfVideoTeam a org:OrganizationalCollaboration ;
-	org:hasMember :debian, :fosdem ;
+:team-debconfVideo a org:OrganizationalCollaboration ;
+	org:hasMember :org-debian, :org-fosdem ;
 	foaf:Homepage <https://wiki.debconf.org/wiki/Videoteam> .
 
-:debian a org:FormalOrganization ;
+:org-debian a org:FormalOrganization ;
 	foaf:Homepage <https://www.debian.org/> .
 
-:greens a org:FormalOrganization ;
+:org-greens a org:FormalOrganization ;
 	foaf:Homepage <https://www.greens-efa.eu/> .
 
-:epfsug a org:Organization ;
+:org-epfsug a org:Organization ;
 	foaf:Homepage <http://epfsug.eu/> .
 
-:fosdem a org:FormalOrganization ;
+:org-fosdem a org:FormalOrganization ;
 	foaf:Homepage <https://fosdem.org/> .
 
-:google a gr:BusinessEntity ;
+:org-google a gr:BusinessEntity ;
 	gr:legalName "Google Inc." ;
 	foaf:Homepage <https://www.google.com/intl/en/about/company/> .
 
-:ticketDsbHolbækRoskilde a tio:TicketPlaceholder ;
+:ticket-dsbHolbækRoskilde a tio:TicketPlaceholder ;
 	rdfs:label "Train ticket from Holbæk to Roskilde"@en ;
-	tio:accessTo :lineDsbCopenhagenKalundborg .
+	tio:accessTo :line-dsbCopenhagenKalundborg .
 
-:ticketDsbRoskildeHolbæk a tio:TicketPlaceholder ;
+:ticket-dsbRoskildeHolbæk a tio:TicketPlaceholder ;
 	rdfs:label "Train ticket from Roskilde to Holbæk"@en ;
-	tio:accessTo :lineDsbCopenhagenKalundborg .
+	tio:accessTo :line-dsbCopenhagenKalundborg .
 
-:ticketDsbRoskildePadborg a tio:TicketPlaceholder ;
+:ticket-dsbRoskildePadborg a tio:TicketPlaceholder ;
 	rdfs:label "Train ticket from Roskilde to Padborg"@en ;
-	tio:accessTo :lineDsbCopenhagenHamburg .
+	tio:accessTo :line-dsbCopenhagenHamburg .
 
-:ticketDsbPadborgRoskilde a tio:TicketPlaceholder ;
+:ticket-dsbPadborgRoskilde a tio:TicketPlaceholder ;
 	rdfs:label "Train ticket from Padborg to Roskilde"@en ;
-	tio:accessTo :lineDsbCopenhagenHamburg .
+	tio:accessTo :line-dsbCopenhagenHamburg .
 
-:ticketDsbInterrail10 a tio:TicketPlaceholder ;
+:ticket-dsbInterrail10 a tio:TicketPlaceholder ;
 	rdfs:label "InterRail 10 days within 22 days"@en .
 
-:ticketDsbInterrail5 a tio:TicketPlaceholder ;
+:ticket-dsbInterrail5 a tio:TicketPlaceholder ;
 	rdfs:label "InterRail 5 days within 10 days"@en .
 
-:ticketDbRoskildePadborg a tio:TicketPlaceholder ;
+:ticket-dbRoskildePadborg a tio:TicketPlaceholder ;
 	rdfs:label "Train ticket from Roskilde to Padborg"@en ;
-	tio:accessTo :lineDbBorealis .
+	tio:accessTo :line-dbBorealis .
 
-:ticketDbPadborgRoskilde a tio:TicketPlaceholder ;
+:ticket-dbPadborgRoskilde a tio:TicketPlaceholder ;
 	rdfs:label "Train ticket from Padborg to Roskilde"@en ;
-	tio:accessTo :lineDbBorealis .
+	tio:accessTo :line-dbBorealis .
 
-:ticketDbRoskildeCologne a tio:TicketPlaceholder ;
+:ticket-dbRoskildeCologne a tio:TicketPlaceholder ;
 	rdfs:label "Train ticket from Roskilde to Cologne"@en ;
-	tio:accessTo :lineDbBorealis .
+	tio:accessTo :line-dbBorealis .
 
-:ticketDbCologneRoskilde a tio:TicketPlaceholder ;
+:ticket-dbCologneRoskilde a tio:TicketPlaceholder ;
 	rdfs:label "Train ticket from Cologne to Roskilde"@en ;
-	tio:accessTo :lineDbBorealis .
+	tio:accessTo :line-dbBorealis .
 
-:ticketDbCologneBrussels a tio:TicketPlaceholder ;
+:ticket-dbCologneBrussels a tio:TicketPlaceholder ;
 	rdfs:label "Train ticket from Cologne to Brussels"@en ;
-	tio:accessTo :lineDbCologneBrussels .
+	tio:accessTo :line-dbCologneBrussels .
 
-:ticketDbInterrail10 a tio:TicketPlaceholder ;
+:ticket-dbInterrail10 a tio:TicketPlaceholder ;
 	rdfs:label "InterRail 10 days within 22 days"@en .
 
-:ticketDbInterrail5 a tio:TicketPlaceholder ;
+:ticket-dbInterrail5 a tio:TicketPlaceholder ;
 	rdfs:label "InterRail 5 days within 10 days"@en .
 
-:ticketThalysCologneBrussels a tio:TicketPlaceholder ;
+:ticket-thalysCologneBrussels a tio:TicketPlaceholder ;
 	rdfs:label "Train ticket from Cologne to Brussels"@en ;
-	tio:accessTo :lineThalysCologneBrussels .
+	tio:accessTo :line-thalysCologneBrussels .
 
-:ticketDbBrusselsCologne a tio:TicketPlaceholder ;
+:ticket-dbBrusselsCologne a tio:TicketPlaceholder ;
 	rdfs:label "Train ticket from Brussels to Cologne"@en ;
-	tio:accessTo :lineDbCologneBrussels .
+	tio:accessTo :line-dbCologneBrussels .
 
-:ticketThalysBrusselsCologne a tio:TicketPlaceholder ;
+:ticket-thalysBrusselsCologne a tio:TicketPlaceholder ;
 	rdfs:label "Train ticket from Brussels to Cologne"@en ;
-	tio:accessTo :lineThalysCologneBrussels .
+	tio:accessTo :line-thalysCologneBrussels .
 
-:ticketThalysBrusselsParis a tio:TicketPlaceholder ;
+:ticket-thalysBrusselsParis a tio:TicketPlaceholder ;
 	rdfs:label "Train ticket from Brussels to Paris"@en ;
-	tio:accessTo :lineThalysBrusselsParis .
+	tio:accessTo :line-thalysBrusselsParis .
 
-:ticketThalysParisBrussels a tio:TicketPlaceholder ;
+:ticket-thalysParisBrussels a tio:TicketPlaceholder ;
 	rdfs:label "Train ticket from Paris to Brussels"@en ;
-	tio:accessTo :lineThalysBrusselsParis .
+	tio:accessTo :line-thalysBrusselsParis .
 
-:ticketRenfeBarcelonaParis a tio:TicketPlaceholder ;
+:ticket-renfeBarcelonaParis a tio:TicketPlaceholder ;
 	rdfs:label "Train ticket from Barcelona to Paris"@en ;
-	tio:accessTo :lineRenfeParisBarcelona .
+	tio:accessTo :line-renfeParisBarcelona .
 
-:lineDsbCopenhagenKalundborg a tio:TrainService ;
+:line-dsbCopenhagenKalundborg a tio:TrainService ;
 	tio:from dbpedia:Copenhagen ;
 	tio:via dbpedia:Roskilde ;
 	tio:via dbpedia:Holbæk ;
 	tio:to dbpedia:Kalundborg .
 
-:lineDsbCopenhagenHamburg a tio:TrainService ;
+:line-dsbCopenhagenHamburg a tio:TrainService ;
 	tio:from dbpedia:Copenhagen ;
 	tio:via dbpedia:Roskilde ;
 	tio:via dbpedia:Padborg ;
 	tio:to dbpedia:Hamburg .
 
-:lineDbBorealis a tio:TrainService ;
+:line-dbBorealis a tio:TrainService ;
 	foaf:Page <https://en.wikipedia.org/wiki/City_Night_Line> ;
 	tio:from dbpedia:Copenhagen ;
 	tio:via dbpedia:Roskilde ;
 	tio:via dbpedia:Cologne ;
 	tio:to dbpedia:Amsterdam .
 
-:lineDbCologneBrussels a tio:TrainService ;
+:line-dbCologneBrussels a tio:TrainService ;
 	tio:via dbpedia:Cologne ;
 	tio:to dbpedia:Brussels .
 
-:lineThalysCologneBrussels a tio:TrainService ;
+:line-thalysCologneBrussels a tio:TrainService ;
 	tio:via dbpedia:Cologne ;
 	tio:to dbpedia:Brussels .
 
-:lineThalysBrusselsParis a tio:TrainService ;
+:line-thalysBrusselsParis a tio:TrainService ;
 	tio:from dbpedia:Brussels ;
 	tio:to dbpedia:Paris .
 
-:lineRenfeParisBarcelona a tio:TrainService ;
+:line-renfeParisBarcelona a tio:TrainService ;
 	tio:from dbpedia:Paris ;
 	tio:to dbpedia:Barcelona .
 
-:offerDsbHolbækPadborg a gr:Offering ;
+:offer-dsbHolbækPadborg a gr:Offering ;
 	gr:name "Holbæk-Padborg"@en ;
 	gr:description "Train ticket from Holbæk to Padborg"@en ;
-	gr:includes :ticketDsbHolbækRoskilde, :ticketDsbRoskildePadborg ;
+	gr:includes :ticket-dsbHolbækRoskilde, :ticket-dsbRoskildePadborg ;
 	gr:hasBusinessFunction gr:Sell ;
 	gr:hasPriceSpecification [ a gr:UnitPriceSpecification ;
 		rdfs:comment "DKK215 is approx. €29"@en ;
@@ -967,10 +967,10 @@
 		gr:hasCurrencyValue "384"^^xsd:float
 	] .
 
-:offerDsbPadborgHolbæk a gr:Offering ;
+:offer-dsbPadborgHolbæk a gr:Offering ;
 	gr:name "Holbæk-Padborg"@en ;
 	gr:description "Train ticket from Padborg to Holbæk"@en ;
-	gr:includes :ticketDsbRoskildeHolbæk, :ticketDsbPadborgRoskilde ;
+	gr:includes :ticket-dsbRoskildeHolbæk, :ticket-dsbPadborgRoskilde ;
 	gr:hasBusinessFunction gr:Sell ;
 	gr:hasPriceSpecification [ a gr:UnitPriceSpecification ;
 		rdfs:comment "DKK215 is approx. €29"@en ;
@@ -982,13 +982,13 @@
 		gr:hasCurrencyValue "384"^^xsd:float
 	] .
 
-:offerDsbHolbækBrusselsReturn a gr:Offering ;
+:offer-dsbHolbækBrusselsReturn a gr:Offering ;
 	gr:name "Holbæk-Brussels-Holbæk"@en ;
 	gr:description "Train ticket from Holbæk to Brussels and return"@en ;
 	rdfs:comment "Price includes couchette reservation (2*DKK152)"@en ;
-	gr:includes :ticketDsbHolbækRoskilde, :ticketDsbRoskildeHolbæk,
-		:ticketDbRoskildeCologne, :ticketDbCologneRoskilde,
-		:ticketThalysCologneBrussels, :ticketThalysBrusselsCologne ;
+	gr:includes :ticket-dsbHolbækRoskilde, :ticket-dsbRoskildeHolbæk,
+		:ticket-dbRoskildeCologne, :ticket-dbCologneRoskilde,
+		:ticket-thalysCologneBrussels, :ticket-thalysBrusselsCologne ;
 	gr:hasBusinessFunction gr:Sell ;
 	gr:hasPriceSpecification [ a gr:UnitPriceSpecification ;
 		rdfs:comment "DKK2038 is approx. €274"@en ;
@@ -1000,11 +1000,11 @@
 		gr:hasCurrencyValue "2524"^^xsd:float
 	] .
 
-:offerDsbInterrail10 a gr:Offering ;
+:offer-dsbInterrail10 a gr:Offering ;
 	gr:name "InterRail"@en ;
 	gr:description "InterRail 10 days within 22 days"@en ;
 	rdfs:comment "for spring discount, first ride must begin no later than May 16th"@en ;
-	gr:includes :ticketDbInterrail10 ;
+	gr:includes :ticket-dbInterrail10 ;
 	gr:hasBusinessFunction gr:Sell ;
 	gr:availabilityEnds "2014-05-16T23:59:59Z"^^xsd:dateTime ;
 	gr:hasPriceSpecification [ a gr:UnitPriceSpecification ;
@@ -1018,11 +1018,11 @@
 		gr:hasCurrencyValue "3035"^^xsd:float
 	] .
 
-:offerDsbInterrail5 a gr:Offering ;
+:offer-dsbInterrail5 a gr:Offering ;
 	gr:name "InterRail"@en ;
 	gr:description "InterRail 5 days within 10 days"@en ;
 	rdfs:comment "for spring discount, first ride must begin no later than May 16th"@en ;
-	gr:includes :ticketDbInterrail5 ;
+	gr:includes :ticket-dbInterrail5 ;
 	gr:hasBusinessFunction gr:Sell ;
 	gr:availabilityEnds "2014-05-16T23:59:59Z"^^xsd:dateTime ;
 	gr:hasPriceSpecification [ a gr:UnitPriceSpecification ;
@@ -1036,7 +1036,7 @@
 		gr:hasCurrencyValue "2140"^^xsd:float
 	] .
 
-:offerDbBahncard25Probe a gr:Offering ;
+:offer-dbBahncard25Probe a gr:Offering ;
 	gr:name "Probe-BahnCard 25"@en ;
 	gr:description "BahnCard 25 valid for 4 months"@en ;
 	gr:hasBusinessFunction gr:Sell ;
@@ -1050,7 +1050,7 @@
 		gr:hasCurrencyValue "25"^^xsd:float
 	] .
 
-:offerDbBahncard25 a gr:Offering ;
+:offer-dbBahncard25 a gr:Offering ;
 	gr:name "BahnCard25"@en ;
 	gr:description "BahnCard 25 valid for 1 year"@en ;
 	gr:hasBusinessFunction gr:Sell ;
@@ -1064,11 +1064,11 @@
 		gr:hasCurrencyValue "62"^^xsd:float
 	] .
 
-:offerDbInterrail10 a gr:Offering ;
+:offer-dbInterrail10 a gr:Offering ;
 	gr:name "InterRail"@en ;
 	gr:description "InterRail 10 days within 22 days"@en ;
 	rdfs:comment "for spring discount, first ride must begin no later than May 16th"@en ;
-	gr:includes :ticketDbInterrail10 ;
+	gr:includes :ticket-dbInterrail10 ;
 	gr:hasBusinessFunction gr:Sell ;
 	gr:availabilityEnds "2014-05-16T23:59:59Z"^^xsd:dateTime ;
 	gr:hasPriceSpecification [ a gr:UnitPriceSpecification ;
@@ -1080,11 +1080,11 @@
 		gr:hasCurrencyValue "399"^^xsd:float
 	] .
 
-:offerDbInterrail5 a gr:Offering ;
+:offer-dbInterrail5 a gr:Offering ;
 	gr:name "InterRail"@en ;
 	gr:description "InterRail 5 days within 10 days"@en ;
 	rdfs:comment "for spring discount, first ride must begin no later than May 16th"@en ;
-	gr:includes :ticketDbInterrail5 ;
+	gr:includes :ticket-dbInterrail5 ;
 	gr:hasBusinessFunction gr:Sell ;
 	gr:availabilityEnds "2014-05-16T23:59:59Z"^^xsd:dateTime ;
 	gr:hasPriceSpecification [ a gr:UnitPriceSpecification ;
@@ -1096,11 +1096,11 @@
 		gr:hasCurrencyValue "281"^^xsd:float
 	] .
 
-:offerDbHolbækCologne a gr:Offering ;
+:offer-dbHolbækCologne a gr:Offering ;
 	gr:name "Holbæk-Cologne"@en ;
 	gr:description "Train ticket from Holbæk to Cologne"@en ;
 	rdfs:comment "Price includes couchette reservation (€15.50)"@en ;
-	gr:includes :ticketDsbHolbækRoskilde, :ticketDbRoskildeCologne ;
+	gr:includes :ticket-dsbHolbækRoskilde, :ticket-dbRoskildeCologne ;
 	gr:hasBusinessFunction gr:Sell ;
 	gr:hasPriceSpecification [ a gr:UnitPriceSpecification ;
 		gr:hasCurrency "EUR"@en ;
@@ -1110,11 +1110,11 @@
 		gr:hasCurrencyValue "99"^^xsd:float
 	] .
 
-:offerDbCologneHolbæk a gr:Offering ;
+:offer-dbCologneHolbæk a gr:Offering ;
 	gr:name "Cologne-Holbæk"@en ;
 	gr:description "Train ticket from Cologne to Holbæk"@en ;
 	rdfs:comment "Price includes couchette reservation (€15.50)"@en ;
-	gr:includes :ticketDbCologneRoskilde, :ticketDsbRoskildeHolbæk ;
+	gr:includes :ticket-dbCologneRoskilde, :ticket-dsbRoskildeHolbæk ;
 	gr:hasBusinessFunction gr:Sell ;
 	gr:hasPriceSpecification [ a gr:UnitPriceSpecification ;
 		gr:hasCurrency "EUR"@en ;
@@ -1124,11 +1124,11 @@
 		gr:hasCurrencyValue "99"^^xsd:float
 	] .
 
-:offerDbHolbækCologneBahncard25 a gr:Offering ;
+:offer-dbHolbækCologneBahncard25 a gr:Offering ;
 	gr:name "Holbæk-Cologne"@en ;
 	gr:description "Train ticket from Holbæk to Cologne incl. Bahncard25 discount"@en ;
 	rdfs:comment "Price includes couchette reservation (€15.50)"@en ;
-	gr:includes :ticketDsbHolbækRoskilde, :ticketDbRoskildeCologne ;
+	gr:includes :ticket-dsbHolbækRoskilde, :ticket-dbRoskildeCologne ;
 	gr:hasBusinessFunction gr:Sell ;
 	gr:hasPriceSpecification [ a gr:UnitPriceSpecification ;
 		gr:hasCurrency "EUR"@en ;
@@ -1138,13 +1138,13 @@
 		gr:hasCurrencyValue "79.25"^^xsd:float
 	] .
 
-:offerDbCologneHolbækBahncard25 a gr:Offering ;
+:offer-dbCologneHolbækBahncard25 a gr:Offering ;
 	gr:name "Cologne-Holbæk"@en ;
 	gr:description "Train ticket from Cologne to Holbæk incl. Bahncard25 discount"@en ;
 	rdfs:comment "Price includes couchette reservation (€15.50)"@en ;
-	gr:includes :ticketDbCologneRoskilde, :ticketDsbRoskildeHolbæk ;
+	gr:includes :ticket-dbCologneRoskilde, :ticket-dsbRoskildeHolbæk ;
 	gr:hasBusinessFunction gr:Sell ;
-	gr:eligibleCustomerTypes :membersBahncard25 ;
+	gr:eligibleCustomerTypes :membership-bahncard25 ;
 	gr:hasPriceSpecification [ a gr:UnitPriceSpecification ;
 		gr:hasCurrency "EUR"@en ;
 		gr:hasCurrencyValue "63.25"^^xsd:float
@@ -1153,10 +1153,10 @@
 		gr:hasCurrencyValue "79.25"^^xsd:float
 	] .
 
-:offerDbCologneBrussels a gr:Offering ;
+:offer-dbCologneBrussels a gr:Offering ;
 	gr:name "Cologne-Brussels"@en ;
 	gr:description "Train ticket from Cologne to Brussels"@en ;
-	gr:includes :ticketDbCologneBrussels ;
+	gr:includes :ticket-dbCologneBrussels ;
 	gr:hasBusinessFunction gr:Sell ;
 	gr:hasPriceSpecification [ a gr:UnitPriceSpecification ;
 		gr:hasCurrency "EUR"@en ;
@@ -1172,10 +1172,10 @@
 		gr:hasCurrencyValue "39"^^xsd:float
 	] .
 
-:offerDbBrusselsCologne a gr:Offering ;
+:offer-dbBrusselsCologne a gr:Offering ;
 	gr:name "Brussels-Cologne"@en ;
 	gr:description "Train ticket from Brussels to Cologne"@en ;
-	gr:includes :ticketDbBrusselsCologne ;
+	gr:includes :ticket-dbBrusselsCologne ;
 	gr:hasBusinessFunction gr:Sell ;
 	gr:hasPriceSpecification [ a gr:UnitPriceSpecification ;
 		gr:hasCurrency "EUR"@en ;
@@ -1191,10 +1191,10 @@
 		gr:hasCurrencyValue "39"^^xsd:float
 	] .
 
-:offerDbCologneBrusselsBahncard25 a gr:Offering ;
+:offer-dbCologneBrusselsBahncard25 a gr:Offering ;
 	gr:name "Cologne-Brussels"@en ;
 	gr:description "Train ticket from Cologne to Brussels incl. Bahncard25 discount"@en ;
-	gr:includes :ticketDbCologneBrussels ;
+	gr:includes :ticket-dbCologneBrussels ;
 	gr:hasBusinessFunction gr:Sell ;
 	gr:hasPriceSpecification [ a gr:UnitPriceSpecification ;
 		gr:hasCurrency "EUR"@en ;
@@ -1210,10 +1210,10 @@
 		gr:hasCurrencyValue "29.15"^^xsd:float
 	] .
 
-:offerDbBrusselsCologneBahncard25 a gr:Offering ;
+:offer-dbBrusselsCologneBahncard25 a gr:Offering ;
 	gr:name "Brussels-Cologne"@en ;
 	gr:description "Train ticket from Brussels to Cologne incl. Bahncard25 discount"@en ;
-	gr:includes :ticketDbBrusselsCologne ;
+	gr:includes :ticket-dbBrusselsCologne ;
 	gr:hasBusinessFunction gr:Sell ;
 	gr:hasPriceSpecification [ a gr:UnitPriceSpecification ;
 		gr:hasCurrency "EUR"@en ;
@@ -1229,10 +1229,10 @@
 		gr:hasCurrencyValue "29.15"^^xsd:float
 	] .
 
-:offerSncfBrusselsParis a gr:Offering ;
+:offer-sncfBrusselsParis a gr:Offering ;
 	gr:name "Brussels-Paris"@en ;
 	gr:description "Train ticket from Brussels to Paris"@en ;
-	gr:includes :ticketThalysBrusselsParis ;
+	gr:includes :ticket-thalysBrusselsParis ;
 	gr:hasBusinessFunction gr:Sell ;
 	gr:hasPriceSpecification [ a gr:UnitPriceSpecification ;
 		gr:hasCurrency "EUR"@en ;
@@ -1245,10 +1245,10 @@
 		gr:hasCurrencyValue "81"^^xsd:float
 	] .
 
-:offerSncfParisBrussels a gr:Offering ;
+:offer-sncfParisBrussels a gr:Offering ;
 	gr:name "Paris-Brussels"@en ;
 	gr:description "Train ticket from Paris to Brussels"@en ;
-	gr:includes :ticketThalysBrusselsParis ;
+	gr:includes :ticket-thalysBrusselsParis ;
 	gr:hasBusinessFunction gr:Sell ;
 	gr:hasPriceSpecification [ a gr:UnitPriceSpecification ;
 		gr:hasCurrency "EUR"@en ;
@@ -1264,20 +1264,20 @@
 		gr:hasCurrencyValue "81"^^xsd:float
 	] .
 
-:offerSncfParisBarcelonaReturn a gr:Offering ;
+:offer-sncfParisBarcelonaReturn a gr:Offering ;
 	gr:name "Paris-Barcelona-Paris"@en ;
 	gr:description "Train ticket from Paris to Barcelona and return"@en ;
-	gr:includes :ticketRenfeParisBarcelona, :ticketRenfeBarcelonaParis ;
+	gr:includes :ticket-renfeParisBarcelona, :ticket-renfeBarcelonaParis ;
 	gr:hasBusinessFunction gr:Sell ;
 	gr:hasPriceSpecification [ a gr:UnitPriceSpecification ;
 		gr:hasCurrency "EUR"@en ;
 		gr:hasCurrencyValue "179.20"^^xsd:float
 	] .
 
-:offerSncfParisBarcelona a gr:Offering ;
+:offer-sncfParisBarcelona a gr:Offering ;
 	gr:name "Paris-Barcelona"@en ;
 	gr:description "Train ticket from Paris to Barcelona"@en ;
-	gr:includes :ticketRenfeParisBarcelona ;
+	gr:includes :ticket-renfeParisBarcelona ;
 	gr:hasBusinessFunction gr:Sell ;
 	gr:hasPriceSpecification [ a gr:UnitPriceSpecification ;
 		gr:hasCurrency "EUR"@en ;
@@ -1290,10 +1290,10 @@
 		gr:hasCurrencyValue "125.70"^^xsd:float
 	] .
 
-:offerSncfBarcelonaParis a gr:Offering ;
+:offer-sncfBarcelonaParis a gr:Offering ;
 	gr:name "Barcelona-Paris"@en ;
 	gr:description "Train ticket from Barcelona to Paris"@en ;
-	gr:includes :ticketRenfeBarcelonaParis ;
+	gr:includes :ticket-renfeBarcelonaParis ;
 	gr:hasBusinessFunction gr:Sell ;
 	gr:hasPriceSpecification [ a gr:UnitPriceSpecification ;
 		gr:hasCurrency "EUR"@en ;
@@ -1306,23 +1306,23 @@
 		gr:hasCurrencyValue "125.70"^^xsd:float
 	] .
 
-:membersBahncard25 a gr:BusinessEntityType;
+:membership-bahncard25 a gr:BusinessEntityType;
 	rdfs:label "Holders of DB Bahncard25 discount cards"@en .
 
-:DSB a gr:BusinessEntity ;
+:org-dsb a gr:BusinessEntity ;
 	foaf:Page <http://www.dsb.dk/> ;
 	foaf:Page <http://www.rejseplanen.dk/> ;
-	gr:offers :offerDsbHolbækBrusselsReturn .
+	gr:offer-s :offer-dsbHolbækBrusselsReturn .
 
-:DB a gr:BusinessEntity ;
+:org-db a gr:BusinessEntity ;
 	foaf:Page <https://www.bahn.com/> ;
-	gr:offers :offerDbBahncard25Probe, :offerDbInterrail,
-		:offerDbHolbækCologne, :offerDbHolbækCologneBahncard25,
-		:offerDbCologneBrussels, :offerDbCologneBrusselsBahncard25,
-		:offerDbBrusselsCologne, :offerDbBrusselsCologneBahncard25,
-		:offerDbCologneHolbæk, :offerDbCologneHolbækBahncard25 .
+	gr:offer-s :offer-dbBahncard25Probe, :offer-dbInterrail,
+		:offer-dbHolbækCologne, :offer-dbHolbækCologneBahncard25,
+		:offer-dbCologneBrussels, :offer-dbCologneBrusselsBahncard25,
+		:offer-dbBrusselsCologne, :offer-dbBrusselsCologneBahncard25,
+		:offer-dbCologneHolbæk, :offer-dbCologneHolbækBahncard25 .
 
-:SNCF a gr:BusinessEntity ;
+:org-sncf a gr:BusinessEntity ;
 	foaf:Page <http://en.voyages-sncf.com/en/> ;
-	gr:offers :offerBrusselsParis, :offerParisBrussels,
+	gr:offer-s :offerBrusselsParis, :offerParisBrussels,
 		:offerBarcelonaParisReturn .