diff --git a/conf/output/test-output-rppd-lobid-0.json b/conf/output/test-output-rppd-lobid-0.json
index 482c7c65..fe7c52b8 100644
--- a/conf/output/test-output-rppd-lobid-0.json
+++ b/conf/output/test-output-rppd-lobid-0.json
@@ -12,7 +12,7 @@
   } ],
   "professionOrOccupation" : [ {
     "label" : "Komponist",
-    "id" : "https://rpb.lobid.org/sw/4032009n1"
+    "id" : "https://d-nb.info/gnd/4032009-1"
   } ],
   "dateOfBirth" : [ "1854-09-01" ],
   "dateOfDeath" : [ "1921-09-27" ],
diff --git a/conf/output/test-output-rppd-lobid-1.json b/conf/output/test-output-rppd-lobid-1.json
index 00cc3b64..92d6d5fb 100644
--- a/conf/output/test-output-rppd-lobid-1.json
+++ b/conf/output/test-output-rppd-lobid-1.json
@@ -12,13 +12,13 @@
   } ],
   "professionOrOccupation" : [ {
     "label" : "Maler",
-    "id" : "https://rpb.lobid.org/sw/4037215n7"
+    "id" : "https://d-nb.info/gnd/4037215-7"
   }, {
     "label" : "Grafiker",
-    "id" : "https://rpb.lobid.org/sw/4125173n8"
+    "id" : "https://d-nb.info/gnd/4125173-8"
   }, {
     "label" : "Kunsterzieher",
-    "id" : "https://rpb.lobid.org/sw/4302182n7"
+    "id" : "https://d-nb.info/gnd/4302182-7"
   } ],
   "dateOfBirth" : [ "1896-11-14" ],
   "dateOfDeath" : [ "1984" ],
diff --git a/conf/output/test-output-rppd-lobid-10.json b/conf/output/test-output-rppd-lobid-10.json
index 7f0ff9ec..7682b105 100644
--- a/conf/output/test-output-rppd-lobid-10.json
+++ b/conf/output/test-output-rppd-lobid-10.json
@@ -11,10 +11,10 @@
   } ],
   "professionOrOccupation" : [ {
     "label" : "Journalist",
-    "id" : "https://rpb.lobid.org/sw/4028781n6"
+    "id" : "https://d-nb.info/gnd/4028781-6"
   }, {
     "label" : "Politiker",
-    "id" : "https://rpb.lobid.org/sw/4046517n2"
+    "id" : "https://d-nb.info/gnd/4046517-2"
   } ],
   "dateOfBirth" : [ "1825-06-09" ],
   "dateOfDeath" : [ "1880-01-01" ],
diff --git a/conf/output/test-output-rppd-lobid-12.json b/conf/output/test-output-rppd-lobid-12.json
index 37fa2367..4e5f1462 100644
--- a/conf/output/test-output-rppd-lobid-12.json
+++ b/conf/output/test-output-rppd-lobid-12.json
@@ -12,10 +12,10 @@
   } ],
   "professionOrOccupation" : [ {
     "label" : "Komponist",
-    "id" : "https://rpb.lobid.org/sw/4032009n1"
+    "id" : "https://d-nb.info/gnd/4032009-1"
   }, {
     "label" : "Dirigent",
-    "id" : "https://rpb.lobid.org/sw/4012434n4"
+    "id" : "https://d-nb.info/gnd/4012434-4"
   } ],
   "dateOfBirth" : [ "1818-01-10" ],
   "dateOfDeath" : [ "1870-12-30" ],
diff --git a/conf/output/test-output-rppd-lobid-13.json b/conf/output/test-output-rppd-lobid-13.json
index bf0dd7b3..7d9be254 100644
--- a/conf/output/test-output-rppd-lobid-13.json
+++ b/conf/output/test-output-rppd-lobid-13.json
@@ -12,10 +12,10 @@
   } ],
   "professionOrOccupation" : [ {
     "label" : "Jurist",
-    "id" : "https://rpb.lobid.org/sw/4029050n5"
+    "id" : "https://d-nb.info/gnd/4029050-5"
   }, {
     "label" : "Musikdirektor",
-    "id" : "https://rpb.lobid.org/sw/7628980n1"
+    "id" : "https://d-nb.info/gnd/7628980-1"
   } ],
   "dateOfBirth" : [ "1772-03-19" ],
   "dateOfDeath" : [ "1855-12-26" ],
