diff --git a/site_ansto/instrument/hipd/config/nexus/nexus_in_motors.dic b/site_ansto/instrument/hipd/config/nexus/nexus_in_motors.dic
index a72d1493..f46c7a4b 100644
--- a/site_ansto/instrument/hipd/config/nexus/nexus_in_motors.dic
+++ b/site_ansto/instrument/hipd/config/nexus/nexus_in_motors.dic
@@ -1,33 +1,22 @@
+mot_name=xxx
+mot_units=xxx
+mot_long_name=xxx
 #--------------- NXmonochromator
-mom=/$(entryName),NXentry/$(inst),NXinstrument/$(monochromator),NXcrystal/SDS mom  -type NX_FLOAT32 -attr {units,degree} -attr {long_name,mom}
-mchi=/$(entryName),NXentry/$(inst),NXinstrument/$(monochromator),NXcrystal/SDS mchi  -type NX_FLOAT32 -attr {units,degree} -attr {long_name,mchi}
-mphi=/$(entryName),NXentry/$(inst),NXinstrument/$(monochromator),NXcrystal/SDS mphi  -type NX_FLOAT32 -attr {units,degree} -attr {long_name,mphi}
-mx=/$(entryName),NXentry/$(inst),NXinstrument/$(monochromator),NXcrystal/SDS mx  -type NX_FLOAT32 -attr {units,degree} -attr {long_name,mx}
-my=/$(entryName),NXentry/$(inst),NXinstrument/$(monochromator),NXcrystal/SDS my  -type NX_FLOAT32 -attr {units,degree} -attr {long_name,my}
-mtth=/$(entryName),NXentry/$(inst),NXinstrument/$(monochromator),NXcrystal/SDS mtth  -type NX_FLOAT32 -attr {units,degree} -attr {long_name,mtth}
-mth=/$(entryName),NXentry/$(inst),NXinstrument/$(monochromator),NXcrystal/SDS mth  -type NX_FLOAT32 -attr {units,degree} -attr {long_name,mth}
+nxcrystal_mot=/$(entryName),NXentry/$(inst),NXinstrument/$(monochromator),NXcrystal/SDS $(mot_name)  -type NX_FLOAT32 -attr {units,$(mot_units)} -attr {long_name,$(mot_long_name)}
+#XXX add units command to configurable virtual motors.
+mth=/$(entryName),NXentry/$(inst),NXinstrument/$(monochromator),NXcrystal/SDS mth -type NX_FLOAT32 -attr {units,degrees} -attr {long_name,mono_theta}
 #--------------- NXsample
-som=/$(entryName),NXentry/sample,NXsample/SDS som  -type NX_FLOAT32 -attr {units,degree} -attr {long_name,som}
-schi=/$(entryName),NXentry/sample,NXsample/SDS schi  -type NX_FLOAT32 -attr {units,degree} -attr {long_name,schi}
-sphi=/$(entryName),NXentry/sample,NXsample/SDS sphi  -type NX_FLOAT32 -attr {units,degree} -attr {long_name,sphi}
-sx=/$(entryName),NXentry/sample,NXsample/SDS sx  -type NX_FLOAT32 -attr {units,degree} -attr {long_name,sx}
-sy=/$(entryName),NXentry/sample,NXsample/SDS sy  -type NX_FLOAT32 -attr {units,degree} -attr {long_name,sy}
-stth=/$(entryName),NXentry/sample,NXsample/SDS stth  -type NX_FLOAT32 -attr {units,degree} -attr {long_name,stth}
+nxsample_mot=/$(entryName),NXentry/sample,NXsample/SDS $(mot_name) -type NX_FLOAT32 -attr {units,$(mot_units)} -attr {long_name,$(mot_long_name)}
+#XXX add units command to configurable virtual motors.
 sth=/$(entryName),NXentry/sample,NXsample/SDS sth  -type NX_FLOAT32 -attr {units,degree} -attr {long_name,sth}
 # Slit motors
