diff --git a/.github/workflows/run_clang_format.py b/.github/workflows/run_clang_format.py
index 0f6e1afc46c..54f9f59fe86 100755
--- a/.github/workflows/run_clang_format.py
+++ b/.github/workflows/run_clang_format.py
@@ -70,30 +70,30 @@
     '../../OgreMain/include/OgreHlmsDatablock.h': 3,
     '../../OgreMain/include/Animation/OgreBone.inl': 63,
     '../../OgreMain/include/Math/Array/OgreNodeMemoryManager.h': 3,
-    '../../OgreMain/include/Math/Array/C/OgreArrayVector3.inl': 849,
-    '../../OgreMain/include/Math/Array/C/OgreArraySphere.inl': 24,
-    '../../OgreMain/include/Math/Array/C/OgreArrayMatrix4.inl': 528,
+    '../../OgreMain/include/Math/Array/C/OgreArrayVector3C.inl': 849,
+    '../../OgreMain/include/Math/Array/C/OgreArraySphereC.inl': 24,
+    '../../OgreMain/include/Math/Array/C/OgreArrayMatrix4C.inl': 528,
     '../../OgreMain/include/Math/Array/C/OgreMathlibC.inl': 33,
-    '../../OgreMain/include/Math/Array/C/OgreArrayAabb.inl': 114,
-    '../../OgreMain/include/Math/Array/C/OgreBooleanMask.inl': 54,
-    '../../OgreMain/include/Math/Array/C/OgreArrayQuaternion.inl': 699,
-    '../../OgreMain/include/Math/Array/C/OgreArrayMatrixAf4x3.inl': 1053,
-    '../../OgreMain/include/Math/Array/NEON/Single/OgreArrayVector3.inl': 1386,
-    '../../OgreMain/include/Math/Array/NEON/Single/OgreArraySphere.inl': 30,
-    '../../OgreMain/include/Math/Array/NEON/Single/OgreArrayMatrix4.inl': 1419,
+    '../../OgreMain/include/Math/Array/C/OgreArrayAabbC.inl': 114,
+    '../../OgreMain/include/Math/Array/C/OgreBooleanMaskC.inl': 54,
+    '../../OgreMain/include/Math/Array/C/OgreArrayQuaternionC.inl': 699,
+    '../../OgreMain/include/Math/Array/C/OgreArrayMatrixAf4x3C.inl': 1053,
+    '../../OgreMain/include/Math/Array/NEON/Single/OgreArrayVector3NEON.inl': 1386,
+    '../../OgreMain/include/Math/Array/NEON/Single/OgreArraySphereNEON.inl': 30,
+    '../../OgreMain/include/Math/Array/NEON/Single/OgreArrayMatrix4NEON.inl': 1419,
     '../../OgreMain/include/Math/Array/NEON/Single/OgreMathlibNEON.h': 6,
     '../../OgreMain/include/Math/Array/NEON/Single/OgreMathlibNEON.inl': 408,
-    '../../OgreMain/include/Math/Array/NEON/Single/OgreArrayAabb.inl': 216,
-    '../../OgreMain/include/Math/Array/NEON/Single/OgreBooleanMask.inl': 141,
-    '../../OgreMain/include/Math/Array/NEON/Single/OgreArrayQuaternion.inl': 1167,
-    '../../OgreMain/include/Math/Array/NEON/Single/OgreArrayMatrixAf4x3.inl': 1791,
-    '../../OgreMain/include/Math/Array/SSE2/Single/OgreArrayVector3.inl': 1239,
-    '../../OgreMain/include/Math/Array/SSE2/Single/OgreArraySphere.inl': 30,
-    '../../OgreMain/include/Math/Array/SSE2/Single/OgreArrayMatrix4.inl': 1530,
-    '../../OgreMain/include/Math/Array/SSE2/Single/OgreArrayAabb.inl': 219,
-    '../../OgreMain/include/Math/Array/SSE2/Single/OgreBooleanMask.inl': 126,
-    '../../OgreMain/include/Math/Array/SSE2/Single/OgreArrayQuaternion.inl': 1071,
-    '../../OgreMain/include/Math/Array/SSE2/Single/OgreArrayMatrixAf4x3.inl': 1929,
+    '../../OgreMain/include/Math/Array/NEON/Single/OgreArrayAabbNEON.inl': 216,
+    '../../OgreMain/include/Math/Array/NEON/Single/OgreBooleanMaskNEON.inl': 141,
+    '../../OgreMain/include/Math/Array/NEON/Single/OgreArrayQuaternionNEON.inl': 1167,
+    '../../OgreMain/include/Math/Array/NEON/Single/OgreArrayMatrixAf4x3NEON.inl': 1791,
+    '../../OgreMain/include/Math/Array/SSE2/Single/OgreArrayVector3SSE2.inl': 1239,
+    '../../OgreMain/include/Math/Array/SSE2/Single/OgreArraySphereSSE2.inl': 30,
+    '../../OgreMain/include/Math/Array/SSE2/Single/OgreArrayMatrix4SSE2.inl': 1530,
+    '../../OgreMain/include/Math/Array/SSE2/Single/OgreArrayAabbSSE2.inl': 219,
+    '../../OgreMain/include/Math/Array/SSE2/Single/OgreBooleanMaskSSE2.inl': 126,
+    '../../OgreMain/include/Math/Array/SSE2/Single/OgreArrayQuaternionSSE2.inl': 1071,
+    '../../OgreMain/include/Math/Array/SSE2/Single/OgreArrayMatrixAf4x3SSE2.inl': 1929,
     '../../OgreMain/include/Compositor/OgreCompositorManager2.h': 3,
     '../../OgreMain/include/Compositor/Pass/OgreCompositorPassDef.h': 3,
     '../../OgreMain/src/OgrePlatformInformation.cpp': 2274,
diff --git a/OgreMain/include/Math/Array/C/OgreArrayAabb.h b/OgreMain/include/Math/Array/C/OgreArrayAabbC.h
similarity index 99%
rename from OgreMain/include/Math/Array/C/OgreArrayAabb.h
rename to OgreMain/include/Math/Array/C/OgreArrayAabbC.h
index 272c5cef8d8..d8f5d1ccf8e 100644
--- a/OgreMain/include/Math/Array/C/OgreArrayAabb.h
+++ b/OgreMain/include/Math/Array/C/OgreArrayAabbC.h
@@ -177,6 +177,6 @@ namespace Ogre
 
 }  // namespace Ogre
 
-#include "OgreArrayAabb.inl"
+#include "OgreArrayAabbC.inl"
 
 #endif
diff --git a/OgreMain/include/Math/Array/C/OgreArrayAabb.inl b/OgreMain/include/Math/Array/C/OgreArrayAabbC.inl
similarity index 100%
rename from OgreMain/include/Math/Array/C/OgreArrayAabb.inl
rename to OgreMain/include/Math/Array/C/OgreArrayAabbC.inl
diff --git a/OgreMain/include/Math/Array/C/OgreArrayMatrix4.h b/OgreMain/include/Math/Array/C/OgreArrayMatrix4C.h
similarity index 99%
rename from OgreMain/include/Math/Array/C/OgreArrayMatrix4.h
rename to OgreMain/include/Math/Array/C/OgreArrayMatrix4C.h
index afbed589ef0..a4d8e4e46e6 100644
--- a/OgreMain/include/Math/Array/C/OgreArrayMatrix4.h
+++ b/OgreMain/include/Math/Array/C/OgreArrayMatrix4C.h
@@ -250,6 +250,6 @@ namespace Ogre
 
 }  // namespace Ogre
 