diff --git a/conf/output/test-output-rppd-lobid-14.json b/conf/output/test-output-rppd-lobid-14.json
index bb108357..eda963dc 100644
--- a/conf/output/test-output-rppd-lobid-14.json
+++ b/conf/output/test-output-rppd-lobid-14.json
@@ -11,7 +11,7 @@
   } ],
   "professionOrOccupation" : [ {
     "label" : "Komponist",
-    "id" : "https://rpb.lobid.org/sw/4032009n1"
+    "id" : "https://d-nb.info/gnd/4032009-1"
   } ],
   "gender" : [ {
     "id" : "https://d-nb.info/standards/vocab/gnd/gender#male",
diff --git a/conf/output/test-output-rppd-lobid-16.json b/conf/output/test-output-rppd-lobid-16.json
index 7b2b4292..e632042b 100644
--- a/conf/output/test-output-rppd-lobid-16.json
+++ b/conf/output/test-output-rppd-lobid-16.json
@@ -12,7 +12,7 @@
   } ],
   "professionOrOccupation" : [ {
     "label" : "Maler",
-    "id" : "https://rpb.lobid.org/sw/4037215n7"
+    "id" : "https://d-nb.info/gnd/4037215-7"
   } ],
   "dateOfBirth" : [ "1796-12-20" ],
   "dateOfDeath" : [ "1844-02-29" ],
diff --git a/conf/output/test-output-rppd-lobid-17.json b/conf/output/test-output-rppd-lobid-17.json
index ceeb3989..cb0970e3 100644
--- a/conf/output/test-output-rppd-lobid-17.json
+++ b/conf/output/test-output-rppd-lobid-17.json
@@ -12,16 +12,16 @@
   } ],
   "professionOrOccupation" : [ {
     "label" : "Klassischer Philologe",
-    "id" : "https://rpb.lobid.org/sw/4199241n6"
+    "id" : "https://d-nb.info/gnd/4199241-6"
   }, {
     "label" : "Historiker",
-    "id" : "https://rpb.lobid.org/sw/4025098n2"
+    "id" : "https://d-nb.info/gnd/4025098-2"
   }, {
     "label" : "Archäologe",
-    "id" : "https://rpb.lobid.org/sw/4191824n1"
+    "id" : "https://d-nb.info/gnd/4191824-1"
   }, {
     "label" : "Gymnasiallehrer",
-    "id" : "https://rpb.lobid.org/sw/4158589n6"
+    "id" : "https://d-nb.info/gnd/4158589-6"
   } ],
   "dateOfBirth" : [ "1857-12-01" ],
   "dateOfDeath" : [ "1923-12-02" ],
diff --git a/conf/output/test-output-rppd-lobid-18.json b/conf/output/test-output-rppd-lobid-18.json
index 46dce59d..b81b5e7b 100644
--- a/conf/output/test-output-rppd-lobid-18.json
+++ b/conf/output/test-output-rppd-lobid-18.json
@@ -15,7 +15,7 @@
     "id" : "https://rpb.lobid.org/sw/929n170632"
   }, {
     "label" : "Lehrer",
-    "id" : "https://rpb.lobid.org/sw/4035088n5"
+    "id" : "https://d-nb.info/gnd/4035088-5"
   } ],
   "dateOfBirth" : [ "1603" ],
   "dateOfDeath" : [ "1658-12-12" ],
diff --git a/conf/output/test-output-rppd-lobid-19.json b/conf/output/test-output-rppd-lobid-19.json
index 8449a034..5dcc5ca8 100644
--- a/conf/output/test-output-rppd-lobid-19.json
+++ b/conf/output/test-output-rppd-lobid-19.json
@@ -12,10 +12,10 @@
   } ],
   "professionOrOccupation" : [ {
     "label" : "Lehrer",
-    "id" : "https://rpb.lobid.org/sw/4035088n5"
+    "id" : "https://d-nb.info/gnd/4035088-5"
   }, {
     "label" : "Bürgermeister",
-    "id" : "https://rpb.lobid.org/sw/4136676n1"
+    "id" : "https://d-nb.info/gnd/4136676-1"
   } ],
   "dateOfBirth" : [ "1912-07-24" ],
   "dateOfDeath" : [ "1994-02-03" ],