-ss1u=/$(entryName),NXentry/slits,NXfilter/SDS ss1u  -type NX_FLOAT32 -attr {units,degree} -attr {long_name,ss1u}
-ss1d=/$(entryName),NXentry/slits,NXfilter/SDS ss1d  -type NX_FLOAT32 -attr {units,degree} -attr {long_name,ss1d}
-ss1l=/$(entryName),NXentry/slits,NXfilter/SDS ss1l  -type NX_FLOAT32 -attr {units,degree} -attr {long_name,ss1l}
-ss1r=/$(entryName),NXentry/slits,NXfilter/SDS ss1r  -type NX_FLOAT32 -attr {units,degree} -attr {long_name,ss1r}
-ss1vg=/$(entryName),NXentry/slits,NXfilter/SDS ss1vg  -type NX_FLOAT32 -attr {units,degree} -attr {long_name,ss1vg}
-ss1vo=/$(entryName),NXentry/slits,NXfilter/SDS ss1vo  -type NX_FLOAT32 -attr {units,degree} -attr {long_name,ss1vo}
-ss1hg=/$(entryName),NXentry/slits,NXfilter/SDS ss1hg  -type NX_FLOAT32 -attr {units,degree} -attr {long_name,ss1hg}
-ss1ho=/$(entryName),NXentry/slits,NXfilter/SDS ss1ho  -type NX_FLOAT32 -attr {units,degree} -attr {long_name,ss1ho}
-ss2u=/$(entryName),NXentry/slits,NXfilter/SDS ss2u  -type NX_FLOAT32 -attr {units,degree} -attr {long_name,ss2u}
-ss2d=/$(entryName),NXentry/slits,NXfilter/SDS ss2d  -type NX_FLOAT32 -attr {units,degree} -attr {long_name,ss2d}
-ss2l=/$(entryName),NXentry/slits,NXfilter/SDS ss2l  -type NX_FLOAT32 -attr {units,degree} -attr {long_name,ss2l}
-ss2r=/$(entryName),NXentry/slits,NXfilter/SDS ss2r  -type NX_FLOAT32 -attr {units,degree} -attr {long_name,ss2r}
-ss2vg=/$(entryName),NXentry/slits,NXfilter/SDS ss2vg  -type NX_FLOAT32 -attr {units,degree} -attr {long_name,ss2vg}
-ss2vo=/$(entryName),NXentry/slits,NXfilter/SDS ss2vo  -type NX_FLOAT32 -attr {units,degree} -attr {long_name,ss2vo}
-ss2hg=/$(entryName),NXentry/slits,NXfilter/SDS ss2hg  -type NX_FLOAT32 -attr {units,degree} -attr {long_name,ss2hg}
-ss2ho=/$(entryName),NXentry/slits,NXfilter/SDS ss2ho  -type NX_FLOAT32 -attr {units,degree} -attr {long_name,ss2ho}
+nxfilter_mot=/$(entryName),NXentry/slits,NXfilter/SDS $(mot_name) -type NX_FLOAT32 -attr {units,$(mot_units)} -attr {long_name,$(mot_long_name)}
+#XXX add units command to configurable virtual motors.
+ss1vg=/$(entryName),NXentry/slits,NXfilter/SDS ss1vg  -type NX_FLOAT32 -attr {units,mm} -attr {long_name,ss1vg}
+ss1vo=/$(entryName),NXentry/slits,NXfilter/SDS ss1vo  -type NX_FLOAT32 -attr {units,mm} -attr {long_name,ss1vo}
+ss1hg=/$(entryName),NXentry/slits,NXfilter/SDS ss1hg  -type NX_FLOAT32 -attr {units,mm} -attr {long_name,ss1hg}
+ss1ho=/$(entryName),NXentry/slits,NXfilter/SDS ss1ho  -type NX_FLOAT32 -attr {units,mm} -attr {long_name,ss1ho}
+ss2vg=/$(entryName),NXentry/slits,NXfilter/SDS ss2vg  -type NX_FLOAT32 -attr {units,mm} -attr {long_name,ss2vg}
+ss2vo=/$(entryName),NXentry/slits,NXfilter/SDS ss2vo  -type NX_FLOAT32 -attr {units,mm} -attr {long_name,ss2vo}
+ss2hg=/$(entryName),NXentry/slits,NXfilter/SDS ss2hg  -type NX_FLOAT32 -attr {units,mm} -attr {long_name,ss2hg}
+ss2ho=/$(entryName),NXentry/slits,NXfilter/SDS ss2ho  -type NX_FLOAT32 -attr {units,mm} -attr {long_name,ss2ho}
diff --git a/site_ansto/instrument/hrpd/config/nexus/nexus_in_motors.dic b/site_ansto/instrument/hrpd/config/nexus/nexus_in_motors.dic
index 3fe2f24c..611608dd 100644
--- a/site_ansto/instrument/hrpd/config/nexus/nexus_in_motors.dic
+++ b/site_ansto/instrument/hrpd/config/nexus/nexus_in_motors.dic
@@ -1,36 +1,21 @@
-
+mot_name=xxx
+mot_units=xxx
+mot_long_name=xxx
 #--------------- NXmonochromator
