diff --git a/applications/NXarchive.nxdl.xml b/applications/NXarchive.nxdl.xml
index 1f03c282f..4920d93b2 100644
--- a/applications/NXarchive.nxdl.xml
+++ b/applications/NXarchive.nxdl.xml
@@ -23,9 +23,9 @@
 -->
 <definition name="NXarchive" extends="NXobject" type="group"
   category="application"
-    xmlns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@"
+  xmlns="http://definition.nexusformat.org/nxdl/3.1"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@ ../nxdl.xsd"
+    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd"
     version="1.0b"
     >
     <doc>
diff --git a/applications/NXarpes.nxdl.xml b/applications/NXarpes.nxdl.xml
index 03afb04fe..3915c04c3 100644
--- a/applications/NXarpes.nxdl.xml
+++ b/applications/NXarpes.nxdl.xml
@@ -23,9 +23,9 @@
 -->
 <definition name="NXarpes" extends="NXobject" type="group"
 	    version="1.0"  category="application"
-	    xmlns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@"
+	    xmlns="http://definition.nexusformat.org/nxdl/3.1"
 	    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@ ../nxdl.xsd"
+	    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd"
 	    >
   <doc>
     This is an application definition for angular resolved photo electron spectroscopy.
diff --git a/applications/NXdirecttof.nxdl.xml b/applications/NXdirecttof.nxdl.xml
index 0e8ddd0bd..e24a74575 100644
--- a/applications/NXdirecttof.nxdl.xml
+++ b/applications/NXdirecttof.nxdl.xml
@@ -23,9 +23,9 @@
 -->
 <definition name="NXdirecttof" extends="NXtofraw" type="group"
   category="application"
-    xmlns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@"
+  xmlns="http://definition.nexusformat.org/nxdl/3.1"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@ ../nxdl.xsd"
+    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd"
     version="1.0b"
     >
     <doc>This is a application definition for raw data from a direct geometry TOF spectrometer</doc>
diff --git a/applications/NXfluo.nxdl.xml b/applications/NXfluo.nxdl.xml
index 9675ee24a..a055799c3 100644
--- a/applications/NXfluo.nxdl.xml
+++ b/applications/NXfluo.nxdl.xml
@@ -23,9 +23,9 @@
 -->
 <definition name="NXfluo" extends="NXobject" type="group"
     version="1.0"  category="application"
-    xmlns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@"
+    xmlns="http://definition.nexusformat.org/nxdl/3.1"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@ ../nxdl.xsd "
+    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd "
     >
     <doc>
       This is an application definition for raw data from an X-ray fluorescence 
diff --git a/applications/NXindirecttof.nxdl.xml b/applications/NXindirecttof.nxdl.xml
index c335d3243..0540f1da0 100644
--- a/applications/NXindirecttof.nxdl.xml
+++ b/applications/NXindirecttof.nxdl.xml
@@ -23,9 +23,9 @@
 -->
 <definition name="NXindirecttof" extends="NXtofraw" type="group"
   category="application"
-    xmlns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@"
+  xmlns="http://definition.nexusformat.org/nxdl/3.1"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@ ../nxdl.xsd"
+    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd"
     version="1.0b"
     >
     <doc>This is a application definition for raw data from a direct geometry TOF spectrometer</doc>
diff --git a/applications/NXiqproc.nxdl.xml b/applications/NXiqproc.nxdl.xml
index 5a253c2d3..8716c668c 100644
--- a/applications/NXiqproc.nxdl.xml
+++ b/applications/NXiqproc.nxdl.xml
@@ -23,9 +23,9 @@
 -->
 <definition name="NXiqproc" extends="NXobject" type="group"
   category="application"
-    xmlns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@"
+  xmlns="http://definition.nexusformat.org/nxdl/3.1"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@ ../nxdl.xsd"
+    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd"
     version="1.0b"
     >
     <doc>Application definition for any :math:`I(Q)` data.</doc>
diff --git a/applications/NXlauetof.nxdl.xml b/applications/NXlauetof.nxdl.xml
index 6996b6418..b0d0661bb 100644
--- a/applications/NXlauetof.nxdl.xml
+++ b/applications/NXlauetof.nxdl.xml
@@ -23,9 +23,9 @@
 -->
 <definition name="NXlauetof" extends="NXobject" type="group"
   category="application"
-  xmlns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@"
+  xmlns="http://definition.nexusformat.org/nxdl/3.1"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@ ../nxdl.xsd"
+  xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd"
   version="1.0b"
   >
   <doc>
diff --git a/applications/NXmonopd.nxdl.xml b/applications/NXmonopd.nxdl.xml
index 258cb7846..18beb8575 100644
--- a/applications/NXmonopd.nxdl.xml
+++ b/applications/NXmonopd.nxdl.xml
@@ -23,9 +23,9 @@
 -->
 <definition name="NXmonopd" extends="NXobject" type="group"
     category="application"
-    xmlns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@"
+    xmlns="http://definition.nexusformat.org/nxdl/3.1"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@ ../nxdl.xsd"
+    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd"
     version="1.0b"
     >
     <doc>
diff --git a/applications/NXmx.nxdl.xml b/applications/NXmx.nxdl.xml
index b0537df1e..84c15714a 100644
--- a/applications/NXmx.nxdl.xml
+++ b/applications/NXmx.nxdl.xml
@@ -23,9 +23,9 @@
 -->
 <definition name="NXmx" extends="NXobject" type="group"
 	version="1.3" category="application"
-	xmlns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@"
+	xmlns="http://definition.nexusformat.org/nxdl/3.1"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@ ../nxdl.xsd"
+	xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd"
 	>
 
 	<symbols>
diff --git a/applications/NXrefscan.nxdl.xml b/applications/NXrefscan.nxdl.xml
index a0b001c46..7d599a2e8 100644
--- a/applications/NXrefscan.nxdl.xml
+++ b/applications/NXrefscan.nxdl.xml
@@ -23,9 +23,9 @@
 -->
 <definition name="NXrefscan" extends="NXobject" type="group"
   category="application"
-    xmlns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@"
+  xmlns="http://definition.nexusformat.org/nxdl/3.1"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@ ../nxdl.xsd"
+    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd"
     version="1.0b"
   >
   <doc>
diff --git a/applications/NXreftof.nxdl.xml b/applications/NXreftof.nxdl.xml
index 43f9fe98f..73c090d88 100644
--- a/applications/NXreftof.nxdl.xml
+++ b/applications/NXreftof.nxdl.xml
@@ -23,9 +23,9 @@
 -->
 <definition name="NXreftof" extends="NXobject" type="group"
   category="application"
-    xmlns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@"
+  xmlns="http://definition.nexusformat.org/nxdl/3.1"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@ ../nxdl.xsd"
+    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd"
     version="1.0b"
   >
     <doc>This is an application definition for raw data from a TOF reflectometer. </doc>
diff --git a/applications/NXsas.nxdl.xml b/applications/NXsas.nxdl.xml
index abff5d85f..afafcf56c 100644
--- a/applications/NXsas.nxdl.xml
+++ b/applications/NXsas.nxdl.xml
@@ -23,9 +23,9 @@
 -->
 <definition name="NXsas" extends="NXobject" type="group"
   category="application"
-  xmlns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@"
+  xmlns="http://definition.nexusformat.org/nxdl/3.1"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@ ../nxdl.xsd"
+  xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd"
   version="1.0b"
   >
   <doc>
diff --git a/applications/NXsastof.nxdl.xml b/applications/NXsastof.nxdl.xml
index 45f411034..b0a2ec4b5 100644
--- a/applications/NXsastof.nxdl.xml
+++ b/applications/NXsastof.nxdl.xml
@@ -23,9 +23,9 @@
 -->
 <definition name="NXsastof" extends="NXobject" type="group"
   category="application"