diff --git a/conf/output/test-output-rppd-lobid-2.json b/conf/output/test-output-rppd-lobid-2.json
index f1eb3577..12f9b632 100644
--- a/conf/output/test-output-rppd-lobid-2.json
+++ b/conf/output/test-output-rppd-lobid-2.json
@@ -11,7 +11,7 @@
   } ],
   "professionOrOccupation" : [ {
     "label" : "Lehrer",
-    "id" : "https://rpb.lobid.org/sw/4035088n5"
+    "id" : "https://d-nb.info/gnd/4035088-5"
   } ],
   "dateOfBirth" : [ "1895-04-04" ],
   "dateOfDeath" : [ "1972-04-23" ],
diff --git a/conf/output/test-output-rppd-lobid-21.json b/conf/output/test-output-rppd-lobid-21.json
index f371352c..10cd4022 100644
--- a/conf/output/test-output-rppd-lobid-21.json
+++ b/conf/output/test-output-rppd-lobid-21.json
@@ -11,7 +11,7 @@
   } ],
   "professionOrOccupation" : [ {
     "label" : "Unternehmer",
-    "id" : "https://rpb.lobid.org/sw/4061949n7"
+    "id" : "https://d-nb.info/gnd/4061949-7"
   } ],
   "dateOfBirth" : [ "1866-11-08" ],
   "dateOfDeath" : [ "1930-06-19" ],
diff --git a/conf/output/test-output-rppd-lobid-23.json b/conf/output/test-output-rppd-lobid-23.json
index 4e0b2af5..e25c630f 100644
--- a/conf/output/test-output-rppd-lobid-23.json
+++ b/conf/output/test-output-rppd-lobid-23.json
@@ -11,10 +11,10 @@
   } ],
   "professionOrOccupation" : [ {
     "label" : "Bäcker",
-    "id" : "https://rpb.lobid.org/sw/4120966n7"
+    "id" : "https://d-nb.info/gnd/4120966-7"
   }, {
     "label" : "Lagerkommandant",
-    "id" : "https://rpb.lobid.org/sw/4276356n3"
+    "id" : "https://d-nb.info/gnd/4276356-3"
   } ],
   "dateOfBirth" : [ "1906-03-26" ],
   "dateOfDeath" : [ "1974-10-23" ],
diff --git a/conf/output/test-output-rppd-lobid-24.json b/conf/output/test-output-rppd-lobid-24.json
index 018ce54e..afb8a33c 100644
--- a/conf/output/test-output-rppd-lobid-24.json
+++ b/conf/output/test-output-rppd-lobid-24.json
@@ -11,7 +11,7 @@
   } ],
   "professionOrOccupation" : [ {
     "label" : "Polizeibeamter",
-    "id" : "https://rpb.lobid.org/sw/4135253n1"
+    "id" : "https://d-nb.info/gnd/4135253-1"
   } ],
   "dateOfBirth" : [ "1806-08-29" ],
   "dateOfDeath" : [ "1870-06-10" ],
diff --git a/conf/output/test-output-rppd-lobid-25.json b/conf/output/test-output-rppd-lobid-25.json
index 94edef1e..8161a6b5 100644
--- a/conf/output/test-output-rppd-lobid-25.json
+++ b/conf/output/test-output-rppd-lobid-25.json
@@ -11,7 +11,7 @@
   } ],
   "professionOrOccupation" : [ {
     "label" : "Oberregierungsrat",
-    "id" : "https://rpb.lobid.org/sw/4398834n9"
+    "id" : "https://d-nb.info/gnd/4398834-9"
   } ],
   "dateOfBirth" : [ "1893-04-21" ],
   "dateOfDeath" : [ "1952-10-16" ],
diff --git a/conf/output/test-output-rppd-lobid-26.json b/conf/output/test-output-rppd-lobid-26.json
index 1f9d3dd7..ab8fbdac 100644
--- a/conf/output/test-output-rppd-lobid-26.json
+++ b/conf/output/test-output-rppd-lobid-26.json
@@ -12,7 +12,7 @@
   } ],
   "professionOrOccupation" : [ {
     "label" : "Dekan / Kirche",
-    "id" : "https://rpb.lobid.org/sw/4441540n0"
+    "id" : "https://d-nb.info/gnd/4441540-0"
   } ],
   "dateOfBirth" : [ "1872-09-17" ],
   "dateOfDeath" : [ "1942-10-03" ],
