diff --git a/core/model-vocabulary/src/main/java/org/eclipse/rdf4j/model/vocabulary/AFN.java b/core/model-vocabulary/src/main/java/org/eclipse/rdf4j/model/vocabulary/AFN.java
index db5a8f23eb..c79391b671 100644
--- a/core/model-vocabulary/src/main/java/org/eclipse/rdf4j/model/vocabulary/AFN.java
+++ b/core/model-vocabulary/src/main/java/org/eclipse/rdf4j/model/vocabulary/AFN.java
@@ -11,6 +11,7 @@
 package org.eclipse.rdf4j.model.vocabulary;
 
 import org.eclipse.rdf4j.model.IRI;
+import org.eclipse.rdf4j.model.Namespace;
 
 /**
  * http://jena.hpl.hp.com/ARQ/function#.
@@ -27,6 +28,8 @@ private AFN() {
 
 	public static final String PREFIX = "afn";
 
+	public static final Namespace NS = Vocabularies.createNamespace(PREFIX, NAMESPACE);
+
 	/**
 	 * http://jena.hpl.hp.com/ARQ/function#localname The LocalName QueryModelNode as a SPARQL function.
 	 */
diff --git a/core/model-vocabulary/src/main/java/org/eclipse/rdf4j/model/vocabulary/APF.java b/core/model-vocabulary/src/main/java/org/eclipse/rdf4j/model/vocabulary/APF.java
index bef3a96507..af53de7dcd 100644
--- a/core/model-vocabulary/src/main/java/org/eclipse/rdf4j/model/vocabulary/APF.java
+++ b/core/model-vocabulary/src/main/java/org/eclipse/rdf4j/model/vocabulary/APF.java
@@ -11,6 +11,7 @@
 package org.eclipse.rdf4j.model.vocabulary;
 
 import org.eclipse.rdf4j.model.IRI;
+import org.eclipse.rdf4j.model.Namespace;
 
 /**
  * http://jena.hpl.hp.com/ARQ/property#.
@@ -27,6 +28,8 @@ private APF() {
 
 	public static final String PREFIX = "apf";
 
+	public static final Namespace NS = Vocabularies.createNamespace(PREFIX, NAMESPACE);
+
 	public static final IRI STR_SPLIT;
 
 	public static final IRI CONCAT;
diff --git a/core/model-vocabulary/src/main/java/org/eclipse/rdf4j/model/vocabulary/EARL.java b/core/model-vocabulary/src/main/java/org/eclipse/rdf4j/model/vocabulary/EARL.java
index 8b5d96c8a6..3565ae8f5d 100644
--- a/core/model-vocabulary/src/main/java/org/eclipse/rdf4j/model/vocabulary/EARL.java
+++ b/core/model-vocabulary/src/main/java/org/eclipse/rdf4j/model/vocabulary/EARL.java
@@ -11,6 +11,7 @@
 package org.eclipse.rdf4j.model.vocabulary;
 
 import org.eclipse.rdf4j.model.IRI;
+import org.eclipse.rdf4j.model.Namespace;
 
 /**
  * Constants for EARL primitives and for the EARL namespace.
@@ -27,6 +28,8 @@ public class EARL {
 	 */
 	public static final String PREFIX = "earl";
 
+	public static final Namespace NS = Vocabularies.createNamespace(PREFIX, NAMESPACE);
+
 	public final static IRI ASSERTOR;
 
 	public final static IRI ASSERTION;
diff --git a/core/model-vocabulary/src/main/java/org/eclipse/rdf4j/model/vocabulary/GEOF.java b/core/model-vocabulary/src/main/java/org/eclipse/rdf4j/model/vocabulary/GEOF.java
index 954c51ea0b..56ed00f3e8 100644
--- a/core/model-vocabulary/src/main/java/org/eclipse/rdf4j/model/vocabulary/GEOF.java
+++ b/core/model-vocabulary/src/main/java/org/eclipse/rdf4j/model/vocabulary/GEOF.java
@@ -11,6 +11,7 @@
 package org.eclipse.rdf4j.model.vocabulary;
 
 import org.eclipse.rdf4j.model.IRI;