-  xmlns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@"
+  xmlns="http://definition.nexusformat.org/nxdl/3.1"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@ ../nxdl.xsd"
+  xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd"
   version="1.0b"
   >
   <doc>
diff --git a/applications/NXscan.nxdl.xml b/applications/NXscan.nxdl.xml
index 557b2cce8..346a15e76 100644
--- a/applications/NXscan.nxdl.xml
+++ b/applications/NXscan.nxdl.xml
@@ -23,9 +23,9 @@
 -->
 <definition name="NXscan" extends="NXobject" type="group"
 	    category="application"
-	    xmlns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@"
+	    xmlns="http://definition.nexusformat.org/nxdl/3.1"
 	    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@ ../nxdl.xsd"
+	    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd"
 	    version="1.0b"
 	    >
   <doc>
diff --git a/applications/NXspe.nxdl.xml b/applications/NXspe.nxdl.xml
index fe68a6fd9..ac9634b91 100644
--- a/applications/NXspe.nxdl.xml
+++ b/applications/NXspe.nxdl.xml
@@ -22,8 +22,8 @@
     # For further information, see http://www.nexusformat.org
 -->
 <definition xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@ ../nxdl.xsd"
- xmlns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@"
+    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd"
+    xmlns="http://definition.nexusformat.org/nxdl/3.1"
  name="NXspe"
  extends="NXobject"
  type="group"
diff --git a/applications/NXsqom.nxdl.xml b/applications/NXsqom.nxdl.xml
index 3055438c9..3c17902fc 100644
--- a/applications/NXsqom.nxdl.xml
+++ b/applications/NXsqom.nxdl.xml
@@ -22,9 +22,9 @@
 # For further information, see http://www.nexusformat.org
 -->
 <definition name="NXsqom" extends="NXobject" type="group" category="application"
-	    xmlns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@"
+  xmlns="http://definition.nexusformat.org/nxdl/3.1"
 	    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@ ../nxdl.xsd" version="1.0b"
+	    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd" version="1.0b"
 	    >
   <doc>
     This is the application definition for S(Q,OM) processed data. As this kind of data is in
diff --git a/applications/NXstxm.nxdl.xml b/applications/NXstxm.nxdl.xml
index d61dd431f..e7e9a3c51 100644
--- a/applications/NXstxm.nxdl.xml
+++ b/applications/NXstxm.nxdl.xml
@@ -23,9 +23,9 @@
 -->
 <definition name="NXstxm" extends="NXobject" type="group"
     category="application"
-    xmlns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@"
+    xmlns="http://definition.nexusformat.org/nxdl/3.1"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@ ../nxdl.xsd"
+    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd"
     version="1.1"
     >
     <symbols>
diff --git a/applications/NXtas.nxdl.xml b/applications/NXtas.nxdl.xml
index 9e214e3c2..262189175 100644
--- a/applications/NXtas.nxdl.xml
+++ b/applications/NXtas.nxdl.xml
@@ -23,9 +23,9 @@
 -->
 <definition name="NXtas" extends="NXobject" type="group"
   category="application"
-    xmlns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@"
+  xmlns="http://definition.nexusformat.org/nxdl/3.1"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@ ../nxdl.xsd"
+    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd"
     version="1.0b"
     >
   <doc>
diff --git a/applications/NXtofnpd.nxdl.xml b/applications/NXtofnpd.nxdl.xml
index ebf377a88..0efd03a11 100644
--- a/applications/NXtofnpd.nxdl.xml
+++ b/applications/NXtofnpd.nxdl.xml
@@ -23,9 +23,9 @@
 -->
 <definition name="NXtofnpd" extends="NXobject" type="group"
   category="application"
-    xmlns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@"
+  xmlns="http://definition.nexusformat.org/nxdl/3.1"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@ ../nxdl.xsd"
+    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd"
     version="1.0b"
     >
     <doc>This is a application definition for raw data from a TOF neutron powder diffractometer</doc>
diff --git a/applications/NXtofraw.nxdl.xml b/applications/NXtofraw.nxdl.xml
index 1ee78a596..f3b8065da 100644
--- a/applications/NXtofraw.nxdl.xml
+++ b/applications/NXtofraw.nxdl.xml
@@ -23,9 +23,9 @@
 -->
 <definition name="NXtofraw" extends="NXobject" type="group"
   category="application"
-    xmlns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@"
+  xmlns="http://definition.nexusformat.org/nxdl/3.1"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@ ../nxdl.xsd"
+    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd"
     version="1.0b"
     >
     <doc>This is an application definition for raw data from a generic TOF instrument</doc>
diff --git a/applications/NXtofsingle.nxdl.xml b/applications/NXtofsingle.nxdl.xml
index 1a198f719..0f3acfe41 100644
--- a/applications/NXtofsingle.nxdl.xml
+++ b/applications/NXtofsingle.nxdl.xml
@@ -23,9 +23,9 @@
 -->
 <definition name="NXtofsingle" extends="NXobject" type="group"
   category="application"
-    xmlns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@"
+  xmlns="http://definition.nexusformat.org/nxdl/3.1"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@ ../nxdl.xsd"
+    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd"
     version="1.0b"
     >
     <doc>This is a application definition for raw data from a generic TOF instrument</doc>
diff --git a/applications/NXtomo.nxdl.xml b/applications/NXtomo.nxdl.xml
index bd5f1b9ca..f840bc15f 100644
--- a/applications/NXtomo.nxdl.xml
+++ b/applications/NXtomo.nxdl.xml
@@ -23,9 +23,9 @@
 -->
 <definition name="NXtomo" extends="NXobject" type="group"
     category="application"
-    xmlns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@"
+    xmlns="http://definition.nexusformat.org/nxdl/3.1"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@ ../nxdl.xsd"
+    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd"
     version="2.0"
   >
 
diff --git a/applications/NXtomophase.nxdl.xml b/applications/NXtomophase.nxdl.xml
index 33ff954b3..940bf4332 100644
--- a/applications/NXtomophase.nxdl.xml
+++ b/applications/NXtomophase.nxdl.xml
@@ -23,9 +23,9 @@
 -->
 <definition name="NXtomophase" extends="NXobject" type="group"
     category="application"
-    xmlns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@"
+    xmlns="http://definition.nexusformat.org/nxdl/3.1"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@ ../nxdl.xsd"
+    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd"
     version="1.0b"
   >
 
diff --git a/applications/NXtomoproc.nxdl.xml b/applications/NXtomoproc.nxdl.xml
index e9947d5b2..f74318f5b 100644
--- a/applications/NXtomoproc.nxdl.xml
+++ b/applications/NXtomoproc.nxdl.xml
@@ -23,9 +23,9 @@
 -->
 <definition name="NXtomoproc" extends="NXobject" type="group"
   category="application"
-    xmlns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@"
+  xmlns="http://definition.nexusformat.org/nxdl/3.1"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@ ../nxdl.xsd"
+    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd"
     version="1.0b"
   >
 
diff --git a/applications/NXxas.nxdl.xml b/applications/NXxas.nxdl.xml
index f571e497c..5048acaa8 100644
--- a/applications/NXxas.nxdl.xml
+++ b/applications/NXxas.nxdl.xml
@@ -23,9 +23,9 @@
 -->
 <definition name="NXxas" extends="NXobject" type="group"
     version="1.0"  category="application"
-    xmlns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@"
+    xmlns="http://definition.nexusformat.org/nxdl/3.1"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@ ../nxdl.xsd "
+    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd "
     >
     <doc>
       This is an application definition for raw data from an X-ray absorption 