-mom=/$(entryName),NXentry/$(inst),NXinstrument/$(monochromator),NXcrystal/SDS mom  -type NX_FLOAT32 -attr {units,degree} -attr {long_name,mom}
-mchi=/$(entryName),NXentry/$(inst),NXinstrument/$(monochromator),NXcrystal/SDS mchi  -type NX_FLOAT32 -attr {units,degree} -attr {long_name,mchi}
-mphi=/$(entryName),NXentry/$(inst),NXinstrument/$(monochromator),NXcrystal/SDS mphi  -type NX_FLOAT32 -attr {units,degree} -attr {long_name,mphi}
-mx=/$(entryName),NXentry/$(inst),NXinstrument/$(monochromator),NXcrystal/SDS mx  -type NX_FLOAT32 -attr {units,degree} -attr {long_name,mx}
-my=/$(entryName),NXentry/$(inst),NXinstrument/$(monochromator),NXcrystal/SDS my  -type NX_FLOAT32 -attr {units,degree} -attr {long_name,my}
-mtth=/$(entryName),NXentry/$(inst),NXinstrument/$(monochromator),NXcrystal/SDS mtth  -type NX_FLOAT32 -attr {units,degree} -attr {long_name,mtth}
+nxcrystal_mot=/$(entryName),NXentry/$(inst),NXinstrument/$(monochromator),NXcrystal/SDS $(mot_name)  -type NX_FLOAT32 -attr {units,$(mot_units)} -attr {long_name,$(mot_long_name)}
+#XXX add units command to configurable virtual motors.
 mth=/$(entryName),NXentry/$(inst),NXinstrument/$(monochromator),NXcrystal/SDS mth  -type NX_FLOAT32 -attr {units,degree} -attr {long_name,mth}
-pcr=/$(entryName),NXentry/$(inst),NXinstrument/$(monochromator),NXcrystal/SDS pcr  -type NX_FLOAT32 -attr {units,degree} -attr {long_name,primary_collimator_rotation}
-pcx=/$(entryName),NXentry/$(inst),NXinstrument/$(monochromator),NXcrystal/SDS pcx  -type NX_FLOAT32 -attr {units,mm} -attr {long_name,primary_collimator_translation}
-
 #--------------- NXsample