diff --git a/conf/output/test-output-rppd-lobid-27.json b/conf/output/test-output-rppd-lobid-27.json
index 84fc9a24..f19a84ff 100644
--- a/conf/output/test-output-rppd-lobid-27.json
+++ b/conf/output/test-output-rppd-lobid-27.json
@@ -11,7 +11,7 @@
   } ],
   "professionOrOccupation" : [ {
     "label" : "Lehrer",
-    "id" : "https://rpb.lobid.org/sw/4035088n5"
+    "id" : "https://d-nb.info/gnd/4035088-5"
   } ],
   "dateOfBirth" : [ "1883-07-28" ],
   "dateOfDeath" : [ "1955-05-16" ],
diff --git a/conf/output/test-output-rppd-lobid-28.json b/conf/output/test-output-rppd-lobid-28.json
index dce449d7..e4392ed6 100644
--- a/conf/output/test-output-rppd-lobid-28.json
+++ b/conf/output/test-output-rppd-lobid-28.json
@@ -12,10 +12,10 @@
   } ],
   "professionOrOccupation" : [ {
     "label" : "Maler",
-    "id" : "https://rpb.lobid.org/sw/4037215n7"
+    "id" : "https://d-nb.info/gnd/4037215-7"
   }, {
     "label" : "Bildhauer",
-    "id" : "https://rpb.lobid.org/sw/4139550n5"
+    "id" : "https://d-nb.info/gnd/4139550-5"
   } ],
   "dateOfBirth" : [ "1919-09-03" ],
   "dateOfDeath" : [ "1995-11-20" ],
diff --git a/conf/output/test-output-rppd-lobid-29.json b/conf/output/test-output-rppd-lobid-29.json
index a1d870ca..bec8a8c0 100644
--- a/conf/output/test-output-rppd-lobid-29.json
+++ b/conf/output/test-output-rppd-lobid-29.json
@@ -11,7 +11,7 @@
   } ],
   "professionOrOccupation" : [ {
     "label" : "Landwirt",
-    "id" : "https://rpb.lobid.org/sw/4034399n6"
+    "id" : "https://d-nb.info/gnd/4034399-6"
   }, {
     "label" : "Kammerdirektor",
     "id" : "https://rpb.lobid.org/sw/00Sn49x3465a"
diff --git a/conf/output/test-output-rppd-lobid-3.json b/conf/output/test-output-rppd-lobid-3.json
index 8174dfa0..aae69ba8 100644
--- a/conf/output/test-output-rppd-lobid-3.json
+++ b/conf/output/test-output-rppd-lobid-3.json
@@ -12,13 +12,13 @@
   } ],
   "professionOrOccupation" : [ {
     "label" : "Gymnasiallehrer",
-    "id" : "https://rpb.lobid.org/sw/4158589n6"
+    "id" : "https://d-nb.info/gnd/4158589-6"
   }, {
     "label" : "Schriftsteller",
-    "id" : "https://rpb.lobid.org/sw/4053309n8"
+    "id" : "https://d-nb.info/gnd/4053309-8"
   }, {
     "label" : "Verleger",
-    "id" : "https://rpb.lobid.org/sw/4138343n6"
+    "id" : "https://d-nb.info/gnd/4138343-6"
   } ],
   "dateOfBirth" : [ "1914-11-05" ],
   "dateOfDeath" : [ "2003-07-01" ],
diff --git a/conf/output/test-output-rppd-lobid-30.json b/conf/output/test-output-rppd-lobid-30.json
index f1a7e2b7..53455e2c 100644
--- a/conf/output/test-output-rppd-lobid-30.json
+++ b/conf/output/test-output-rppd-lobid-30.json
@@ -11,7 +11,7 @@
   } ],
   "professionOrOccupation" : [ {
     "label" : "Musikdirektor",
-    "id" : "https://rpb.lobid.org/sw/7628980n1"
+    "id" : "https://d-nb.info/gnd/7628980-1"
   } ],
   "dateOfBirth" : [ "1742-12-27" ],
   "dateOfDeath" : [ "1825-05-06" ],
diff --git a/conf/output/test-output-rppd-lobid-31.json b/conf/output/test-output-rppd-lobid-31.json
index d942f7dd..aedd3f60 100644
--- a/conf/output/test-output-rppd-lobid-31.json
+++ b/conf/output/test-output-rppd-lobid-31.json
@@ -11,7 +11,7 @@
   } ],
   "professionOrOccupation" : [ {
     "label" : "Lyriker",
-    "id" : "https://rpb.lobid.org/sw/4168391n2"
+    "id" : "https://d-nb.info/gnd/4168391-2"
   } ],
   "dateOfBirth" : [ "1825-01-10" ],
   "dateOfDeath" : [ "1901-11-14" ],