diff --git a/applications/NXxasproc.nxdl.xml b/applications/NXxasproc.nxdl.xml
index 4e60b6e4c..2cb02f2e2 100644
--- a/applications/NXxasproc.nxdl.xml
+++ b/applications/NXxasproc.nxdl.xml
@@ -23,9 +23,9 @@
 -->
 <definition name="NXxasproc" extends="NXobject" type="group"
   version="1.0"  category="application"
-    xmlns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@"
+  xmlns="http://definition.nexusformat.org/nxdl/3.1"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@ ../nxdl.xsd "
+    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd "
     >
     <doc>
        This is an application definition for processed data from XAS. This 
diff --git a/applications/NXxbase.nxdl.xml b/applications/NXxbase.nxdl.xml
index c81e6c16f..515b5cb9f 100644
--- a/applications/NXxbase.nxdl.xml
+++ b/applications/NXxbase.nxdl.xml
@@ -23,9 +23,9 @@
 -->
 <definition name="NXxbase" extends="NXobject" type="group"
   category="application"
-    xmlns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@"
+  xmlns="http://definition.nexusformat.org/nxdl/3.1"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@ ../nxdl.xsd"
+    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd"
     version="1.0b"
   >
     <doc>
diff --git a/applications/NXxeuler.nxdl.xml b/applications/NXxeuler.nxdl.xml
index bd0bd4d8f..2480f5d0f 100644
--- a/applications/NXxeuler.nxdl.xml
+++ b/applications/NXxeuler.nxdl.xml
@@ -23,9 +23,9 @@
 -->
 <definition name="NXxeuler" extends="NXxbase" type="group"
   category="application"
-    xmlns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@"
+  xmlns="http://definition.nexusformat.org/nxdl/3.1"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@ ../nxdl.xsd"
+    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd"
     version="1.0b"
   >
     <doc>
diff --git a/applications/NXxkappa.nxdl.xml b/applications/NXxkappa.nxdl.xml
index 1f0bebc03..8734dc8ed 100644
--- a/applications/NXxkappa.nxdl.xml
+++ b/applications/NXxkappa.nxdl.xml
@@ -23,9 +23,9 @@
 -->
 <definition name="NXxkappa" extends="NXxbase" type="group"
   category="application"
-  xmlns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@"
+  xmlns="http://definition.nexusformat.org/nxdl/3.1"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@ ../nxdl.xsd"
+  xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd"
   version="1.0b"
   >
   <doc>
diff --git a/applications/NXxlaue.nxdl.xml b/applications/NXxlaue.nxdl.xml
index 87879d666..392c450e3 100644
--- a/applications/NXxlaue.nxdl.xml
+++ b/applications/NXxlaue.nxdl.xml
@@ -23,9 +23,9 @@
 -->
 <definition name="NXxlaue" extends="NXxrot" type="group"
   category="application"
-  xmlns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@"
+  xmlns="http://definition.nexusformat.org/nxdl/3.1"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@ ../nxdl.xsd"
+  xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd"
   version="1.0b"
   >
   <doc>
diff --git a/applications/NXxlaueplate.nxdl.xml b/applications/NXxlaueplate.nxdl.xml
index 12c6cc8e9..115cc8211 100644
--- a/applications/NXxlaueplate.nxdl.xml
+++ b/applications/NXxlaueplate.nxdl.xml
@@ -23,9 +23,9 @@
 -->
 <definition name="NXxlaueplate" extends="NXxlaue" type="group"
   category="application"
-  xmlns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@"
+  xmlns="http://definition.nexusformat.org/nxdl/3.1"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@ ../nxdl.xsd"
+  xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd"
   version="1.0b"
   >
   <doc>
diff --git a/applications/NXxnb.nxdl.xml b/applications/NXxnb.nxdl.xml
index f9a09fecb..6ba0f3766 100644
--- a/applications/NXxnb.nxdl.xml
+++ b/applications/NXxnb.nxdl.xml
@@ -23,9 +23,9 @@
 -->
 <definition name="NXxnb" extends="NXxbase" type="group"
   category="application"
-  xmlns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@"
+  xmlns="http://definition.nexusformat.org/nxdl/3.1"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@ ../nxdl.xsd"
+  xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd"
   version="1.0b"
   >
   <doc>
diff --git a/applications/NXxrot.nxdl.xml b/applications/NXxrot.nxdl.xml
index d240a4a3e..013acfa73 100644
--- a/applications/NXxrot.nxdl.xml
+++ b/applications/NXxrot.nxdl.xml
@@ -23,9 +23,9 @@
 -->
 <definition name="NXxrot" extends="NXxbase" type="group"
   category="application"
-  xmlns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@"
+  xmlns="http://definition.nexusformat.org/nxdl/3.1"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@ ../nxdl.xsd"
+  xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd"
   version="1.0b"
   >
   <doc>
diff --git a/base_classes/NXaperture.nxdl.xml b/base_classes/NXaperture.nxdl.xml
index 64a905867..b35ac84e1 100644
--- a/base_classes/NXaperture.nxdl.xml
+++ b/base_classes/NXaperture.nxdl.xml
@@ -21,9 +21,9 @@
 #
 # For further information, see http://www.nexusformat.org
 -->
-<definition xmlns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@" category="base"
+<definition xmlns="http://definition.nexusformat.org/nxdl/3.1" category="base"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@ ../nxdl.xsd"
+    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd"
     name="NXaperture" 
     version="1.0"
     type="group" extends="NXobject">
diff --git a/base_classes/NXattenuator.nxdl.xml b/base_classes/NXattenuator.nxdl.xml
index 37aafb5cb..6a4cba1fb 100644
--- a/base_classes/NXattenuator.nxdl.xml
+++ b/base_classes/NXattenuator.nxdl.xml
@@ -27,9 +27,9 @@
     extends="NXobject"
     category="base"
     version="1.0"
-    xmlns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@"
+    xmlns="http://definition.nexusformat.org/nxdl/3.1"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@ ../nxdl.xsd"
+    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd"
     >
 
     <doc>
diff --git a/base_classes/NXbeam.nxdl.xml b/base_classes/NXbeam.nxdl.xml
index deec5346a..4357a079a 100644
--- a/base_classes/NXbeam.nxdl.xml
+++ b/base_classes/NXbeam.nxdl.xml
@@ -21,9 +21,9 @@
 #
 # For further information, see http://www.nexusformat.org
 -->
-<definition xmlns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@" category="base"
+<definition xmlns="http://definition.nexusformat.org/nxdl/3.1" category="base"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@ ../nxdl.xsd"
+    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd"
     name="NXbeam"
     version="1.0"
     type="group" extends="NXobject">
diff --git a/base_classes/NXbeam_stop.nxdl.xml b/base_classes/NXbeam_stop.nxdl.xml
index b6bef213e..6ae68ff62 100644
--- a/base_classes/NXbeam_stop.nxdl.xml
+++ b/base_classes/NXbeam_stop.nxdl.xml
@@ -21,9 +21,9 @@
 #
 # For further information, see http://www.nexusformat.org
 -->
-<definition xmlns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@" category="base"
+<definition xmlns="http://definition.nexusformat.org/nxdl/3.1" category="base"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@ ../nxdl.xsd"
+    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd"
     name="NXbeam_stop"
     version="1.0"
     type="group" extends="NXobject">
diff --git a/base_classes/NXbending_magnet.nxdl.xml b/base_classes/NXbending_magnet.nxdl.xml
index be8cb0d7a..5fd8e11c0 100644
--- a/base_classes/NXbending_magnet.nxdl.xml
+++ b/base_classes/NXbending_magnet.nxdl.xml
@@ -21,9 +21,9 @@
 #
 # For further information, see http://www.nexusformat.org
 -->
-<definition xmlns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@" category="base"
+<definition xmlns="http://definition.nexusformat.org/nxdl/3.1" category="base"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@ ../nxdl.xsd"
+    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd"
     name="NXbending_magnet" 
     version="1.0"
 	type="group" extends="NXobject">
