diff --git a/expath-pkg.xml b/expath-pkg.xml
index b5bd0b90b482d1c12ea06362e0c1c3c922bbc1f5..457f8c4848cb54d293c2a9ed955e137ff19ab768 100644
--- a/expath-pkg.xml
+++ b/expath-pkg.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<package xmlns="http://expath.org/ns/pkg" name="http://bdn-edition.de/intermediate_format" abbrev="interformat" version="0.2.4" spec="1.0">
+<package xmlns="http://expath.org/ns/pkg" name="http://bdn-edition.de/intermediate_format" abbrev="interformat" version="0.2.5" spec="1.0">
     <title>BdN - Intermediate Format</title>
     <dependency package="http://exist-db.org/apps/shared"/>
 </package>
\ No newline at end of file
diff --git a/modules/intermediate_format/identification.xqm b/modules/intermediate_format/identification.xqm
index 4f0f1b3600d5988e3e5e0558207b0d34248777a3..0b43eda95fc75d0af4d51af9dc97bb341508b70a 100644
--- a/modules/intermediate_format/identification.xqm
+++ b/modules/intermediate_format/identification.xqm
@@ -17,8 +17,8 @@ xquery version "3.0";
  : @status working
  : @author Uwe Sikora
  :)
-module namespace ident="http://bdn.edition.de/intermediate_format/identification";
-import module namespace markerset = "http://bdn.edition.de/intermediate_format/markerset" at "markerset.xqm";
+module namespace ident="http://bdn-edition.de/intermediate_format/identification";
+import module namespace markerset = "http://bdn-edition.de/intermediate_format/markerset" at "markerset.xqm";
 
 declare default element namespace "http://www.tei-c.org/ns/1.0";
 
diff --git a/modules/intermediate_format/markerset.xqm b/modules/intermediate_format/markerset.xqm
index 25669750ac0deb7f1c8921eda3e14daa4f433ca0..4a9f0fc33f03b3c79714ec95d932b7da4bb939fe 100644
--- a/modules/intermediate_format/markerset.xqm
+++ b/modules/intermediate_format/markerset.xqm
@@ -8,7 +8,7 @@ xquery version "3.0";
  : @status working
  : @author Uwe Sikora, Michelles Rodzis
  :)
-module namespace markerset="http://bdn.edition.de/intermediate_format/markerset";
+module namespace markerset="http://bdn-edition.de/intermediate_format/markerset";
 declare default element namespace "http://www.tei-c.org/ns/1.0";
 
 
diff --git a/modules/intermediate_format/preprocessing.xqm b/modules/intermediate_format/preprocessing.xqm
index 061e16c723bf0af48b95276104252204e8d54a87..436c3e69a985ab0217c3e18e9895e79d2bb15b6d 100644
--- a/modules/intermediate_format/preprocessing.xqm
+++ b/modules/intermediate_format/preprocessing.xqm
@@ -10,8 +10,8 @@ xquery version "3.0";
  : @status working
  : @author Uwe Sikora
  :)
-module namespace pre="http://bdn.edition.de/intermediate_format/preprocessing";
-import module namespace whitespace = "http://bdn.edition.de/intermediate_format/whitespace_handling" at "whitespace-handling.xqm";
+module namespace pre="http://bdn-edition.de/intermediate_format/preprocessing";
+import module namespace whitespace = "http://bdn-edition.de/intermediate_format/whitespace_handling" at "whitespace-handling.xqm";
 
 declare default element namespace "http://www.tei-c.org/ns/1.0";
 
diff --git a/modules/intermediate_format/whitespace-handling.xqm b/modules/intermediate_format/whitespace-handling.xqm
index 4e797d5772be53852413093f2c18d048e88d1b1e..485d513884266e8ef99970f53145cc9647098ae8 100644
--- a/modules/intermediate_format/whitespace-handling.xqm
+++ b/modules/intermediate_format/whitespace-handling.xqm
@@ -8,8 +8,8 @@ xquery version "3.0";
  : @status working
  : @author Uwe Sikora
  :)
-module namespace whitespace="http://bdn.edition.de/intermediate_format/whitespace_handling";
-import module namespace pre="http://bdn.edition.de/intermediate_format/preprocessing" at "preprocessing.xqm";
+module namespace whitespace="http://bdn-edition.de/intermediate_format/whitespace_handling";
+import module namespace pre="http://bdn-edition.de/intermediate_format/preprocessing" at "preprocessing.xqm";
 
 declare default element namespace "http://www.tei-c.org/ns/1.0";
 
diff --git a/oxygen/devel/modules/outputtesting.xqm b/oxygen/devel/modules/outputtesting.xqm
index b00234338b9ad4b60fec4d8a1745c068d1cab6d4..ddf7b8eab42ceaebadef2fe7843c441ee27d20f7 100644
--- a/oxygen/devel/modules/outputtesting.xqm
+++ b/oxygen/devel/modules/outputtesting.xqm
@@ -8,7 +8,7 @@ xquery version "3.0";
  : @status development
  : @author Uwe Sikora
  :)
-module namespace output="http://bdn.edition.de/intermediate_format/output_testing";
+module namespace output="http://bdn-edition.de/intermediate_format/output_testing";
 (:declare default element namespace "http://www.tei-c.org/ns/1.0";:)
 declare namespace tei = "http://www.tei-c.org/ns/1.0";
 