diff --git a/conf/output/test-output-rppd-lobid-32.json b/conf/output/test-output-rppd-lobid-32.json
index 7109a081..b47cd7ee 100644
--- a/conf/output/test-output-rppd-lobid-32.json
+++ b/conf/output/test-output-rppd-lobid-32.json
@@ -12,10 +12,10 @@
   } ],
   "professionOrOccupation" : [ {
     "label" : "Rabbiner",
-    "id" : "https://rpb.lobid.org/sw/4176751n2"
+    "id" : "https://d-nb.info/gnd/4176751-2"
   }, {
     "label" : "Talmudist",
-    "id" : "https://rpb.lobid.org/sw/4293593n3"
+    "id" : "https://d-nb.info/gnd/4293593-3"
   } ],
   "dateOfBirth" : [ "1836-04-24" ],
   "dateOfDeath" : [ "1917" ],
diff --git a/conf/output/test-output-rppd-lobid-33.json b/conf/output/test-output-rppd-lobid-33.json
index 350c907d..52c3e417 100644
--- a/conf/output/test-output-rppd-lobid-33.json
+++ b/conf/output/test-output-rppd-lobid-33.json
@@ -11,10 +11,10 @@
   } ],
   "professionOrOccupation" : [ {
     "label" : "Lehrer",
-    "id" : "https://rpb.lobid.org/sw/4035088n5"
+    "id" : "https://d-nb.info/gnd/4035088-5"
   }, {
     "label" : "Heimatkundler",
-    "id" : "https://rpb.lobid.org/sw/4313907n3"
+    "id" : "https://d-nb.info/gnd/4313907-3"
   } ],
   "dateOfBirth" : [ "1859-12-03" ],
   "dateOfDeath" : [ "1915-06-03" ],
diff --git a/conf/output/test-output-rppd-lobid-34.json b/conf/output/test-output-rppd-lobid-34.json
index 7c2e552c..8ad96f0e 100644
--- a/conf/output/test-output-rppd-lobid-34.json
+++ b/conf/output/test-output-rppd-lobid-34.json
@@ -11,7 +11,7 @@
   } ],
   "professionOrOccupation" : [ {
     "label" : "Verwaltungsfachangestellter",
-    "id" : "https://rpb.lobid.org/sw/4063330n5"
+    "id" : "https://d-nb.info/gnd/4063330-5"
   } ],
   "dateOfBirth" : [ "1895-03-15" ],
   "dateOfDeath" : [ "1951-12-10" ],
diff --git a/conf/output/test-output-rppd-lobid-35.json b/conf/output/test-output-rppd-lobid-35.json
index 0f932830..bf1139e4 100644
--- a/conf/output/test-output-rppd-lobid-35.json
+++ b/conf/output/test-output-rppd-lobid-35.json
@@ -11,7 +11,7 @@
   } ],
   "professionOrOccupation" : [ {
     "label" : "Richter",
-    "id" : "https://rpb.lobid.org/sw/4049923n6"
+    "id" : "https://d-nb.info/gnd/4049923-6"
   } ],
   "dateOfBirth" : [ "1800-08-17" ],
   "dateOfDeath" : [ "unbekannt" ],
diff --git a/conf/output/test-output-rppd-lobid-36.json b/conf/output/test-output-rppd-lobid-36.json
index 7da8c282..e222e87b 100644
--- a/conf/output/test-output-rppd-lobid-36.json
+++ b/conf/output/test-output-rppd-lobid-36.json
@@ -11,13 +11,13 @@
   } ],
   "professionOrOccupation" : [ {
     "label" : "Jurist",
-    "id" : "https://rpb.lobid.org/sw/4029050n5"
+    "id" : "https://d-nb.info/gnd/4029050-5"
   }, {
     "label" : "Landrat",
-    "id" : "https://rpb.lobid.org/sw/4166616n1"
+    "id" : "https://d-nb.info/gnd/4166616-1"
   }, {
     "label" : "Ehrenamtliche Tätigkeit",
-    "id" : "https://rpb.lobid.org/sw/4013673n5"
+    "id" : "https://d-nb.info/gnd/4013673-5"
   } ],
   "dateOfBirth" : [ "1936-11-28" ],
   "dateOfDeath" : [ "2023-05-30" ],
