diff --git a/Code/Mantid/Geometry/inc/DataSpace.h b/Code/Mantid/Geometry/inc/DataSpace.h
index 3fe83fdc1dc4d746b60eb95e07faa3e4e60217dc..37abd4f3ff1455b6331c35038e6d940cd318c4fd 100644
--- a/Code/Mantid/Geometry/inc/DataSpace.h
+++ b/Code/Mantid/Geometry/inc/DataSpace.h
@@ -1,7 +1,7 @@
 #ifndef DataSpace_h
 #define DataSpace_h
 
-//! Impliments a simple data storage space
+// Impliments a simple data storage space
 
 namespace Mantid
 {
diff --git a/Code/Mantid/Geometry/inc/Property.h b/Code/Mantid/Geometry/inc/PropertyGeometry.h
similarity index 100%
rename from Code/Mantid/Geometry/inc/Property.h
rename to Code/Mantid/Geometry/inc/PropertyGeometry.h