You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@any23.apache.org by an...@apache.org on 2017/01/13 22:25:50 UTC

[11/25] any23 git commit: ANY23-276 : Convert from Sesame to RDF4J

http://git-wip-us.apache.org/repos/asf/any23/blob/445d13ab/api/src/main/java/org/apache/any23/vocab/HRecipe.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/any23/vocab/HRecipe.java b/api/src/main/java/org/apache/any23/vocab/HRecipe.java
index f68c1a0..0124a54 100644
--- a/api/src/main/java/org/apache/any23/vocab/HRecipe.java
+++ b/api/src/main/java/org/apache/any23/vocab/HRecipe.java
@@ -17,7 +17,7 @@
 
 package org.apache.any23.vocab;
 
-import org.openrdf.model.URI;
+import org.eclipse.rdf4j.model.IRI;
 
 /**
  * Vocabulary to map the <a href="http://microformats.org/wiki/hrecipe">hRecipe</a> microformat.
@@ -38,30 +38,30 @@ public class HRecipe extends Vocabulary {
     }
 
     // Resources.
-    public URI Recipe     = createClass(NS, "Recipe");
-    public URI Duration   = createClass(NS, "Duration");
-    public URI Ingredient = createClass(NS, "Ingredient");
-    public URI Nutrition  = createClass(NS, "Nutrition");
+    public IRI Recipe     = createClass(NS, "Recipe");
+    public IRI Duration   = createClass(NS, "Duration");
+    public IRI Ingredient = createClass(NS, "Ingredient");
+    public IRI Nutrition  = createClass(NS, "Nutrition");
 
     // Properties.
-    public URI fn                     = createProperty(NS, "fn");
-    public URI duration               = createProperty(NS, "duration");
-    public URI durationTitle          = createProperty(NS, "durationTitle");
-    public URI durationTime           = createProperty(NS, "durationTime");
-    public URI photo                  = createProperty(NS, "photo");
-    public URI summary                = createProperty(NS, "summary");
-    public URI author                 = createProperty(NS, "author");
-    public URI published              = createProperty(NS, "published");
-    public URI nutrition              = createProperty(NS, "nutrition");
-    public URI nutritionValue         = createProperty(NS, "nutritionValue");
-    public URI nutritionValueType     = createProperty(NS, "nutritionValueType");
-    public URI tag                    = createProperty(NS, "tag");
-    public URI ingredient             = createProperty(NS, "ingredient");
-    public URI ingredientName         = createProperty(NS, "ingredientName");
-    public URI ingredientQuantity     = createProperty(NS, "ingredientQuantity");
-    public URI ingredientQuantityType = createProperty(NS, "ingredientQuantityType");
-    public URI instructions           = createProperty(NS, "instructions");
-    public URI yield                  = createProperty(NS, "yield");
+    public IRI fn                     = createProperty(NS, "fn");
+    public IRI duration               = createProperty(NS, "duration");
+    public IRI durationTitle          = createProperty(NS, "durationTitle");
+    public IRI durationTime           = createProperty(NS, "durationTime");
+    public IRI photo                  = createProperty(NS, "photo");
+    public IRI summary                = createProperty(NS, "summary");
+    public IRI author                 = createProperty(NS, "author");
+    public IRI published              = createProperty(NS, "published");
+    public IRI nutrition              = createProperty(NS, "nutrition");
+    public IRI nutritionValue         = createProperty(NS, "nutritionValue");
+    public IRI nutritionValueType     = createProperty(NS, "nutritionValueType");
+    public IRI tag                    = createProperty(NS, "tag");
+    public IRI ingredient             = createProperty(NS, "ingredient");
+    public IRI ingredientName         = createProperty(NS, "ingredientName");
+    public IRI ingredientQuantity     = createProperty(NS, "ingredientQuantity");
+    public IRI ingredientQuantityType = createProperty(NS, "ingredientQuantityType");
+    public IRI instructions           = createProperty(NS, "instructions");
+    public IRI yield                  = createProperty(NS, "yield");
 
     private HRecipe() {
         super(NS);

http://git-wip-us.apache.org/repos/asf/any23/blob/445d13ab/api/src/main/java/org/apache/any23/vocab/HResume.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/any23/vocab/HResume.java b/api/src/main/java/org/apache/any23/vocab/HResume.java
index 1a50157..f8ee68e 100644
--- a/api/src/main/java/org/apache/any23/vocab/HResume.java
+++ b/api/src/main/java/org/apache/any23/vocab/HResume.java
@@ -17,7 +17,7 @@
 
 package org.apache.any23.vocab;
 
-import org.openrdf.model.URI;
+import org.eclipse.rdf4j.model.IRI;
 
 /**
  * @author Nisala Nirmana
@@ -36,16 +36,16 @@ public class HResume extends Vocabulary {
         return instance;
     }
 
-    public URI Resume  = createClass(NS, "Resume");
-    public URI education   = createClass(NS, "education");
-    public URI experience = createClass(NS, "experience");
-    public URI contact = createClass(NS, "contact");
-    public URI affiliation = createClass(NS, "affiliation");
+    public IRI Resume  = createClass(NS, "Resume");
+    public IRI education   = createClass(NS, "education");
+    public IRI experience = createClass(NS, "experience");
+    public IRI contact = createClass(NS, "contact");
+    public IRI affiliation = createClass(NS, "affiliation");
 
 
-    public URI name  = createProperty(NS, "name");
-    public URI summary   = createProperty(NS, "summary");
-    public URI skill   = createProperty(NS, "skill");
+    public IRI name  = createProperty(NS, "name");
+    public IRI summary   = createProperty(NS, "summary");
+    public IRI skill   = createProperty(NS, "skill");
 
 
     private HResume() {

http://git-wip-us.apache.org/repos/asf/any23/blob/445d13ab/api/src/main/java/org/apache/any23/vocab/ICAL.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/any23/vocab/ICAL.java b/api/src/main/java/org/apache/any23/vocab/ICAL.java
index a0b59c9..c8b4be1 100644
--- a/api/src/main/java/org/apache/any23/vocab/ICAL.java
+++ b/api/src/main/java/org/apache/any23/vocab/ICAL.java
@@ -17,7 +17,7 @@
 
 package org.apache.any23.vocab;
 
-import org.openrdf.model.URI;
+import org.eclipse.rdf4j.model.IRI;
 
 /**
  * Vocabulary definitions from <code>ical.rdf</code>
@@ -39,484 +39,484 @@ public class ICAL extends Vocabulary {
     }
 
     /**
-     * The namespace of the vocabulary as a URI.
+     * The namespace of the vocabulary as a IRI.
      */
-    public final URI NAMESPACE = createURI(NS);
+    public final IRI NAMESPACE = createIRI(NS);
 
-    public final URI DomainOf_rrule = createClass("DomainOf_rrule");
-    public final URI List_of_Float  = createClass("List_of_Float");
+    public final IRI DomainOf_rrule = createClass("DomainOf_rrule");
+    public final IRI List_of_Float  = createClass("List_of_Float");
 
     /**
      * Provide a grouping of component properties that define an alarm..
      */
-    public final URI Valarm            = createClass("Valarm");
+    public final IRI Valarm            = createClass("Valarm");
 
-    public final URI Value_CAL_ADDRESS = createClass("Value_CAL-ADDRESS");
+    public final IRI Value_CAL_ADDRESS = createClass("Value_CAL-ADDRESS");
 
-    public final URI Value_DATE        = createClass("Value_DATE");
+    public final IRI Value_DATE        = createClass("Value_DATE");
 
-    public final URI Value_DURATION    = createClass("Value_DURATION");
+    public final IRI Value_DURATION    = createClass("Value_DURATION");
 
-    public final URI Value_PERIOD      = createClass("Value_PERIOD");
+    public final IRI Value_PERIOD      = createClass("Value_PERIOD");
 
-    public final URI Value_RECUR       = createClass("Value_RECUR");
+    public final IRI Value_RECUR       = createClass("Value_RECUR");
 
-    public final URI Vcalendar         = createClass("vcalendar");
+    public final IRI Vcalendar         = createClass("vcalendar");
 
     /**
      * Provide a grouping of component properties that describe an event..
      */
-    public final URI Vevent = createClass("Vevent");
+    public final IRI Vevent = createClass("Vevent");
 
     /**
      * Provide a grouping of component properties that describe either a request
      * for free/busy time, describe a response to a request for free/busy time or
      * describe a published set of busy time..
      */
-    public final URI Vfreebusy = createClass("Vfreebusy");
+    public final IRI Vfreebusy = createClass("Vfreebusy");
 
     /**
      * Provide a grouping of component properties that describe a journal entry..
      */
-    public final URI Vjournal = createClass("Vjournal");
+    public final IRI Vjournal = createClass("Vjournal");
 
     /**
      * Provide a grouping of component properties that defines a time zone..
      */
-    public final URI Vtimezone = createClass("Vtimezone");
+    public final IRI Vtimezone = createClass("Vtimezone");
 
     /**
      * Provide a grouping of calendar properties that describe a to-do..
      */
-    public final URI Vtodo = createClass("Vtodo");
+    public final IRI Vtodo = createClass("Vtodo");
 
 
     /**
-     * The URI provides the capability to associate a document object with a
-     * calendar component.default value type: URI.
+     * The IRI provides the capability to associate a document object with a
+     * calendar component.default value type: IRI.
      */
-    public final URI attach = createProperty("attach");
+    public final IRI attach = createProperty("attach");
 
     /**
-     * The URI defines an "Attendee" within a calendar component.value type:
+     * The IRI defines an "Attendee" within a calendar component.value type:
      * CAL-ADDRESS.
      */
