diff --git a/lib/raid6/algos.c b/lib/raid6/algos.c
index df7ff72777b87bf05208a9fcca72ac5ea2fa4629..b595f560bee74ba855da88bbc1793bf7eb193312 100644
--- a/lib/raid6/algos.c
+++ b/lib/raid6/algos.c
@@ -11,7 +11,7 @@
  * ----------------------------------------------------------------------- */
 
 /*
- * raid6algos.c
+ * raid6/algos.c
  *
  * Algorithm list and algorithm selection for RAID-6
  */
diff --git a/lib/raid6/mmx.c b/lib/raid6/mmx.c
index e7f6c13132bfd12e2f145a337ed954659198d971..279347f23094e14f5044ab413fba4859e520d4d4 100644
--- a/lib/raid6/mmx.c
+++ b/lib/raid6/mmx.c
@@ -11,7 +11,7 @@
  * ----------------------------------------------------------------------- */
 
 /*
- * raid6mmx.c
+ * raid6/mmx.c
  *
  * MMX implementation of RAID-6 syndrome functions
  */
@@ -19,9 +19,9 @@
 #if defined(__i386__) && !defined(__arch_um__)
 
 #include <linux/raid/pq.h>
-#include "raid6x86.h"
+#include "x86.h"
 
-/* Shared with raid6sse1.c */
+/* Shared with raid6/sse1.c */
 const struct raid6_mmx_constants {
 	u64 x1d;
 } raid6_mmx_constants = {
diff --git a/lib/raid6/recov.c b/lib/raid6/recov.c
index 2609f00e0d61ed8c5b80347704c4bf6d9fbae29f..8590d19cf52231660a6a906acdc12bcf2156c9c9 100644
--- a/lib/raid6/recov.c
+++ b/lib/raid6/recov.c
@@ -11,7 +11,7 @@
  * ----------------------------------------------------------------------- */
 
 /*
- * raid6recov.c
+ * raid6/recov.c
  *
  * RAID-6 data recovery in dual failure mode.  In single failure mode,
  * use the RAID-5 algorithm (or, in the case of Q failure, just reconstruct
diff --git a/lib/raid6/sse1.c b/lib/raid6/sse1.c
index b274dd5eab8f1a39aa3706e0d012bfeb8cef92f2..10dd91948c07900f8811248da682fc30767cc1fc 100644
--- a/lib/raid6/sse1.c
+++ b/lib/raid6/sse1.c
@@ -11,7 +11,7 @@
  * ----------------------------------------------------------------------- */
 
 /*
- * raid6sse1.c
+ * raid6/sse1.c
  *
  * SSE-1/MMXEXT implementation of RAID-6 syndrome functions
  *
@@ -24,9 +24,9 @@
 #if defined(__i386__) && !defined(__arch_um__)
 
 #include <linux/raid/pq.h>
-#include "raid6x86.h"
+#include "x86.h"
 
-/* Defined in raid6mmx.c */
+/* Defined in raid6/mmx.c */
 extern const struct raid6_mmx_constants {
 	u64 x1d;
 } raid6_mmx_constants;
diff --git a/lib/raid6/sse2.c b/lib/raid6/sse2.c
index 6ed6c6c0389f47aef453c8708defd7f01e4d1c8f..bc2d57daa589a714a29fc21e96927636b68b7679 100644
--- a/lib/raid6/sse2.c
+++ b/lib/raid6/sse2.c
@@ -11,7 +11,7 @@
  * ----------------------------------------------------------------------- */
 
 /*
- * raid6sse2.c
+ * raid6/sse2.c
  *
  * SSE-2 implementation of RAID-6 syndrome functions
  *
@@ -20,7 +20,7 @@
 #if (defined(__i386__) || defined(__x86_64__)) && !defined(__arch_um__)
 
 #include <linux/raid/pq.h>
-#include "raid6x86.h"
+#include "x86.h"
 
 static const struct raid6_sse_constants {
 	u64 x1d[2];
diff --git a/lib/raid6/raid6x86.h b/lib/raid6/x86.h
similarity index 99%
rename from lib/raid6/raid6x86.h
rename to lib/raid6/x86.h
index 4c22c1568558b7c92dac1b456559d9981cc2ae3c..cb2a8c91c886a6c4ca5f6ebc3aec4d4e0f447258 100644
--- a/lib/raid6/raid6x86.h
+++ b/lib/raid6/x86.h
@@ -11,7 +11,7 @@
  * ----------------------------------------------------------------------- */
 
 /*
- * raid6x86.h
+ * raid6/x86.h
  *
  * Definitions common to x86 and x86-64 RAID-6 code only
  */