-#include "OgreArrayMatrix4.inl"
+#include "OgreArrayMatrix4C.inl"
 
 #endif
diff --git a/OgreMain/include/Math/Array/C/OgreArrayMatrix4.inl b/OgreMain/include/Math/Array/C/OgreArrayMatrix4C.inl
similarity index 100%
rename from OgreMain/include/Math/Array/C/OgreArrayMatrix4.inl
rename to OgreMain/include/Math/Array/C/OgreArrayMatrix4C.inl
diff --git a/OgreMain/include/Math/Array/C/OgreArrayMatrixAf4x3.h b/OgreMain/include/Math/Array/C/OgreArrayMatrixAf4x3C.h
similarity index 99%
rename from OgreMain/include/Math/Array/C/OgreArrayMatrixAf4x3.h
rename to OgreMain/include/Math/Array/C/OgreArrayMatrixAf4x3C.h
index bde28a5f342..32da91b6997 100644
--- a/OgreMain/include/Math/Array/C/OgreArrayMatrixAf4x3.h
+++ b/OgreMain/include/Math/Array/C/OgreArrayMatrixAf4x3C.h
@@ -274,6 +274,6 @@ namespace Ogre
 
 }  // namespace Ogre
 
-#include "OgreArrayMatrixAf4x3.inl"
+#include "OgreArrayMatrixAf4x3C.inl"
 
 #endif
diff --git a/OgreMain/include/Math/Array/C/OgreArrayMatrixAf4x3.inl b/OgreMain/include/Math/Array/C/OgreArrayMatrixAf4x3C.inl
similarity index 100%
rename from OgreMain/include/Math/Array/C/OgreArrayMatrixAf4x3.inl
rename to OgreMain/include/Math/Array/C/OgreArrayMatrixAf4x3C.inl
diff --git a/OgreMain/include/Math/Array/C/OgreArrayQuaternion.h b/OgreMain/include/Math/Array/C/OgreArrayQuaternionC.h
similarity index 99%
rename from OgreMain/include/Math/Array/C/OgreArrayQuaternion.h
rename to OgreMain/include/Math/Array/C/OgreArrayQuaternionC.h
index 5b0b4fa34eb..004e39d7fac 100644
--- a/OgreMain/include/Math/Array/C/OgreArrayQuaternion.h
+++ b/OgreMain/include/Math/Array/C/OgreArrayQuaternionC.h
@@ -37,8 +37,6 @@ THE SOFTWARE.
 #include "Math/Array/OgreArrayVector3.h"
 #include "Math/Array/OgreMathlib.h"
 