diff --git a/oxygen/devel/modules/unittesting.xqm b/oxygen/devel/modules/unittesting.xqm
index 6e13bf6d1fc94d63dbd3ab3cbcc276beba6e5443..67d1e4273cc08db9ae1dae37a96c9e7ed294b627 100644
--- a/oxygen/devel/modules/unittesting.xqm
+++ b/oxygen/devel/modules/unittesting.xqm
@@ -10,9 +10,9 @@ xquery version "3.0";
  : @status development
  : @author Uwe Sikora
  :)
-module namespace test="http://bdn.edition.de/intermediate_format/unit_testing";
+module namespace test="http://bdn-edition.de/intermediate_format/unit_testing";
 
-import module namespace ident = "http://bdn.edition.de/intermediate_format/identification" at "../../../modules/intermediate_format/identification.xqm";
+import module namespace ident = "http://bdn-edition.de/intermediate_format/identification" at "../../../modules/intermediate_format/identification.xqm";
 
 declare namespace tei = "http://www.tei-c.org/ns/1.0";
 
diff --git a/oxygen/intermediate_format.oxygen.devel.xqm b/oxygen/intermediate_format.oxygen.devel.xqm
index 8b4616e981620ddc5625ec57c15243d25661e0d7..2b1a66a76c0fb943f0b625c23b6674a5564f8d0d 100644
--- a/oxygen/intermediate_format.oxygen.devel.xqm
+++ b/oxygen/intermediate_format.oxygen.devel.xqm
@@ -4,10 +4,10 @@ xquery version "3.0";
 declare default element namespace "http://www.tei-c.org/ns/1.0";
 
 import module namespace functx = "http://www.functx.com" at "functx.xqm";
-import module namespace markerset = "http://bdn.edition.de/intermediate_format/markerset" at "../modules/intermediate_format/markerset.xqm";
-import module namespace pre = "http://bdn.edition.de/intermediate_format/preprocessing" at "../modules/intermediate_format/preprocessing.xqm";
-import module namespace ident = "http://bdn.edition.de/intermediate_format/identification" at "../modules/intermediate_format/identification.xqm";
-import module namespace test = "http://bdn.edition.de/intermediate_format/unit_testing" at "devel/modules/unittesting.xqm";
+import module namespace markerset = "http://bdn-edition.de/intermediate_format/markerset" at "../modules/intermediate_format/markerset.xqm";
+import module namespace pre = "http://bdn-edition.de/intermediate_format/preprocessing" at "../modules/intermediate_format/preprocessing.xqm";
+import module namespace ident = "http://bdn-edition.de/intermediate_format/identification" at "../modules/intermediate_format/identification.xqm";
+import module namespace test = "http://bdn-edition.de/intermediate_format/unit_testing" at "devel/modules/unittesting.xqm";
 (:declare namespace target = "http://www.interform.com/target_index";
 import module "http://www.interform.com/target_index" at "targetindex.xqm";
 :)
diff --git a/oxygen/outputtest.oxygen.devel.xqm b/oxygen/outputtest.oxygen.devel.xqm
index 8b71c70216de827e770ee381f070b712f1a4c83e..4d024e954ab8b0e1204e24f02cb0d47dc71eb64b 100644
--- a/oxygen/outputtest.oxygen.devel.xqm
+++ b/oxygen/outputtest.oxygen.devel.xqm
@@ -3,7 +3,7 @@ xquery version "3.0";
 
 declare default element namespace "http://www.tei-c.org/ns/1.0";
 
-import module namespace output = "http://bdn.edition.de/intermediate_format/output_testing" at "devel/modules/outputtesting.xqm";
+import module namespace output = "http://bdn-edition.de/intermediate_format/output_testing" at "devel/modules/outputtesting.xqm";
 
 declare namespace tei = "http://www.tei-c.org/ns/1.0";
 (:declare option saxon:output "indent=no";:)
diff --git a/rest/intermediate_format.xql b/rest/intermediate_format.xql
index 6b702850f10d1dfd13272633a0610cc10e2649ce..4010b36db7764da9cb48236da83c794886b826ab 100644
--- a/rest/intermediate_format.xql
+++ b/rest/intermediate_format.xql
@@ -1,10 +1,10 @@
 xquery version "3.1";
 
 declare namespace tei = "http://www.tei-c.org/ns/1.0";
-import module namespace pre="http://bdn.edition.de/intermediate_format/preprocessing" at "xmldb:exist:///db/apps/interformat/modules/intermediate_format/preprocessing.xqm";
-import module namespace ident = "http://bdn.edition.de/intermediate_format/identification" at "xmldb:exist:///db/apps/interformat/modules/intermediate_format/identification.xqm";
+import module namespace pre="http://bdn-edition.de/intermediate_format/preprocessing" at "xmldb:exist:///db/apps/interformat/modules/intermediate_format/preprocessing.xqm";
+import module namespace ident = "http://bdn-edition.de/intermediate_format/identification" at "xmldb:exist:///db/apps/interformat/modules/intermediate_format/identification.xqm";
 import module namespace config = "http://bdn-edition.de/intermediate_format/config" at "xmldb:exist:///db/apps/interformat/modules/config.xqm";
-import module namespace ifutils="http://bdn.edition.de/intermediate_format/utils" at "xmldb:exist:///db/apps/interformat/modules/ifutils.xqm";
+import module namespace ifutils="http://bdn-edition.de/intermediate_format/utils" at "xmldb:exist:///db/apps/interformat/modules/ifutils.xqm";
 import module namespace console="http://exist-db.org/xquery/console";
 
 (: http://localhost:8080/exist/rest/apps/interformat/rest/intermediate_format.xql :)