diff --git a/base_classes/NXcapillary.nxdl.xml b/base_classes/NXcapillary.nxdl.xml
index 3140b33a4..e71e26b6c 100644
--- a/base_classes/NXcapillary.nxdl.xml
+++ b/base_classes/NXcapillary.nxdl.xml
@@ -21,9 +21,9 @@
 #
 # For further information, see http://www.nexusformat.org
 -->
-<definition xmlns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@" category="base"
+<definition xmlns="http://definition.nexusformat.org/nxdl/3.1" category="base"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@ ../nxdl.xsd"
+    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd"
     name="NXcapillary"
     version="1.0"
     type="group" extends="NXobject">
diff --git a/base_classes/NXcharacterization.nxdl.xml b/base_classes/NXcharacterization.nxdl.xml
index 26ee60308..9a4b82dc2 100644
--- a/base_classes/NXcharacterization.nxdl.xml
+++ b/base_classes/NXcharacterization.nxdl.xml
@@ -21,9 +21,9 @@
 #
 # For further information, see http://www.nexusformat.org
 -->
-<definition xmlns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@" category="base"
+<definition xmlns="http://definition.nexusformat.org/nxdl/3.1" category="base"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@ ../nxdl.xsd"
+	xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd"
 	name="NXcharacterization" 
 	version="1.0"
     type="group" extends="NXobject">
diff --git a/base_classes/NXcite.nxdl.xml b/base_classes/NXcite.nxdl.xml
index af1ad897b..4adcf239b 100644
--- a/base_classes/NXcite.nxdl.xml
+++ b/base_classes/NXcite.nxdl.xml
@@ -22,9 +22,9 @@
   # For further information, see http://www.nexusformat.org 
 -->
 <definition type="group" name="NXcite" category="base"
-	extends="NXobject" xmlns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@"
+	extends="NXobject" xmlns="http://definition.nexusformat.org/nxdl/3.1"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@ ../nxdl.xsd"
+	xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd"
 	version="1.0">
 	<doc>
 		Definition to include references for example for detectors,
diff --git a/base_classes/NXcollection.nxdl.xml b/base_classes/NXcollection.nxdl.xml
index ca94de2d2..a1708d356 100644
--- a/base_classes/NXcollection.nxdl.xml
+++ b/base_classes/NXcollection.nxdl.xml
@@ -21,7 +21,7 @@
 #
 # For further information, see http://www.nexusformat.org
 -->
-<definition xmlns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@" 
+<definition xmlns="http://definition.nexusformat.org/nxdl/3.1" 
 	category="base"
 	name="NXcollection" 
 	version="1.0"
@@ -31,7 +31,7 @@
 	ignoreExtraFields="true"
 	ignoreExtraAttributes="true"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@ ../nxdl.xsd"
+	xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd"
 	>
 
 	<!-- 
diff --git a/base_classes/NXcollimator.nxdl.xml b/base_classes/NXcollimator.nxdl.xml
index ad32ab90b..94bb34eb2 100644
--- a/base_classes/NXcollimator.nxdl.xml
+++ b/base_classes/NXcollimator.nxdl.xml
@@ -21,9 +21,9 @@
 #
 # For further information, see http://www.nexusformat.org
 -->
-<definition xmlns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@" category="base"
+<definition xmlns="http://definition.nexusformat.org/nxdl/3.1" category="base"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@ ../nxdl.xsd"
+    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd"
     name="NXcollimator" 
     version="1.0"
     type="group" extends="NXobject">
diff --git a/base_classes/NXcrystal.nxdl.xml b/base_classes/NXcrystal.nxdl.xml
index ef42ff2ca..ff5b6187a 100644
--- a/base_classes/NXcrystal.nxdl.xml
+++ b/base_classes/NXcrystal.nxdl.xml
@@ -21,9 +21,9 @@
 #
 # For further information, see http://www.nexusformat.org
 -->
-<definition xmlns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@" category="base"
+<definition xmlns="http://definition.nexusformat.org/nxdl/3.1" category="base"
 	    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@ ../nxdl.xsd"
+	    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd"
 	    name="NXcrystal" 
 	    version="1.0"
 	    type="group" extends="NXobject"
diff --git a/base_classes/NXdata.nxdl.xml b/base_classes/NXdata.nxdl.xml
index 1e4141eb2..b72a0b998 100644
--- a/base_classes/NXdata.nxdl.xml
+++ b/base_classes/NXdata.nxdl.xml
@@ -28,9 +28,9 @@
 	category="base"
 	ignoreExtraFields="true"
 	ignoreExtraAttributes="true" 
-	xmlns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@"
+	xmlns="http://definition.nexusformat.org/nxdl/3.1"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@ ../nxdl.xsd"
+	xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd"
 	>
 	
 	<!-- 
diff --git a/base_classes/NXdetector.nxdl.xml b/base_classes/NXdetector.nxdl.xml
index 0714d83cb..22c4911ad 100644
--- a/base_classes/NXdetector.nxdl.xml
+++ b/base_classes/NXdetector.nxdl.xml
@@ -23,8 +23,8 @@
 -->
 <definition category="base" extends="NXobject" name="NXdetector"
             type="group" version="1.1"
-            xsi:schemaLocation="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@ ../nxdl.xsd"
-            xmlns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@"
+            xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd"
+            xmlns="http://definition.nexusformat.org/nxdl/3.1"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xmlns:xs="http://www.w3.org/2001/XMLSchema"
             xmlns:ns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@"
diff --git a/base_classes/NXdetector_group.nxdl.xml b/base_classes/NXdetector_group.nxdl.xml
index 771c0fa3e..9d40ba7cd 100644
--- a/base_classes/NXdetector_group.nxdl.xml
+++ b/base_classes/NXdetector_group.nxdl.xml
@@ -21,9 +21,9 @@
 #
 # For further information, see http://www.nexusformat.org
 -->
-<definition xmlns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@" category="base"
+<definition xmlns="http://definition.nexusformat.org/nxdl/3.1" category="base"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@ ../nxdl.xsd"
+    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd"
     name="NXdetector_group" 
     version="1.0"
 	type="group" extends="NXobject">
diff --git a/base_classes/NXdetector_module.nxdl.xml b/base_classes/NXdetector_module.nxdl.xml
index 1a3b18206..5b8a2d878 100644
--- a/base_classes/NXdetector_module.nxdl.xml
+++ b/base_classes/NXdetector_module.nxdl.xml
@@ -23,9 +23,9 @@
 -->
 <definition 
 	category="base" 
-    xmlns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@"
+	xmlns="http://definition.nexusformat.org/nxdl/3.1"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@ ../nxdl.xsd"
+	xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd"
 	name="NXdetector_module" 
 	version="1.0" 
 	type="group" extends="NXobject">
diff --git a/base_classes/NXdisk_chopper.nxdl.xml b/base_classes/NXdisk_chopper.nxdl.xml
index 6f4223c27..5bd95fce4 100644
--- a/base_classes/NXdisk_chopper.nxdl.xml
+++ b/base_classes/NXdisk_chopper.nxdl.xml
@@ -21,9 +21,9 @@
 #
 # For further information, see http://www.nexusformat.org
 -->
-<definition xmlns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@" category="base"
+<definition xmlns="http://definition.nexusformat.org/nxdl/3.1" category="base"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@ ../nxdl.xsd"
+	xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd"
 	name="NXdisk_chopper" 
 	version="1.0"
 	type="group" extends="NXobject">
diff --git a/base_classes/NXentry.nxdl.xml b/base_classes/NXentry.nxdl.xml
index 3ef5ea574..c3b3ffc53 100644
--- a/base_classes/NXentry.nxdl.xml
+++ b/base_classes/NXentry.nxdl.xml
@@ -26,9 +26,9 @@
 	type="group" 
 	extends="NXobject"
 	category="base"