-    public final URI attendee   = createProperty("attendee");
-    public final URI calAddress = createProperty("calAddress");
-    public final URI component  = createProperty("component");
-    public final URI daylight  = createProperty("daylight");
+    public final IRI attendee   = createProperty("attendee");
+    public final IRI calAddress = createProperty("calAddress");
+    public final IRI component  = createProperty("component");
+    public final IRI daylight  = createProperty("daylight");
 
     /**
-     * The URI specifies a positive duration of time.value type: DURATION.
+     * The IRI specifies a positive duration of time.value type: DURATION.
      */
-    public final URI duration = createProperty("duration");
+    public final IRI duration = createProperty("duration");
 
     /**
-     * This URI defines a rule or repeating pattern for an exception to a recurrence
+     * This IRI defines a rule or repeating pattern for an exception to a recurrence
      * set.value type: RECUR.
      */
-    public final URI exrule = createProperty("exrule");
+    public final IRI exrule = createProperty("exrule");
 
     /**
-     * The URI defines one or more free or busy time intervals.value type: PERIOD.
+     * The IRI defines one or more free or busy time intervals.value type: PERIOD.
      */
-    public final URI freebusy = createProperty("freebusy");
+    public final IRI freebusy = createProperty("freebusy");
 
     /**
-     * value type: list of FLOATThis URI specifies information related to the
+     * value type: list of FLOATThis IRI specifies information related to the
      * global position for the activity specified by a calendar component..
      */
-    public final URI geo = createProperty("geo");
+    public final IRI geo = createProperty("geo");
 
     /**
-     * value type: CAL-ADDRESSThe URI defines the organizer for a calendar component..
+     * value type: CAL-ADDRESSThe IRI defines the organizer for a calendar component..
      */
-    public final URI organizer = createProperty("organizer");
+    public final IRI organizer = createProperty("organizer");
 
     /**
-     * This URI defines a rule or repeating pattern for recurring events, to-dos,
+     * This IRI defines a rule or repeating pattern for recurring events, to-dos,
      * or time zone definitions.value type: RECUR.
      */
-    public final URI rrule = createProperty("rrule");
+    public final IRI rrule = createProperty("rrule");
 
-    public final URI standard = createProperty("standard");
+    public final IRI standard = createProperty("standard");
 
     /**
-     * This URI specifies when an alarm will trigger.default value type: DURATION.
+     * This IRI specifies when an alarm will trigger.default value type: DURATION.
      */
-    public final URI trigger = createProperty("trigger");
+    public final IRI trigger = createProperty("trigger");
 
     /**
      * The TZURL provides a means for a VTIMEZONE component to point to a network
      * location that can be used to retrieve an up-to- date version of itself.value
-     * type: URI.
+     * type: IRI.
      */
-    public final URI tzurl = createProperty("tzurl");
+    public final IRI tzurl = createProperty("tzurl");
 
     /**
-     * This URI defines a Uniform URI Locator (URL) associated with the
-     * iCalendar object.value type: URI.
+     * This IRI defines a Uniform IRI Locator (URL) associated with the
+     * iCalendar object.value type: IRI.
      */
-    public final URI url = createProperty("url");
+    public final IRI url = createProperty("url");
 
     /**
-     * value type: TEXTThis class of URI provides a framework for defining non-standard
+     * value type: TEXTThis class of IRI provides a framework for defining non-standard
      * properties..
      */
-    public final URI X_ = createProperty("X-");
+    public final IRI X_ = createProperty("X-");
 
     /**
-     * value type: TEXTThis URI defines the action to be invoked when an alarm
+     * value type: TEXTThis IRI defines the action to be invoked when an alarm
      * is triggered..
      */
-    public final URI action = createProperty("action");
+    public final IRI action = createProperty("action");
 
     /**
-     * To specify an alternate text representation for the URI value..
+     * To specify an alternate text representation for the IRI value..
      */
-    public final URI altrep = createProperty("altrep");
+    public final IRI altrep = createProperty("altrep");
 
-    public final URI byday = createProperty("byday");
+    public final IRI byday = createProperty("byday");
 
-    public final URI byhour = createProperty("byhour");
+    public final IRI byhour = createProperty("byhour");
 
-    public final URI byminute = createProperty("byminute");
+    public final IRI byminute = createProperty("byminute");
 
-    public final URI bymonth = createProperty("bymonth");
+    public final IRI bymonth = createProperty("bymonth");
 
-    public final URI bysecond = createProperty("bysecond");
+    public final IRI bysecond = createProperty("bysecond");
 
-    public final URI bysetpos = createProperty("bysetpos");
+    public final IRI bysetpos = createProperty("bysetpos");
 
-    public final URI byweekno = createProperty("byweekno");
+    public final IRI byweekno = createProperty("byweekno");
 
-    public final URI byyearday = createProperty("byyearday");
+    public final IRI byyearday = createProperty("byyearday");
 
     /**
-     * value type: TEXTThis URI defines the calendar scale used for the calendar
+     * value type: TEXTThis IRI defines the calendar scale used for the calendar
      * information specified in the iCalendar object..
      */
-    public final URI calscale = createProperty("calscale");
+    public final IRI calscale = createProperty("calscale");
 
     /**
-     * value type: TEXTThis URI defines the categories for a calendar component..
+     * value type: TEXTThis IRI defines the categories for a calendar component..
      */
-    public final URI categories = createProperty("categories");
+    public final IRI categories = createProperty("categories");
 
     /**
-     * value type: TEXTThis URI defines the access classification for a calendar
+     * value type: TEXTThis IRI defines the access classification for a calendar
      * component..
      */
-    public final URI class_ = createProperty("class");
+    public final IRI class_ = createProperty("class");
 
     /**
      * To specify the common name to be associated with the calendar user specified
-     * by the URI..
+     * by the IRI..
      */
-    public final URI cn = createProperty("cn");
+    public final IRI cn = createProperty("cn");
 
     /**
-     * value type: TEXTThis URI specifies non-processing information intended
+     * value type: TEXTThis IRI specifies non-processing information intended
      * to provide a comment to the calendar user..
      */
-    public final URI comment = createProperty("comment");
+    public final IRI comment = createProperty("comment");
 
     /**
-     * value type: DATE-TIMEThis URI defines the date and time that a to-do
+     * value type: DATE-TIMEThis IRI defines the date and time that a to-do
      * was actually completed..
      */
-    public final URI completed = createProperty("completed");
+    public final IRI completed = createProperty("completed");
 
     /**
-     * value type: TEXTThe URI is used to represent contact information or alternately
+     * value type: TEXTThe IRI is used to represent contact information or alternately
      * a reference to contact information associated with the calendar component..
      */
-    public final URI contact = createProperty("contact");
+    public final IRI contact = createProperty("contact");
 
-    public final URI count = createProperty("count");
+    public final IRI count = createProperty("count");
 
     /**
-     * This URI specifies the date and time that the calendar information was
+     * This IRI specifies the date and time that the calendar information was
      * created by the calendar user agent in the calendar store. Note: This is analogous
      * to the creation date and time for a file in the file system.value type: DATE-TIME.
      */
-    public final URI created = createProperty("created");
+    public final IRI created = createProperty("created");
 
     /**
-     * To specify the type of calendar user specified by the URI..
+     * To specify the type of calendar user specified by the IRI..
      */
-    public final URI cutype = createProperty("cutype");
+    public final IRI cutype = createProperty("cutype");
 
     /**
      * To specify the calendar users that have delegated their participation to the
-     * calendar user specified by the URI..
+     * calendar user specified by the IRI..
      */
-    public final URI delegatedFrom = createProperty("delegatedFrom");
+    public final IRI delegatedFrom = createProperty("delegatedFrom");
 
     /**
-     * To specify the calendar users to whom the calendar user specified by the URI
+     * To specify the calendar users to whom the calendar user specified by the IRI
      * has delegated participation..
      */
-    public final URI delegatedTo = createProperty("delegatedTo");
+    public final IRI delegatedTo = createProperty("delegatedTo");
 
     /**
-     * value type: TEXTThis URI provides a more complete description of the
-     * calendar component, than that provided by the "SUMMARY" URI..
+     * value type: TEXTThis IRI provides a more complete description of the
+     * calendar component, than that provided by the "SUMMARY" IRI..
      */
-    public final URI description = createProperty("description");
+    public final IRI description = createProperty("description");
 
     /**
      * To specify reference to a directory entry associated with the calendar user
-     * specified by the URI..
+     * specified by the IRI..
      */
-    public final URI dir = createProperty("dir");
+    public final IRI dir = createProperty("dir");
 
     /**
-     * This URI specifies the date and time that a calendar component ends.default
+     * This IRI specifies the date and time that a calendar component ends.default
      * value type: DATE-TIME.
      */
-    public final URI dtend = createProperty("dtend");
+    public final IRI dtend = createProperty("dtend");
 
     /**
-     * value type: DATE-TIMEThe URI indicates the date/time that the instance
+     * value type: DATE-TIMEThe IRI indicates the date/time that the instance
      * of the iCalendar object was created..
      */
-    public final URI dtstamp = createProperty("dtstamp");
+    public final IRI dtstamp = createProperty("dtstamp");
 
     /**
-     * default value type: DATE-TIMEThis URI specifies when the calendar component
+     * default value type: DATE-TIMEThis IRI specifies when the calendar component
      * begins..
      */
-    public final URI dtstart = createProperty("dtstart");
+    public final IRI dtstart = createProperty("dtstart");
 
     /**
-     * default value type: DATE-TIMEThis URI defines the date and time that
+     * default value type: DATE-TIMEThis IRI defines the date and time that
      * a to-do is expected to be completed..
      */