diff --git a/conf/output/test-output-rppd-lobid-37.json b/conf/output/test-output-rppd-lobid-37.json
index c4878d97..838ac8c1 100644
--- a/conf/output/test-output-rppd-lobid-37.json
+++ b/conf/output/test-output-rppd-lobid-37.json
@@ -12,16 +12,16 @@
   } ],
   "professionOrOccupation" : [ {
     "label" : "Journalist",
-    "id" : "https://rpb.lobid.org/sw/4028781n6"
+    "id" : "https://d-nb.info/gnd/4028781-6"
   }, {
     "label" : "Redakteur",
-    "id" : "https://rpb.lobid.org/sw/4177294n5"
+    "id" : "https://d-nb.info/gnd/4177294-5"
   }, {
     "label" : "Ehrenamtliche Tätigkeit",
-    "id" : "https://rpb.lobid.org/sw/4013673n5"
+    "id" : "https://d-nb.info/gnd/4013673-5"
   }, {
     "label" : "Ortsvorsteher",
-    "id" : "https://rpb.lobid.org/sw/4466532n5"
+    "id" : "https://d-nb.info/gnd/4466532-5"
   } ],
   "dateOfBirth" : [ "1935-05-25" ],
   "dateOfDeath" : [ "2023-04-14" ],
diff --git a/conf/output/test-output-rppd-lobid-38.json b/conf/output/test-output-rppd-lobid-38.json
index e5e1d3c2..1f99d274 100644
--- a/conf/output/test-output-rppd-lobid-38.json
+++ b/conf/output/test-output-rppd-lobid-38.json
@@ -12,10 +12,10 @@
   } ],
   "professionOrOccupation" : [ {
     "label" : "Gymnasiallehrer",
-    "id" : "https://rpb.lobid.org/sw/4158589n6"
+    "id" : "https://d-nb.info/gnd/4158589-6"
   }, {
     "label" : "Mäzen",
-    "id" : "https://rpb.lobid.org/sw/7607862n0"
+    "id" : "https://d-nb.info/gnd/7607862-0"
   } ],
   "dateOfBirth" : [ "1823-05-24" ],
   "dateOfDeath" : [ "1892-03-11" ],
diff --git a/conf/output/test-output-rppd-lobid-39.json b/conf/output/test-output-rppd-lobid-39.json
index 232a1a8f..58b0f8f3 100644
--- a/conf/output/test-output-rppd-lobid-39.json
+++ b/conf/output/test-output-rppd-lobid-39.json
@@ -12,13 +12,13 @@
   } ],
   "professionOrOccupation" : [ {
     "label" : "Bürgermeister",
-    "id" : "https://rpb.lobid.org/sw/4136676n1"
+    "id" : "https://d-nb.info/gnd/4136676-1"
   }, {
     "label" : "Landwirt",
-    "id" : "https://rpb.lobid.org/sw/4034399n6"
+    "id" : "https://d-nb.info/gnd/4034399-6"
   }, {
     "label" : "Gastwirt",
-    "id" : "https://rpb.lobid.org/sw/4156075n9"
+    "id" : "https://d-nb.info/gnd/4156075-9"
   } ],
   "dateOfBirth" : [ "1899-11-12" ],
   "dateOfDeath" : [ "1973-06-24" ],
diff --git a/conf/output/test-output-rppd-lobid-4.json b/conf/output/test-output-rppd-lobid-4.json
index 93332493..790f7fe5 100644
--- a/conf/output/test-output-rppd-lobid-4.json
+++ b/conf/output/test-output-rppd-lobid-4.json
@@ -15,10 +15,10 @@
     "id" : "https://rpb.lobid.org/sw/1148297561"
   }, {
     "label" : "Schriftsteller",
-    "id" : "https://rpb.lobid.org/sw/4053309n8"
+    "id" : "https://d-nb.info/gnd/4053309-8"
   }, {
     "label" : "Kolumnist",
-    "id" : "https://rpb.lobid.org/sw/4335688n6"
+    "id" : "https://d-nb.info/gnd/4335688-6"
   } ],
   "dateOfBirth" : [ "1932-10-10" ],
   "dateOfDeath" : [ "2016-09-28" ],