-	xmlns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@"
+	xmlns="http://definition.nexusformat.org/nxdl/3.1"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@ ../nxdl.xsd"
+	xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd"
 	>
 
 	<doc>
diff --git a/base_classes/NXenvironment.nxdl.xml b/base_classes/NXenvironment.nxdl.xml
index 9a08fe9d4..5e8f5c549 100644
--- a/base_classes/NXenvironment.nxdl.xml
+++ b/base_classes/NXenvironment.nxdl.xml
@@ -21,9 +21,9 @@
 #
 # For further information, see http://www.nexusformat.org
 -->
-<definition xmlns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@" category="base"
+<definition xmlns="http://definition.nexusformat.org/nxdl/3.1" category="base"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@ ../nxdl.xsd"
+    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd"
     name="NXenvironment" 
     version="1.0"
 	type="group" extends="NXobject">
diff --git a/base_classes/NXevent_data.nxdl.xml b/base_classes/NXevent_data.nxdl.xml
index b48f38ebf..6908bc36e 100644
--- a/base_classes/NXevent_data.nxdl.xml
+++ b/base_classes/NXevent_data.nxdl.xml
@@ -21,9 +21,9 @@
 #
 # For further information, see http://www.nexusformat.org
 -->
-<definition xmlns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@" category="base"
+<definition xmlns="http://definition.nexusformat.org/nxdl/3.1" category="base"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@ ../nxdl.xsd"
+	xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd"
 	name="NXevent_data" 
 	version="1.0"
 	type="group" extends="NXobject">
diff --git a/base_classes/NXfermi_chopper.nxdl.xml b/base_classes/NXfermi_chopper.nxdl.xml
index c4787f535..94de2f8f9 100644
--- a/base_classes/NXfermi_chopper.nxdl.xml
+++ b/base_classes/NXfermi_chopper.nxdl.xml
@@ -21,9 +21,9 @@
 #
 # For further information, see http://www.nexusformat.org
 -->
-<definition xmlns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@" category="base"
+<definition xmlns="http://definition.nexusformat.org/nxdl/3.1" category="base"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@ ../nxdl.xsd"
+	xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd"
 	name="NXfermi_chopper" 
 	version="1.0"
 	type="group" extends="NXobject">
diff --git a/base_classes/NXfilter.nxdl.xml b/base_classes/NXfilter.nxdl.xml
index 3548b3ff3..5ddc0021d 100644
--- a/base_classes/NXfilter.nxdl.xml
+++ b/base_classes/NXfilter.nxdl.xml
@@ -26,9 +26,9 @@
 	type="group"
 	extends="NXobject"
 	category="base"
-	version="1.0" xmlns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@"
+	version="1.0" xmlns="http://definition.nexusformat.org/nxdl/3.1"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@ ../nxdl.xsd"
+	xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd"
     >
 	<doc>
 		Template for specifying the state of band pass filters.
diff --git a/base_classes/NXflipper.nxdl.xml b/base_classes/NXflipper.nxdl.xml
index 0db597fbf..41eb69cd5 100644
--- a/base_classes/NXflipper.nxdl.xml
+++ b/base_classes/NXflipper.nxdl.xml
@@ -21,9 +21,9 @@
 #
 # For further information, see http://www.nexusformat.org
 -->
-<definition xmlns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@" category="base"
+<definition xmlns="http://definition.nexusformat.org/nxdl/3.1" category="base"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@ ../nxdl.xsd"
+    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd"
     name="NXflipper" 
     version="1.0"
 	type="group" extends="NXobject">
diff --git a/base_classes/NXfresnel_zone_plate.nxdl.xml b/base_classes/NXfresnel_zone_plate.nxdl.xml
index fc53378d0..ed322b4fe 100644
--- a/base_classes/NXfresnel_zone_plate.nxdl.xml
+++ b/base_classes/NXfresnel_zone_plate.nxdl.xml
@@ -24,9 +24,9 @@
 <definition name="NXfresnel_zone_plate" type="group" extends="NXobject"
    category="base"
    version="1.0"
-   xmlns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@"
+   xmlns="http://definition.nexusformat.org/nxdl/3.1"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@ ../nxdl.xsd"
+   xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd"
 >
 
 	<doc>description for a fresnel zone plate</doc>
diff --git a/base_classes/NXgeometry.nxdl.xml b/base_classes/NXgeometry.nxdl.xml
index 9593f602f..2e691a41c 100644
--- a/base_classes/NXgeometry.nxdl.xml
+++ b/base_classes/NXgeometry.nxdl.xml
@@ -21,9 +21,9 @@
 #
 # For further information, see http://www.nexusformat.org
 -->
-<definition xmlns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@" category="base"
+<definition xmlns="http://definition.nexusformat.org/nxdl/3.1" category="base"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@ ../nxdl.xsd"
+    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd"
     name="NXgeometry" 
     version="1.0"
 	type="group" extends="NXobject"
diff --git a/base_classes/NXgrating.nxdl.xml b/base_classes/NXgrating.nxdl.xml
index 461c38481..8c10bcf7d 100644
--- a/base_classes/NXgrating.nxdl.xml
+++ b/base_classes/NXgrating.nxdl.xml
@@ -24,9 +24,9 @@
 <definition name="NXgrating" type="group" extends="NXobject"
   category="base"
   version="1.0"
-  xmlns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@"
+  xmlns="http://definition.nexusformat.org/nxdl/3.1"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@ ../nxdl.xsd"
+  xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd"
   >
 
 	<doc>Description for a diffraction grating, as could be used in a soft X-ray monochromator</doc>
diff --git a/base_classes/NXguide.nxdl.xml b/base_classes/NXguide.nxdl.xml
index 50f823542..59f7ab135 100644
--- a/base_classes/NXguide.nxdl.xml
+++ b/base_classes/NXguide.nxdl.xml
@@ -26,9 +26,9 @@
 	type="group" 
 	extends="NXobject"
 	category="base"
-	xmlns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@"
+	xmlns="http://definition.nexusformat.org/nxdl/3.1"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@ ../nxdl.xsd"
+	xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd"
 	>
     
     <symbols>
diff --git a/base_classes/NXinsertion_device.nxdl.xml b/base_classes/NXinsertion_device.nxdl.xml
index 9c83dd009..19820f391 100644
--- a/base_classes/NXinsertion_device.nxdl.xml
+++ b/base_classes/NXinsertion_device.nxdl.xml
@@ -21,9 +21,9 @@
 #
 # For further information, see http://www.nexusformat.org
 -->
-<definition xmlns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@" category="base"
+<definition xmlns="http://definition.nexusformat.org/nxdl/3.1" category="base"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@ ../nxdl.xsd"
+    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd"
     name="NXinsertion_device" 
     version="1.0"
 	type="group" extends="NXobject">
diff --git a/base_classes/NXinstrument.nxdl.xml b/base_classes/NXinstrument.nxdl.xml
index 4dbae3a9b..cc3075852 100644
--- a/base_classes/NXinstrument.nxdl.xml
+++ b/base_classes/NXinstrument.nxdl.xml
@@ -21,9 +21,9 @@
 #
 # For further information, see http://www.nexusformat.org
 -->
-<definition xmlns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@" category="base"
+<definition xmlns="http://definition.nexusformat.org/nxdl/3.1" category="base"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@ ../nxdl.xsd"
+	xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd"
 	name="NXinstrument" 
 	version="1.0"
     type="group" extends="NXobject">
