diff --git a/config/dispatcher/dispatcher.ex b/config/dispatcher/dispatcher.ex
index 6e1116c..4ef9420 100644
--- a/config/dispatcher/dispatcher.ex
+++ b/config/dispatcher/dispatcher.ex
@@ -60,8 +60,8 @@ defmodule Dispatcher do
     Proxy.forward conn, path, "http://cache/board-position-codes/"
   end
 
-  match "/agents/*path", %{ accept: [:json], layer: :api} do
-    Proxy.forward conn, path, "http://cache/agents/"
+  match "/functionaries/*path", %{ accept: [:json], layer: :api} do
+    Proxy.forward conn, path, "http://cache/functionaries/"
   end
 
   match "/agent-status-codes/*path", %{ accept: [:json], layer: :api} do
diff --git a/config/resources/domain.json b/config/resources/domain.json
index 5a52006..c7bdb42 100644
--- a/config/resources/domain.json
+++ b/config/resources/domain.json
@@ -61,9 +61,9 @@
           "cardinality": "many",
           "inverse": true
         },
-        "agents": {
+        "functionaries": {
           "predicate": "mandaat:isBestuurlijkeAliasVan",
-          "target": "agents",
+          "target": "functionaries",
           "cardinality": "many",
           "inverse": true
         }
@@ -125,9 +125,7 @@
     },
     "mandatories": {
       "class": "mandaat:Mandataris",
-      "super": [
-        "agents-in-position"
-      ],
+      "super": ["agents-in-position"],
       "attributes": {
         "start-date": {
           "type": "date",
@@ -170,16 +168,12 @@
           "predicate": "skos:prefLabel"
         }
       },
-      "features": [
-        "include-uri"
-      ],
+      "features": ["include-uri"],
       "new-resource-base": "http://data.vlaanderen.be/id/concept/MandatarisStatusCode/"
     },
     "worship-mandatories": {
       "class": "ere:EredienstMandataris",
-      "super": [
-        "mandatories"
-      ],
+      "super": ["mandatories"],
       "attributes": {
         "expected-end-date": {
           "type": "date",
@@ -244,9 +238,7 @@
     },
     "mandates": {
       "class": "mandaat:Mandaat",
-      "super": [
-        "posts"
-      ],
+      "super": ["posts"],
       "relationships": {
         "role-board": {
           "predicate": "org:role",
@@ -268,11 +260,9 @@
       },
       "new-resource-base": "http://data.lblod.info/id/mandaten/"
     },
-    "agents": {
+    "functionaries": {
       "class": "lblodlg:Functionaris",
-      "super": [
-        "agents-in-position"
-      ],
+      "super": ["agents-in-position"],
       "attributes": {
         "start-date": {
           "type": "datetime",
@@ -310,16 +300,12 @@
           "predicate": "skos:prefLabel"
         }
       },
-      "features": [
-        "include-uri"
-      ],
+      "features": ["include-uri"],
       "new-resource-base": "http://data.vlaanderen.be/id/concept/functionarisStatusCode/"
     },
     "board-positions": {
       "class": "lblodlg:Bestuursfunctie",
-      "super": [
-        "posts"
-      ],
+      "super": ["posts"],
       "relationships": {
         "role-board": {
           "predicate": "org:role",
@@ -490,9 +476,7 @@
     },
     "administrative-units": {
       "class": "besluit:Bestuurseenheid",
-      "super": [
-        "organizations"
-      ],
+      "super": ["organizations"],
       "relationships": {
         "classification": {
           "predicate": "org:classification",
@@ -540,16 +524,12 @@
     },
     "administrative-unit-classification-codes": {
       "class": "code:BestuurseenheidClassificatieCode",
-      "super": [
-        "organization-classification-codes"
-      ],
+      "super": ["organization-classification-codes"],
       "new-resource-base": "http://data.vlaanderen.be/id/concept/BestuurseenheidClassificatieCode/"
     },
     "worship-administrative-units": {
       "class": "ere:EredienstBestuurseenheid",
-      "super": [
-        "administrative-units"
-      ],
+      "super": ["administrative-units"],
       "relationships": {
         "recognized-worship-type": {
           "predicate": "ere:typeEredienst",
@@ -572,9 +552,7 @@
     },
     "worship-services": {
       "class": "ere:BestuurVanDeEredienst",
-      "super": [
-        "worship-administrative-units"
-      ],
+      "super": ["worship-administrative-units"],
       "attributes": {
         "denomination": {
           "type": "string",
@@ -599,16 +577,12 @@
     },
     "central-worship-services": {
       "class": "ere:CentraalBestuurVanDeEredienst",
-      "super": [
-        "worship-administrative-units"
-      ],
+      "super": ["worship-administrative-units"],
       "new-resource-base": "http://data.lblod.info/id/centraleBesturenVanDeEredienst/"
     },
     "representative-bodies": {
       "class": "ere:RepresentatiefOrgaan",
-      "super": [
-        "organizations"
-      ],
+      "super": ["organizations"],
       "relationships": {
         "classification": {
           "predicate": "org:classification",
@@ -631,9 +605,7 @@
     },
     "representative-body-classification-codes": {
       "class": "ext:RepresentatiefOrgaanClassificatieCode",
-      "super": [
-        "organization-classification-codes"
-      ],
+      "super": ["organization-classification-codes"],
       "new-resource-base": "http://data.vlaanderen.be/id/concept/RepresentatiefOrgaanClassificatieCode/"
     },
     "governing-bodies": {
@@ -851,9 +823,7 @@
           "predicate": "skos:prefLabel"
         }
       },
-      "features": [
-        "include-uri"
-      ],
+      "features": ["include-uri"],
       "new-resource-base": "http://lblod.data.gift/concepts/"
     },
     "locations": {
@@ -906,9 +876,7 @@
     },
     "ministers": {
       "class": "ere:RolBedienaar",
-      "super": [
-        "agents-in-position"
-      ],
+      "super": ["agents-in-position"],
       "relationships": {
         "minister-position": {
           "predicate": "org:holds",
@@ -976,9 +944,7 @@
     },
     "minister-positions": {
       "class": "ere:PositieBedienaar",
-      "super": [
-        "posts"
-      ],
+      "super": ["posts"],
       "relationships": {
         "function": {
           "predicate": "ere:functie",
diff --git a/config/search/config.json b/config/search/config.json
index 6e56567..db8733f 100644
--- a/config/search/config.json
+++ b/config/search/config.json
@@ -250,8 +250,8 @@
       }
     },
     {
-      "type": "agent",
-      "on_path": "agents",
+      "type": "functionary",
+      "on_path": "functionaries",
       "rdf_type": "http://data.lblod.info/vocabularies/leidinggevenden/Functionaris",
       "properties": {
         "given_name": [
@@ -568,14 +568,14 @@
     },
     {
       "type": "person",
-      "composite_types": ["minister", "agent", "mandatory"],
+      "composite_types": ["minister", "functionary", "mandatory"],
       "on_path": "people",
       "properties": [
         {
           "name": "given_name",
           "mappings": {
             "minister": "given_name",
-            "agent": "given_name",
+            "functionary": "given_name",
             "mandatory": "given_name"
           }
         },
@@ -583,7 +583,7 @@
           "name": "person_id",
           "mappings": {
             "minister": "person_id",
-            "agent": "person_id",
+            "functionary": "person_id",
             "mandatory": "person_id"
           }
         },
@@ -591,7 +591,7 @@
           "name": "family_name",
           "mappings": {
             "minister": "family_name",
-            "agent": "family_name",
+            "functionary": "family_name",
             "mandatory": "family_name"
           }
         },
@@ -599,7 +599,7 @@
           "name": "first_name_used",
           "mappings": {
             "minister": "first_name_used",
-            "agent": "first_name_used",
+            "functionary": "first_name_used",
             "mandatory": "first_name_used"
           }
         },
@@ -607,7 +607,7 @@
           "name": "end_date",
           "mappings": {
             "minister": "end_date",
-            "agent": "end_date",
+            "functionary": "end_date",
             "mandatory": "end_date"
           }
         },
@@ -615,7 +615,7 @@
           "name": "organization_id",
           "mappings": {
             "minister": "organization_id",
-            "agent": "organization_id",
+            "functionary": "organization_id",
             "mandatory": "organization_id"
           }
         },
@@ -623,7 +623,7 @@
           "name": "organization_classification",
           "mappings": {
             "minister": "organization_classification",
-            "agent": "organization_classification",
+            "functionary": "organization_classification",
             "mandatory": "organization_classification"
           }
         },
@@ -631,7 +631,7 @@
           "name": "organization_name",
           "mappings": {
             "minister": "organization_name",
-            "agent": "organization_name",
+            "functionary": "organization_name",
             "mandatory": "organization_name"
           }
         },
@@ -639,7 +639,7 @@
           "name": "organization_municipality",
           "mappings": {
             "minister": "organization_municipality",
-            "agent": "organization_municipality",
+            "functionary": "organization_municipality",
             "mandatory": "organization_municipality"
           }
         },
@@ -647,7 +647,7 @@
           "name": "organization_province",
           "mappings": {
             "minister": "organization_province",
-            "agent": "organization_province",
+            "functionary": "organization_province",
             "mandatory": "organization_province"
           }
         },
@@ -655,7 +655,7 @@
           "name": "position_id",
           "mappings": {
             "minister": "position_id",
-            "agent": "position_id",
+            "functionary": "position_id",
             "mandatory": "position_id"
           }
         },
@@ -663,7 +663,7 @@
           "name": "position_name",
           "mappings": {
             "minister": "position_name",
-            "agent": "position_name",
+            "functionary": "position_name",
             "mandatory": "position_name"
           }
         }
diff --git a/config/search/dev/config.json b/config/search/dev/config.json
index 13890ba..c58fda3 100644
--- a/config/search/dev/config.json
+++ b/config/search/dev/config.json
@@ -222,8 +222,8 @@
       }
     },
     {
-      "type": "agent",
-      "on_path": "agents",
+      "type": "functionary",
+      "on_path": "functionaries",
       "rdf_type": "http://data.lblod.info/vocabularies/leidinggevenden/Functionaris",
       "properties": {
         "given_name": [
@@ -540,14 +540,14 @@
     },
     {
       "type": "person",
-      "composite_types": ["minister", "agent", "mandatory"],
+      "composite_types": ["minister", "functionary", "mandatory"],
       "on_path": "people",
       "properties": [
         {
           "name": "given_name",
           "mappings": {
             "minister": "given_name",
-            "agent": "given_name",
+            "functionary": "given_name",
             "mandatory": "given_name"
           }
         },
@@ -555,7 +555,7 @@
           "name": "person_id",
           "mappings": {
             "minister": "person_id",
-            "agent": "person_id",
+            "functionary": "person_id",
             "mandatory": "person_id"
           }
         },
@@ -563,7 +563,7 @@
           "name": "family_name",
           "mappings": {
             "minister": "family_name",
-            "agent": "family_name",
+            "functionary": "family_name",
             "mandatory": "family_name"
           }
         },
@@ -571,7 +571,7 @@
           "name": "first_name_used",
           "mappings": {
             "minister": "first_name_used",
-            "agent": "first_name_used",
+            "functionary": "first_name_used",
             "mandatory": "first_name_used"
           }
         },
@@ -579,7 +579,7 @@
           "name": "end_date",
           "mappings": {
             "minister": "end_date",
-            "agent": "end_date",
+            "functionary": "end_date",
             "mandatory": "end_date"
           }
         },
@@ -587,7 +587,7 @@
           "name": "organization_id",
           "mappings": {
             "minister": "organization_id",
-            "agent": "organization_id",
+            "functionary": "organization_id",
             "mandatory": "organization_id"
           }
         },
@@ -595,7 +595,7 @@
           "name": "organization_classification",
           "mappings": {
             "minister": "organization_classification",
-            "agent": "organization_classification",
+            "functionary": "organization_classification",
             "mandatory": "organization_classification"
           }
         },
@@ -603,7 +603,7 @@
           "name": "organization_name",
           "mappings": {
             "minister": "organization_name",
-            "agent": "organization_name",
+            "functionary": "organization_name",
             "mandatory": "organization_name"
           }
         },
@@ -611,7 +611,7 @@
           "name": "organization_municipality",
           "mappings": {
             "minister": "organization_municipality",
-            "agent": "organization_municipality",
+            "functionary": "organization_municipality",
             "mandatory": "organization_municipality"
           }
         },
@@ -619,7 +619,7 @@
           "name": "organization_province",
           "mappings": {
             "minister": "organization_province",
-            "agent": "organization_province",
+            "functionary": "organization_province",
             "mandatory": "organization_province"
           }
         },
@@ -627,7 +627,7 @@
           "name": "position_id",
           "mappings": {
             "minister": "position_id",
-            "agent": "position_id",
+            "functionary": "position_id",
             "mandatory": "position_id"
           }
         },
@@ -635,7 +635,7 @@
           "name": "position_name",
           "mappings": {
             "minister": "position_name",
-            "agent": "position_name",
+            "functionary": "position_name",
             "mandatory": "position_name"
           }
         }