diff --git a/Code/Mantid/instrument/ARCS_Definition_19000000-20121010.xml b/Code/Mantid/instrument/ARCS_Definition_19000000-20121010.xml
index d598f8a6384e7383f46df31f8c174ab28b5d8f77..acadeeb9767463dcaa94d92cfd7456e5c4f892ab 100644
--- a/Code/Mantid/instrument/ARCS_Definition_19000000-20121010.xml
+++ b/Code/Mantid/instrument/ARCS_Definition_19000000-20121010.xml
@@ -12,7 +12,7 @@
<reference-frame>
<along-beam axis="z"/>
<pointing-up axis="y"/>
- <handedness axis="right"/>
+ <handedness val="right"/>
</reference-frame>
</defaults>
<!--SOURCE AND SAMPLE POSITION-->
@@ -2139,8 +2139,8 @@
<cylinder id="cyl-approx">
<centre-of-bottom-base y="0.0" x="0.0" z="0.0"/>
<axis y="0.0" x="0.0" z="1.0"/>
- <radius radius="0.01"/>
- <height height="0.03"/>
+ <radius val="0.01"/>
+ <height val="0.03"/>
</cylinder>
<algebra val="cyl-approx"/>
</type>
diff --git a/Code/Mantid/instrument/ARCS_Definition_20121010-20121011.xml b/Code/Mantid/instrument/ARCS_Definition_20121010-20121011.xml
index 33fdd5c53b0d0b2b16e0d610ffb01fcf4a8d5aee..c3f0b783124d1dabe05df0dd71c6787b0ff431ad 100644
--- a/Code/Mantid/instrument/ARCS_Definition_20121010-20121011.xml
+++ b/Code/Mantid/instrument/ARCS_Definition_20121010-20121011.xml
@@ -11,7 +11,7 @@
<reference-frame>
<along-beam axis="z"/>
<pointing-up axis="y"/>
- <handedness axis="right"/>
+ <handedness val="right"/>
</reference-frame>
<default-view view="cylindrical_y"/>
</defaults>
@@ -2140,8 +2140,8 @@
<cylinder id="cyl-approx">
<centre-of-bottom-base y="0.0" x="0.0" z="0.0"/>
<axis y="0.0" x="0.0" z="1.0"/>
- <radius radius="0.01"/>
- <height height="0.03"/>
+ <radius val="0.01"/>
+ <height val="0.03"/>
</cylinder>
<algebra val="cyl-approx"/>
</type>
diff --git a/Code/Mantid/instrument/ARCS_Definition_20121011-.xml b/Code/Mantid/instrument/ARCS_Definition_20121011-.xml
index 9e4098d4822acb73db774423ac85b3c5af1a3750..212a912a1f6213705dc95767b32910c3c0eb3da9 100644
--- a/Code/Mantid/instrument/ARCS_Definition_20121011-.xml
+++ b/Code/Mantid/instrument/ARCS_Definition_20121011-.xml
@@ -12,7 +12,7 @@
<reference-frame>
<along-beam axis="z"/>
<pointing-up axis="y"/>
- <handedness axis="right"/>
+ <handedness val="right"/>
</reference-frame>
<default-view view="cylindrical_y"/>
</defaults>
@@ -2140,8 +2140,8 @@
<cylinder id="cyl-approx">
<centre-of-bottom-base y="0.0" x="0.0" z="0.0"/>
<axis y="0.0" x="0.0" z="1.0"/>
- <radius radius="0.01"/>
- <height height="0.03"/>
+ <radius val="0.01"/>
+ <height val="0.03"/>
</cylinder>
<algebra val="cyl-approx"/>
</type>
diff --git a/Code/Mantid/instrument/BASIS_Definition.xml b/Code/Mantid/instrument/BASIS_Definition.xml
index 5cf806cfe3c8437e394ac68c46584be08a0efb83..af7a3004633d9f342257699db00da326c10b923a 100644
--- a/Code/Mantid/instrument/BASIS_Definition.xml
+++ b/Code/Mantid/instrument/BASIS_Definition.xml
@@ -7,7 +7,7 @@
<reference-frame>
<along-beam axis="z"/>
<pointing-up axis="y"/>
- <handedness axis="right"/>
+ <handedness val="right"/>
</reference-frame>
</defaults>
<!--SOURCE AND SAMPLE POSITION-->
@@ -51898,8 +51898,8 @@
<cylinder id="cyl-approx">
<centre-of-bottom-base y="0.0" x="0.0" z="0.0"/>
<axis y="0.0" x="0.0" z="1.0"/>
- <radius radius="0.01"/>
- <height height="0.03"/>
+ <radius val="0.01"/>
+ <height val="0.03"/>
</cylinder>
<algebra val="cyl-approx"/>
</type>
diff --git a/Code/Mantid/instrument/BIOSANS_Definition_2012.xml b/Code/Mantid/instrument/BIOSANS_Definition_2012.xml
index c17c18203affd54e330398b66be74f6400209ad9..6d221258453a7cf5844211f8e8308da4cb7f770a 100644
--- a/Code/Mantid/instrument/BIOSANS_Definition_2012.xml
+++ b/Code/Mantid/instrument/BIOSANS_Definition_2012.xml
@@ -9,7 +9,7 @@
<reference-frame>
<along-beam axis="z"/>
<pointing-up axis="y"/>
- <handedness axis="right"/>
+ <handedness val="right"/>
</reference-frame>
</defaults>
<!--SOURCE AND SAMPLE POSITION-->
diff --git a/Code/Mantid/instrument/CNCS_Definition.xml b/Code/Mantid/instrument/CNCS_Definition.xml
index 9777c55920a9ef5acb3a49bc7c58c511af1498e5..88d178f2ba3cf79c8c58b267560d0e6141b2ad2d 100644
--- a/Code/Mantid/instrument/CNCS_Definition.xml
+++ b/Code/Mantid/instrument/CNCS_Definition.xml
@@ -7,7 +7,7 @@
<reference-frame>
<along-beam axis="z"/>
<pointing-up axis="y"/>
- <handedness axis="right"/>
+ <handedness val="right"/>
</reference-frame>
</defaults>
<!--SOURCE AND SAMPLE POSITION-->
diff --git a/Code/Mantid/instrument/CNCS_Definition_20120215-20120313.xml b/Code/Mantid/instrument/CNCS_Definition_20120215-20120313.xml
index 3830af1caf17d4c2852167eaeec4e732ad821e84..6901929f2d3fac285c820c84366975a70c1a15c2 100644
--- a/Code/Mantid/instrument/CNCS_Definition_20120215-20120313.xml
+++ b/Code/Mantid/instrument/CNCS_Definition_20120215-20120313.xml
@@ -6,7 +6,7 @@
<reference-frame>
<along-beam axis="z"/>
<pointing-up axis="y"/>
- <handedness axis="right"/>
+ <handedness val="right"/>
</reference-frame>
</defaults>
<!--SOURCE AND SAMPLE POSITION-->
@@ -698,8 +698,8 @@
<cylinder id="cyl-approx">
<centre-of-bottom-base y="0.0" x="0.0" z="0.0"/>
<axis y="0.0" x="0.0" z="1.0"/>
- <radius radius="0.01"/>
- <height height="0.03"/>
+ <radius val="0.01"/>
+ <height val="0.03"/>
</cylinder>
<algebra val="cyl-approx"/>
</type>
diff --git a/Code/Mantid/instrument/CNCS_Definition_20120314_20120816.xml b/Code/Mantid/instrument/CNCS_Definition_20120314_20120816.xml
index e4b39a89ff107fecd5a4b8e634291171c646782d..a98aaeb5d49fd730b8ef0ad8d15bc50db5ecb8cf 100644
--- a/Code/Mantid/instrument/CNCS_Definition_20120314_20120816.xml
+++ b/Code/Mantid/instrument/CNCS_Definition_20120314_20120816.xml
@@ -7,7 +7,7 @@
<reference-frame>
<along-beam axis="z"/>
<pointing-up axis="y"/>
- <handedness axis="right"/>
+ <handedness val="right"/>
</reference-frame>
</defaults>
<!--SOURCE AND SAMPLE POSITION-->
@@ -699,8 +699,8 @@
<cylinder id="cyl-approx">
<centre-of-bottom-base y="0.0" x="0.0" z="0.0"/>
<axis y="0.0" x="0.0" z="1.0"/>
- <radius radius="0.01"/>
- <height height="0.03"/>
+ <radius val="0.01"/>
+ <height val="0.03"/>
</cylinder>
<algebra val="cyl-approx"/>
</type>
diff --git a/Code/Mantid/instrument/CNCS_Definition_35155-44929.xml b/Code/Mantid/instrument/CNCS_Definition_35155-44929.xml
index 511f5158da1518ec3d798cd189af8b4414815f55..7dd19a88fce9ad3667455fa60e8314504c4d3b09 100644
--- a/Code/Mantid/instrument/CNCS_Definition_35155-44929.xml
+++ b/Code/Mantid/instrument/CNCS_Definition_35155-44929.xml
@@ -7,7 +7,7 @@
<reference-frame>
<along-beam axis="z"/>
<pointing-up axis="y"/>
- <handedness axis="right"/>
+ <handedness val="right"/>
</reference-frame>
</defaults>
<!--SOURCE AND SAMPLE POSITION-->
@@ -699,8 +699,8 @@
<cylinder id="cyl-approx">
<centre-of-bottom-base y="0.0" x="0.0" z="0.0"/>
<axis y="0.0" x="0.0" z="1.0"/>
- <radius radius="0.01"/>
- <height height="0.03"/>
+ <radius val="0.01"/>
+ <height val="0.03"/>
</cylinder>
<algebra val="cyl-approx"/>
</type>
diff --git a/Code/Mantid/instrument/EQ-SANS_Definition.xml b/Code/Mantid/instrument/EQ-SANS_Definition.xml
index 9a3d10cc829ba97d06d31bf1b87dd6742edfe79f..b8fbe2eeba9311807a5a14810c2f052e62cc0764 100644
--- a/Code/Mantid/instrument/EQ-SANS_Definition.xml
+++ b/Code/Mantid/instrument/EQ-SANS_Definition.xml
@@ -11,7 +11,7 @@
<reference-frame>
<along-beam axis="z"/>
<pointing-up axis="y"/>
- <handedness axis="right"/>
+ <handedness val="right"/>
</reference-frame>
</defaults>
<!--SOURCE AND SAMPLE POSITION-->
@@ -3002,8 +3002,8 @@
<cylinder id="cyl-approx">
<centre-of-bottom-base y="0.0" x="0.0" z="0.0"/>
<axis y="0.0" x="0.0" z="1.0"/>
- <radius radius="0.01"/>
- <height height="0.03"/>
+ <radius val="0.01"/>
+ <height val="0.03"/>
</cylinder>
<algebra val="cyl-approx"/>
</type>
diff --git a/Code/Mantid/instrument/HIRESSANS_Definition.xml b/Code/Mantid/instrument/HIRESSANS_Definition.xml
index ff088f3d736ff640ada1d5c3ec52c4d799dcdd74..069bc762b3829f2be6f96f8ca5e725f29909bb51 100644
--- a/Code/Mantid/instrument/HIRESSANS_Definition.xml
+++ b/Code/Mantid/instrument/HIRESSANS_Definition.xml
@@ -9,7 +9,7 @@
<reference-frame>
<along-beam axis="z"/>
<pointing-up axis="y"/>
- <handedness axis="right"/>
+ <handedness val="right"/>
</reference-frame>
</defaults>
<!--SOURCE AND SAMPLE POSITION-->
diff --git a/Code/Mantid/instrument/HYSPECA_Definition.xml b/Code/Mantid/instrument/HYSPECA_Definition.xml
index 8ed08c31f0f006dca238295b2aadfdccfc5a00a5..90555eb79fc0d3880b3064e52cc60d2294319bde 100644
--- a/Code/Mantid/instrument/HYSPECA_Definition.xml
+++ b/Code/Mantid/instrument/HYSPECA_Definition.xml
@@ -6,7 +6,7 @@
<reference-frame>
<along-beam axis="z"/>
<pointing-up axis="y"/>
- <handedness axis="right"/>
+ <handedness val="right"/>
</reference-frame>
<default-view view="cylindrical_y"/>
</defaults>
@@ -43,7 +43,7 @@
</component>
</type>
<component type="Tank" idlist="Tank">
- <location t-position="70.148" roty="70.148">
+ <location>
<parameter name="r-position">
<value val="0"/>
</parameter>
diff --git a/Code/Mantid/instrument/HYSPEC_Definition.xml b/Code/Mantid/instrument/HYSPEC_Definition.xml
index ef2c766714619a9c5b9ad524443d6df1b4740cb3..707868de9dbf582d212f7d9b9a0d363c93744559 100644
--- a/Code/Mantid/instrument/HYSPEC_Definition.xml
+++ b/Code/Mantid/instrument/HYSPEC_Definition.xml
@@ -6,7 +6,7 @@
<reference-frame>
<along-beam axis="z"/>
<pointing-up axis="y"/>
- <handedness axis="right"/>
+ <handedness val="right"/>
</reference-frame>
<default-view view="cylindrical_y"/>
</defaults>
diff --git a/Code/Mantid/instrument/MANDI_Definition_2012.xml b/Code/Mantid/instrument/MANDI_Definition_2012.xml
index d096120e6d9dec3e8d49cae4e84f0d0b945b092c..53f6ed5085608f2048bb7fec1018f63ddf431227 100644
--- a/Code/Mantid/instrument/MANDI_Definition_2012.xml
+++ b/Code/Mantid/instrument/MANDI_Definition_2012.xml
@@ -14,7 +14,7 @@
<reference-frame>
<along-beam axis="z"/>
<pointing-up axis="y"/>
- <handedness axis="right"/>
+ <handedness val="right"/>
</reference-frame>
<default-view view="spherical_y"/>
</defaults>
diff --git a/Code/Mantid/instrument/MANDI_Definition_2013_03_15.xml b/Code/Mantid/instrument/MANDI_Definition_2013_03_15.xml
index 84eada8c0d75632f908414894d3eb5c8ab27f4d2..461fb16c7df81e6c5ce8e2b88b26f1d9ee58df63 100644
--- a/Code/Mantid/instrument/MANDI_Definition_2013_03_15.xml
+++ b/Code/Mantid/instrument/MANDI_Definition_2013_03_15.xml
@@ -14,7 +14,7 @@
<reference-frame>
<along-beam axis="z"/>
<pointing-up axis="y"/>
- <handedness axis="right"/>
+ <handedness val="right"/>
</reference-frame>
<default-view view="spherical_y"/>
</defaults>
diff --git a/Code/Mantid/instrument/NOMAD_Definition.xml b/Code/Mantid/instrument/NOMAD_Definition.xml
index db1f8310023131ceca995cebe33ebd7dfb09a388..0a5ec63e49805de63ccf68fb1de111ab74465f0b 100644
--- a/Code/Mantid/instrument/NOMAD_Definition.xml
+++ b/Code/Mantid/instrument/NOMAD_Definition.xml
@@ -8,7 +8,7 @@
<reference-frame>
<along-beam axis="z"/>
<pointing-up axis="y"/>
- <handedness axis="right"/>
+ <handedness val="right"/>
</reference-frame>
</defaults>
<!--SOURCE-->
@@ -987,8 +987,8 @@
<cylinder id="cyl-approx">
<centre-of-bottom-base y="0.0" x="0.0" z="0.0"/>
<axis y="0.0" x="0.0" z="1.0"/>
- <radius radius="0.01"/>
- <height height="0.03"/>
+ <radius val="0.01"/>
+ <height val="0.03"/>
</cylinder>
<algebra val="cyl-approx"/>
</type>
diff --git a/Code/Mantid/instrument/NOMAD_Definition_19000000-20120630.xml b/Code/Mantid/instrument/NOMAD_Definition_19000000-20120630.xml
index a074305d8d0eef171e03251f9053ff79471322db..8bd018073f78f497c906497fd5dbcf39355c59bc 100644
--- a/Code/Mantid/instrument/NOMAD_Definition_19000000-20120630.xml
+++ b/Code/Mantid/instrument/NOMAD_Definition_19000000-20120630.xml
@@ -13,7 +13,7 @@
<reference-frame>
<along-beam axis="z"/>
<pointing-up axis="y"/>
- <handedness axis="right"/>
+ <handedness val="right"/>
</reference-frame>
</defaults>
<!--SOURCE-->
diff --git a/Code/Mantid/instrument/NOMAD_Definition_20120701-20120731.xml b/Code/Mantid/instrument/NOMAD_Definition_20120701-20120731.xml
index 0380f78c15364ed9aaa2edecdd98a7ad5d10cb8f..4482b898c5cd501ba189d4ea479ba3bb2445bb30 100644
--- a/Code/Mantid/instrument/NOMAD_Definition_20120701-20120731.xml
+++ b/Code/Mantid/instrument/NOMAD_Definition_20120701-20120731.xml
@@ -8,7 +8,7 @@
<reference-frame>
<along-beam axis="z"/>
<pointing-up axis="y"/>
- <handedness axis="right"/>
+ <handedness val="right"/>
</reference-frame>
</defaults>
<!--SOURCE-->
@@ -987,8 +987,8 @@
<cylinder id="cyl-approx">
<centre-of-bottom-base y="0.0" x="0.0" z="0.0"/>
<axis y="0.0" x="0.0" z="1.0"/>
- <radius radius="0.01"/>
- <height height="0.03"/>
+ <radius val="0.01"/>
+ <height val="0.03"/>
</cylinder>
<algebra val="cyl-approx"/>
</type>
diff --git a/Code/Mantid/instrument/POWGEN_Definition_2010.xml b/Code/Mantid/instrument/POWGEN_Definition_2010.xml
index 8ddc5946e39c3414a880d1b4067e68cb9ce05ab1..b9ec940d1e0824c0f3f526bef7ad0a5abf926e65 100644
--- a/Code/Mantid/instrument/POWGEN_Definition_2010.xml
+++ b/Code/Mantid/instrument/POWGEN_Definition_2010.xml
@@ -15,7 +15,7 @@
<reference-frame>
<along-beam axis="z"/>
<pointing-up axis="y"/>
- <handedness axis="right"/>
+ <handedness val="right"/>
</reference-frame>
</defaults>
<!--SOURCE-->
diff --git a/Code/Mantid/instrument/POWGEN_Definition_2011-02-25.xml b/Code/Mantid/instrument/POWGEN_Definition_2011-02-25.xml
index 78a149fc65a399fa32d6c314bb461faf03d05791..c733547885676242c8292009d27645e5bd44f8c8 100644
--- a/Code/Mantid/instrument/POWGEN_Definition_2011-02-25.xml
+++ b/Code/Mantid/instrument/POWGEN_Definition_2011-02-25.xml
@@ -16,7 +16,7 @@
<reference-frame>
<along-beam axis="z"/>
<pointing-up axis="y"/>
- <handedness axis="right"/>
+ <handedness val="right"/>
</reference-frame>
</defaults>
<!--SOURCE-->
diff --git a/Code/Mantid/instrument/POWGEN_Definition_2012-08-20.xml b/Code/Mantid/instrument/POWGEN_Definition_2012-08-20.xml
index adeceac0f352b6cdce6d39d03764d88afcb86c01..622e53d4429ac95ac78debf9a300b76f98ca8e0b 100644
--- a/Code/Mantid/instrument/POWGEN_Definition_2012-08-20.xml
+++ b/Code/Mantid/instrument/POWGEN_Definition_2012-08-20.xml
@@ -17,7 +17,7 @@
<reference-frame>
<along-beam axis="z"/>
<pointing-up axis="y"/>
- <handedness axis="right"/>
+ <handedness val="right"/>
</reference-frame>
</defaults>
<!--SOURCE-->
diff --git a/Code/Mantid/instrument/POWGEN_Definition_2012-11-27.xml b/Code/Mantid/instrument/POWGEN_Definition_2012-11-27.xml
index 6a37771de50c56c8815c534c4a91affff76e0bae..784b23d6299b226708f89cab497b23ca16c2014c 100644
--- a/Code/Mantid/instrument/POWGEN_Definition_2012-11-27.xml
+++ b/Code/Mantid/instrument/POWGEN_Definition_2012-11-27.xml
@@ -18,7 +18,7 @@
<reference-frame>
<along-beam axis="z"/>
<pointing-up axis="y"/>
- <handedness axis="right"/>
+ <handedness val="right"/>
</reference-frame>
</defaults>
<!--SOURCE-->
diff --git a/Code/Mantid/instrument/POWGEN_Definition_2013-06-01.xml b/Code/Mantid/instrument/POWGEN_Definition_2013-06-01.xml
index 2afa419d101e9a1004f9366449655d2df4f786ee..3b57d4fc66941d912f1b1f7b4b4606078b72407a 100644
--- a/Code/Mantid/instrument/POWGEN_Definition_2013-06-01.xml
+++ b/Code/Mantid/instrument/POWGEN_Definition_2013-06-01.xml
@@ -8,7 +8,7 @@
<reference-frame>
<along-beam axis="z"/>
<pointing-up axis="y"/>
- <handedness axis="right"/>
+ <handedness val="right"/>
</reference-frame>
</defaults>
<!--SOURCE-->
diff --git a/Code/Mantid/instrument/POWGEN_Definition_2013-08-01.xml b/Code/Mantid/instrument/POWGEN_Definition_2013-08-01.xml
index bb8c31121b5fb8d4fedb44ac4b31e5a2f1b2982c..2ed7dab35c1d5f2c440562b635177c857416cadd 100644
--- a/Code/Mantid/instrument/POWGEN_Definition_2013-08-01.xml
+++ b/Code/Mantid/instrument/POWGEN_Definition_2013-08-01.xml
@@ -8,7 +8,7 @@
<reference-frame>
<along-beam axis="z"/>
<pointing-up axis="y"/>
- <handedness axis="right"/>
+ <handedness val="right"/>
</reference-frame>
</defaults>
<!--SOURCE-->
diff --git a/Code/Mantid/instrument/REF_L_Definition.xml b/Code/Mantid/instrument/REF_L_Definition.xml
index 3884080fc52d6d668d8b57dce747b5839af2a995..7e199f063383e79e851b5470abe411eb9a9c410d 100644
--- a/Code/Mantid/instrument/REF_L_Definition.xml
+++ b/Code/Mantid/instrument/REF_L_Definition.xml
@@ -5,7 +5,7 @@
<reference-frame>
<along-beam axis="z"/>
<pointing-up axis="y"/>
- <handedness axis="right"/>
+ <handedness val="right"/>
</reference-frame>
</defaults>
<!--SOURCE AND SAMPLE POSITION-->
@@ -4563,8 +4563,8 @@
<cylinder id="cyl-approx">
<centre-of-bottom-base x="0.0" y="0.0" z="0.0"/>
<axis x="0.0" y="0.0" z="1.0"/>
- <radius radius="0.01"/>
- <height height="0.03"/>
+ <radius val="0.01"/>
+ <height val="0.03"/>
</cylinder>
<algebra val="cyl-approx"/>
</type>
diff --git a/Code/Mantid/instrument/SEQUOIA_Definition.xml b/Code/Mantid/instrument/SEQUOIA_Definition.xml
index dd4099b83227ddb9c3450f31644af9572c3ecf7a..2324d5514f983f80728c0fc8d784d6de23ec7266 100644
--- a/Code/Mantid/instrument/SEQUOIA_Definition.xml
+++ b/Code/Mantid/instrument/SEQUOIA_Definition.xml
@@ -9,7 +9,7 @@
<reference-frame>
<along-beam axis="z"/>
<pointing-up axis="y"/>
- <handedness axis="right"/>
+ <handedness val="right"/>
</reference-frame>
</defaults>
<!--SOURCE AND SAMPLE POSITION-->
@@ -1656,8 +1656,8 @@
<cylinder id="cyl-approx">
<centre-of-bottom-base y="0.0" x="0.0" z="0.0"/>
<axis y="0.0" x="0.0" z="1.0"/>
- <radius radius="0.01"/>
- <height height="0.03"/>
+ <radius val="0.01"/>
+ <height val="0.03"/>
</cylinder>
<algebra val="cyl-approx"/>
</type>
diff --git a/Code/Mantid/instrument/SEQUOIA_Definition_upto_19889.xml b/Code/Mantid/instrument/SEQUOIA_Definition_upto_19889.xml
index e063352369a1f877727466dcaa729c2b0f4784dc..e50998048131ace992c3ca850e47c6a89abd1de5 100644
--- a/Code/Mantid/instrument/SEQUOIA_Definition_upto_19889.xml
+++ b/Code/Mantid/instrument/SEQUOIA_Definition_upto_19889.xml
@@ -11,7 +11,7 @@
<reference-frame>
<along-beam axis="z"/>
<pointing-up axis="y"/>
- <handedness axis="right"/>
+ <handedness val="right"/>
</reference-frame>
</defaults>
<!--SOURCE AND SAMPLE POSITION-->
@@ -1658,8 +1658,8 @@
<cylinder id="cyl-approx">
<centre-of-bottom-base y="0.0" x="0.0" z="0.0"/>
<axis y="0.0" x="0.0" z="1.0"/>
- <radius radius="0.01"/>
- <height height="0.03"/>
+ <radius val="0.01"/>
+ <height val="0.03"/>
</cylinder>
<algebra val="cyl-approx"/>
</type>
diff --git a/Code/Mantid/instrument/SNAP_Definition.xml b/Code/Mantid/instrument/SNAP_Definition.xml
index 776ea4d6b979b0aaf1b1fb5da4c8c75eef4c0388..8da5f31242a34e9b89567ab4f7b2f139e418d0a8 100644
--- a/Code/Mantid/instrument/SNAP_Definition.xml
+++ b/Code/Mantid/instrument/SNAP_Definition.xml
@@ -14,7 +14,7 @@
<reference-frame>
<along-beam axis="z"/>
<pointing-up axis="y"/>
- <handedness axis="right"/>
+ <handedness val="right"/>
</reference-frame>
</defaults>
<!--SOURCE-->
diff --git a/Code/Mantid/instrument/SXD_Definition.xml b/Code/Mantid/instrument/SXD_Definition.xml
index 8771d9ea07c04b7d29ca4d88f1406358f781e052..a9233a48911194273fe15775b3d71cf29c1cb52f 100644
--- a/Code/Mantid/instrument/SXD_Definition.xml
+++ b/Code/Mantid/instrument/SXD_Definition.xml
@@ -11,7 +11,7 @@
<reference-frame>
<along-beam axis="z"/>
<pointing-up axis="y"/>
- <handedness axis="right"/>
+ <handedness val="right"/>
</reference-frame>
<default-view view="spherical_z"/>
</defaults>
diff --git a/Code/Mantid/instrument/TOPAZ_Definition_2010.xml b/Code/Mantid/instrument/TOPAZ_Definition_2010.xml
index 413d7eadfdd619ae05f6975d65847a90149f5f41..090995f95c0d6c4f1d0504802c3bae911576f20f 100644
--- a/Code/Mantid/instrument/TOPAZ_Definition_2010.xml
+++ b/Code/Mantid/instrument/TOPAZ_Definition_2010.xml
@@ -16,7 +16,7 @@ calibration/geometry/ code. -->
<reference-frame>
<along-beam axis="z"/>
<pointing-up axis="y"/>
- <handedness axis="right"/>
+ <handedness val="right"/>
</reference-frame>
<default-view view="spherical_y"/>
</defaults>
diff --git a/Code/Mantid/instrument/TOPAZ_Definition_2011-01-01.xml b/Code/Mantid/instrument/TOPAZ_Definition_2011-01-01.xml
index 67070805bd3bf91c8e798ad1e1566e23f12c7325..c3602a7938bdc589e579901207cce247e12f1c7f 100644
--- a/Code/Mantid/instrument/TOPAZ_Definition_2011-01-01.xml
+++ b/Code/Mantid/instrument/TOPAZ_Definition_2011-01-01.xml
@@ -14,7 +14,7 @@
<reference-frame>
<along-beam axis="z"/>
<pointing-up axis="y"/>
- <handedness axis="right"/>
+ <handedness val="right"/>
</reference-frame>
<default-view view="spherical_y"/>
</defaults>
diff --git a/Code/Mantid/instrument/TOPAZ_Definition_2011-10-03.xml b/Code/Mantid/instrument/TOPAZ_Definition_2011-10-03.xml
index 9368a63e49592b077810dc82f1026e07cd1b0f3a..540f01bfb45e686e38d3662f83eda83a4fa499a6 100644
--- a/Code/Mantid/instrument/TOPAZ_Definition_2011-10-03.xml
+++ b/Code/Mantid/instrument/TOPAZ_Definition_2011-10-03.xml
@@ -14,7 +14,7 @@
<reference-frame>
<along-beam axis="z"/>
<pointing-up axis="y"/>
- <handedness axis="right"/>
+ <handedness val="right"/>
</reference-frame>
<default-view view="spherical_y"/>
</defaults>
diff --git a/Code/Mantid/instrument/TOPAZ_Definition_2011-10-21.xml b/Code/Mantid/instrument/TOPAZ_Definition_2011-10-21.xml
index 49c9d16ab819762fd2241d6ee77ff0bf0be6c7c4..729b5fe374c688f3d69a1f39aa92c0e477f13fdc 100644
--- a/Code/Mantid/instrument/TOPAZ_Definition_2011-10-21.xml
+++ b/Code/Mantid/instrument/TOPAZ_Definition_2011-10-21.xml
@@ -14,7 +14,7 @@
<reference-frame>
<along-beam axis="z"/>
<pointing-up axis="y"/>
- <handedness axis="right"/>
+ <handedness val="right"/>
</reference-frame>
<default-view view="spherical_y"/>
</defaults>
diff --git a/Code/Mantid/instrument/TOPAZ_Definition_2012-05-25.xml b/Code/Mantid/instrument/TOPAZ_Definition_2012-05-25.xml
index 86677acd493216f25318af77fae6fdb4c895366c..1da5cbfba4dd9d256224c1b2a7e5428ee204be70 100644
--- a/Code/Mantid/instrument/TOPAZ_Definition_2012-05-25.xml
+++ b/Code/Mantid/instrument/TOPAZ_Definition_2012-05-25.xml
@@ -14,7 +14,7 @@
<reference-frame>
<along-beam axis="z"/>
<pointing-up axis="y"/>
- <handedness axis="right"/>
+ <handedness val="right"/>
</reference-frame>
<default-view view="spherical_y"/>
</defaults>
diff --git a/Code/Mantid/instrument/TOPAZ_Definition_2012-08-23.xml b/Code/Mantid/instrument/TOPAZ_Definition_2012-08-23.xml
index 4a5d371c22de0ce6a8f2b7f033b0328c952eaffa..cfb63e9eb60ff8e8df5f28fe5fa9584346bc8f1d 100644
--- a/Code/Mantid/instrument/TOPAZ_Definition_2012-08-23.xml
+++ b/Code/Mantid/instrument/TOPAZ_Definition_2012-08-23.xml
@@ -14,7 +14,7 @@
<reference-frame>
<along-beam axis="z"/>
<pointing-up axis="y"/>
- <handedness axis="right"/>
+ <handedness val="right"/>
</reference-frame>
<default-view view="spherical_y"/>
</defaults>
diff --git a/Code/Mantid/instrument/VISION_Definition.xml b/Code/Mantid/instrument/VISION_Definition.xml
index 8a543efb93533127501e6533fbca510c7d593807..c73618cd2f56a2605af0b89b1839c04cc0f8399b 100644
--- a/Code/Mantid/instrument/VISION_Definition.xml
+++ b/Code/Mantid/instrument/VISION_Definition.xml
@@ -8,7 +8,7 @@
<reference-frame>
<along-beam axis="z"/>
<pointing-up axis="y"/>
- <handedness axis="right"/>
+ <handedness val="right"/>
</reference-frame>
</defaults>
<!--SOURCE AND SAMPLE POSITION-->
@@ -4460,8 +4460,8 @@
<cylinder id="cyl-approx">
<centre-of-bottom-base y="0.0" x="0.0" z="0.0"/>
<axis y="0.0" x="0.0" z="1.0"/>
- <radius radius="0.01"/>
- <height height="0.03"/>
+ <radius val="0.01"/>
+ <height val="0.03"/>
</cylinder>
<algebra val="cyl-approx"/>
</type>
diff --git a/Code/Mantid/instrument/VULCAN_Definition.xml b/Code/Mantid/instrument/VULCAN_Definition.xml
index 436f6a5211e30013a08f6e3347bec8c82377504e..ba5c179bcefd8c70e2f70840f94e925066492650 100644
--- a/Code/Mantid/instrument/VULCAN_Definition.xml
+++ b/Code/Mantid/instrument/VULCAN_Definition.xml
@@ -13,7 +13,7 @@
<reference-frame>
<along-beam axis="z"/>
<pointing-up axis="y"/>
- <handedness axis="right"/>
+ <handedness val="right"/>
</reference-frame>
</defaults>
<!--SOURCE-->