diff --git a/base_classes/NXlog.nxdl.xml b/base_classes/NXlog.nxdl.xml
index f69655587..d16c92409 100644
--- a/base_classes/NXlog.nxdl.xml
+++ b/base_classes/NXlog.nxdl.xml
@@ -27,9 +27,9 @@
     type="group" 
     extends="NXobject"
 	category="base"
-    xmlns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@" 
+	xmlns="http://definition.nexusformat.org/nxdl/3.1" 
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@ ../nxdl.xsd"
+	xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd"
     >
     <doc>
         Definition of information that is recorded against time, 
diff --git a/base_classes/NXmirror.nxdl.xml b/base_classes/NXmirror.nxdl.xml
index 469db8acf..bf08f62bd 100644
--- a/base_classes/NXmirror.nxdl.xml
+++ b/base_classes/NXmirror.nxdl.xml
@@ -21,9 +21,9 @@
 #
 # For further information, see http://www.nexusformat.org
 -->
-<definition xmlns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@" category="base"
+<definition xmlns="http://definition.nexusformat.org/nxdl/3.1" category="base"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@ ../nxdl.xsd"
+    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd"
     name="NXmirror" 
     version="1.0"
 	type="group" extends="NXobject">
diff --git a/base_classes/NXmoderator.nxdl.xml b/base_classes/NXmoderator.nxdl.xml
index 16ec02583..67cfed63e 100644
--- a/base_classes/NXmoderator.nxdl.xml
+++ b/base_classes/NXmoderator.nxdl.xml
@@ -21,9 +21,9 @@
 #
 # For further information, see http://www.nexusformat.org
 -->
-<definition xmlns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@" category="base"
+<definition xmlns="http://definition.nexusformat.org/nxdl/3.1" category="base"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@ ../nxdl.xsd"
+    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd"
     name="NXmoderator" 
     version="1.0"
 	type="group" extends="NXobject">
diff --git a/base_classes/NXmonitor.nxdl.xml b/base_classes/NXmonitor.nxdl.xml
index 148ae03d6..c49786e05 100644
--- a/base_classes/NXmonitor.nxdl.xml
+++ b/base_classes/NXmonitor.nxdl.xml
@@ -21,9 +21,9 @@
 #
 # For further information, see http://www.nexusformat.org
 -->
-<definition xmlns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@" category="base"
+<definition xmlns="http://definition.nexusformat.org/nxdl/3.1" category="base"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@ ../nxdl.xsd"
+    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd"
     name="NXmonitor" 
     version="1.0"
     type="group" extends="NXobject">
diff --git a/base_classes/NXmonochromator.nxdl.xml b/base_classes/NXmonochromator.nxdl.xml
index 2d1a242e0..61477b99b 100644
--- a/base_classes/NXmonochromator.nxdl.xml
+++ b/base_classes/NXmonochromator.nxdl.xml
@@ -21,9 +21,9 @@
 #
 # For further information, see http://www.nexusformat.org
 -->
-<definition xmlns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@" category="base"
+<definition xmlns="http://definition.nexusformat.org/nxdl/3.1" category="base"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@ ../nxdl.xsd"
+    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd"
     name="NXmonochromator" 
     version="1.0"
 	type="group" extends="NXobject">
diff --git a/base_classes/NXnote.nxdl.xml b/base_classes/NXnote.nxdl.xml
index 02612818a..bc98400b2 100644
--- a/base_classes/NXnote.nxdl.xml
+++ b/base_classes/NXnote.nxdl.xml
@@ -21,9 +21,9 @@
 #
 # For further information, see http://www.nexusformat.org
 -->
-<definition xmlns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@" category="base"
+<definition xmlns="http://definition.nexusformat.org/nxdl/3.1" category="base"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@ ../nxdl.xsd"
+	xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd"
 	name="NXnote" 
 	version="1.0"
     type="group" extends="NXobject">
diff --git a/base_classes/NXobject.nxdl.xml b/base_classes/NXobject.nxdl.xml
index 4200b88f0..e94ab0c6c 100644
--- a/base_classes/NXobject.nxdl.xml
+++ b/base_classes/NXobject.nxdl.xml
@@ -21,9 +21,9 @@
 #
 # For further information, see http://www.nexusformat.org
 -->
-<definition xmlns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@" category="base"
+<definition xmlns="http://definition.nexusformat.org/nxdl/3.1" category="base"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@ ../nxdl.xsd"
+	xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd"
 	name="NXobject" 
 	version="1.0"
 	type="group">
diff --git a/base_classes/NXorientation.nxdl.xml b/base_classes/NXorientation.nxdl.xml
index c0a7d6b9b..c14084728 100644
--- a/base_classes/NXorientation.nxdl.xml
+++ b/base_classes/NXorientation.nxdl.xml
@@ -22,9 +22,9 @@
 # For further information, see http://www.nexusformat.org
 
 -->
-<definition xmlns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@" category="base"
+<definition xmlns="http://definition.nexusformat.org/nxdl/3.1" category="base"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@ ../nxdl.xsd"
+    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd"
     name="NXorientation" 
     version="1.0"
 	type="group" extends="NXobject">
diff --git a/base_classes/NXparameters.nxdl.xml b/base_classes/NXparameters.nxdl.xml
index 87e1345d7..bd5505a13 100644
--- a/base_classes/NXparameters.nxdl.xml
+++ b/base_classes/NXparameters.nxdl.xml
@@ -21,9 +21,9 @@
 #
 # For further information, see http://www.nexusformat.org
 -->
-<definition xmlns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@" category="base"
+<definition xmlns="http://definition.nexusformat.org/nxdl/3.1" category="base"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@ ../nxdl.xsd"
+    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd"
     name="NXparameters" 
     version="1.0"
 	type="group" extends="NXobject">
diff --git a/base_classes/NXpinhole.nxdl.xml b/base_classes/NXpinhole.nxdl.xml
index d1f9f0117..8a9efe243 100644
--- a/base_classes/NXpinhole.nxdl.xml
+++ b/base_classes/NXpinhole.nxdl.xml
@@ -23,9 +23,9 @@
 -->
 <definition 
 	category="base" 
-    xmlns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@"
+	xmlns="http://definition.nexusformat.org/nxdl/3.1"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@ ../nxdl.xsd"
+	xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd"
 	name="NXpinhole" 
 	version="1.0" 
 	type="group" extends="NXobject">
diff --git a/base_classes/NXpolarizer.nxdl.xml b/base_classes/NXpolarizer.nxdl.xml
index 5e08b4c98..a69efe468 100644
--- a/base_classes/NXpolarizer.nxdl.xml
+++ b/base_classes/NXpolarizer.nxdl.xml
@@ -21,9 +21,9 @@
 #
 # For further information, see http://www.nexusformat.org
 -->
-<definition xmlns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@" category="base"
+<definition xmlns="http://definition.nexusformat.org/nxdl/3.1" category="base"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@ ../nxdl.xsd"
+    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd"
     name="NXpolarizer" 
     version="1.0"
 	type="group" extends="NXobject">
diff --git a/base_classes/NXpositioner.nxdl.xml b/base_classes/NXpositioner.nxdl.xml
index 729c8a831..1388007ac 100644
--- a/base_classes/NXpositioner.nxdl.xml
+++ b/base_classes/NXpositioner.nxdl.xml
@@ -27,9 +27,9 @@
 	type="group" 
 	extends="NXobject" 
 	category="base"
-    xmlns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@"
+	xmlns="http://definition.nexusformat.org/nxdl/3.1"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@ ../nxdl.xsd"
+    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd"
     >
     <doc>
         This group describes a generic positioner 
diff --git a/base_classes/NXprocess.nxdl.xml b/base_classes/NXprocess.nxdl.xml
index b3e110e19..4f7d0b694 100644
--- a/base_classes/NXprocess.nxdl.xml
+++ b/base_classes/NXprocess.nxdl.xml
@@ -21,9 +21,9 @@
 #
 # For further information, see http://www.nexusformat.org
 -->