-    public final URI due = createProperty("due");
+    public final IRI due = createProperty("due");
 
     /**
-     * To specify an alternate inline encoding for the URI value..
+     * To specify an alternate inline encoding for the IRI value..
      */
-    public final URI encoding = createProperty("encoding");
+    public final IRI encoding = createProperty("encoding");
 
     /**
-     * default value type: DATE-TIMEThis URI defines the list of date/time exceptions
+     * default value type: DATE-TIMEThis IRI defines the list of date/time exceptions
      * for a recurring calendar component..
      */
-    public final URI exdate = createProperty("exdate");
+    public final IRI exdate = createProperty("exdate");
 
     /**
      * To specify the free or busy time type..
      */
-    public final URI fbtype = createProperty("fbtype");
+    public final IRI fbtype = createProperty("fbtype");
 
     /**
      * To specify the content type of a referenced object..
      */
-    public final URI fmttype = createProperty("fmttype");
+    public final IRI fmttype = createProperty("fmttype");
 
-    public final URI freq = createProperty("freq");
+    public final IRI freq = createProperty("freq");
 
-    public final URI interval = createProperty("interval");
+    public final IRI interval = createProperty("interval");
 
     /**
-     * To specify the language for text values in a URI or URI parameter..
+     * To specify the language for text values in a IRI or IRI parameter..
      */
-    public final URI language = createProperty("language");
+    public final IRI language = createProperty("language");
 
     /**
-     * value type: DATE-TIMEThe URI specifies the date and time that the information
+     * value type: DATE-TIMEThe IRI specifies the date and time that the information
      * associated with the calendar component was last revised in the calendar store.
      * Note: This is analogous to the modification date and time for a file in the
      * file system..
      */
-    public final URI lastModified = createProperty("lastModified");
+    public final IRI lastModified = createProperty("lastModified");
 
     /**
-     * value type: TEXTThe URI defines the intended venue for the activity defined
+     * value type: TEXTThe IRI defines the intended venue for the activity defined
      * by a calendar component..
      */
-    public final URI location = createProperty("location");
+    public final IRI location = createProperty("location");
 
     /**
      * To specify the group or list membership of the calendar user specified by
-     * the URI..
+     * the IRI..
      */
-    public final URI member = createProperty("member");
+    public final IRI member = createProperty("member");
 
     /**
-     * value type: TEXTThis URI defines the iCalendar object method associated
+     * value type: TEXTThis IRI defines the iCalendar object method associated
      * with the calendar object..
      */
-    public final URI method = createProperty("method");
+    public final IRI method = createProperty("method");
 
     /**
      * To specify the participation status for the calendar user specified by the
-     * URI..
+     * IRI..
      */
-    public final URI partstat = createProperty("partstat");
+    public final IRI partstat = createProperty("partstat");
 
     /**
-     * value type: INTEGERThis URI is used by an assignee or delegatee of a
+     * value type: INTEGERThis IRI is used by an assignee or delegatee of a
      * to-do to convey the percent completion of a to-do to the Organizer..
      */
-    public final URI percentComplete = createProperty("percentComplete");
+    public final IRI percentComplete = createProperty("percentComplete");
 
     /**
-     * The URI defines the relative priority for a calendar component.value
+     * The IRI defines the relative priority for a calendar component.value
      * type: INTEGER.
      */
-    public final URI priority = createProperty("priority");
+    public final IRI priority = createProperty("priority");
 
     /**
-     * value type: TEXTThis URI specifies the identifier for the product that
+     * value type: TEXTThis IRI specifies the identifier for the product that
      * created the iCalendar object..
      */
-    public final URI prodid = createProperty("prodid");
+    public final IRI prodid = createProperty("prodid");
 
     /**
      * To specify the effective range of recurrence instances from the instance specified
-     * by the recurrence identifier specified by the URI..
+     * by the recurrence identifier specified by the IRI..
      */
-    public final URI range = createProperty("range");
+    public final IRI range = createProperty("range");
 
     /**
-     * default value type: DATE-TIMEThis URI defines the list of date/times
+     * default value type: DATE-TIMEThis IRI defines the list of date/times
      * for a recurrence set..
      */
-    public final URI rdate = createProperty("rdate");
+    public final IRI rdate = createProperty("rdate");
 
     /**
-     * default value type: DATE-TIMEThis URI is used in conjunction with the
-     * "UID" and "SEQUENCE" URI to identify a specific instance of a recurring
-     * "VEVENT", "VTODO" or "VJOURNAL" calendar component. The URI value is
-     * the effective value of the "DTSTART" URI of the recurrence instance..
+     * default value type: DATE-TIMEThis IRI is used in conjunction with the
+     * "UID" and "SEQUENCE" IRI to identify a specific instance of a recurring
+     * "VEVENT", "VTODO" or "VJOURNAL" calendar component. The IRI value is
+     * the effective value of the "DTSTART" IRI of the recurrence instance..
      */
-    public final URI recurrenceId = createProperty("recurrenceId");
+    public final IRI recurrenceId = createProperty("recurrenceId");
 
     /**
      * To specify the relationship of the alarm trigger with respect to the start
      * or end of the calendar component..
      */
-    public final URI related = createProperty("related");
+    public final IRI related = createProperty("related");
 
     /**
-     * The URI is used to represent a relationship or reference between one
+     * The IRI is used to represent a relationship or reference between one
      * calendar component and another.value type: TEXT.
      */
-    public final URI relatedTo = createProperty("relatedTo");
+    public final IRI relatedTo = createProperty("relatedTo");
 
     /**
      * To specify the type of hierarchical relationship associated with the calendar
-     * component specified by the URI..
+     * component specified by the IRI..
      */
-    public final URI reltype = createProperty("reltype");
+    public final IRI reltype = createProperty("reltype");
 
     /**
-     * This URI defines the number of time the alarm should be repeated, after
+     * This IRI defines the number of time the alarm should be repeated, after
      * the initial trigger.value type: INTEGER.
      */
-    public final URI repeat = createProperty("repeat");
+    public final IRI repeat = createProperty("repeat");
 
     /**
-     * value type: TEXTThis URI defines the status code returned for a scheduling
+     * value type: TEXTThis IRI defines the status code returned for a scheduling
      * request..
      */
-    public final URI requestStatus = createProperty("requestStatus");
+    public final IRI requestStatus = createProperty("requestStatus");
 
     /**
-     * value type: TEXTThis URI defines the equipment or resources anticipated
+     * value type: TEXTThis IRI defines the equipment or resources anticipated
      * for an activity specified by a calendar entity...
      */
-    public final URI resources = createProperty("resources");
+    public final IRI resources = createProperty("resources");
 
     /**
-     * To specify the participation role for the calendar user specified by the URI..
+     * To specify the participation role for the calendar user specified by the IRI..
      */
-    public final URI role = createProperty("role");
+    public final IRI role = createProperty("role");
 
     /**
      * To specify whether there is an expectation of a favor of a reply from the
-     * calendar user specified by the URI value..
+     * calendar user specified by the IRI value..
      */
-    public final URI rsvp = createProperty("rsvp");
+    public final IRI rsvp = createProperty("rsvp");
 
     /**
      * To specify the calendar user that is acting on behalf of the calendar user
-     * specified by the URI..
+     * specified by the IRI..
      */
-    public final URI sentBy = createProperty("sentBy");
+    public final IRI sentBy = createProperty("sentBy");
 
     /**
-     * value type: integerThis URI defines the revision sequence number of the
+     * value type: integerThis IRI defines the revision sequence number of the
      * calendar component within a sequence of revisions..
      */
-    public final URI sequence = createProperty("sequence");
+    public final IRI sequence = createProperty("sequence");
 
     /**
-     * value type: TEXTThis URI defines the overall status or confirmation for
+     * value type: TEXTThis IRI defines the overall status or confirmation for
      * the calendar component..
      */
-    public final URI status = createProperty("status");
+    public final IRI status = createProperty("status");
 
     /**
-     * This URI defines a short summary or subject for the calendar component.value
+     * This IRI defines a short summary or subject for the calendar component.value
      * type: TEXT.
      */
-    public final URI summary = createProperty("summary");
+    public final IRI summary = createProperty("summary");
 
     /**
-     * This URI defines whether an event is transparent or not to busy time
+     * This IRI defines whether an event is transparent or not to busy time
      * searches.value type: TEXT.
      */
-    public final URI transp = createProperty("transp");
+    public final IRI transp = createProperty("transp");
 
     /**
      * value type: TEXTTo specify the identifier for the time zone definition for
-     * a time component in the URI value.This URI specifies the text value
+     * a time component in the IRI value.This IRI specifies the text value
      * that uniquely identifies the "VTIMEZONE" calendar component..
      */
-    public final URI tzid = createProperty("tzid");
+    public final IRI tzid = createProperty("tzid");
 
     /**
-     * value type: TEXTThis URI specifies the customary designation for a time
+     * value type: TEXTThis IRI specifies the customary designation for a time
      * zone description..
      */
-    public final URI tzname = createProperty("tzname");
+    public final IRI tzname = createProperty("tzname");
 
     /**
-     * value type: UTC-OFFSETThis URI specifies the offset which is in use prior
+     * value type: UTC-OFFSETThis IRI specifies the offset which is in use prior
      * to this time zone observance..
      */
-    public final URI tzoffsetfrom = createProperty("tzoffsetfrom");
+    public final IRI tzoffsetfrom = createProperty("tzoffsetfrom");
 
     /**
-     * value type: UTC-OFFSETThis URI specifies the offset which is in use in
+     * value type: UTC-OFFSETThis IRI specifies the offset which is in use in
      * this time zone observance..
      */
