diff --git a/ADApp/pluginSrc/NDFileHDF5LayoutXML.cpp b/ADApp/pluginSrc/NDFileHDF5LayoutXML.cpp
index 5d8819b3f..e0aee3c87 100644
--- a/ADApp/pluginSrc/NDFileHDF5LayoutXML.cpp
+++ b/ADApp/pluginSrc/NDFileHDF5LayoutXML.cpp
@@ -37,25 +37,32 @@ namespace hdf5
 
   const std::string LayoutXML::DEFAULT_LAYOUT = " \
   <group name=\"entry\"> \
-    <attribute name=\"NX_class\" source=\"constant\" value=\"NX_entry\" type=\"string\"></attribute> \
+    <attribute name=\"NX_class\" source=\"constant\" value=\"NXentry\" type=\"string\"></attribute> \
     <group name=\"instrument\"> \
-      <attribute name=\"NX_class\" source=\"constant\" value=\"NX_instrument\" type=\"string\"></attribute> \
+      <attribute name=\"NX_class\" source=\"constant\" value=\"NXinstrument\" type=\"string\"></attribute> \
       <group name=\"detector\"> \
+        <attribute name=\"NX_class\" source=\"constant\" value=\"NXdetector\" type=\"string\"></attribute> \
         <dataset name=\"data\" source=\"detector\" det_default=\"true\"> \
-          <attribute name=\"NX_class\" source=\"constant\" value=\"SDS\"></attribute> \
+          <attribute name=\"NX_class\" source=\"constant\" value=\"SDS\" type=\"string\"></attribute> \
           <attribute name=\"signal\" source=\"constant\" value=\"1\" type=\"int\"></attribute> \
         </dataset> \
         <group name=\"NDAttributes\"> \
+          <attribute name=\"NX_class\" source=\"constant\" value=\"NXcollection\" type=\"string\"></attribute> \
           <dataset name=\"ColorMode\" source=\"ndattribute\" ndattribute=\"ColorMode\"> \
           </dataset> \
         </group>          <!-- end group NDAttribute --> \
       </group>            <!-- end group detector --> \
       <group name=\"NDAttributes\" ndattr_default=\"true\"> \
+        <attribute name=\"NX_class\" source=\"constant\" value=\"NXcollection\" type=\"string\"></attribute> \
       </group>            <!-- end group NDAttribute (default) --> \
       <group name=\"performance\"> \
         <dataset name=\"timestamp\"></dataset> \
       </group>            <!-- end group performance --> \
     </group>              <!-- end group instrument --> \
+    <group name=\"data\"> \
+      <attribute name=\"NX_class\" source=\"constant\" value=\"NXdata\" type=\"string\"></attribute> \
+      <!-- needs a hard link from /entry/instrument/detector/data to /entry/data/data --> \
+    </group>              <!-- end group data --> \
   </group>                <!-- end group entry --> ";
 
   LayoutXML::LayoutXML() : ptr_tree(NULL), ptr_curr_element(NULL)
diff --git a/iocBoot/hdf5_layout_demo.xml b/iocBoot/hdf5_layout_demo.xml
index dfee5ed1f..b36d5ffcf 100644
--- a/iocBoot/hdf5_layout_demo.xml
+++ b/iocBoot/hdf5_layout_demo.xml
@@ -3,9 +3,9 @@
   <group name="entry">
     <attribute name="test_float_array" source="constant" value="1.3,2.9,3.4,4.8,5.234" type="float"></attribute>
     <attribute name="test_int_array" source="constant" value="1,2,3,4,5,6,7,8,9,0" type="int"></attribute>
-    <attribute name="NX_class" source="constant" value="NX_entry" type="string"></attribute>
+    <attribute name="NX_class" source="constant" value="NXentry" type="string"></attribute>
     <group name="detector">
-      <attribute name="NX_class" source="constant" value="NX_detector" type="string"></attribute>
+      <attribute name="NX_class" source="constant" value="NXdata" type="string"></attribute>
       <dataset name="data1" source="detector" det_default="true">
         <attribute name="test_att_1" source="ndattribute" ndattribute="ArrayCounter"></attribute>
         <attribute name="test_att_2" source="ndattribute" ndattribute="AcqTime"></attribute>
@@ -32,7 +32,7 @@
       <dataset name="ArrayCounter" source="ndattribute" ndattribute="ArrayCounter"/>
     </group>
     <group name="instruments" ndattr_default="true">
-      <attribute name="NX_class" source="constant" value="NX_instrument" type="string"></attribute>
+      <attribute name="NX_class" source="constant" value="NXinstrument" type="string"></attribute>
     </group>
   </group>
 </xml>