-<definition xmlns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@" category="base"
+<definition xmlns="http://definition.nexusformat.org/nxdl/3.1" category="base"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@ ../nxdl.xsd"
+    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd"
     name="NXprocess" 
     version="1.0"
 	type="group" extends="NXobject">
diff --git a/base_classes/NXroot.nxdl.xml b/base_classes/NXroot.nxdl.xml
index 0037bf031..4e8a6bfdc 100644
--- a/base_classes/NXroot.nxdl.xml
+++ b/base_classes/NXroot.nxdl.xml
@@ -21,9 +21,9 @@
 #
 # For further information, see http://www.nexusformat.org
 -->
-<definition xmlns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@" category="base"
+<definition xmlns="http://definition.nexusformat.org/nxdl/3.1" category="base"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@ ../nxdl.xsd"
+    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd"
     name="NXroot" 
     version="1.0"
     type="group" extends="NXobject">
diff --git a/base_classes/NXsample.nxdl.xml b/base_classes/NXsample.nxdl.xml
index c8d4e3f3d..625b136e4 100644
--- a/base_classes/NXsample.nxdl.xml
+++ b/base_classes/NXsample.nxdl.xml
@@ -21,9 +21,9 @@
 #
 # For further information, see http://www.nexusformat.org
 -->
-<definition xmlns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@" category="base"
+<definition xmlns="http://definition.nexusformat.org/nxdl/3.1" category="base"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@ ../nxdl.xsd"
+	xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd"
 	name="NXsample" 
 	version="1.0"
 	type="group" extends="NXobject"
diff --git a/base_classes/NXsensor.nxdl.xml b/base_classes/NXsensor.nxdl.xml
index 4890ce412..5eed2a781 100644
--- a/base_classes/NXsensor.nxdl.xml
+++ b/base_classes/NXsensor.nxdl.xml
@@ -21,9 +21,9 @@
 #
 # For further information, see http://www.nexusformat.org
 -->
-<definition xmlns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@" category="base"
+<definition xmlns="http://definition.nexusformat.org/nxdl/3.1" category="base"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@ ../nxdl.xsd"
+	xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd"
 	name="NXsensor" 
 	version="1.0"
 	type="group" extends="NXobject">
diff --git a/base_classes/NXshape.nxdl.xml b/base_classes/NXshape.nxdl.xml
index 26f26356f..b4763fa00 100644
--- a/base_classes/NXshape.nxdl.xml
+++ b/base_classes/NXshape.nxdl.xml
@@ -21,9 +21,9 @@
 #
 # For further information, see http://www.nexusformat.org
 -->
-<definition xmlns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@" category="base"
+<definition xmlns="http://definition.nexusformat.org/nxdl/3.1" category="base"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@ ../nxdl.xsd"
+	xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd"
 	name="NXshape" 
 	version="1.0"
 	type="group" extends="NXobject">
diff --git a/base_classes/NXslit.nxdl.xml b/base_classes/NXslit.nxdl.xml
index 17c836abf..e67dc9983 100644
--- a/base_classes/NXslit.nxdl.xml
+++ b/base_classes/NXslit.nxdl.xml
@@ -23,9 +23,9 @@
 -->
 <definition 
 	category="base"
-    xmlns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@" 
+	xmlns="http://definition.nexusformat.org/nxdl/3.1" 
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@ ../nxdl.xsd"
+	xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd"
 	name="NXslit" 
 	version="1.0" 
 	type="group" extends="NXobject">
diff --git a/base_classes/NXsource.nxdl.xml b/base_classes/NXsource.nxdl.xml
index c04be9be9..a0e653dbe 100644
--- a/base_classes/NXsource.nxdl.xml
+++ b/base_classes/NXsource.nxdl.xml
@@ -21,9 +21,9 @@
 #
 # For further information, see http://www.nexusformat.org
 -->
-<definition xmlns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@" category="base"
+<definition xmlns="http://definition.nexusformat.org/nxdl/3.1" category="base"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@ ../nxdl.xsd"
+	xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd"
 	name="NXsource" 
 	version="1.0"
     type="group" extends="NXobject">
diff --git a/base_classes/NXsubentry.nxdl.xml b/base_classes/NXsubentry.nxdl.xml
index 0d6aa18e5..ef50ab4e9 100644
--- a/base_classes/NXsubentry.nxdl.xml
+++ b/base_classes/NXsubentry.nxdl.xml
@@ -26,9 +26,9 @@
 	type="group" 
 	extends="NXobject"
 	category="base"
-	xmlns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@"
+	xmlns="http://definition.nexusformat.org/nxdl/3.1"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@ ../nxdl.xsd"
+	xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd"
 	>
 
 	<doc>
diff --git a/base_classes/NXtransformations.nxdl.xml b/base_classes/NXtransformations.nxdl.xml
index 984250f00..9e7f65ddc 100644
--- a/base_classes/NXtransformations.nxdl.xml
+++ b/base_classes/NXtransformations.nxdl.xml
@@ -21,7 +21,7 @@
 #
 # For further information, see http://www.nexusformat.org
 -->
-<definition xmlns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@" 
+<definition xmlns="http://definition.nexusformat.org/nxdl/3.1" 
 	category="contributed"
 	name="NXtransformations" 
 	version="1.0"
@@ -31,7 +31,7 @@
 	ignoreExtraFields="true"
 	ignoreExtraAttributes="true"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@ ../nxdl.xsd"
+	xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd"
 	>
 
 	<doc>
diff --git a/base_classes/NXtranslation.nxdl.xml b/base_classes/NXtranslation.nxdl.xml
index 25f85078c..86f0712f2 100644
--- a/base_classes/NXtranslation.nxdl.xml
+++ b/base_classes/NXtranslation.nxdl.xml
@@ -21,9 +21,9 @@
 #
 # For further information, see http://www.nexusformat.org
 -->
-<definition xmlns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@" category="base"
+<definition xmlns="http://definition.nexusformat.org/nxdl/3.1" category="base"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@ ../nxdl.xsd"
+	xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd"
 	name="NXtranslation" 
 	version="1.0"
     type="group" extends="NXobject">
diff --git a/base_classes/NXuser.nxdl.xml b/base_classes/NXuser.nxdl.xml
index 2b2311731..ee07e624e 100644
--- a/base_classes/NXuser.nxdl.xml
+++ b/base_classes/NXuser.nxdl.xml
@@ -21,9 +21,9 @@
 #
 # For further information, see http://www.nexusformat.org
 -->
-<definition xmlns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@" category="base"
+<definition xmlns="http://definition.nexusformat.org/nxdl/3.1" category="base"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@ ../nxdl.xsd"
+	xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd"
 	name="NXuser" 
 	version="1.0"
     type="group" extends="NXobject">
diff --git a/base_classes/NXvelocity_selector.nxdl.xml b/base_classes/NXvelocity_selector.nxdl.xml
index b3b6de2b6..5e2b5fee6 100644
--- a/base_classes/NXvelocity_selector.nxdl.xml
+++ b/base_classes/NXvelocity_selector.nxdl.xml
@@ -21,9 +21,9 @@
 #
 # For further information, see http://www.nexusformat.org
 -->
-<definition xmlns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@" category="base"
+<definition xmlns="http://definition.nexusformat.org/nxdl/3.1" category="base"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@ ../nxdl.xsd"
+	xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd"
     name="NXvelocity_selector" 
     version="1.0"
     type="group" extends="NXobject">
diff --git a/base_classes/NXxraylens.nxdl.xml b/base_classes/NXxraylens.nxdl.xml
index d168d205c..914c41358 100644
--- a/base_classes/NXxraylens.nxdl.xml
+++ b/base_classes/NXxraylens.nxdl.xml
@@ -21,9 +21,9 @@
 #
 # For further information, see http://www.nexusformat.org
 -->