+import org.eclipse.rdf4j.model.Namespace;
 
 /**
  * @see <a href=
@@ -20,6 +21,10 @@ public class GEOF {
 
 	public static final String NAMESPACE = "http://www.opengis.net/def/function/geosparql/";
 
+	public static final String PREFIX = "geof";
+
+	public static final Namespace NS = Vocabularies.createNamespace(PREFIX, NAMESPACE);
+
 	public static final IRI DISTANCE;
 
 	public static final IRI BUFFER;
diff --git a/core/model-vocabulary/src/main/java/org/eclipse/rdf4j/model/vocabulary/LIST.java b/core/model-vocabulary/src/main/java/org/eclipse/rdf4j/model/vocabulary/LIST.java
index 7b77784961..9f7d2993d9 100644
--- a/core/model-vocabulary/src/main/java/org/eclipse/rdf4j/model/vocabulary/LIST.java
+++ b/core/model-vocabulary/src/main/java/org/eclipse/rdf4j/model/vocabulary/LIST.java
@@ -11,6 +11,7 @@
 package org.eclipse.rdf4j.model.vocabulary;
 
 import org.eclipse.rdf4j.model.IRI;
+import org.eclipse.rdf4j.model.Namespace;
 
 /**
  * http://jena.hpl.hp.com/ARQ/list#.
@@ -27,6 +28,8 @@ private LIST() {
 
 	public static final String PREFIX = "list";
 
+	public static final Namespace NS = Vocabularies.createNamespace(PREFIX, NAMESPACE);
+
 	public static final IRI MEMBER;
 
 	public static final IRI INDEX;
diff --git a/core/model-vocabulary/src/main/java/org/eclipse/rdf4j/model/vocabulary/SP.java b/core/model-vocabulary/src/main/java/org/eclipse/rdf4j/model/vocabulary/SP.java
index 9d099838a2..1e13bd3076 100644
--- a/core/model-vocabulary/src/main/java/org/eclipse/rdf4j/model/vocabulary/SP.java
+++ b/core/model-vocabulary/src/main/java/org/eclipse/rdf4j/model/vocabulary/SP.java
@@ -11,6 +11,7 @@
 package org.eclipse.rdf4j.model.vocabulary;
 
 import org.eclipse.rdf4j.model.IRI;
+import org.eclipse.rdf4j.model.Namespace;
 
 /**
  * @version 1.4.0
@@ -25,6 +26,8 @@ public class SP {
 
 	public static final String PREFIX = "sp";
 
+	public static final Namespace NS = Vocabularies.createNamespace(PREFIX, NAMESPACE);
+
 	/**
 	 * http://spinrdf.org/sp#Path The base class of SPARQL property path expressions. Paths are used by sp:TriplePath
 	 * triple paths.
diff --git a/core/model-vocabulary/src/main/java/org/eclipse/rdf4j/model/vocabulary/SPIF.java b/core/model-vocabulary/src/main/java/org/eclipse/rdf4j/model/vocabulary/SPIF.java
index 8ab72fca44..a8f8cb63cb 100644
--- a/core/model-vocabulary/src/main/java/org/eclipse/rdf4j/model/vocabulary/SPIF.java
+++ b/core/model-vocabulary/src/main/java/org/eclipse/rdf4j/model/vocabulary/SPIF.java
@@ -11,6 +11,7 @@
 package org.eclipse.rdf4j.model.vocabulary;
 
 import org.eclipse.rdf4j.model.IRI;
+import org.eclipse.rdf4j.model.Namespace;
 
 /**
  * http://spinrdf.org/spif#.
@@ -27,6 +28,8 @@ private SPIF() {
 
 	public static final String PREFIX = "spif";
 
+	public static final Namespace NS = Vocabularies.createNamespace(PREFIX, NAMESPACE);
+
 	public static final IRI MOD_FUNCTION;
 
 	public static final IRI PARSE_DATE_FUNCTION;
diff --git a/core/model-vocabulary/src/main/java/org/eclipse/rdf4j/model/vocabulary/SPIN.java b/core/model-vocabulary/src/main/java/org/eclipse/rdf4j/model/vocabulary/SPIN.java
index 63830fadef..9121a284e7 100644
--- a/core/model-vocabulary/src/main/java/org/eclipse/rdf4j/model/vocabulary/SPIN.java
+++ b/core/model-vocabulary/src/main/java/org/eclipse/rdf4j/model/vocabulary/SPIN.java
@@ -11,6 +11,7 @@
 package org.eclipse.rdf4j.model.vocabulary;
 
 import org.eclipse.rdf4j.model.IRI;
+import org.eclipse.rdf4j.model.Namespace;
 
 /**
  * @version 1.4.0
@@ -25,6 +26,8 @@ public class SPIN {
 
 	public static final String PREFIX = "spin";
 
+	public static final Namespace NS = Vocabularies.createNamespace(PREFIX, NAMESPACE);
+
 	/**
 	 * http://spinrdf.org/spin#Function Metaclass for functions that can be used in SPARQL expressions (e.g. FILTER or
 	 * BIND). The function themselves are classes that are instances of this metaclass. Function calls are instances of
diff --git a/core/model-vocabulary/src/main/java/org/eclipse/rdf4j/model/vocabulary/SPINX.java b/core/model-vocabulary/src/main/java/org/eclipse/rdf4j/model/vocabulary/SPINX.java
index 9ca8d4ff7c..90ce446693 100644
--- a/core/model-vocabulary/src/main/java/org/eclipse/rdf4j/model/vocabulary/SPINX.java
+++ b/core/model-vocabulary/src/main/java/org/eclipse/rdf4j/model/vocabulary/SPINX.java
@@ -11,6 +11,7 @@
 package org.eclipse.rdf4j.model.vocabulary;
 
 import org.eclipse.rdf4j.model.IRI;
+import org.eclipse.rdf4j.model.Namespace;
 
 /**
  * http://spinrdf.org/spinx#.
@@ -27,6 +28,8 @@ private SPINX() {
 
 	public static final String PREFIX = "spinx";
 
+	public static final Namespace NS = Vocabularies.createNamespace(PREFIX, NAMESPACE);
+
 	public static final IRI JAVA_SCRIPT_CODE_PROPERTY;
 
 	public static final IRI JAVA_SCRIPT_FILE_PROPERTY;
diff --git a/core/model-vocabulary/src/main/java/org/eclipse/rdf4j/model/vocabulary/SPL.java b/core/model-vocabulary/src/main/java/org/eclipse/rdf4j/model/vocabulary/SPL.java
index 85a55ff761..70f7608221 100644
--- a/core/model-vocabulary/src/main/java/org/eclipse/rdf4j/model/vocabulary/SPL.java
+++ b/core/model-vocabulary/src/main/java/org/eclipse/rdf4j/model/vocabulary/SPL.java
@@ -11,6 +11,7 @@
 package org.eclipse.rdf4j.model.vocabulary;
 
 import org.eclipse.rdf4j.model.IRI;
+import org.eclipse.rdf4j.model.Namespace;
 
 /**
  * SPIN Standard Module library.
@@ -27,6 +28,8 @@ private SPL() {
 
 	public static final String PREFIX = "spl";
 
+	public static final Namespace NS = Vocabularies.createNamespace(PREFIX, NAMESPACE);
+
 	/**
 	 * http://spinrdf.org/spl#Argument Provides metadata about an argument of a SPIN Function or Template.
 	 */