-    public final URI tzoffsetto = createProperty("tzoffsetto");
+    public final IRI tzoffsetto = createProperty("tzoffsetto");
 
     /**
-     * This URI defines the persistent, globally unique identifier for the calendar
+     * This IRI defines the persistent, globally unique identifier for the calendar
      * component.value type: TEXT.
      */
-    public final URI uid = createProperty("uid");
+    public final IRI uid = createProperty("uid");
 
-    public final URI until = createProperty("until");
+    public final IRI until = createProperty("until");
 
     /**
-     * value type: TEXTThis URI specifies the identifier corresponding to the
+     * value type: TEXTThis IRI specifies the identifier corresponding to the
      * highest version number or the minimum and maximum range of the iCalendar specification
      * that is required in order to interpret the iCalendar object..
      */
-    public final URI version = createProperty("version");
+    public final IRI version = createProperty("version");
 
-    private URI createClass(String string) {
+    private IRI createClass(String string) {
         return createClass(NS, string);
     }
 
-    private URI createProperty(String string) {
+    private IRI createProperty(String string) {
         return createProperty(NS, string);
     }
 

http://git-wip-us.apache.org/repos/asf/any23/blob/445d13ab/api/src/main/java/org/apache/any23/vocab/LKIFCoreAction.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/any23/vocab/LKIFCoreAction.java b/api/src/main/java/org/apache/any23/vocab/LKIFCoreAction.java
index 93cfef1..0747db3 100644
--- a/api/src/main/java/org/apache/any23/vocab/LKIFCoreAction.java
+++ b/api/src/main/java/org/apache/any23/vocab/LKIFCoreAction.java
@@ -16,7 +16,7 @@
  */
 package org.apache.any23.vocab;
 
-import org.openrdf.model.URI;
+import org.eclipse.rdf4j.model.IRI;
 
 /**
  * <p>An implementation of the <a href="https://github.com/RinkeHoekstra/lkif-core">lkif-core</a>
@@ -51,35 +51,35 @@ public class LKIFCoreAction extends Vocabulary {
     /* http://www.estrellaproject.org/lkif-core/action.owl */
     /////////////////////////////////////////////////////////
     // CLASSES
-    public final URI Action                 = createClass(NS, "Action");
-    public final URI Agent                  = createClass(NS, "Agent");
-    public final URI Artifact               = createClass(NS, "Artifact");
-    public final URI Collaborative_Plan     = createClass(NS, "Collaborative_Plan");
-    public final URI Creation_C             = createClass(NS, "Creation");
-    public final URI Natural_Object         = createClass(NS, "Natural_Object");
-    public final URI Organisation           = createClass(NS, "Organisation");
-    public final URI Person                 = createClass(NS, "Person");
-    public final URI Personal_Plan          = createClass(NS, "Personal_Plan");
-    public final URI Plan                   = createClass(NS, "Plan");
-    public final URI Reaction               = createClass(NS, "Reaction");
-    public final URI Transaction            = createClass(NS, "Transaction");
-    public final URI Mental_Object          = createClass(NS, "Mental_Object");
-    public final URI Change                 = createClass(NS, "Change");
-    public final URI Physical_Object        = createClass(NS, "Physical_Object");
-    public final URI Process                = createClass(NS, "Process");
+    public final IRI Action                 = createClass(NS, "Action");
+    public final IRI Agent                  = createClass(NS, "Agent");
+    public final IRI Artifact               = createClass(NS, "Artifact");
+    public final IRI Collaborative_Plan     = createClass(NS, "Collaborative_Plan");
+    public final IRI Creation_C             = createClass(NS, "Creation");
+    public final IRI Natural_Object         = createClass(NS, "Natural_Object");
+    public final IRI Organisation           = createClass(NS, "Organisation");
+    public final IRI Person                 = createClass(NS, "Person");
+    public final IRI Personal_Plan          = createClass(NS, "Personal_Plan");
+    public final IRI Plan                   = createClass(NS, "Plan");
+    public final IRI Reaction               = createClass(NS, "Reaction");
+    public final IRI Transaction            = createClass(NS, "Transaction");
+    public final IRI Mental_Object          = createClass(NS, "Mental_Object");
+    public final IRI Change                 = createClass(NS, "Change");
+    public final IRI Physical_Object        = createClass(NS, "Physical_Object");
+    public final IRI Process                = createClass(NS, "Process");
     
     // RESOURCES
     
     // PROPERTIES
-    public final URI actor                   = createProperty(NS, "actor");
-    public final URI actor_in                = createProperty(NS, "actor_in");
-    public final URI direct_part             = createProperty(NS, "direct_part");
-    public final URI member                  = createProperty(NS, "member");
-    public final URI part                    = createProperty(NS, "part");
-    public final URI creation_P              = createProperty(NS, "creation");
-    public final URI participant             = createProperty(NS, "participant");
-    public final URI participant_in          = createProperty(NS, "participant_in");
-    public final URI result_of               = createProperty(NS, "result_of");
+    public final IRI actor                   = createProperty(NS, "actor");
+    public final IRI actor_in                = createProperty(NS, "actor_in");
+    public final IRI direct_part             = createProperty(NS, "direct_part");
+    public final IRI member                  = createProperty(NS, "member");
+    public final IRI part                    = createProperty(NS, "part");
+    public final IRI creation_P              = createProperty(NS, "creation");
+    public final IRI participant             = createProperty(NS, "participant");
+    public final IRI participant_in          = createProperty(NS, "participant_in");
+    public final IRI result_of               = createProperty(NS, "result_of");
     
     private LKIFCoreAction() {
       super(NS);

http://git-wip-us.apache.org/repos/asf/any23/blob/445d13ab/api/src/main/java/org/apache/any23/vocab/LKIFCoreExpression.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/any23/vocab/LKIFCoreExpression.java b/api/src/main/java/org/apache/any23/vocab/LKIFCoreExpression.java
index 3821373..60c0dd9 100644
--- a/api/src/main/java/org/apache/any23/vocab/LKIFCoreExpression.java
+++ b/api/src/main/java/org/apache/any23/vocab/LKIFCoreExpression.java
@@ -16,7 +16,7 @@
  */
 package org.apache.any23.vocab;
 
-import org.openrdf.model.URI;
+import org.eclipse.rdf4j.model.IRI;
 
 /**
  * <p>An implementation of the <a href="https://github.com/RinkeHoekstra/lkif-core">lkif-core</a>
@@ -50,75 +50,75 @@ public class LKIFCoreExpression extends Vocabulary {
     /* http://www.estrellaproject.org/lkif-core/expression.owl */
     /////////////////////////////////////////////////////////////
     // CLASSES
-    public final URI Argument                          = createClass(NS, "Argument");
-    public final URI Assertion                         = createClass(NS, "Assertion");
-    public final URI Assumption                        = createClass(NS, "Assumption");
-    public final URI Belief                            = createClass(NS, "Belief");
-    public final URI Cause                             = createClass(NS, "Cause");
-    public final URI Communicated_Attitude             = createClass(NS, "Communicated_Attitude");
-    public final URI Declaration                       = createClass(NS, "Declaration");
-    public final URI Desire                            = createClass(NS, "Desire");
-    public final URI Document                          = createClass(NS, "Document");
-    public final URI Evaluative_Attitude               = createClass(NS, "Evaluative_Attitude");
-    public final URI Evaluative_Proposition            = createClass(NS, "Evaluative_Proposition");
-    public final URI Evidence                          = createClass(NS, "Evidence");
-    public final URI Exception                         = createClass(NS, "Exception");
-    public final URI Expectation                       = createClass(NS, "Expectation");
-    public final URI Expression                        = createClass(NS, "Expression");
-    public final URI Fact                              = createClass(NS, "Fact");
-    public final URI Intention                         = createClass(NS, "Intention");
-    public final URI Lie                               = createClass(NS, "Lie");
-    public final URI Medium                            = createClass(NS, "Medium");
-    public final URI Observation                       = createClass(NS, "Observation");
-    public final URI Problem                           = createClass(NS, "Problem");
-    public final URI Promise                           = createClass(NS, "Promise");
-    public final URI Proposition                       = createClass(NS, "Proposition");
-    public final URI Propositional_Attitude            = createClass(NS, "Propositional_Attitude");
-    public final URI Qualification                     = createClass(NS, "Qualification");
-    public final URI Qualified                         = createClass(NS, "Qualified");
-    public final URI Reason                            = createClass(NS, "Reason");
-    public final URI Speech_Act                        = createClass(NS, "Speech_Act");
-    public final URI Statement_In_Writing              = createClass(NS, "Statement_In_Writing");
-    public final URI Surprise                          = createClass(NS, "Surprise");
+    public final IRI Argument                          = createClass(NS, "Argument");
+    public final IRI Assertion                         = createClass(NS, "Assertion");
+    public final IRI Assumption                        = createClass(NS, "Assumption");
+    public final IRI Belief                            = createClass(NS, "Belief");
+    public final IRI Cause                             = createClass(NS, "Cause");
+    public final IRI Communicated_Attitude             = createClass(NS, "Communicated_Attitude");
+    public final IRI Declaration                       = createClass(NS, "Declaration");
+    public final IRI Desire                            = createClass(NS, "Desire");
+    public final IRI Document                          = createClass(NS, "Document");
+    public final IRI Evaluative_Attitude               = createClass(NS, "Evaluative_Attitude");
+    public final IRI Evaluative_Proposition            = createClass(NS, "Evaluative_Proposition");
+    public final IRI Evidence                          = createClass(NS, "Evidence");
+    public final IRI Exception                         = createClass(NS, "Exception");
+    public final IRI Expectation                       = createClass(NS, "Expectation");
+    public final IRI Expression                        = createClass(NS, "Expression");
+    public final IRI Fact                              = createClass(NS, "Fact");
+    public final IRI Intention                         = createClass(NS, "Intention");
+    public final IRI Lie                               = createClass(NS, "Lie");
+    public final IRI Medium                            = createClass(NS, "Medium");
+    public final IRI Observation                       = createClass(NS, "Observation");
+    public final IRI Problem                           = createClass(NS, "Problem");
+    public final IRI Promise                           = createClass(NS, "Promise");
+    public final IRI Proposition                       = createClass(NS, "Proposition");
+    public final IRI Propositional_Attitude            = createClass(NS, "Propositional_Attitude");
+    public final IRI Qualification                     = createClass(NS, "Qualification");
+    public final IRI Qualified                         = createClass(NS, "Qualified");
+    public final IRI Reason                            = createClass(NS, "Reason");
+    public final IRI Speech_Act                        = createClass(NS, "Speech_Act");
+    public final IRI Statement_In_Writing              = createClass(NS, "Statement_In_Writing");
+    public final IRI Surprise                          = createClass(NS, "Surprise");
     
     // RESOURCES
     
     // PROPERTIES
-    public final URI addressee                         = createProperty(NS, "addressee");
-    public final URI asserted_by                       = createProperty(NS, "asserted_by");
-    public final URI asserts                           = createProperty(NS, "asserts");
-    public final URI attitude                          = createProperty(NS, "attitude");
-    public final URI author                            = createProperty(NS, "author");
-    public final URI bears                             = createProperty(NS, "bears");
-    public final URI believed_by                       = createProperty(NS, "believed_by");
-    public final URI believes                          = createProperty(NS, "believes");
-    public final URI declares                          = createProperty(NS, "declares");
-    public final URI declared_by                       = createProperty(NS, "declared_by");
-    public final URI evaluated_by                      = createProperty(NS, "evaluated_by");
-    public final URI evaluates                         = createProperty(NS, "evaluates");
-    public final URI evaluatively_comparable           = createProperty(NS, "evaluatively_comparable");
-    public final URI held_by                           = createProperty(NS, "held_by");
-    public final URI holds                             = createProperty(NS, "holds");
-    public final URI intended_by                       = createProperty(NS, "intended_by");
-    public final URI intends                           = createProperty(NS, "intends");
-    public final URI medium                            = createProperty(NS, "medium");
-    public final URI observer                          = createProperty(NS, "observer");
-    public final URI observes                          = createProperty(NS, "observes");
-    public final URI promised_by                       = createProperty(NS, "promised_by");
-    public final URI promises                          = createProperty(NS, "promises");
-    public final URI qualified_by                      = createProperty(NS, "qualified_by");
-    public final URI qualifies                         = createProperty(NS, "qualifies");
-    public final URI qualitatively_comparable          = createProperty(NS, "qualitatively_comparable");
-    public final URI stated_by                         = createProperty(NS, "stated_by");
-    public final URI states                            = createProperty(NS, "states");
-    public final URI towards                           = createProperty(NS, "towards");
-    public final URI utterer                           = createProperty(NS, "utterer");
-    public final URI utters                            = createProperty(NS, "utters");
-    public final URI creation                          = createProperty(NS, "creation");
-    public final URI counts_as                         = createProperty(NS, "counts_as");
-    public final URI imposed_on                        = createProperty(NS, "imposed_on");
-    public final URI played_by                         = createProperty(NS, "played_by");
-    public final URI plays                             = createProperty(NS, "plays");
+    public final IRI addressee                         = createProperty(NS, "addressee");
+    public final IRI asserted_by                       = createProperty(NS, "asserted_by");
+    public final IRI asserts                           = createProperty(NS, "asserts");
+    public final IRI attitude                          = createProperty(NS, "attitude");
+    public final IRI author                            = createProperty(NS, "author");
+    public final IRI bears                             = createProperty(NS, "bears");
+    public final IRI believed_by                       = createProperty(NS, "believed_by");
+    public final IRI believes                          = createProperty(NS, "believes");
+    public final IRI declares                          = createProperty(NS, "declares");
+    public final IRI declared_by                       = createProperty(NS, "declared_by");
+    public final IRI evaluated_by                      = createProperty(NS, "evaluated_by");
+    public final IRI evaluates                         = createProperty(NS, "evaluates");
+    public final IRI evaluatively_comparable           = createProperty(NS, "evaluatively_comparable");
+    public final IRI held_by                           = createProperty(NS, "held_by");
+    public final IRI holds                             = createProperty(NS, "holds");
+    public final IRI intended_by                       = createProperty(NS, "intended_by");
+    public final IRI intends                           = createProperty(NS, "intends");
+    public final IRI medium                            = createProperty(NS, "medium");
+    public final IRI observer                          = createProperty(NS, "observer");
+    public final IRI observes                          = createProperty(NS, "observes");
+    public final IRI promised_by                       = createProperty(NS, "promised_by");
+    public final IRI promises                          = createProperty(NS, "promises");
+    public final IRI qualified_by                      = createProperty(NS, "qualified_by");
+    public final IRI qualifies                         = createProperty(NS, "qualifies");
+    public final IRI qualitatively_comparable          = createProperty(NS, "qualitatively_comparable");
+    public final IRI stated_by                         = createProperty(NS, "stated_by");
+    public final IRI states                            = createProperty(NS, "states");
+    public final IRI towards                           = createProperty(NS, "towards");
+    public final IRI utterer                           = createProperty(NS, "utterer");
+    public final IRI utters                            = createProperty(NS, "utters");
+    public final IRI creation                          = createProperty(NS, "creation");
+    public final IRI counts_as                         = createProperty(NS, "counts_as");
+    public final IRI imposed_on                        = createProperty(NS, "imposed_on");
+    public final IRI played_by                         = createProperty(NS, "played_by");
+    public final IRI plays                             = createProperty(NS, "plays");
     
     private LKIFCoreExpression() {
       super(NS);

http://git-wip-us.apache.org/repos/asf/any23/blob/445d13ab/api/src/main/java/org/apache/any23/vocab/LKIFCoreLegalAction.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/any23/vocab/LKIFCoreLegalAction.java b/api/src/main/java/org/apache/any23/vocab/LKIFCoreLegalAction.java
index 6573da8..0553b9a 100644
--- a/api/src/main/java/org/apache/any23/vocab/LKIFCoreLegalAction.java
+++ b/api/src/main/java/org/apache/any23/vocab/LKIFCoreLegalAction.java
@@ -16,7 +16,7 @@
  */
 package org.apache.any23.vocab;
 
-import org.openrdf.model.URI;
+import org.eclipse.rdf4j.model.IRI;
 
 /**
  * <p>An implementation of the <a href="https://github.com/RinkeHoekstra/lkif-core">lkif-core</a>
@@ -50,28 +50,28 @@ public class LKIFCoreLegalAction extends Vocabulary {
     /* http://www.estrellaproject.org/lkif-core/legal-action.owl# */
     ////////////////////////////////////////////////////////////////
     // CLASSES
-    public final URI Limited_Company                = createClass(NS, "Limited_Company");
-    public final URI Private_Legal_Person           = createClass(NS, "Private_Legal_Person");
-    public final URI Society                        = createClass(NS, "Society");
-    public final URI Natural_Person                 = createClass(NS, "Natural_Person");
-    public final URI Mandate                        = createClass(NS, "Mandate");
-    public final URI Corporation                    = createClass(NS, "Corporation");
-    public final URI Legal_Person                   = createClass(NS, "Legal_Person");
-    public final URI Public_Body                    = createClass(NS, "Public_Body");
-    public final URI Foundation                     = createClass(NS, "Foundation");
-    public final URI Co_operative                   = createClass(NS, "Co-operative"); 
-    public final URI Legislative_Body               = createClass(NS, "Legislative_Body");
-    public final URI Delegation                     = createClass(NS, "Delegation");
-    public final URI Legal_Speech_Act               = createClass(NS, "Legal_Speech_Act");
-    public final URI Public_Act                     = createClass(NS, "Public_Act");
-    public final URI Company                        = createClass(NS, "Company");
-    public final URI Decision                       = createClass(NS, "Decision");
-    public final URI Public_Limited_Company         = createClass(NS, "Public_Limited_Company");
-    public final URI Incorporated                   = createClass(NS, "Incorporated");
-    public final URI Act_of_Law                     = createClass(NS, "Act_of_Law");
-    public final URI Association                    = createClass(NS, "Association");
-    public final URI Assignment                     = createClass(NS, "Assignment");
-    public final URI Unincorporated                 = createClass(NS, "Unincorporated");
+    public final IRI Limited_Company                = createClass(NS, "Limited_Company");
+    public final IRI Private_Legal_Person           = createClass(NS, "Private_Legal_Person");
+    public final IRI Society                        = createClass(NS, "Society");
+    public final IRI Natural_Person                 = createClass(NS, "Natural_Person");
+    public final IRI Mandate                        = createClass(NS, "Mandate");
+    public final IRI Corporation                    = createClass(NS, "Corporation");
+    public final IRI Legal_Person                   = createClass(NS, "Legal_Person");
+    public final IRI Public_Body                    = createClass(NS, "Public_Body");
+    public final IRI Foundation                     = createClass(NS, "Foundation");
+    public final IRI Co_operative                   = createClass(NS, "Co-operative"); 
+    public final IRI Legislative_Body               = createClass(NS, "Legislative_Body");
+    public final IRI Delegation                     = createClass(NS, "Delegation");
+    public final IRI Legal_Speech_Act               = createClass(NS, "Legal_Speech_Act");
+    public final IRI Public_Act                     = createClass(NS, "Public_Act");
+    public final IRI Company                        = createClass(NS, "Company");
+    public final IRI Decision                       = createClass(NS, "Decision");
+    public final IRI Public_Limited_Company         = createClass(NS, "Public_Limited_Company");
+    public final IRI Incorporated                   = createClass(NS, "Incorporated");
+    public final IRI Act_of_Law                     = createClass(NS, "Act_of_Law");
+    public final IRI Association                    = createClass(NS, "Association");
+    public final IRI Assignment                     = createClass(NS, "Assignment");
+    public final IRI Unincorporated                 = createClass(NS, "Unincorporated");
     
     // RESOURCES
     

http://git-wip-us.apache.org/repos/asf/any23/blob/445d13ab/api/src/main/java/org/apache/any23/vocab/LKIFCoreLegalRole.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/any23/vocab/LKIFCoreLegalRole.java b/api/src/main/java/org/apache/any23/vocab/LKIFCoreLegalRole.java
index aa203f1..37f0056 100644
--- a/api/src/main/java/org/apache/any23/vocab/LKIFCoreLegalRole.java
+++ b/api/src/main/java/org/apache/any23/vocab/LKIFCoreLegalRole.java
@@ -16,7 +16,7 @@
  */
 package org.apache.any23.vocab;
 
-import org.openrdf.model.URI;
+import org.eclipse.rdf4j.model.IRI;
 
 /**
  * <p>An implementation of the <a href="https://github.com/RinkeHoekstra/lkif-core">lkif-core</a>
@@ -49,9 +49,9 @@ public class LKIFCoreLegalRole extends Vocabulary {
     /* http://www.estrellaproject.org/lkif-core/legal-role.owl# */
     //////////////////////////////////////////////////////////////
     // CLASSES
-    public final URI Social_Legal_Role                  = createClass(NS, "Social_Legal_Role");
-    public final URI Legal_Role                         = createClass(NS, "Legal_Role");
-    public final URI Professional_Legal_Role            = createClass(NS, "Professional_Legal_Role");
+    public final IRI Social_Legal_Role                  = createClass(NS, "Social_Legal_Role");
+    public final IRI Legal_Role                         = createClass(NS, "Legal_Role");
+    public final IRI Professional_Legal_Role            = createClass(NS, "Professional_Legal_Role");
     
     // RESOURCES
     

http://git-wip-us.apache.org/repos/asf/any23/blob/445d13ab/api/src/main/java/org/apache/any23/vocab/LKIFCoreMereology.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/any23/vocab/LKIFCoreMereology.java b/api/src/main/java/org/apache/any23/vocab/LKIFCoreMereology.java
index d6c3fc8..0bc650b 100644
--- a/api/src/main/java/org/apache/any23/vocab/LKIFCoreMereology.java
+++ b/api/src/main/java/org/apache/any23/vocab/LKIFCoreMereology.java
@@ -16,7 +16,7 @@
  */
 package org.apache.any23.vocab;
 
-import org.openrdf.model.URI;
+import org.eclipse.rdf4j.model.IRI;
 
 /**
  * <p>An implementation of the <a href="https://github.com/RinkeHoekstra/lkif-core">lkif-core</a>
@@ -50,29 +50,29 @@ public class LKIFCoreMereology extends Vocabulary {
     /* http://www.estrellaproject.org/lkif-core/mereology.owl */
     /////////////////////////////////////////////////////////////
     // CLASSES
-    public final URI Atom                        = createClass(NS, "Atom");
-    public final URI Composition                 = createClass(NS, "Composition");
-    public final URI Pair                        = createClass(NS, "Pair");
-    public final URI Part                        = createClass(NS, "Part");
-    public final URI Whole                       = createClass(NS, "Whole");
+    public final IRI Atom                        = createClass(NS, "Atom");
+    public final IRI Composition                 = createClass(NS, "Composition");
+    public final IRI Pair                        = createClass(NS, "Pair");
+    public final IRI Part                        = createClass(NS, "Part");
+    public final IRI Whole                       = createClass(NS, "Whole");
     
     // RESOURCES
     
     // PROPERTIES
-    public final URI component                   = createProperty(NS, "component");
-    public final URI component_of                = createProperty(NS, "component_of");
-    public final URI composed_of                 = createProperty(NS, "composed_of");
-    public final URI composes                    = createProperty(NS, "composes");
-    public final URI contained_in                = createProperty(NS, "contained_in");
-    public final URI contains                    = createProperty(NS, "contains");
-    public final URI direct_part                 = createProperty(NS, "direct_part");
-    public final URI direct_part_of              = createProperty(NS, "direct_part_of");
-    public final URI member                      = createProperty(NS, "member");
-    public final URI member_of                   = createProperty(NS, "member_of");
-    public final URI part                        = createProperty(NS, "part");
-    public final URI part_of                     = createProperty(NS, "part_of");
-    public final URI strict_part                 = createProperty(NS, "strict_part");
-    public final URI strict_part_of              = createProperty(NS, "strict_part_of");
+    public final IRI component                   = createProperty(NS, "component");
+    public final IRI component_of                = createProperty(NS, "component_of");
+    public final IRI composed_of                 = createProperty(NS, "composed_of");
+    public final IRI composes                    = createProperty(NS, "composes");
+    public final IRI contained_in                = createProperty(NS, "contained_in");
+    public final IRI contains                    = createProperty(NS, "contains");
+    public final IRI direct_part                 = createProperty(NS, "direct_part");
+    public final IRI direct_part_of              = createProperty(NS, "direct_part_of");
+    public final IRI member                      = createProperty(NS, "member");
+    public final IRI member_of                   = createProperty(NS, "member_of");
+    public final IRI part                        = createProperty(NS, "part");
+    public final IRI part_of                     = createProperty(NS, "part_of");
+    public final IRI strict_part                 = createProperty(NS, "strict_part");
+    public final IRI strict_part_of              = createProperty(NS, "strict_part_of");
     
     private LKIFCoreMereology() {
       super(NS);

http://git-wip-us.apache.org/repos/asf/any23/blob/445d13ab/api/src/main/java/org/apache/any23/vocab/LKIFCoreNorm.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/any23/vocab/LKIFCoreNorm.java b/api/src/main/java/org/apache/any23/vocab/LKIFCoreNorm.java
index 95e77b7..1d40628 100644
--- a/api/src/main/java/org/apache/any23/vocab/LKIFCoreNorm.java
+++ b/api/src/main/java/org/apache/any23/vocab/LKIFCoreNorm.java
@@ -16,7 +16,7 @@
  */
 package org.apache.any23.vocab;
 
-import org.openrdf.model.URI;
+import org.eclipse.rdf4j.model.IRI;
 
 /**
  * <p>An implementation of the <a href="https://github.com/RinkeHoekstra/lkif-core">lkif-core</a>
@@ -53,76 +53,76 @@ public class LKIFCoreNorm extends Vocabulary {
     /* http://www.estrellaproject.org/lkif-core/norm.owl */
     ///////////////////////////////////////////////////////
     // CLASSES
-    public final URI Hohfeldian_Power                        = createClass(NS, "Hohfeldian_Power");
-    public final URI Normatively_Qualified                   = createClass(NS, "Normatively_Qualified");
-    public final URI Code_of_Conduct                         = createClass(NS, "Code_of_Conduct");
-    public final URI Regulation                              = createClass(NS, "Regulation");
-    public final URI Soft_Law                                = createClass(NS, "Soft_Law");
-    public final URI Strictly_Disallowed                     = createClass(NS, "Strictly_Disallowed");
-    public final URI Permissive_Right                        = createClass(NS, "Permissive_Right");
-    public final URI Proclamation                            = createClass(NS, "Proclamation");
-    public final URI Legal_Expression                        = createClass(NS, "Legal_Expression");
-    public final URI Qualificatory_Expression                = createClass(NS, "Qualificatory_Expression");
-    public final URI Enabling_Power                          = createClass(NS, "Enabling_Power");
-    public final URI Existential_Expression                  = createClass(NS, "Existential_Expression");
-    public final URI Persuasive_Precedent                    = createClass(NS, "Persuasive_Precedent");
-    public final URI Belief_In_Violation                     = createClass(NS, "Belief_In_Violation");
-    public final URI Strictly_Allowed                        = createClass(NS, "Strictly_Allowed");
-    public final URI Legal_Doctrine                          = createClass(NS, "Legal_Doctrine");
-    public final URI Resolution                              = createClass(NS, "Resolution");
-    public final URI Evaluative_Expression                   = createClass(NS, "Evaluative_Expression");
-    public final URI Liberty_Right                           = createClass(NS, "Liberty_Right");
-    public final URI Declarative_Power                       = createClass(NS, "Declarative_Power");
-    public final URI Contract                                = createClass(NS, "Contract");
-    public final URI Custom                                  = createClass(NS, "Custom");
-    public final URI Exclusionary_Right                      = createClass(NS, "Exclusionary_Right");
-    public final URI International_Agreement                 = createClass(NS, "International_Agreement");
-    public final URI Customary_Law                           = createClass(NS, "Customary_Law");
-    public final URI Action_Power                            = createClass(NS, "Action_Power");
-    public final URI Legal_Source                            = createClass(NS, "Legal_Source");
-    public final URI Statute                                 = createClass(NS, "Statute");
-    public final URI International_Arbitration               = createClass(NS, "International_Arbitration");
-    public final URI Immunity                                = createClass(NS, "Immunity");
-    public final URI Treaty                                  = createClass(NS, "Treaty");
-    public final URI Mandatory_Precedent                     = createClass(NS, "Mandatory_Precedent");
-    public final URI Code                                    = createClass(NS, "Code");
-    public final URI Allowed                                 = createClass(NS, "Allowed");
-    public final URI Observation_of_Violation                = createClass(NS, "Observation_of_Violation");
-    public final URI Legal_Document                          = createClass(NS, "Legal_Document");
-    public final URI Potestative_Expression                  = createClass(NS, "Potestative_Expression");
-    public final URI Norm                                    = createClass(NS, "Norm");
-    public final URI Potestative_Right                       = createClass(NS, "Potestative_Right");
-    public final URI Allowed_And_Disallowed                  = createClass(NS, "Allowed_And_Disallowed");
-    public final URI Obligation                              = createClass(NS, "Obligation");
-    public final URI Disallowed_Intention                    = createClass(NS, "Disallowed_Intention");
-    public final URI Permission                              = createClass(NS, "Permission");
-    public final URI Liability_Right                         = createClass(NS, "Liability_Right");
-    public final URI Right                                   = createClass(NS, "Right");
-    public final URI Obliged                                 = createClass(NS, "Obliged");
-    public final URI Non_binding_International_Agreement     = createClass(NS, "Non-binding_International_Agreement");
-    public final URI Directive                               = createClass(NS, "Directive");
-    public final URI Disallowed                              = createClass(NS, "Disallowed");
-    public final URI Definitional_Expression                 = createClass(NS, "Definitional_Expression");
-    public final URI Prohibition                             = createClass(NS, "Prohibition");
-    public final URI Precedent                               = createClass(NS, "Precedent");
-    public final URI Obligative_Right                        = createClass(NS, "Obligative_Right");
+    public final IRI Hohfeldian_Power                        = createClass(NS, "Hohfeldian_Power");
+    public final IRI Normatively_Qualified                   = createClass(NS, "Normatively_Qualified");
+    public final IRI Code_of_Conduct                         = createClass(NS, "Code_of_Conduct");
+    public final IRI Regulation                              = createClass(NS, "Regulation");
+    public final IRI Soft_Law                                = createClass(NS, "Soft_Law");
+    public final IRI Strictly_Disallowed                     = createClass(NS, "Strictly_Disallowed");
+    public final IRI Permissive_Right                        = createClass(NS, "Permissive_Right");
+    public final IRI Proclamation                            = createClass(NS, "Proclamation");
+    public final IRI Legal_Expression                        = createClass(NS, "Legal_Expression");
+    public final IRI Qualificatory_Expression                = createClass(NS, "Qualificatory_Expression");
+    public final IRI Enabling_Power                          = createClass(NS, "Enabling_Power");
+    public final IRI Existential_Expression                  = createClass(NS, "Existential_Expression");
+    public final IRI Persuasive_Precedent                    = createClass(NS, "Persuasive_Precedent");
+    public final IRI Belief_In_Violation                     = createClass(NS, "Belief_In_Violation");
+    public final IRI Strictly_Allowed                        = createClass(NS, "Strictly_Allowed");
+    public final IRI Legal_Doctrine                          = createClass(NS, "Legal_Doctrine");
+    public final IRI Resolution                              = createClass(NS, "Resolution");
+    public final IRI Evaluative_Expression                   = createClass(NS, "Evaluative_Expression");
+    public final IRI Liberty_Right                           = createClass(NS, "Liberty_Right");
+    public final IRI Declarative_Power                       = createClass(NS, "Declarative_Power");
+    public final IRI Contract                                = createClass(NS, "Contract");
+    public final IRI Custom                                  = createClass(NS, "Custom");
+    public final IRI Exclusionary_Right                      = createClass(NS, "Exclusionary_Right");
+    public final IRI International_Agreement                 = createClass(NS, "International_Agreement");
+    public final IRI Customary_Law                           = createClass(NS, "Customary_Law");
+    public final IRI Action_Power                            = createClass(NS, "Action_Power");
+    public final IRI Legal_Source                            = createClass(NS, "Legal_Source");
+    public final IRI Statute                                 = createClass(NS, "Statute");
+    public final IRI International_Arbitration               = createClass(NS, "International_Arbitration");
+    public final IRI Immunity                                = createClass(NS, "Immunity");
+    public final IRI Treaty                                  = createClass(NS, "Treaty");
+    public final IRI Mandatory_Precedent                     = createClass(NS, "Mandatory_Precedent");
+    public final IRI Code                                    = createClass(NS, "Code");
+    public final IRI Allowed                                 = createClass(NS, "Allowed");
+    public final IRI Observation_of_Violation                = createClass(NS, "Observation_of_Violation");
+    public final IRI Legal_Document                          = createClass(NS, "Legal_Document");
+    public final IRI Potestative_Expression                  = createClass(NS, "Potestative_Expression");
+    public final IRI Norm                                    = createClass(NS, "Norm");
+    public final IRI Potestative_Right                       = createClass(NS, "Potestative_Right");
+    public final IRI Allowed_And_Disallowed                  = createClass(NS, "Allowed_And_Disallowed");
+    public final IRI Obligation                              = createClass(NS, "Obligation");
+    public final IRI Disallowed_Intention                    = createClass(NS, "Disallowed_Intention");
+    public final IRI Permission                              = createClass(NS, "Permission");
+    public final IRI Liability_Right                         = createClass(NS, "Liability_Right");
+    public final IRI Right                                   = createClass(NS, "Right");
+    public final IRI Obliged                                 = createClass(NS, "Obliged");
+    public final IRI Non_binding_International_Agreement     = createClass(NS, "Non-binding_International_Agreement");
+    public final IRI Directive                               = createClass(NS, "Directive");
+    public final IRI Disallowed                              = createClass(NS, "Disallowed");
+    public final IRI Definitional_Expression                 = createClass(NS, "Definitional_Expression");
+    public final IRI Prohibition                             = createClass(NS, "Prohibition");
+    public final IRI Precedent                               = createClass(NS, "Precedent");
+    public final IRI Obligative_Right                        = createClass(NS, "Obligative_Right");
     
     // RESOURCES
     
     // PROPERTIES
-    public final URI normatively_comparable                  = createProperty(NS, "normatively_comparable");
-    public final URI normatively_equivalent_or_better        = createProperty(NS, "normatively_equivalent_or_better");
-    public final URI disallows                               = createProperty(NS, "disallows");
-    public final URI normatively_strictly_worse              = createProperty(NS, "normatively_strictly_worse");
-    public final URI normatively_not_equivalent              = createProperty(NS, "normatively_not_equivalent");
-    public final URI normatively_strictly_better             = createProperty(NS, "normatively_strictly_better");
-    public final URI allowed_by                              = createProperty(NS, "allowed_by");
-    public final URI disallowed_by                           = createProperty(NS, "disallowed_by");
-    public final URI allows                                  = createProperty(NS, "allows");
-    public final URI normatively_equivalent_or_worse         = createProperty(NS, "normatively_equivalent_or_worse");
-    public final URI commands                                = createProperty(NS, "commands");
-    public final URI commanded_by                            = createProperty(NS, "commanded_by");
-    public final URI strictly_equivalent                     = createProperty(NS, "strictly_equivalent");
+    public final IRI normatively_comparable                  = createProperty(NS, "normatively_comparable");
+    public final IRI normatively_equivalent_or_better        = createProperty(NS, "normatively_equivalent_or_better");
+    public final IRI disallows                               = createProperty(NS, "disallows");
+    public final IRI normatively_strictly_worse              = createProperty(NS, "normatively_strictly_worse");
+    public final IRI normatively_not_equivalent              = createProperty(NS, "normatively_not_equivalent");
+    public final IRI normatively_strictly_better             = createProperty(NS, "normatively_strictly_better");
+    public final IRI allowed_by                              = createProperty(NS, "allowed_by");
+    public final IRI disallowed_by                           = createProperty(NS, "disallowed_by");
+    public final IRI allows                                  = createProperty(NS, "allows");
+    public final IRI normatively_equivalent_or_worse         = createProperty(NS, "normatively_equivalent_or_worse");
+    public final IRI commands                                = createProperty(NS, "commands");
+    public final IRI commanded_by                            = createProperty(NS, "commanded_by");
+    public final IRI strictly_equivalent                     = createProperty(NS, "strictly_equivalent");
     
     private LKIFCoreNorm() {
       super(NS);

http://git-wip-us.apache.org/repos/asf/any23/blob/445d13ab/api/src/main/java/org/apache/any23/vocab/LKIFCoreProcess.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/any23/vocab/LKIFCoreProcess.java b/api/src/main/java/org/apache/any23/vocab/LKIFCoreProcess.java
index 090b747..1c55f67 100644
--- a/api/src/main/java/org/apache/any23/vocab/LKIFCoreProcess.java
+++ b/api/src/main/java/org/apache/any23/vocab/LKIFCoreProcess.java
@@ -16,7 +16,7 @@
  */
 package org.apache.any23.vocab;
 
-import org.openrdf.model.URI;
+import org.eclipse.rdf4j.model.IRI;
 
 /**
  * <p>An implementation of the <a href="https://github.com/RinkeHoekstra/lkif-core">lkif-core</a>
@@ -51,28 +51,28 @@ public class LKIFCoreProcess extends Vocabulary {
     /* http://www.estrellaproject.org/lkif-core/process.owl */
     //////////////////////////////////////////////////////////
     // CLASSES
-    public final URI Change                                 = createClass(NS, "Change");
-    public final URI Continuation                           = createClass(NS, "Continuation");
-    public final URI Initiation                             = createClass(NS, "Initiation");
-    public final URI Mental_Process                         = createClass(NS, "Mental_Process");
-    public final URI Physical_Object                        = createClass(NS, "Physical_Object");
-    public final URI Physical_Process                       = createClass(NS, "Physical_Process");
-    public final URI Process                                = createClass(NS, "Process");
-    public final URI Termination                            = createClass(NS, "Termination");
+    public final IRI Change                                 = createClass(NS, "Change");
+    public final IRI Continuation                           = createClass(NS, "Continuation");
+    public final IRI Initiation                             = createClass(NS, "Initiation");
+    public final IRI Mental_Process                         = createClass(NS, "Mental_Process");
+    public final IRI Physical_Object                        = createClass(NS, "Physical_Object");
+    public final IRI Physical_Process                       = createClass(NS, "Physical_Process");
+    public final IRI Process                                = createClass(NS, "Process");
+    public final IRI Termination                            = createClass(NS, "Termination");
     
     // RESOURCES
     
     // PROPERTIES
-    public final URI created_by                              = createProperty(NS, "created_by");
-    public final URI creation                                = createProperty(NS, "creation");
-    public final URI participant                             = createProperty(NS, "participant");
-    public final URI participant_in                          = createProperty(NS, "participant_in");
-    public final URI requirement                             = createProperty(NS, "requirement");
-    public final URI requirement_of                          = createProperty(NS, "requirement_of");
-    public final URI resource                                = createProperty(NS, "resource");
-    public final URI resource_for                            = createProperty(NS, "resource_for ");
-    public final URI result                                  = createProperty(NS, "result");
-    public final URI result_of                               = createProperty(NS, "result_of");
+    public final IRI created_by                              = createProperty(NS, "created_by");
+    public final IRI creation                                = createProperty(NS, "creation");
+    public final IRI participant                             = createProperty(NS, "participant");
+    public final IRI participant_in                          = createProperty(NS, "participant_in");
+    public final IRI requirement                             = createProperty(NS, "requirement");
+    public final IRI requirement_of                          = createProperty(NS, "requirement_of");
+    public final IRI resource                                = createProperty(NS, "resource");
+    public final IRI resource_for                            = createProperty(NS, "resource_for ");
+    public final IRI result                                  = createProperty(NS, "result");
+    public final IRI result_of                               = createProperty(NS, "result_of");
     
     private LKIFCoreProcess() {
       super(NS);

http://git-wip-us.apache.org/repos/asf/any23/blob/445d13ab/api/src/main/java/org/apache/any23/vocab/LKIFCoreRelativePlaces.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/any23/vocab/LKIFCoreRelativePlaces.java b/api/src/main/java/org/apache/any23/vocab/LKIFCoreRelativePlaces.java
index 3737992..fe21cb5 100644
--- a/api/src/main/java/org/apache/any23/vocab/LKIFCoreRelativePlaces.java
+++ b/api/src/main/java/org/apache/any23/vocab/LKIFCoreRelativePlaces.java
@@ -16,7 +16,7 @@
  */
 package org.apache.any23.vocab;
 
-import org.openrdf.model.URI;
+import org.eclipse.rdf4j.model.IRI;
 
 /**
  * <p>An implementation of the <a href="https://github.com/RinkeHoekstra/lkif-core">lkif-core</a>
@@ -49,30 +49,30 @@ public class LKIFCoreRelativePlaces extends Vocabulary {
     /* http://www.estrellaproject.org/lkif-core/relative-places.owl */
     //////////////////////////////////////////////////////////////////
     // CLASSES
-    public final URI Absolute_Place                   = createClass(NS, "Absolute_Place");
-    public final URI Comprehensive_Place              = createClass(NS, "Comprehensive_Place");
-    public final URI Location_Complex                 = createClass(NS, "Location_Complex");
-    public final URI Place                            = createClass(NS, "Place");
-    public final URI Relative_Place                   = createClass(NS, "Relative_Place");
+    public final IRI Absolute_Place                   = createClass(NS, "Absolute_Place");
+    public final IRI Comprehensive_Place              = createClass(NS, "Comprehensive_Place");
+    public final IRI Location_Complex                 = createClass(NS, "Location_Complex");
+    public final IRI Place                            = createClass(NS, "Place");
+    public final IRI Relative_Place                   = createClass(NS, "Relative_Place");
     
     // RESOURCES
     
     // PROPERTIES
-    public final URI abut                             = createProperty(NS, "abut");
-    public final URI connect                          = createProperty(NS, "connect");
-    public final URI cover                            = createProperty(NS, "cover");
-    public final URI covered_by                       = createProperty(NS, "covered_by");
-    public final URI exactly_coincide                 = createProperty(NS, "exactly_coincide");
-    public final URI externally_connect               = createProperty(NS, "externally_connect");
-    public final URI in                               = createProperty(NS, "in");
-    public final URI location_complex                 = createProperty(NS, "location_complex");
-    public final URI location_complex_for             = createProperty(NS, "location_complex_for");
-    public final URI meet                             = createProperty(NS, "meet");
-    public final URI overlap                          = createProperty(NS, "overlap");
-    public final URI partially_coincide               = createProperty(NS, "partially_coincide");
-    public final URI relatively_fixed                 = createProperty(NS, "relatively_fixed");
-    public final URI spatial_reference                = createProperty(NS, "spatial_reference");
-    public final URI spatial_relation                 = createProperty(NS, "spatial_relation");
+    public final IRI abut                             = createProperty(NS, "abut");
+    public final IRI connect                          = createProperty(NS, "connect");
+    public final IRI cover                            = createProperty(NS, "cover");
+    public final IRI covered_by                       = createProperty(NS, "covered_by");
+    public final IRI exactly_coincide                 = createProperty(NS, "exactly_coincide");
+    public final IRI externally_connect               = createProperty(NS, "externally_connect");
+    public final IRI in                               = createProperty(NS, "in");
+    public final IRI location_complex                 = createProperty(NS, "location_complex");
+    public final IRI location_complex_for             = createProperty(NS, "location_complex_for");
+    public final IRI meet                             = createProperty(NS, "meet");
+    public final IRI overlap                          = createProperty(NS, "overlap");
+    public final IRI partially_coincide               = createProperty(NS, "partially_coincide");
+    public final IRI relatively_fixed                 = createProperty(NS, "relatively_fixed");
+    public final IRI spatial_reference                = createProperty(NS, "spatial_reference");
+    public final IRI spatial_relation                 = createProperty(NS, "spatial_relation");
     
     private LKIFCoreRelativePlaces() {
       super(NS);

http://git-wip-us.apache.org/repos/asf/any23/blob/445d13ab/api/src/main/java/org/apache/any23/vocab/LKIFCoreRole.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/any23/vocab/LKIFCoreRole.java b/api/src/main/java/org/apache/any23/vocab/LKIFCoreRole.java
index 21fd745..a968da2 100644
--- a/api/src/main/java/org/apache/any23/vocab/LKIFCoreRole.java
+++ b/api/src/main/java/org/apache/any23/vocab/LKIFCoreRole.java
@@ -16,7 +16,7 @@
  */
 package org.apache.any23.vocab;
 
-import org.openrdf.model.URI;
+import org.eclipse.rdf4j.model.IRI;
 
 /**
  * <p>An implementation of the <a href="https://github.com/RinkeHoekstra/lkif-core">lkif-core</a>
@@ -50,22 +50,22 @@ public class LKIFCoreRole extends Vocabulary {
     /* http://www.estrellaproject.org/lkif-core/role.owl */
     ///////////////////////////////////////////////////////
     // CLASSES
-    public final URI Epistemic_Role                      = createClass(NS, "Epistemic_Role");
-    public final URI Function                            = createClass(NS, "Function");
-    public final URI Organisation_Role                   = createClass(NS, "Organisation_Role");
-    public final URI Person_Role                         = createClass(NS, "Person_Role");
-    public final URI Role                                = createClass(NS, "Role");
-    public final URI Social_Role                         = createClass(NS, "Social_Role");
-    public final URI Subjective_Entity                   = createClass(NS, "Subjective_Entity ");
+    public final IRI Epistemic_Role                      = createClass(NS, "Epistemic_Role");
+    public final IRI Function                            = createClass(NS, "Function");
+    public final IRI Organisation_Role                   = createClass(NS, "Organisation_Role");
+    public final IRI Person_Role                         = createClass(NS, "Person_Role");
+    public final IRI Role                                = createClass(NS, "Role");
+    public final IRI Social_Role                         = createClass(NS, "Social_Role");
+    public final IRI Subjective_Entity                   = createClass(NS, "Subjective_Entity ");
     
     // RESOURCES
     
     // PROPERTIES
-    public final URI context                             = createProperty(NS, "context");
-    public final URI counts_as                           = createProperty(NS, "counts_as");
-    public final URI imposed_on                          = createProperty(NS, "imposed_on");
-    public final URI played_by                           = createProperty(NS, "played_by");
-    public final URI plays                               = createProperty(NS, "plays");
+    public final IRI context                             = createProperty(NS, "context");
+    public final IRI counts_as                           = createProperty(NS, "counts_as");
+    public final IRI imposed_on                          = createProperty(NS, "imposed_on");
+    public final IRI played_by                           = createProperty(NS, "played_by");
+    public final IRI plays                               = createProperty(NS, "plays");
     
     private LKIFCoreRole() {
       super(NS);