-<definition xmlns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@" category="base"
+<definition xmlns="http://definition.nexusformat.org/nxdl/3.1" category="base"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@ ../nxdl.xsd"
+    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd"
     name="NXxraylens"
     version="1.0"
     type="group" extends="NXobject">
diff --git a/contributed_definitions/NXcanSAS.nxdl.xml b/contributed_definitions/NXcanSAS.nxdl.xml
index 553fd6e92..beef60b51 100644
--- a/contributed_definitions/NXcanSAS.nxdl.xml
+++ b/contributed_definitions/NXcanSAS.nxdl.xml
@@ -33,9 +33,9 @@
 <definition name="NXcanSAS" extends="NXobject" type="group"
 	    version="1.0"  
 	    category="contributed"
-	    xmlns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@"
+	    xmlns="http://definition.nexusformat.org/nxdl/3.1"
 	    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@ ../nxdl.xsd"
+	    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd"
 	    >
 	<doc>
 		Implementation of the :index:`canSAS` standard to store
diff --git a/contributed_definitions/NXelectrostatic_kicker.nxdl.xml b/contributed_definitions/NXelectrostatic_kicker.nxdl.xml
index 96a05fe5f..21d60d83b 100644
--- a/contributed_definitions/NXelectrostatic_kicker.nxdl.xml
+++ b/contributed_definitions/NXelectrostatic_kicker.nxdl.xml
@@ -22,9 +22,9 @@
   # For further information, see http://www.nexusformat.org 
 -->
 <definition type="group" name="NXelectrostatic_kicker" category="contributed" extends="NXobject"
-    xmlns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@"
+  xmlns="http://definition.nexusformat.org/nxdl/3.1"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@ ../nxdl.xsd"
+    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd"
     version="1.0"
     >
 <doc>definition for a electrostatic kicker.</doc>
diff --git a/contributed_definitions/NXmagnetic_kicker.nxdl.xml b/contributed_definitions/NXmagnetic_kicker.nxdl.xml
index 1dd5b2216..5b593691f 100644
--- a/contributed_definitions/NXmagnetic_kicker.nxdl.xml
+++ b/contributed_definitions/NXmagnetic_kicker.nxdl.xml
@@ -22,9 +22,9 @@
   # For further information, see http://www.nexusformat.org 
 -->
 <definition type="group" name="NXmagnetic_kicker" category="contributed" extends="NXobject"
-    xmlns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@"
+	xmlns="http://definition.nexusformat.org/nxdl/3.1"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@ ../nxdl.xsd"
+    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd"
     version="1.0"
     >
 	<doc>definition for a magnetic kicker.</doc>
diff --git a/contributed_definitions/NXquadrupole_magnet.nxdl.xml b/contributed_definitions/NXquadrupole_magnet.nxdl.xml
index 0ee239161..fa460a9f3 100644
--- a/contributed_definitions/NXquadrupole_magnet.nxdl.xml
+++ b/contributed_definitions/NXquadrupole_magnet.nxdl.xml
@@ -22,9 +22,9 @@
   # For further information, see http://www.nexusformat.org 
 -->
 <definition type="group" name="NXquadrupole_magnet" category="contributed" extends="NXobject"
-    xmlns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@"
+  xmlns="http://definition.nexusformat.org/nxdl/3.1"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@ ../nxdl.xsd"
+    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd"
     version="1.0"
     >
 	<doc>definition for a quadrupole magnet.</doc>
diff --git a/contributed_definitions/NXseparator.nxdl.xml b/contributed_definitions/NXseparator.nxdl.xml
index 40b0460a3..fa7ac56d7 100644
--- a/contributed_definitions/NXseparator.nxdl.xml
+++ b/contributed_definitions/NXseparator.nxdl.xml
@@ -22,9 +22,9 @@
   # For further information, see http://www.nexusformat.org 
 -->
 <definition type="group" name="NXseparator" category="contributed" extends="NXobject"
-  xmlns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@"
+  xmlns="http://definition.nexusformat.org/nxdl/3.1"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@ ../nxdl.xsd" version="1.0"
+  xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd" version="1.0"
   >
   <doc>definition for an electrostatic separator.</doc>
   <field name="description" type="NX_CHAR">
diff --git a/contributed_definitions/NXsnsevent.nxdl.xml b/contributed_definitions/NXsnsevent.nxdl.xml
index 9f0a31f51..c98f6f39d 100644
--- a/contributed_definitions/NXsnsevent.nxdl.xml
+++ b/contributed_definitions/NXsnsevent.nxdl.xml
@@ -4,9 +4,9 @@
   # NXsnsevent: candidate NeXus definition for event data from Spallation Neutron Source (SNS) at ORNL.
 -->
 <definition type="group" name="NXsnsevent" category="contributed" extends="NXobject"
-    xmlns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@"
+  xmlns="http://definition.nexusformat.org/nxdl/3.1"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@ ../nxdl.xsd"
+    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd"
     version="1.0"
     >
   <doc>This is a definition for event data from Spallation Neutron Source (SNS) at ORNL.</doc>
diff --git a/contributed_definitions/NXsnshisto.nxdl.xml b/contributed_definitions/NXsnshisto.nxdl.xml
index b568070f6..f923f3483 100644
--- a/contributed_definitions/NXsnshisto.nxdl.xml
+++ b/contributed_definitions/NXsnshisto.nxdl.xml
@@ -4,9 +4,9 @@
   # NXsnshisto: candidate NeXus definition for histogram data from Spallation Neutron Source (SNS) at ORNL.
 -->
 <definition type="group" name="NXsnshisto" category="contributed" extends="NXobject"
-    xmlns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@"
+  xmlns="http://definition.nexusformat.org/nxdl/3.1"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@ ../nxdl.xsd"
+    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd"
     version="1.0"
     >
   <doc>This is a definition for histogram data from Spallation Neutron Source (SNS) at ORNL.</doc>
diff --git a/contributed_definitions/NXsolenoid_magnet.nxdl.xml b/contributed_definitions/NXsolenoid_magnet.nxdl.xml
index 91074dd7a..4a48b72f4 100644
--- a/contributed_definitions/NXsolenoid_magnet.nxdl.xml
+++ b/contributed_definitions/NXsolenoid_magnet.nxdl.xml
@@ -22,9 +22,9 @@
   # For further information, see http://www.nexusformat.org
 -->
 <definition type="group" name="NXsolenoid_magnet" category="contributed" extends="NXobject"
-    xmlns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@"
+  xmlns="http://definition.nexusformat.org/nxdl/3.1"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@ ../nxdl.xsd"
+    xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd"
     version="1.0"
     >
 <doc>definition for a solenoid magnet.</doc>
diff --git a/contributed_definitions/NXspin_rotator.nxdl.xml b/contributed_definitions/NXspin_rotator.nxdl.xml
index 26193c277..2620b3d84 100644
--- a/contributed_definitions/NXspin_rotator.nxdl.xml
+++ b/contributed_definitions/NXspin_rotator.nxdl.xml
@@ -22,9 +22,9 @@
   # For further information, see http://www.nexusformat.org 
 -->
 <definition type="group" name="NXspin_rotator" category="contributed" extends="NXobject"
-  xmlns="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@"
+  xmlns="http://definition.nexusformat.org/nxdl/3.1"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://definition.nexusformat.org/nxdl/@NXDL_RELEASE@ ../nxdl.xsd" version="1.0"
+  xsi:schemaLocation="http://definition.nexusformat.org/nxdl/3.1 ../nxdl.xsd" version="1.0"
   >
   <doc>definition for a spin rotator.</doc>
   <field name="description" type="NX_CHAR">