diff --git a/instrument/FIGARO_Definition.xml b/instrument/FIGARO_Definition.xml
index 4a201ce728d75f209271b5324fc6972e0fadd9fd..a75908efa3ee93f70d7d67b115e12b7c1b930f1e 100644
--- a/instrument/FIGARO_Definition.xml
+++ b/instrument/FIGARO_Definition.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='ASCII'?>
-<instrument xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.mantidproject.org/IDF/1.0" last-modified="2018-03-01 09:42:02.196179" name="Figaro" valid-from="2017-01-31 23:59:59" valid-to="2100-01-31 23:59:59" xsi:schemaLocation="http://www.mantidproject.org/IDF/1.0 http://schema.mantidproject.org/IDF/1.0/IDFSchema.xsd">
+<instrument xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.mantidproject.org/IDF/1.0" last-modified="2018-03-01 09:42:02.196179" name="FIGARO" valid-from="2017-01-31 23:59:59" valid-to="2100-01-31 23:59:59" xsi:schemaLocation="http://www.mantidproject.org/IDF/1.0 http://schema.mantidproject.org/IDF/1.0/IDFSchema.xsd">
   <!-- This is the instrument definition file of the figaro reflectometer at the ILL.
        Generated file, PLEASE DO NOT EDIT THIS FILE!
        This file was automatically generated by mandidgeometry/ILL/IDF/figaro_generatorIDF.py
@@ -81,9 +81,11 @@
   <component type="slit2">
     <location x="0.0" y="0.0" z="-2.53"/>
   </component>
+  <type name="slit2"/>
   <component type="slit3">
     <location x="0.0" y="0.0" z="-0.368"/>
   </component>
+  <type name="slit3"/>
   <!--DETECTORS-->
   <!--64 tubes form the detector-->
   <component idfillbyfirst="x" idstart="1" idstepbyrow="1" type="detector">
diff --git a/instrument/Figaro_Parameters.xml b/instrument/FIGARO_Parameters.xml
similarity index 64%
rename from instrument/Figaro_Parameters.xml
rename to instrument/FIGARO_Parameters.xml
index bf679aa15990656bb5286f0017d8ddb3a351c665..aecec29cc7d816d35c2dd825930c1176dac4a8fa 100644
--- a/instrument/Figaro_Parameters.xml
+++ b/instrument/FIGARO_Parameters.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<parameter-file instrument="Figaro" valid-from="2017-01-31 23:59:59">
+<parameter-file instrument="FIGARO" valid-from="2017-01-31 23:59:59">
 
-	<component-link name="Figaro">
+	<component-link name="FIGARO">
 		<parameter name="deltaE-mode" type="string">
 			<value val="direct" />
 		</parameter>