diff --git a/conf/output/test-output-rppd-lobid-40.json b/conf/output/test-output-rppd-lobid-40.json
index 1a88a4ff..b13c2f1d 100644
--- a/conf/output/test-output-rppd-lobid-40.json
+++ b/conf/output/test-output-rppd-lobid-40.json
@@ -11,10 +11,10 @@
   } ],
   "professionOrOccupation" : [ {
     "label" : "Weibliche Abgeordnete",
-    "id" : "https://rpb.lobid.org/sw/4132700n7"
+    "id" : "https://d-nb.info/gnd/4132700-7"
   }, {
     "label" : "Juristin",
-    "id" : "https://rpb.lobid.org/sw/4130076n2"
+    "id" : "https://d-nb.info/gnd/4130076-2"
   } ],
   "dateOfBirth" : [ "1928-06-08" ],
   "dateOfDeath" : [ "2015-10-07" ],
diff --git a/conf/output/test-output-rppd-lobid-41.json b/conf/output/test-output-rppd-lobid-41.json
index 9ced8dc3..dc8d3730 100644
--- a/conf/output/test-output-rppd-lobid-41.json
+++ b/conf/output/test-output-rppd-lobid-41.json
@@ -11,10 +11,10 @@
   } ],
   "professionOrOccupation" : [ {
     "label" : "Beigeordneter",
-    "id" : "https://rpb.lobid.org/sw/4144367n6"
+    "id" : "https://d-nb.info/gnd/4144367-6"
   }, {
     "label" : "Kommunalpolitiker",
-    "id" : "https://rpb.lobid.org/sw/4396366n3"
+    "id" : "https://d-nb.info/gnd/4396366-3"
   } ],
   "gender" : [ {
     "id" : "https://d-nb.info/standards/vocab/gnd/gender#male",
diff --git a/conf/output/test-output-rppd-lobid-42.json b/conf/output/test-output-rppd-lobid-42.json
index b03cfd09..e5253f46 100644
--- a/conf/output/test-output-rppd-lobid-42.json
+++ b/conf/output/test-output-rppd-lobid-42.json
@@ -11,7 +11,7 @@
   } ],
   "professionOrOccupation" : [ {
     "label" : "Bildhauer",
-    "id" : "https://rpb.lobid.org/sw/4139550n5"
+    "id" : "https://d-nb.info/gnd/4139550-5"
   } ],
   "dateOfBirth" : [ "1977" ],
   "gender" : [ {
diff --git a/conf/output/test-output-rppd-lobid-44.json b/conf/output/test-output-rppd-lobid-44.json
index f504f3d4..45f4d1c4 100644
--- a/conf/output/test-output-rppd-lobid-44.json
+++ b/conf/output/test-output-rppd-lobid-44.json
@@ -11,13 +11,13 @@
   } ],
   "professionOrOccupation" : [ {
     "label" : "Unternehmer",
-    "id" : "https://rpb.lobid.org/sw/4061949n7"
+    "id" : "https://d-nb.info/gnd/4061949-7"
   }, {
     "label" : "Musikinstrumentenbauer",
-    "id" : "https://rpb.lobid.org/sw/4170830n1"
+    "id" : "https://d-nb.info/gnd/4170830-1"
   }, {
     "label" : "Drechsler",
-    "id" : "https://rpb.lobid.org/sw/4301425n2"
+    "id" : "https://d-nb.info/gnd/4301425-2"
   } ],
   "dateOfBirth" : [ "1787" ],
   "dateOfDeath" : [ "1864" ],
diff --git a/conf/output/test-output-rppd-lobid-45.json b/conf/output/test-output-rppd-lobid-45.json
index 0937e6b3..fa69d513 100644
--- a/conf/output/test-output-rppd-lobid-45.json
+++ b/conf/output/test-output-rppd-lobid-45.json
@@ -11,10 +11,10 @@
   } ],
   "professionOrOccupation" : [ {
     "label" : "Techniker",
-    "id" : "https://rpb.lobid.org/sw/4138289n4"
+    "id" : "https://d-nb.info/gnd/4138289-4"
   }, {
     "label" : "Politiker",
-    "id" : "https://rpb.lobid.org/sw/4046517n2"
+    "id" : "https://d-nb.info/gnd/4046517-2"
   } ],
   "periodOfActivity" : [ "1848" ],
   "gender" : [ {
diff --git a/conf/output/test-output-rppd-lobid-5.json b/conf/output/test-output-rppd-lobid-5.json
index 89f2e2d6..c4139948 100644
--- a/conf/output/test-output-rppd-lobid-5.json
+++ b/conf/output/test-output-rppd-lobid-5.json
@@ -11,10 +11,10 @@
   } ],
   "professionOrOccupation" : [ {
     "label" : "Philosoph",
-    "id" : "https://rpb.lobid.org/sw/4045790n4"
+    "id" : "https://d-nb.info/gnd/4045790-4"
   }, {
     "label" : "Schriftsteller",
-    "id" : "https://rpb.lobid.org/sw/4053309n8"
+    "id" : "https://d-nb.info/gnd/4053309-8"
   } ],
   "dateOfBirth" : [ "1959" ],
   "gender" : [ {
diff --git a/conf/output/test-output-rppd-lobid-6.json b/conf/output/test-output-rppd-lobid-6.json
index 82be1275..d792f72d 100644
--- a/conf/output/test-output-rppd-lobid-6.json
+++ b/conf/output/test-output-rppd-lobid-6.json
@@ -12,10 +12,10 @@
   } ],
   "professionOrOccupation" : [ {
     "label" : "Lehrer",
-    "id" : "https://rpb.lobid.org/sw/4035088n5"
+    "id" : "https://d-nb.info/gnd/4035088-5"
   }, {
     "label" : "Schriftsteller",
-    "id" : "https://rpb.lobid.org/sw/4053309n8"
+    "id" : "https://d-nb.info/gnd/4053309-8"
   } ],
   "dateOfBirth" : [ "1890-07-28" ],
   "dateOfDeath" : [ "1966-08-13" ],