-#include "OgreArrayQuaternion.h"
-
 namespace Ogre
 {
     /** \addtogroup Core
@@ -257,6 +255,6 @@ namespace Ogre
 
 }  // namespace Ogre
 
-#include "OgreArrayQuaternion.inl"
+#include "OgreArrayQuaternionC.inl"
 
 #endif
diff --git a/OgreMain/include/Math/Array/C/OgreArrayQuaternion.inl b/OgreMain/include/Math/Array/C/OgreArrayQuaternionC.inl
similarity index 100%
rename from OgreMain/include/Math/Array/C/OgreArrayQuaternion.inl
rename to OgreMain/include/Math/Array/C/OgreArrayQuaternionC.inl
diff --git a/OgreMain/include/Math/Array/C/OgreArraySphere.h b/OgreMain/include/Math/Array/C/OgreArraySphereC.h
similarity index 99%
rename from OgreMain/include/Math/Array/C/OgreArraySphere.h
rename to OgreMain/include/Math/Array/C/OgreArraySphereC.h
index 6a75008907d..480020cb345 100644
--- a/OgreMain/include/Math/Array/C/OgreArraySphere.h
+++ b/OgreMain/include/Math/Array/C/OgreArraySphereC.h
@@ -121,6 +121,6 @@ namespace Ogre
 
 }  // namespace Ogre
 
-#include "OgreArraySphere.inl"
+#include "OgreArraySphereC.inl"
 
 #endif
diff --git a/OgreMain/include/Math/Array/C/OgreArraySphere.inl b/OgreMain/include/Math/Array/C/OgreArraySphereC.inl
similarity index 100%
rename from OgreMain/include/Math/Array/C/OgreArraySphere.inl
rename to OgreMain/include/Math/Array/C/OgreArraySphereC.inl
diff --git a/OgreMain/include/Math/Array/C/OgreArrayVector2.h b/OgreMain/include/Math/Array/C/OgreArrayVector2C.h
similarity index 99%
rename from OgreMain/include/Math/Array/C/OgreArrayVector2.h
rename to OgreMain/include/Math/Array/C/OgreArrayVector2C.h
index 61bd2810044..6d4ec4bb434 100644
--- a/OgreMain/include/Math/Array/C/OgreArrayVector2.h
+++ b/OgreMain/include/Math/Array/C/OgreArrayVector2C.h
@@ -337,6 +337,6 @@ namespace Ogre
 
 }  // namespace Ogre
 
-#include "OgreArrayVector2.inl"
+#include "OgreArrayVector2C.inl"
 
 #endif
diff --git a/OgreMain/include/Math/Array/C/OgreArrayVector2.inl b/OgreMain/include/Math/Array/C/OgreArrayVector2C.inl
similarity index 100%
rename from OgreMain/include/Math/Array/C/OgreArrayVector2.inl
rename to OgreMain/include/Math/Array/C/OgreArrayVector2C.inl
diff --git a/OgreMain/include/Math/Array/C/OgreArrayVector3.h b/OgreMain/include/Math/Array/C/OgreArrayVector3C.h
similarity index 99%
rename from OgreMain/include/Math/Array/C/OgreArrayVector3.h
rename to OgreMain/include/Math/Array/C/OgreArrayVector3C.h
index eca08267fc2..dcacec53ba7 100644
--- a/OgreMain/include/Math/Array/C/OgreArrayVector3.h
+++ b/OgreMain/include/Math/Array/C/OgreArrayVector3C.h
@@ -358,6 +358,6 @@ namespace Ogre
 
 }  // namespace Ogre
 
-#include "OgreArrayVector3.inl"
+#include "OgreArrayVector3C.inl"
 
 #endif
diff --git a/OgreMain/include/Math/Array/C/OgreArrayVector3.inl b/OgreMain/include/Math/Array/C/OgreArrayVector3C.inl
similarity index 100%
rename from OgreMain/include/Math/Array/C/OgreArrayVector3.inl
rename to OgreMain/include/Math/Array/C/OgreArrayVector3C.inl
diff --git a/OgreMain/include/Math/Array/C/OgreArrayVector4.h b/OgreMain/include/Math/Array/C/OgreArrayVector4C.h
similarity index 99%
rename from OgreMain/include/Math/Array/C/OgreArrayVector4.h
rename to OgreMain/include/Math/Array/C/OgreArrayVector4C.h
index d69e26cdbe6..55e3f9ab53b 100644
--- a/OgreMain/include/Math/Array/C/OgreArrayVector4.h
+++ b/OgreMain/include/Math/Array/C/OgreArrayVector4C.h
@@ -278,6 +278,6 @@ namespace Ogre
 
 }  // namespace Ogre
 
-#include "OgreArrayVector4.inl"
+#include "OgreArrayVector4C.inl"
 
 #endif
diff --git a/OgreMain/include/Math/Array/C/OgreArrayVector4.inl b/OgreMain/include/Math/Array/C/OgreArrayVector4C.inl
similarity index 100%
rename from OgreMain/include/Math/Array/C/OgreArrayVector4.inl
rename to OgreMain/include/Math/Array/C/OgreArrayVector4C.inl
diff --git a/OgreMain/include/Math/Array/C/OgreBooleanMask.h b/OgreMain/include/Math/Array/C/OgreBooleanMaskC.h
similarity index 98%
rename from OgreMain/include/Math/Array/C/OgreBooleanMask.h
rename to OgreMain/include/Math/Array/C/OgreBooleanMaskC.h
index a7ba67eba05..ea7d245d1f8 100644
--- a/OgreMain/include/Math/Array/C/OgreBooleanMask.h
+++ b/OgreMain/include/Math/Array/C/OgreBooleanMaskC.h
@@ -63,6 +63,6 @@ namespace Ogre
     };
 }  // namespace Ogre
 
-#include "OgreBooleanMask.inl"
+#include "OgreBooleanMaskC.inl"
 
 #endif
diff --git a/OgreMain/include/Math/Array/C/OgreBooleanMask.inl b/OgreMain/include/Math/Array/C/OgreBooleanMaskC.inl
similarity index 100%
rename from OgreMain/include/Math/Array/C/OgreBooleanMask.inl
rename to OgreMain/include/Math/Array/C/OgreBooleanMaskC.inl
diff --git a/OgreMain/include/Math/Array/NEON/Single/OgreArrayAabb.h b/OgreMain/include/Math/Array/NEON/Single/OgreArrayAabbNEON.h
similarity index 99%
rename from OgreMain/include/Math/Array/NEON/Single/OgreArrayAabb.h
rename to OgreMain/include/Math/Array/NEON/Single/OgreArrayAabbNEON.h
index e65a998bde2..1646e5e41aa 100644
--- a/OgreMain/include/Math/Array/NEON/Single/OgreArrayAabb.h
+++ b/OgreMain/include/Math/Array/NEON/Single/OgreArrayAabbNEON.h
@@ -177,6 +177,6 @@ namespace Ogre
 
 }  // namespace Ogre
 
-#include "OgreArrayAabb.inl"
+#include "OgreArrayAabbNEON.inl"
 
 #endif
diff --git a/OgreMain/include/Math/Array/NEON/Single/OgreArrayAabb.inl b/OgreMain/include/Math/Array/NEON/Single/OgreArrayAabbNEON.inl
similarity index 100%
rename from OgreMain/include/Math/Array/NEON/Single/OgreArrayAabb.inl
rename to OgreMain/include/Math/Array/NEON/Single/OgreArrayAabbNEON.inl
diff --git a/OgreMain/include/Math/Array/NEON/Single/OgreArrayMatrix4.h b/OgreMain/include/Math/Array/NEON/Single/OgreArrayMatrix4NEON.h
similarity index 99%
rename from OgreMain/include/Math/Array/NEON/Single/OgreArrayMatrix4.h
rename to OgreMain/include/Math/Array/NEON/Single/OgreArrayMatrix4NEON.h
index 12bddd0fcb2..226a251afc7 100644
--- a/OgreMain/include/Math/Array/NEON/Single/OgreArrayMatrix4.h
+++ b/OgreMain/include/Math/Array/NEON/Single/OgreArrayMatrix4NEON.h
@@ -253,6 +253,6 @@ namespace Ogre
 
 }  // namespace Ogre
 
-#include "OgreArrayMatrix4.inl"
+#include "OgreArrayMatrix4NEON.inl"
 
 #endif
diff --git a/OgreMain/include/Math/Array/NEON/Single/OgreArrayMatrix4.inl b/OgreMain/include/Math/Array/NEON/Single/OgreArrayMatrix4NEON.inl
similarity index 100%
rename from OgreMain/include/Math/Array/NEON/Single/OgreArrayMatrix4.inl
rename to OgreMain/include/Math/Array/NEON/Single/OgreArrayMatrix4NEON.inl
diff --git a/OgreMain/include/Math/Array/NEON/Single/OgreArrayMatrixAf4x3.h b/OgreMain/include/Math/Array/NEON/Single/OgreArrayMatrixAf4x3NEON.h
similarity index 99%
rename from OgreMain/include/Math/Array/NEON/Single/OgreArrayMatrixAf4x3.h
rename to OgreMain/include/Math/Array/NEON/Single/OgreArrayMatrixAf4x3NEON.h
index de612fdedc6..dd6d1524a6c 100644
--- a/OgreMain/include/Math/Array/NEON/Single/OgreArrayMatrixAf4x3.h
+++ b/OgreMain/include/Math/Array/NEON/Single/OgreArrayMatrixAf4x3NEON.h
@@ -247,6 +247,6 @@ namespace Ogre
 
 }  // namespace Ogre
 
-#include "OgreArrayMatrixAf4x3.inl"
+#include "OgreArrayMatrixAf4x3NEON.inl"
 
 #endif
diff --git a/OgreMain/include/Math/Array/NEON/Single/OgreArrayMatrixAf4x3.inl b/OgreMain/include/Math/Array/NEON/Single/OgreArrayMatrixAf4x3NEON.inl
similarity index 100%
rename from OgreMain/include/Math/Array/NEON/Single/OgreArrayMatrixAf4x3.inl
rename to OgreMain/include/Math/Array/NEON/Single/OgreArrayMatrixAf4x3NEON.inl
diff --git a/OgreMain/include/Math/Array/NEON/Single/OgreArrayQuaternion.h b/OgreMain/include/Math/Array/NEON/Single/OgreArrayQuaternionNEON.h
similarity index 99%
rename from OgreMain/include/Math/Array/NEON/Single/OgreArrayQuaternion.h
rename to OgreMain/include/Math/Array/NEON/Single/OgreArrayQuaternionNEON.h
index 620513a58c0..15a75b85191 100644
--- a/OgreMain/include/Math/Array/NEON/Single/OgreArrayQuaternion.h
+++ b/OgreMain/include/Math/Array/NEON/Single/OgreArrayQuaternionNEON.h
@@ -37,8 +37,6 @@ THE SOFTWARE.
 #include "Math/Array/OgreArrayVector3.h"
 #include "Math/Array/OgreMathlib.h"
 
-#include "OgreArrayQuaternion.h"
-
 namespace Ogre
 {
     /** \addtogroup Core
@@ -256,6 +254,6 @@ namespace Ogre
 
 }  // namespace Ogre
 
-#include "OgreArrayQuaternion.inl"
+#include "OgreArrayQuaternionNEON.inl"
 
 #endif
diff --git a/OgreMain/include/Math/Array/NEON/Single/OgreArrayQuaternion.inl b/OgreMain/include/Math/Array/NEON/Single/OgreArrayQuaternionNEON.inl
similarity index 100%
rename from OgreMain/include/Math/Array/NEON/Single/OgreArrayQuaternion.inl
rename to OgreMain/include/Math/Array/NEON/Single/OgreArrayQuaternionNEON.inl
diff --git a/OgreMain/include/Math/Array/NEON/Single/OgreArraySphere.h b/OgreMain/include/Math/Array/NEON/Single/OgreArraySphereNEON.h
similarity index 99%
rename from OgreMain/include/Math/Array/NEON/Single/OgreArraySphere.h
rename to OgreMain/include/Math/Array/NEON/Single/OgreArraySphereNEON.h
index 05ba17904d9..217e938beff 100644
--- a/OgreMain/include/Math/Array/NEON/Single/OgreArraySphere.h
+++ b/OgreMain/include/Math/Array/NEON/Single/OgreArraySphereNEON.h
@@ -121,6 +121,6 @@ namespace Ogre
 
 }  // namespace Ogre
 
-#include "OgreArraySphere.inl"
+#include "OgreArraySphereNEON.inl"
 
 #endif
diff --git a/OgreMain/include/Math/Array/NEON/Single/OgreArraySphere.inl b/OgreMain/include/Math/Array/NEON/Single/OgreArraySphereNEON.inl
similarity index 100%
rename from OgreMain/include/Math/Array/NEON/Single/OgreArraySphere.inl
rename to OgreMain/include/Math/Array/NEON/Single/OgreArraySphereNEON.inl
diff --git a/OgreMain/include/Math/Array/NEON/Single/OgreArrayVector2.h b/OgreMain/include/Math/Array/NEON/Single/OgreArrayVector2NEON.h
similarity index 99%
rename from OgreMain/include/Math/Array/NEON/Single/OgreArrayVector2.h
rename to OgreMain/include/Math/Array/NEON/Single/OgreArrayVector2NEON.h
index b4e0bdee3b3..0fb7c24eb50 100644
--- a/OgreMain/include/Math/Array/NEON/Single/OgreArrayVector2.h
+++ b/OgreMain/include/Math/Array/NEON/Single/OgreArrayVector2NEON.h
@@ -341,6 +341,6 @@ namespace Ogre
 
 }  // namespace Ogre
 
-#include "OgreArrayVector2.inl"
+#include "OgreArrayVector2NEON.inl"
 
 #endif
diff --git a/OgreMain/include/Math/Array/NEON/Single/OgreArrayVector2.inl b/OgreMain/include/Math/Array/NEON/Single/OgreArrayVector2NEON.inl
similarity index 100%
rename from OgreMain/include/Math/Array/NEON/Single/OgreArrayVector2.inl
rename to OgreMain/include/Math/Array/NEON/Single/OgreArrayVector2NEON.inl
diff --git a/OgreMain/include/Math/Array/NEON/Single/OgreArrayVector3.h b/OgreMain/include/Math/Array/NEON/Single/OgreArrayVector3NEON.h
similarity index 99%
rename from OgreMain/include/Math/Array/NEON/Single/OgreArrayVector3.h
rename to OgreMain/include/Math/Array/NEON/Single/OgreArrayVector3NEON.h
index 385f327734a..91ae25f731b 100644
--- a/OgreMain/include/Math/Array/NEON/Single/OgreArrayVector3.h
+++ b/OgreMain/include/Math/Array/NEON/Single/OgreArrayVector3NEON.h
@@ -375,6 +375,6 @@ namespace Ogre
 
 }  // namespace Ogre
 
-#include "OgreArrayVector3.inl"
+#include "OgreArrayVector3NEON.inl"
 
 #endif
diff --git a/OgreMain/include/Math/Array/NEON/Single/OgreArrayVector3.inl b/OgreMain/include/Math/Array/NEON/Single/OgreArrayVector3NEON.inl
similarity index 100%
rename from OgreMain/include/Math/Array/NEON/Single/OgreArrayVector3.inl
rename to OgreMain/include/Math/Array/NEON/Single/OgreArrayVector3NEON.inl
diff --git a/OgreMain/include/Math/Array/NEON/Single/OgreArrayVector4.h b/OgreMain/include/Math/Array/NEON/Single/OgreArrayVector4NEON.h
similarity index 99%
rename from OgreMain/include/Math/Array/NEON/Single/OgreArrayVector4.h
rename to OgreMain/include/Math/Array/NEON/Single/OgreArrayVector4NEON.h
index a3679b8f938..270dcea2020 100644
--- a/OgreMain/include/Math/Array/NEON/Single/OgreArrayVector4.h
+++ b/OgreMain/include/Math/Array/NEON/Single/OgreArrayVector4NEON.h
@@ -287,6 +287,6 @@ namespace Ogre
 
 }  // namespace Ogre
 
-#include "OgreArrayVector4.inl"
+#include "OgreArrayVector4NEON.inl"
 
 #endif
diff --git a/OgreMain/include/Math/Array/NEON/Single/OgreArrayVector4.inl b/OgreMain/include/Math/Array/NEON/Single/OgreArrayVector4NEON.inl
similarity index 100%
rename from OgreMain/include/Math/Array/NEON/Single/OgreArrayVector4.inl
rename to OgreMain/include/Math/Array/NEON/Single/OgreArrayVector4NEON.inl
diff --git a/OgreMain/include/Math/Array/NEON/Single/OgreBooleanMask.h b/OgreMain/include/Math/Array/NEON/Single/OgreBooleanMaskNEON.h
similarity index 99%
rename from OgreMain/include/Math/Array/NEON/Single/OgreBooleanMask.h
rename to OgreMain/include/Math/Array/NEON/Single/OgreBooleanMaskNEON.h
index 6901c9a581f..57bbd09f5e1 100644
--- a/OgreMain/include/Math/Array/NEON/Single/OgreBooleanMask.h
+++ b/OgreMain/include/Math/Array/NEON/Single/OgreBooleanMaskNEON.h
@@ -90,6 +90,6 @@ namespace Ogre
     };
 }  // namespace Ogre
 
-#include "OgreBooleanMask.inl"
+#include "OgreBooleanMaskNEON.inl"
 
 #endif
diff --git a/OgreMain/include/Math/Array/NEON/Single/OgreBooleanMask.inl b/OgreMain/include/Math/Array/NEON/Single/OgreBooleanMaskNEON.inl
similarity index 100%
rename from OgreMain/include/Math/Array/NEON/Single/OgreBooleanMask.inl
rename to OgreMain/include/Math/Array/NEON/Single/OgreBooleanMaskNEON.inl
diff --git a/OgreMain/include/Math/Array/OgreArrayAabb.h b/OgreMain/include/Math/Array/OgreArrayAabb.h
index caaedfa932d..e7b90867f6d 100644
--- a/OgreMain/include/Math/Array/OgreArrayAabb.h
+++ b/OgreMain/include/Math/Array/OgreArrayAabb.h
@@ -33,18 +33,18 @@ THE SOFTWARE.
 
 #if OGRE_CPU == OGRE_CPU_X86 && OGRE_USE_SIMD == 1
 #    if OGRE_DOUBLE_PRECISION == 1
-#        include "SSE2/Double/OgreArrayAabb.h"
+#        include "SSE2/Double/OgreArrayAabbSSE2.h"
 #    else
-#        include "SSE2/Single/OgreArrayAabb.h"
+#        include "SSE2/Single/OgreArrayAabbSSE2.h"
 #    endif
 #elif OGRE_CPU == OGRE_CPU_ARM && OGRE_USE_SIMD == 1
 #    if OGRE_DOUBLE_PRECISION == 1
 #        error Double precision with SIMD on ARM is not supported
 #    else
-#        include "NEON/Single/OgreArrayAabb.h"
+#        include "NEON/Single/OgreArrayAabbNEON.h"
 #    endif
 #else
-#    include "C/OgreArrayAabb.h"
+#    include "C/OgreArrayAabbC.h"
 #endif
 
 #endif
diff --git a/OgreMain/include/Math/Array/OgreArrayMatrix4.h b/OgreMain/include/Math/Array/OgreArrayMatrix4.h
index c44e7ca5b4f..6f1a6993479 100644
--- a/OgreMain/include/Math/Array/OgreArrayMatrix4.h
+++ b/OgreMain/include/Math/Array/OgreArrayMatrix4.h
@@ -33,18 +33,18 @@ THE SOFTWARE.
 
 #if OGRE_CPU == OGRE_CPU_X86 && OGRE_USE_SIMD == 1
 #    if OGRE_DOUBLE_PRECISION == 1
-#        include "SSE2/Double/OgreArrayMatrix4.h"
+#        include "SSE2/Double/OgreArrayMatrix4SSE2.h"
 #    else
-#        include "SSE2/Single/OgreArrayMatrix4.h"
+#        include "SSE2/Single/OgreArrayMatrix4SSE2.h"
 #    endif
 #elif OGRE_CPU == OGRE_CPU_ARM && OGRE_USE_SIMD == 1
 #    if OGRE_DOUBLE_PRECISION == 1
 #        error Double precision with SIMD on ARM is not supported
 #    else
-#        include "NEON/Single/OgreArrayMatrix4.h"
+#        include "NEON/Single/OgreArrayMatrix4NEON.h"
 #    endif
 #else
-#    include "C/OgreArrayMatrix4.h"
+#    include "C/OgreArrayMatrix4C.h"
 #endif
 
 #endif
diff --git a/OgreMain/include/Math/Array/OgreArrayMatrixAf4x3.h b/OgreMain/include/Math/Array/OgreArrayMatrixAf4x3.h
index e3576ab3168..d62b2f6ba80 100644
--- a/OgreMain/include/Math/Array/OgreArrayMatrixAf4x3.h
+++ b/OgreMain/include/Math/Array/OgreArrayMatrixAf4x3.h
@@ -33,18 +33,18 @@ THE SOFTWARE.
 
 #if OGRE_CPU == OGRE_CPU_X86 && OGRE_USE_SIMD == 1
 #    if OGRE_DOUBLE_PRECISION == 1
-#        include "SSE2/Double/OgreArrayMatrixAf4x3.h"
+#        include "SSE2/Double/OgreArrayMatrixAf4x3SSE2.h"
 #    else
-#        include "SSE2/Single/OgreArrayMatrixAf4x3.h"
+#        include "SSE2/Single/OgreArrayMatrixAf4x3SSE2.h"
 #    endif
 #elif OGRE_CPU == OGRE_CPU_ARM && OGRE_USE_SIMD == 1
 #    if OGRE_DOUBLE_PRECISION == 1
 #        error Double precision with SIMD on ARM is not supported
 #    else
-#        include "NEON/Single/OgreArrayMatrixAf4x3.h"
+#        include "NEON/Single/OgreArrayMatrixAf4x3NEON.h"
 #    endif
 #else
-#    include "C/OgreArrayMatrixAf4x3.h"
+#    include "C/OgreArrayMatrixAf4x3C.h"
 #endif
 
 #endif
diff --git a/OgreMain/include/Math/Array/OgreArrayQuaternion.h b/OgreMain/include/Math/Array/OgreArrayQuaternion.h
index 13e3e211d8d..a7f11bad8ee 100644
--- a/OgreMain/include/Math/Array/OgreArrayQuaternion.h
+++ b/OgreMain/include/Math/Array/OgreArrayQuaternion.h
@@ -33,18 +33,18 @@ THE SOFTWARE.
 
 #if OGRE_CPU == OGRE_CPU_X86 && OGRE_USE_SIMD == 1
 #    if OGRE_DOUBLE_PRECISION == 1
-#        include "SSE2/Double/OgreArrayQuaternion.h"
+#        include "SSE2/Double/OgreArrayQuaternionSSE2.h"
 #    else
-#        include "SSE2/Single/OgreArrayQuaternion.h"
+#        include "SSE2/Single/OgreArrayQuaternionSSE2.h"
 #    endif
 #elif OGRE_CPU == OGRE_CPU_ARM && OGRE_USE_SIMD == 1
 #    if OGRE_DOUBLE_PRECISION == 1
 #        error Double precision with SIMD on ARM is not supported
 #    else
-#        include "NEON/Single/OgreArrayQuaternion.h"
+#        include "NEON/Single/OgreArrayQuaternionNEON.h"
 #    endif
 #else
-#    include "C/OgreArrayQuaternion.h"
+#    include "C/OgreArrayQuaternionC.h"
 #endif
 
 #endif
diff --git a/OgreMain/include/Math/Array/OgreArraySphere.h b/OgreMain/include/Math/Array/OgreArraySphere.h
index 4e0eb21745a..fe0530d04c9 100644
--- a/OgreMain/include/Math/Array/OgreArraySphere.h
+++ b/OgreMain/include/Math/Array/OgreArraySphere.h
@@ -33,18 +33,18 @@ THE SOFTWARE.
 
 #if OGRE_CPU == OGRE_CPU_X86 && OGRE_USE_SIMD == 1
 #    if OGRE_DOUBLE_PRECISION == 1
-#        include "SSE2/Double/OgreArraySphere.h"
+#        include "SSE2/Double/OgreArraySphereSSE2.h"
 #    else
-#        include "SSE2/Single/OgreArraySphere.h"
+#        include "SSE2/Single/OgreArraySphereSSE2.h"
 #    endif
 #elif OGRE_CPU == OGRE_CPU_ARM && OGRE_USE_SIMD == 1
 #    if OGRE_DOUBLE_PRECISION == 1
 #        error Double precision with SIMD on ARM is not supported
 #    else
-#        include "NEON/Single/OgreArraySphere.h"
+#        include "NEON/Single/OgreArraySphereNEON.h"
 #    endif
 #else
-#    include "C/OgreArraySphere.h"
+#    include "C/OgreArraySphereC.h"
 #endif
 
 #endif
diff --git a/OgreMain/include/Math/Array/OgreArrayVector2.h b/OgreMain/include/Math/Array/OgreArrayVector2.h
index 67add3a1d62..6361cede90e 100644
--- a/OgreMain/include/Math/Array/OgreArrayVector2.h
+++ b/OgreMain/include/Math/Array/OgreArrayVector2.h
@@ -33,18 +33,18 @@ THE SOFTWARE.
 
 #if OGRE_CPU == OGRE_CPU_X86 && OGRE_USE_SIMD == 1
 #    if OGRE_DOUBLE_PRECISION == 1
-#        include "SSE2/Double/OgreArrayVector2.h"
+#        include "SSE2/Double/OgreArrayVector2SSE2.h"
 #    else
-#        include "SSE2/Single/OgreArrayVector2.h"
+#        include "SSE2/Single/OgreArrayVector2SSE2.h"
 #    endif
 #elif OGRE_CPU == OGRE_CPU_ARM && OGRE_USE_SIMD == 1
 #    if OGRE_DOUBLE_PRECISION == 1
 #        error Double precision with SIMD on ARM is not supported
 #    else
-#        include "NEON/Single/OgreArrayVector2.h"
+#        include "NEON/Single/OgreArrayVector2NEON.h"
 #    endif
 #else
-#    include "C/OgreArrayVector2.h"
+#    include "C/OgreArrayVector2C.h"
 #endif
 
 #endif
diff --git a/OgreMain/include/Math/Array/OgreArrayVector3.h b/OgreMain/include/Math/Array/OgreArrayVector3.h
index 5c791ea6a85..3b11b7be75d 100644
--- a/OgreMain/include/Math/Array/OgreArrayVector3.h
+++ b/OgreMain/include/Math/Array/OgreArrayVector3.h
@@ -33,18 +33,18 @@ THE SOFTWARE.
 
 #if OGRE_CPU == OGRE_CPU_X86 && OGRE_USE_SIMD == 1
 #    if OGRE_DOUBLE_PRECISION == 1
-#        include "SSE2/Double/OgreArrayVector3.h"
+#        include "SSE2/Double/OgreArrayVector3SSE2.h"
 #    else
-#        include "SSE2/Single/OgreArrayVector3.h"
+#        include "SSE2/Single/OgreArrayVector3SSE2.h"
 #    endif
 #elif OGRE_CPU == OGRE_CPU_ARM && OGRE_USE_SIMD == 1
 #    if OGRE_DOUBLE_PRECISION == 1
 #        error Double precision with SIMD on ARM is not supported
 #    else
-#        include "NEON/Single/OgreArrayVector3.h"
+#        include "NEON/Single/OgreArrayVector3NEON.h"
 #    endif
 #else
-#    include "C/OgreArrayVector3.h"
+#    include "C/OgreArrayVector3C.h"
 #endif
 
 #endif
diff --git a/OgreMain/include/Math/Array/OgreArrayVector4.h b/OgreMain/include/Math/Array/OgreArrayVector4.h
index 7d52c30e413..18696abf2d2 100644
--- a/OgreMain/include/Math/Array/OgreArrayVector4.h
+++ b/OgreMain/include/Math/Array/OgreArrayVector4.h
@@ -33,18 +33,18 @@ THE SOFTWARE.
 
 #if OGRE_CPU == OGRE_CPU_X86 && OGRE_USE_SIMD == 1
 #    if OGRE_DOUBLE_PRECISION == 1
-#        include "SSE2/Double/OgreArrayVector4.h"
+#        include "SSE2/Double/OgreArrayVector4SSE2.h"
 #    else
-#        include "SSE2/Single/OgreArrayVector4.h"
+#        include "SSE2/Single/OgreArrayVector4SSE2.h"
 #    endif
 #elif OGRE_CPU == OGRE_CPU_ARM && OGRE_USE_SIMD == 1
 #    if OGRE_DOUBLE_PRECISION == 1
 #        error Double precision with SIMD on ARM is not supported
 #    else
-#        include "NEON/Single/OgreArrayVector4.h"
+#        include "NEON/Single/OgreArrayVector4NEON.h"
 #    endif
 #else
-#    include "C/OgreArrayVector4.h"
+#    include "C/OgreArrayVector4C.h"
 #endif
 
 #endif
diff --git a/OgreMain/include/Math/Array/OgreBooleanMask.h b/OgreMain/include/Math/Array/OgreBooleanMask.h
index 04214097816..bce5cdde5a4 100644
--- a/OgreMain/include/Math/Array/OgreBooleanMask.h
+++ b/OgreMain/include/Math/Array/OgreBooleanMask.h
@@ -33,18 +33,18 @@ THE SOFTWARE.
 
 #if OGRE_CPU == OGRE_CPU_X86 && OGRE_USE_SIMD == 1
 #    if OGRE_DOUBLE_PRECISION == 1
-#        include "SSE2/Double/OgreBooleanMask.h"
+#        include "SSE2/Double/OgreBooleanMaskSSE2.h"
 #    else
-#        include "SSE2/Single/OgreBooleanMask.h"
+#        include "SSE2/Single/OgreBooleanMaskSSE2.h"
 #    endif
 #elif OGRE_CPU == OGRE_CPU_ARM && OGRE_USE_SIMD == 1
 #    if OGRE_DOUBLE_PRECISION == 1
 #        error Double precision with SIMD on ARM is not supported
 #    else
-#        include "NEON/Single/OgreBooleanMask.h"
+#        include "NEON/Single/OgreBooleanMaskNEON.h"
 #    endif
 #else
-#    include "C/OgreBooleanMask.h"
+#    include "C/OgreBooleanMaskC.h"
 #endif
 
 #endif
diff --git a/OgreMain/include/Math/Array/SSE2/Single/OgreArrayAabb.h b/OgreMain/include/Math/Array/SSE2/Single/OgreArrayAabbSSE2.h
similarity index 99%
rename from OgreMain/include/Math/Array/SSE2/Single/OgreArrayAabb.h
rename to OgreMain/include/Math/Array/SSE2/Single/OgreArrayAabbSSE2.h
index 4c9ff3fbb17..8b017a64a3f 100644
--- a/OgreMain/include/Math/Array/SSE2/Single/OgreArrayAabb.h
+++ b/OgreMain/include/Math/Array/SSE2/Single/OgreArrayAabbSSE2.h
@@ -177,6 +177,6 @@ namespace Ogre
 
 }  // namespace Ogre
 
-#include "OgreArrayAabb.inl"
+#include "OgreArrayAabbSSE2.inl"
 
 #endif
diff --git a/OgreMain/include/Math/Array/SSE2/Single/OgreArrayAabb.inl b/OgreMain/include/Math/Array/SSE2/Single/OgreArrayAabbSSE2.inl
similarity index 100%
rename from OgreMain/include/Math/Array/SSE2/Single/OgreArrayAabb.inl
rename to OgreMain/include/Math/Array/SSE2/Single/OgreArrayAabbSSE2.inl
diff --git a/OgreMain/include/Math/Array/SSE2/Single/OgreArrayMatrix4.h b/OgreMain/include/Math/Array/SSE2/Single/OgreArrayMatrix4SSE2.h
similarity index 99%
rename from OgreMain/include/Math/Array/SSE2/Single/OgreArrayMatrix4.h
rename to OgreMain/include/Math/Array/SSE2/Single/OgreArrayMatrix4SSE2.h
index 8094743a5bf..7a7e411d783 100644
--- a/OgreMain/include/Math/Array/SSE2/Single/OgreArrayMatrix4.h
+++ b/OgreMain/include/Math/Array/SSE2/Single/OgreArrayMatrix4SSE2.h
@@ -238,6 +238,6 @@ namespace Ogre
 
 }  // namespace Ogre
 
-#include "OgreArrayMatrix4.inl"
+#include "OgreArrayMatrix4SSE2.inl"
 
 #endif
diff --git a/OgreMain/include/Math/Array/SSE2/Single/OgreArrayMatrix4.inl b/OgreMain/include/Math/Array/SSE2/Single/OgreArrayMatrix4SSE2.inl
similarity index 100%
rename from OgreMain/include/Math/Array/SSE2/Single/OgreArrayMatrix4.inl
rename to OgreMain/include/Math/Array/SSE2/Single/OgreArrayMatrix4SSE2.inl
diff --git a/OgreMain/include/Math/Array/SSE2/Single/OgreArrayMatrixAf4x3.h b/OgreMain/include/Math/Array/SSE2/Single/OgreArrayMatrixAf4x3SSE2.h
similarity index 99%
rename from OgreMain/include/Math/Array/SSE2/Single/OgreArrayMatrixAf4x3.h
rename to OgreMain/include/Math/Array/SSE2/Single/OgreArrayMatrixAf4x3SSE2.h
index e34c6062d54..520c05a9578 100644
--- a/OgreMain/include/Math/Array/SSE2/Single/OgreArrayMatrixAf4x3.h
+++ b/OgreMain/include/Math/Array/SSE2/Single/OgreArrayMatrixAf4x3SSE2.h
@@ -247,6 +247,6 @@ namespace Ogre
 
 }  // namespace Ogre
 
-#include "OgreArrayMatrixAf4x3.inl"
+#include "OgreArrayMatrixAf4x3SSE2.inl"
 
 #endif
diff --git a/OgreMain/include/Math/Array/SSE2/Single/OgreArrayMatrixAf4x3.inl b/OgreMain/include/Math/Array/SSE2/Single/OgreArrayMatrixAf4x3SSE2.inl
similarity index 100%
rename from OgreMain/include/Math/Array/SSE2/Single/OgreArrayMatrixAf4x3.inl
rename to OgreMain/include/Math/Array/SSE2/Single/OgreArrayMatrixAf4x3SSE2.inl
diff --git a/OgreMain/include/Math/Array/SSE2/Single/OgreArrayQuaternion.h b/OgreMain/include/Math/Array/SSE2/Single/OgreArrayQuaternionSSE2.h
similarity index 99%
rename from OgreMain/include/Math/Array/SSE2/Single/OgreArrayQuaternion.h
rename to OgreMain/include/Math/Array/SSE2/Single/OgreArrayQuaternionSSE2.h
index 981f10c498e..baa6350b45e 100644
--- a/OgreMain/include/Math/Array/SSE2/Single/OgreArrayQuaternion.h
+++ b/OgreMain/include/Math/Array/SSE2/Single/OgreArrayQuaternionSSE2.h
@@ -37,8 +37,6 @@ THE SOFTWARE.
 #include "Math/Array/OgreArrayVector3.h"
 #include "Math/Array/OgreMathlib.h"
 
-#include "OgreArrayQuaternion.h"
-
 namespace Ogre
 {
     /** \addtogroup Core
@@ -257,6 +255,6 @@ namespace Ogre
 
 }  // namespace Ogre
 
-#include "OgreArrayQuaternion.inl"
+#include "OgreArrayQuaternionSSE2.inl"
 
 #endif
diff --git a/OgreMain/include/Math/Array/SSE2/Single/OgreArrayQuaternion.inl b/OgreMain/include/Math/Array/SSE2/Single/OgreArrayQuaternionSSE2.inl
similarity index 100%
rename from OgreMain/include/Math/Array/SSE2/Single/OgreArrayQuaternion.inl
rename to OgreMain/include/Math/Array/SSE2/Single/OgreArrayQuaternionSSE2.inl
diff --git a/OgreMain/include/Math/Array/SSE2/Single/OgreArraySphere.h b/OgreMain/include/Math/Array/SSE2/Single/OgreArraySphereSSE2.h
similarity index 99%
rename from OgreMain/include/Math/Array/SSE2/Single/OgreArraySphere.h
rename to OgreMain/include/Math/Array/SSE2/Single/OgreArraySphereSSE2.h
index 77fa9821940..3554501db4b 100644
--- a/OgreMain/include/Math/Array/SSE2/Single/OgreArraySphere.h
+++ b/OgreMain/include/Math/Array/SSE2/Single/OgreArraySphereSSE2.h
@@ -121,6 +121,6 @@ namespace Ogre
 
 }  // namespace Ogre
 
-#include "OgreArraySphere.inl"
+#include "OgreArraySphereSSE2.inl"
 
 #endif
diff --git a/OgreMain/include/Math/Array/SSE2/Single/OgreArraySphere.inl b/OgreMain/include/Math/Array/SSE2/Single/OgreArraySphereSSE2.inl
similarity index 100%
rename from OgreMain/include/Math/Array/SSE2/Single/OgreArraySphere.inl
rename to OgreMain/include/Math/Array/SSE2/Single/OgreArraySphereSSE2.inl
diff --git a/OgreMain/include/Math/Array/SSE2/Single/OgreArrayVector2.h b/OgreMain/include/Math/Array/SSE2/Single/OgreArrayVector2SSE2.h
similarity index 99%
rename from OgreMain/include/Math/Array/SSE2/Single/OgreArrayVector2.h
rename to OgreMain/include/Math/Array/SSE2/Single/OgreArrayVector2SSE2.h
index 1981b021733..c51736fb243 100644
--- a/OgreMain/include/Math/Array/SSE2/Single/OgreArrayVector2.h
+++ b/OgreMain/include/Math/Array/SSE2/Single/OgreArrayVector2SSE2.h
@@ -340,6 +340,6 @@ namespace Ogre
 
 }  // namespace Ogre
 
-#include "OgreArrayVector2.inl"
+#include "OgreArrayVector2SSE2.inl"
 
 #endif
diff --git a/OgreMain/include/Math/Array/SSE2/Single/OgreArrayVector2.inl b/OgreMain/include/Math/Array/SSE2/Single/OgreArrayVector2SSE2.inl
similarity index 100%
rename from OgreMain/include/Math/Array/SSE2/Single/OgreArrayVector2.inl
rename to OgreMain/include/Math/Array/SSE2/Single/OgreArrayVector2SSE2.inl
diff --git a/OgreMain/include/Math/Array/SSE2/Single/OgreArrayVector3.h b/OgreMain/include/Math/Array/SSE2/Single/OgreArrayVector3SSE2.h
similarity index 99%
rename from OgreMain/include/Math/Array/SSE2/Single/OgreArrayVector3.h
rename to OgreMain/include/Math/Array/SSE2/Single/OgreArrayVector3SSE2.h
index f73ee994835..71379820d61 100644
--- a/OgreMain/include/Math/Array/SSE2/Single/OgreArrayVector3.h
+++ b/OgreMain/include/Math/Array/SSE2/Single/OgreArrayVector3SSE2.h
@@ -376,6 +376,6 @@ namespace Ogre
 
 }  // namespace Ogre
 
-#include "OgreArrayVector3.inl"
+#include "OgreArrayVector3SSE2.inl"
 
 #endif
diff --git a/OgreMain/include/Math/Array/SSE2/Single/OgreArrayVector3.inl b/OgreMain/include/Math/Array/SSE2/Single/OgreArrayVector3SSE2.inl
similarity index 100%
rename from OgreMain/include/Math/Array/SSE2/Single/OgreArrayVector3.inl
rename to OgreMain/include/Math/Array/SSE2/Single/OgreArrayVector3SSE2.inl
diff --git a/OgreMain/include/Math/Array/SSE2/Single/OgreArrayVector4.h b/OgreMain/include/Math/Array/SSE2/Single/OgreArrayVector4SSE2.h
similarity index 99%
rename from OgreMain/include/Math/Array/SSE2/Single/OgreArrayVector4.h
rename to OgreMain/include/Math/Array/SSE2/Single/OgreArrayVector4SSE2.h
index 6e35c31e4c7..0f2f203ec98 100644
--- a/OgreMain/include/Math/Array/SSE2/Single/OgreArrayVector4.h
+++ b/OgreMain/include/Math/Array/SSE2/Single/OgreArrayVector4SSE2.h
@@ -288,6 +288,6 @@ namespace Ogre
 
 }  // namespace Ogre
 
-#include "OgreArrayVector4.inl"
+#include "OgreArrayVector4SSE2.inl"
 
 #endif
diff --git a/OgreMain/include/Math/Array/SSE2/Single/OgreArrayVector4.inl b/OgreMain/include/Math/Array/SSE2/Single/OgreArrayVector4SSE2.inl
similarity index 100%
rename from OgreMain/include/Math/Array/SSE2/Single/OgreArrayVector4.inl
rename to OgreMain/include/Math/Array/SSE2/Single/OgreArrayVector4SSE2.inl
diff --git a/OgreMain/include/Math/Array/SSE2/Single/OgreBooleanMask.h b/OgreMain/include/Math/Array/SSE2/Single/OgreBooleanMaskSSE2.h
similarity index 98%
rename from OgreMain/include/Math/Array/SSE2/Single/OgreBooleanMask.h
rename to OgreMain/include/Math/Array/SSE2/Single/OgreBooleanMaskSSE2.h
index 4f583ec0187..acb11f873a8 100644
--- a/OgreMain/include/Math/Array/SSE2/Single/OgreBooleanMask.h
+++ b/OgreMain/include/Math/Array/SSE2/Single/OgreBooleanMaskSSE2.h
@@ -88,6 +88,6 @@ namespace Ogre
     };
 }  // namespace Ogre
 
-#include "OgreBooleanMask.inl"
+#include "OgreBooleanMaskSSE2.inl"
 
 #endif
diff --git a/OgreMain/include/Math/Array/SSE2/Single/OgreBooleanMask.inl b/OgreMain/include/Math/Array/SSE2/Single/OgreBooleanMaskSSE2.inl
similarity index 100%
rename from OgreMain/include/Math/Array/SSE2/Single/OgreBooleanMask.inl
rename to OgreMain/include/Math/Array/SSE2/Single/OgreBooleanMaskSSE2.inl
diff --git a/OgreMain/include/Math/Simple/C/OgreAabb.h b/OgreMain/include/Math/Simple/C/OgreAabbC.h
similarity index 99%
rename from OgreMain/include/Math/Simple/C/OgreAabb.h
rename to OgreMain/include/Math/Simple/C/OgreAabbC.h
index 6d8e11da277..62ef11e1029 100644
--- a/OgreMain/include/Math/Simple/C/OgreAabb.h
+++ b/OgreMain/include/Math/Simple/C/OgreAabbC.h
@@ -167,6 +167,6 @@ namespace Ogre
 
 }  // namespace Ogre
 
-#include "OgreAabb.inl"
+#include "OgreAabbC.inl"
 
 #endif
diff --git a/OgreMain/include/Math/Simple/C/OgreAabb.inl b/OgreMain/include/Math/Simple/C/OgreAabbC.inl
similarity index 100%
rename from OgreMain/include/Math/Simple/C/OgreAabb.inl
rename to OgreMain/include/Math/Simple/C/OgreAabbC.inl
diff --git a/OgreMain/include/Math/Simple/OgreAabb.h b/OgreMain/include/Math/Simple/OgreAabb.h
index 7a5d15c6069..3709c9a06fa 100644
--- a/OgreMain/include/Math/Simple/OgreAabb.h
+++ b/OgreMain/include/Math/Simple/OgreAabb.h
@@ -33,12 +33,12 @@ THE SOFTWARE.
 
 /*#if OGRE_CPU == OGRE_CPU_X86 && defined( OGRE_USE_SIMD )
     #if OGRE_DOUBLE_PRECISION == 1
-        #include "SSE2/Double/OgreAabb.h"
+        #include "SSE2/Double/OgreAabbSSE2.h"
     #else
-        #include "SSE2/Single/OgreAabb.h"
+        #include "SSE2/Single/OgreAabbSSE2.h"
     #endif
 #else*/
-#include "C/OgreAabb.h"
+#include "C/OgreAabbC.h"
 //#endif
 
 #endif
diff --git a/OgreMain/src/Math/Array/C/OgreArrayAabb.cpp b/OgreMain/src/Math/Array/C/OgreArrayAabbC.cpp
similarity index 100%
rename from OgreMain/src/Math/Array/C/OgreArrayAabb.cpp
rename to OgreMain/src/Math/Array/C/OgreArrayAabbC.cpp
diff --git a/OgreMain/src/Math/Array/C/OgreArrayMatrix4.cpp b/OgreMain/src/Math/Array/C/OgreArrayMatrix4C.cpp
similarity index 100%
rename from OgreMain/src/Math/Array/C/OgreArrayMatrix4.cpp
rename to OgreMain/src/Math/Array/C/OgreArrayMatrix4C.cpp
diff --git a/OgreMain/src/Math/Array/C/OgreArrayMatrixAf4x3.cpp b/OgreMain/src/Math/Array/C/OgreArrayMatrixAf4x3C.cpp
similarity index 100%
rename from OgreMain/src/Math/Array/C/OgreArrayMatrixAf4x3.cpp
rename to OgreMain/src/Math/Array/C/OgreArrayMatrixAf4x3C.cpp
diff --git a/OgreMain/src/Math/Array/C/OgreArrayQuaternion.cpp b/OgreMain/src/Math/Array/C/OgreArrayQuaternionC.cpp
similarity index 100%
rename from OgreMain/src/Math/Array/C/OgreArrayQuaternion.cpp
rename to OgreMain/src/Math/Array/C/OgreArrayQuaternionC.cpp
diff --git a/OgreMain/src/Math/Array/C/OgreArrayVector2.cpp b/OgreMain/src/Math/Array/C/OgreArrayVector2C.cpp
similarity index 100%
rename from OgreMain/src/Math/Array/C/OgreArrayVector2.cpp
rename to OgreMain/src/Math/Array/C/OgreArrayVector2C.cpp
diff --git a/OgreMain/src/Math/Array/C/OgreArrayVector3.cpp b/OgreMain/src/Math/Array/C/OgreArrayVector3C.cpp
similarity index 100%
rename from OgreMain/src/Math/Array/C/OgreArrayVector3.cpp
rename to OgreMain/src/Math/Array/C/OgreArrayVector3C.cpp
diff --git a/OgreMain/src/Math/Array/C/OgreArrayVector4.cpp b/OgreMain/src/Math/Array/C/OgreArrayVector4C.cpp
similarity index 100%
rename from OgreMain/src/Math/Array/C/OgreArrayVector4.cpp
rename to OgreMain/src/Math/Array/C/OgreArrayVector4C.cpp