diff --git a/config/config-map-tblArmItems.json b/config/config-map-tblArmItems.json
index fb9170fc326da5eb820d04679cd30442eaffd54e..8e6d285f0dd4d3045905840eb1f021cd855a9065 100644
--- a/config/config-map-tblArmItems.json
+++ b/config/config-map-tblArmItems.json
@@ -7,7 +7,7 @@
     "initial_instance_definitions": "src/rdf-mappings/initial_ontology_definitions.py",
     "_initial_instance_definitions": null,
     "existing_representation_ontology": "data/ontologies/digital-heraldry-ontology-representation.ttl",
-    "existing_entity_ontology": "data/ontologies/digital-heraldry-ontology-entities.ttl",
+    "existing_entity_ontology": "data/ontologies/digital-heraldry-ontology-entity.ttl",
     "_existing_ontology": "data/rdf-output/coat-of-arms-manuscript-provenances.ttl",
     "__existing_ontology": null,
     "create_research_dataset": true,
diff --git a/data/ontologies/digital-heraldry-ontology-entities.ttl b/data/ontologies/digital-heraldry-ontology-entity.ttl
similarity index 77%
rename from data/ontologies/digital-heraldry-ontology-entities.ttl
rename to data/ontologies/digital-heraldry-ontology-entity.ttl
index fa15fc2e4540cae76d56b84c8a081c9c34fd9d5c..b9c32874dc2f11066e502543c4612f6dccda45be 100644
--- a/data/ontologies/digital-heraldry-ontology-entities.ttl
+++ b/data/ontologies/digital-heraldry-ontology-entity.ttl
@@ -1,31 +1,31 @@
-@prefix : <http://digitalheraldry.org/digital-heraldry-ontology/entities#> .
+@prefix : <http://digitalheraldry.org/digital-heraldry-ontology/entity#> .
 @prefix owl: <http://www.w3.org/2002/07/owl#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix xml: <http://www.w3.org/XML/1998/namespace> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix dhoe: <http://digitalheraldry.org/digital-heraldry-ontology/entities#> .
+@prefix dhoe: <http://digitalheraldry.org/digital-heraldry-ontology/entity#> .
 @prefix dhoh: <http://digitalheraldry.org/digital-heraldry-ontology/heraldry#> .
 @prefix dhor: <http://digitalheraldry.org/digital-heraldry-ontology/representation#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix vann: <http://purl.org/vocab/vann/> .
 @prefix dcterms: <http://purl.org/dc/terms/> .
-@base <http://digitalheraldry.org/digital-heraldry-ontology/entities#> .
-
-<http://digitalheraldry.org/digital-heraldry-ontology/entities#> rdf:type owl:Ontology ;
-                                                                  owl:versionIRI <http://digitalheraldry.org/digital-heraldry-ontology/entities/0.1.0> ;
-                                                                  dcterms:creator "Philipp Schneider" ,
-                                                                                  "Torsten Hiltmann" ;
-                                                                  dcterms:description "The Digital Heraldry Entities Ontology is used to describe entities and their metadata that can be identified through coats of arms. It also enables linking an identification of a coat of arms (created with the Digital Heraldry Ontology) to a specific source in a specific context."@en ;
-                                                                  dcterms:license <https://creativecommons.org/licenses/by/4.0/> ;
-                                                                  dcterms:publisher "https://www.geschichte.hu-berlin.de/de/bereiche-und-lehrstuehle/digital-history" ;
-                                                                  dcterms:title "Digital Heraldry Objects Ontology" ;
-                                                                  vann:preferredNamespacePrefix "dhoe" .
+@base <http://digitalheraldry.org/digital-heraldry-ontology/entity#> .
+
+<http://digitalheraldry.org/digital-heraldry-ontology/entity#> rdf:type owl:Ontology ;
+                                                                owl:versionIRI <http://digitalheraldry.org/digital-heraldry-ontology/entity/0.1.0> ;
+                                                                dcterms:creator "Philipp Schneider" ,
+                                                                                "Torsten Hiltmann" ;
+                                                                dcterms:description "The Digital Heraldry Entity Ontology is used to describe entities and their metadata that can be identified through coats of arms. It also enables linking an identification of a coat of arms (created with the Digital Heraldry Ontology) to a specific source in a specific context."@en ;
+                                                                dcterms:license <https://creativecommons.org/licenses/by/4.0/> ;
+                                                                dcterms:publisher "https://www.geschichte.hu-berlin.de/de/bereiche-und-lehrstuehle/digital-history" ;
+                                                                dcterms:title "Digital Heraldry Objects Ontology" ;
+                                                                vann:preferredNamespacePrefix "dhoe" .
 
 #################################################################
 #    Annotation properties
 #################################################################
 