diff --git a/conf/output/test-output-rppd-lobid-7.json b/conf/output/test-output-rppd-lobid-7.json
index 946f46be..e73f283c 100644
--- a/conf/output/test-output-rppd-lobid-7.json
+++ b/conf/output/test-output-rppd-lobid-7.json
@@ -11,7 +11,7 @@
   } ],
   "professionOrOccupation" : [ {
     "label" : "Heimatschriftsteller",
-    "id" : "https://rpb.lobid.org/sw/4772761n5"
+    "id" : "https://d-nb.info/gnd/4772761-5"
   } ],
   "dateOfBirth" : [ "1912" ],
   "dateOfDeath" : [ "1995" ],
diff --git a/conf/output/test-output-rppd-lobid-8.json b/conf/output/test-output-rppd-lobid-8.json
index 25e43cc4..e1268b10 100644
--- a/conf/output/test-output-rppd-lobid-8.json
+++ b/conf/output/test-output-rppd-lobid-8.json
@@ -11,10 +11,10 @@
   } ],
   "professionOrOccupation" : [ {
     "label" : "Schriftsteller",
-    "id" : "https://rpb.lobid.org/sw/4053309n8"
+    "id" : "https://d-nb.info/gnd/4053309-8"
   }, {
     "label" : "Journalist",
-    "id" : "https://rpb.lobid.org/sw/4028781n6"
+    "id" : "https://d-nb.info/gnd/4028781-6"
   } ],
   "dateOfBirth" : [ "1943-11-01" ],
   "gender" : [ {
diff --git a/conf/output/test-output-rppd-lobid-9.json b/conf/output/test-output-rppd-lobid-9.json
index a35f124b..9a88a46d 100644
--- a/conf/output/test-output-rppd-lobid-9.json
+++ b/conf/output/test-output-rppd-lobid-9.json
@@ -12,7 +12,7 @@
   } ],
   "professionOrOccupation" : [ {
     "label" : "Schriftsteller",
-    "id" : "https://rpb.lobid.org/sw/4053309n8"
+    "id" : "https://d-nb.info/gnd/4053309-8"
   } ],
   "dateOfBirth" : [ "1924-08-07" ],
   "dateOfDeath" : [ "2008-03-23" ],
diff --git a/conf/rppd-to-lobid.fix b/conf/rppd-to-lobid.fix
index b8b5e67b..60676607 100644
--- a/conf/rppd-to-lobid.fix
+++ b/conf/rppd-to-lobid.fix
@@ -74,7 +74,12 @@ end
 do list(path:"professionOrOccupation[]", "var": "$i")
   lookup("$i.label", "SW_map", delete: "true")
   if exists("$i.label")
-    prepend("$i.id", "https://rpb.lobid.org/sw/")
+    if all_match("$i.id", "(^\\d*)n(\\d)")
+      replace_all("$i.id", "(^\\d*)n(\\d)", "$1-$2")
+      prepend("$i.id", "https://d-nb.info/gnd/")
+    else
+      prepend("$i.id", "https://rpb.lobid.org/sw/")
+    end
   # TODO kein Beispiel in Testdaten
   else
     move_field("$i.id", "$i.label")