-som=/$(entryName),NXentry/sample,NXsample/SDS som  -type NX_FLOAT32 -attr {units,degree} -attr {long_name,som}
-schi=/$(entryName),NXentry/sample,NXsample/SDS schi  -type NX_FLOAT32 -attr {units,degree} -attr {long_name,schi}
-sphi=/$(entryName),NXentry/sample,NXsample/SDS sphi  -type NX_FLOAT32 -attr {units,degree} -attr {long_name,sphi}
-sx=/$(entryName),NXentry/sample,NXsample/SDS sx  -type NX_FLOAT32 -attr {units,degree} -attr {long_name,sx}
-sy=/$(entryName),NXentry/sample,NXsample/SDS sy  -type NX_FLOAT32 -attr {units,degree} -attr {long_name,sy}
-stth=/$(entryName),NXentry/sample,NXsample/SDS stth  -type NX_FLOAT32 -attr {units,degree} -attr {long_name,stth}
+nxsample_mot=/$(entryName),NXentry/sample,NXsample/SDS $(mot_name) -type NX_FLOAT32 -attr {units,$(mot_units)} -attr {long_name,$(mot_long_name)}
+#XXX add units command to configurable virtual motors.
 sth=/$(entryName),NXentry/sample,NXsample/SDS sth  -type NX_FLOAT32 -attr {units,degree} -attr {long_name,sth}
 # Slit motors
-ss1u=/$(entryName),NXentry/slits,NXfilter/SDS ss1u  -type NX_FLOAT32 -attr {units,degree} -attr {long_name,ss1u}
-ss1d=/$(entryName),NXentry/slits,NXfilter/SDS ss1d  -type NX_FLOAT32 -attr {units,degree} -attr {long_name,ss1d}
-ss1l=/$(entryName),NXentry/slits,NXfilter/SDS ss1l  -type NX_FLOAT32 -attr {units,degree} -attr {long_name,ss1l}
-ss1r=/$(entryName),NXentry/slits,NXfilter/SDS ss1r  -type NX_FLOAT32 -attr {units,degree} -attr {long_name,ss1r}
+nxfilter_mot=/$(entryName),NXentry/slits,NXfilter/SDS $(mot_name) -type NX_FLOAT32 -attr {units,$(mot_units)} -attr {long_name,$(mot_long_name)}
+#XXX add units command to configurable virtual motors.
 ss1vg=/$(entryName),NXentry/slits,NXfilter/SDS ss1vg  -type NX_FLOAT32 -attr {units,degree} -attr {long_name,ss1vg}
 ss1vo=/$(entryName),NXentry/slits,NXfilter/SDS ss1vo  -type NX_FLOAT32 -attr {units,degree} -attr {long_name,ss1vo}
 ss1hg=/$(entryName),NXentry/slits,NXfilter/SDS ss1hg  -type NX_FLOAT32 -attr {units,degree} -attr {long_name,ss1hg}
 ss1ho=/$(entryName),NXentry/slits,NXfilter/SDS ss1ho  -type NX_FLOAT32 -attr {units,degree} -attr {long_name,ss1ho}
-ss2u=/$(entryName),NXentry/slits,NXfilter/SDS ss2u  -type NX_FLOAT32 -attr {units,degree} -attr {long_name,ss2u}
-ss2d=/$(entryName),NXentry/slits,NXfilter/SDS ss2d  -type NX_FLOAT32 -attr {units,degree} -attr {long_name,ss2d}
-ss2l=/$(entryName),NXentry/slits,NXfilter/SDS ss2l  -type NX_FLOAT32 -attr {units,degree} -attr {long_name,ss2l}
-ss2r=/$(entryName),NXentry/slits,NXfilter/SDS ss2r  -type NX_FLOAT32 -attr {units,degree} -attr {long_name,ss2r}
 ss2vg=/$(entryName),NXentry/slits,NXfilter/SDS ss2vg  -type NX_FLOAT32 -attr {units,degree} -attr {long_name,ss2vg}
 ss2vo=/$(entryName),NXentry/slits,NXfilter/SDS ss2vo  -type NX_FLOAT32 -attr {units,degree} -attr {long_name,ss2vo}
 ss2hg=/$(entryName),NXentry/slits,NXfilter/SDS ss2hg  -type NX_FLOAT32 -attr {units,degree} -attr {long_name,ss2hg}