-###  http://digitalheraldry.org/digital-heraldry-ontology/entities#hasAnnotatorComment
+###  http://digitalheraldry.org/digital-heraldry-ontology/entity#hasAnnotatorComment
 dhoe:hasAnnotatorComment rdf:type owl:AnnotationProperty ;
                          rdfs:comment "Comment in natural language, done by the human annotator responsable for the respective identification."@en ;
                          rdfs:label "hasAnnotatorComment"@en ;
@@ -61,14 +61,14 @@ vann:preferredNamespacePrefix rdf:type owl:AnnotationProperty .
 #    Object Properties
 #################################################################
 
-###  http://digitalheraldry.org/digital-heraldry-ontology/entities#attributesCoATo
+###  http://digitalheraldry.org/digital-heraldry-ontology/entity#attributesCoATo
 dhoe:attributesCoATo rdf:type owl:ObjectProperty ;
                      rdfs:domain dhor:DescriptionAct ;
                      rdfs:range dhoe:IdentifiedEntity ;
                      rdfs:label "attributesCoATo"@en .
 
 
-###  http://digitalheraldry.org/digital-heraldry-ontology/entities#hasPrimaryIdentification
+###  http://digitalheraldry.org/digital-heraldry-ontology/entity#hasPrimaryIdentification
 dhoe:hasPrimaryIdentification rdf:type owl:ObjectProperty ;
                               rdfs:domain dhor:CoatOfArmsRepresentation ;
                               rdfs:range dhoe:IdentifiedEntity ;
@@ -79,7 +79,7 @@ dhoe:hasPrimaryIdentification rdf:type owl:ObjectProperty ;
 #    Classes
 #################################################################
 
-###  http://digitalheraldry.org/digital-heraldry-ontology/entities#IdentifiedEntity
+###  http://digitalheraldry.org/digital-heraldry-ontology/entity#IdentifiedEntity
 dhoe:IdentifiedEntity rdf:type owl:Class ;
                       rdfs:label "IdentifiedEntity"@en .
 
diff --git a/src/rdf-mappings/dho_namespaces.py b/src/rdf-mappings/dho_namespaces.py
index 5631e534d5ccf46e11f28d52fb090f350ddb2bbc..b96458568e4a48c408773d3d35d3e43ccb90e703 100644
--- a/src/rdf-mappings/dho_namespaces.py
+++ b/src/rdf-mappings/dho_namespaces.py
@@ -12,7 +12,7 @@ dho_n = Namespace(dho_uri)
 dho_blazon_n = Namespace(URIRef('http://digitalheraldry.org/digital-heraldry-ontology/blazon#'))
 dho_rep_n = Namespace(URIRef('http://digitalheraldry.org/digital-heraldry-ontology/representation#'))
 dho_obj_n = Namespace(URIRef('http://digitalheraldry.org/digital-heraldry-ontology/objects#'))
-dho_ent_n = Namespace(URIRef('http://digitalheraldry.org/digital-heraldry-ontology/entities#'))
+dho_ent_n = Namespace(URIRef('http://digitalheraldry.org/digital-heraldry-ontology/entity#'))
 dho_data_n = Namespace(URIRef('http://digitalheraldry.org/digital-heraldry-ontology/data#'))
 
 def bind_namespaces(g):