diff --git a/mktables.c b/mktables.c
index e0a5b124..528d9aa7 100644
--- a/mktables.c
+++ b/mktables.c
@@ -234,7 +234,7 @@ int main(void)
 	set_cauchy(matrix);
 
 	printf("/**\n");
-	printf(" * Normalized Extended Cauchy matrix used to generate parity.\n");
+	printf(" * Cauchy matrix used to generate parity.\n");
 	printf(" * This matrix is valid for up to %u parity with %u data disks.\n", PARITY, DISK);
 	printf(" *\n");
 	for(p=0;p<PARITY;++p) {
@@ -245,7 +245,7 @@ int main(void)
 		printf("\n");
 	}
 	printf(" */\n");
-	printf("const unsigned char  __attribute__((aligned(256))) gfmatrix[%u][256] =\n", PARITY);
+	printf("const unsigned char  __attribute__((aligned(256))) gfgen[%u][256] =\n", PARITY);
 	printf("{\n");
 	for(p=0;p<PARITY;++p) {
 		printf("\t{\n");
@@ -264,12 +264,12 @@ int main(void)
 
 	printf("#if defined(__i386__) || defined(__x86_64__)\n");
 	printf("/**\n");
-	printf(" * PSHUFB tables for the Extended Cauchy matrix.\n");
+	printf(" * PSHUFB tables for the Cauchy matrix.\n");
 	printf(" *\n");
 	printf(" * Indexes are [DISK][PARITY - 2][LH].\n");
 	printf(" * Where DISK is from 0 to %u, PARITY from 2 to %u, LH from 0 to 1.\n", DISK - 1, PARITY - 1);
 	printf(" */\n");
-	printf("const unsigned char  __attribute__((aligned(256))) gfpshufb[%u][%u][2][16] =\n", DISK, np(PARITY - 2));
+	printf("const unsigned char  __attribute__((aligned(256))) gfgenpshufb[%u][%u][2][16] =\n", DISK, np(PARITY - 2));
 	printf("{\n");
 	for(i=0;i<DISK;++i) {
 		printf("\t{\n");
diff --git a/raid.c b/raid.c
index c65eade2..292925ae 100644
--- a/raid.c
+++ b/raid.c
@@ -587,8 +587,8 @@ void raidTP_int8(unsigned char** vbuf, unsigned data, unsigned size)
 			d0 = v_8(vbuf[d][i]);
 
 			p0 ^= d0;
-			q0 ^= gfmul[d0][gfmatrix[1][d]];
-			r0 ^= gfmul[d0][gfmatrix[2][d]];
+			q0 ^= gfmul[d0][gfgen[1][d]];
+			r0 ^= gfmul[d0][gfgen[2][d]];
 		}
 
 		/* first disk with all coefficients at 1 */
@@ -636,8 +636,8 @@ void raidTP_ssse3(unsigned char** vbuf, unsigned data, unsigned size)
 		asm volatile("pand   %xmm7,%xmm4");
 		asm volatile("pand   %xmm7,%xmm5");
 
-		asm volatile("movdqa %0,%%xmm2" : : "m" (gfpshufb[l][0][0][0]));
-		asm volatile("movdqa %0,%%xmm6" : : "m" (gfpshufb[l][0][1][0]));
+		asm volatile("movdqa %0,%%xmm2" : : "m" (gfgenpshufb[l][0][0][0]));
+		asm volatile("movdqa %0,%%xmm6" : : "m" (gfgenpshufb[l][0][1][0]));
 		asm volatile("pshufb %xmm4,%xmm2");
 		asm volatile("pshufb %xmm5,%xmm6");
 		asm volatile("pxor   %xmm6,%xmm2");
@@ -660,10 +660,10 @@ void raidTP_ssse3(unsigned char** vbuf, unsigned data, unsigned size)
 			asm volatile("pand   %xmm7,%xmm4");
 			asm volatile("pand   %xmm7,%xmm5");
 
-			asm volatile("movdqa %0,%%xmm6" : : "m" (gfpshufb[d][0][0][0]));
+			asm volatile("movdqa %0,%%xmm6" : : "m" (gfgenpshufb[d][0][0][0]));
 			asm volatile("pshufb %xmm4,%xmm6");
 			asm volatile("pxor   %xmm6,%xmm2");
-			asm volatile("movdqa %0,%%xmm6" : : "m" (gfpshufb[d][0][1][0]));
+			asm volatile("movdqa %0,%%xmm6" : : "m" (gfgenpshufb[d][0][1][0]));
 			asm volatile("pshufb %xmm5,%xmm6");
 			asm volatile("pxor   %xmm6,%xmm2");
 		}
@@ -731,8 +731,8 @@ void raidTP_ssse3ext(unsigned char** vbuf, unsigned data, unsigned size)
 		asm volatile("pand   %xmm11,%xmm5");
 		asm volatile("pand   %xmm11,%xmm13");
 
-		asm volatile("movdqa %0,%%xmm2" : : "m" (gfpshufb[l][0][0][0]));
-		asm volatile("movdqa %0,%%xmm7" : : "m" (gfpshufb[l][0][1][0]));
+		asm volatile("movdqa %0,%%xmm2" : : "m" (gfgenpshufb[l][0][0][0]));
+		asm volatile("movdqa %0,%%xmm7" : : "m" (gfgenpshufb[l][0][1][0]));
 		asm volatile("movdqa %xmm2,%xmm10");
 		asm volatile("movdqa %xmm7,%xmm15");
 		asm volatile("pshufb %xmm4,%xmm2");
@@ -772,8 +772,8 @@ void raidTP_ssse3ext(unsigned char** vbuf, unsigned data, unsigned size)
 			asm volatile("pand   %xmm11,%xmm5");
 			asm volatile("pand   %xmm11,%xmm13");
 
-			asm volatile("movdqa %0,%%xmm6" : : "m" (gfpshufb[d][0][0][0]));
-			asm volatile("movdqa %0,%%xmm7" : : "m" (gfpshufb[d][0][1][0]));
+			asm volatile("movdqa %0,%%xmm6" : : "m" (gfgenpshufb[d][0][0][0]));
+			asm volatile("movdqa %0,%%xmm7" : : "m" (gfgenpshufb[d][0][1][0]));
 			asm volatile("movdqa %xmm6,%xmm14");
 			asm volatile("movdqa %xmm7,%xmm15");
 			asm volatile("pshufb %xmm4,%xmm6");
@@ -851,9 +851,9 @@ void raidQP_int8(unsigned char** vbuf, unsigned data, unsigned size)
 			d0 = v_8(vbuf[d][i]);
 
 			p0 ^= d0;
-			q0 ^= gfmul[d0][gfmatrix[1][d]];
-			r0 ^= gfmul[d0][gfmatrix[2][d]];
-			s0 ^= gfmul[d0][gfmatrix[3][d]];
+			q0 ^= gfmul[d0][gfgen[1][d]];
+			r0 ^= gfmul[d0][gfgen[2][d]];
+			s0 ^= gfmul[d0][gfgen[3][d]];
 		}
 
 		/* first disk with all coefficients at 1 */
@@ -903,14 +903,14 @@ void raidQP_ssse3(unsigned char** vbuf, unsigned data, unsigned size)
 		asm volatile("pand   %xmm7,%xmm4");
 		asm volatile("pand   %xmm7,%xmm5");
 
-		asm volatile("movdqa %0,%%xmm2" : : "m" (gfpshufb[l][0][0][0]));
-		asm volatile("movdqa %0,%%xmm7" : : "m" (gfpshufb[l][0][1][0]));
+		asm volatile("movdqa %0,%%xmm2" : : "m" (gfgenpshufb[l][0][0][0]));
+		asm volatile("movdqa %0,%%xmm7" : : "m" (gfgenpshufb[l][0][1][0]));
 		asm volatile("pshufb %xmm4,%xmm2");
 		asm volatile("pshufb %xmm5,%xmm7");
 		asm volatile("pxor   %xmm7,%xmm2");
 
-		asm volatile("movdqa %0,%%xmm3" : : "m" (gfpshufb[l][1][0][0]));
-		asm volatile("movdqa %0,%%xmm7" : : "m" (gfpshufb[l][1][1][0]));
+		asm volatile("movdqa %0,%%xmm3" : : "m" (gfgenpshufb[l][1][0][0]));
+		asm volatile("movdqa %0,%%xmm7" : : "m" (gfgenpshufb[l][1][1][0]));
 		asm volatile("pshufb %xmm4,%xmm3");
 		asm volatile("pshufb %xmm5,%xmm7");
 		asm volatile("pxor   %xmm7,%xmm3");
@@ -936,15 +936,15 @@ void raidQP_ssse3(unsigned char** vbuf, unsigned data, unsigned size)
 			asm volatile("pand   %xmm7,%xmm4");
 			asm volatile("pand   %xmm7,%xmm5");
 
-			asm volatile("movdqa %0,%%xmm6" : : "m" (gfpshufb[d][0][0][0]));
-			asm volatile("movdqa %0,%%xmm7" : : "m" (gfpshufb[d][0][1][0]));
+			asm volatile("movdqa %0,%%xmm6" : : "m" (gfgenpshufb[d][0][0][0]));
+			asm volatile("movdqa %0,%%xmm7" : : "m" (gfgenpshufb[d][0][1][0]));
 			asm volatile("pshufb %xmm4,%xmm6");
 			asm volatile("pshufb %xmm5,%xmm7");
 			asm volatile("pxor   %xmm6,%xmm2");
 			asm volatile("pxor   %xmm7,%xmm2");
 
-			asm volatile("movdqa %0,%%xmm6" : : "m" (gfpshufb[d][1][0][0]));
-			asm volatile("movdqa %0,%%xmm7" : : "m" (gfpshufb[d][1][1][0]));
+			asm volatile("movdqa %0,%%xmm6" : : "m" (gfgenpshufb[d][1][0][0]));
+			asm volatile("movdqa %0,%%xmm7" : : "m" (gfgenpshufb[d][1][1][0]));
 			asm volatile("pshufb %xmm4,%xmm6");
 			asm volatile("pshufb %xmm5,%xmm7");
 			asm volatile("pxor   %xmm6,%xmm3");
@@ -1017,8 +1017,8 @@ void raidQP_ssse3ext(unsigned char** vbuf, unsigned data, unsigned size)
 		asm volatile("pand   %xmm15,%xmm5");
 		asm volatile("pand   %xmm15,%xmm13");
 
-		asm volatile("movdqa %0,%%xmm2" : : "m" (gfpshufb[l][0][0][0]));
-		asm volatile("movdqa %0,%%xmm7" : : "m" (gfpshufb[l][0][1][0]));
+		asm volatile("movdqa %0,%%xmm2" : : "m" (gfgenpshufb[l][0][0][0]));
+		asm volatile("movdqa %0,%%xmm7" : : "m" (gfgenpshufb[l][0][1][0]));
 		asm volatile("movdqa %xmm2,%xmm10");
 		asm volatile("movdqa %xmm7,%xmm15");
 		asm volatile("pshufb %xmm4,%xmm2");
@@ -1028,8 +1028,8 @@ void raidQP_ssse3ext(unsigned char** vbuf, unsigned data, unsigned size)
 		asm volatile("pxor   %xmm7,%xmm2");
 		asm volatile("pxor   %xmm15,%xmm10");
 
-		asm volatile("movdqa %0,%%xmm3" : : "m" (gfpshufb[l][1][0][0]));
-		asm volatile("movdqa %0,%%xmm7" : : "m" (gfpshufb[l][1][1][0]));
+		asm volatile("movdqa %0,%%xmm3" : : "m" (gfgenpshufb[l][1][0][0]));
+		asm volatile("movdqa %0,%%xmm7" : : "m" (gfgenpshufb[l][1][1][0]));
 		asm volatile("movdqa %xmm3,%xmm11");
 		asm volatile("movdqa %xmm7,%xmm15");
 		asm volatile("pshufb %xmm4,%xmm3");
@@ -1071,8 +1071,8 @@ void raidQP_ssse3ext(unsigned char** vbuf, unsigned data, unsigned size)
 			asm volatile("pand   %xmm15,%xmm5");
 			asm volatile("pand   %xmm15,%xmm13");
 
-			asm volatile("movdqa %0,%%xmm6" : : "m" (gfpshufb[d][0][0][0]));
-			asm volatile("movdqa %0,%%xmm7" : : "m" (gfpshufb[d][0][1][0]));
+			asm volatile("movdqa %0,%%xmm6" : : "m" (gfgenpshufb[d][0][0][0]));
+			asm volatile("movdqa %0,%%xmm7" : : "m" (gfgenpshufb[d][0][1][0]));
 			asm volatile("movdqa %xmm6,%xmm14");
 			asm volatile("movdqa %xmm7,%xmm15");
 			asm volatile("pshufb %xmm4,%xmm6");
@@ -1084,8 +1084,8 @@ void raidQP_ssse3ext(unsigned char** vbuf, unsigned data, unsigned size)
 			asm volatile("pxor   %xmm7,%xmm2");
 			asm volatile("pxor   %xmm15,%xmm10");
 
-			asm volatile("movdqa %0,%%xmm6" : : "m" (gfpshufb[d][1][0][0]));
-			asm volatile("movdqa %0,%%xmm7" : : "m" (gfpshufb[d][1][1][0]));
+			asm volatile("movdqa %0,%%xmm6" : : "m" (gfgenpshufb[d][1][0][0]));
+			asm volatile("movdqa %0,%%xmm7" : : "m" (gfgenpshufb[d][1][1][0]));
 			asm volatile("movdqa %xmm6,%xmm14");
 			asm volatile("movdqa %xmm7,%xmm15");
 			asm volatile("pshufb %xmm4,%xmm6");
@@ -1171,10 +1171,10 @@ void raidPP_int8(unsigned char** vbuf, unsigned data, unsigned size)
 			d0 = v_8(vbuf[d][i]);
 
 			p0 ^= d0;
-			q0 ^= gfmul[d0][gfmatrix[1][d]];
-			r0 ^= gfmul[d0][gfmatrix[2][d]];
-			s0 ^= gfmul[d0][gfmatrix[3][d]];
-			t0 ^= gfmul[d0][gfmatrix[4][d]];
+			q0 ^= gfmul[d0][gfgen[1][d]];
+			r0 ^= gfmul[d0][gfgen[2][d]];
+			s0 ^= gfmul[d0][gfgen[3][d]];
+			t0 ^= gfmul[d0][gfgen[4][d]];
 		}
 		
 		/* first disk with all coefficients at 1 */
@@ -1234,20 +1234,20 @@ void raidPP_ssse3(unsigned char** vbuf, unsigned data, unsigned size)
 		asm volatile("pand   %xmm7,%xmm4");
 		asm volatile("pand   %xmm7,%xmm5");
 
-		asm volatile("movdqa %0,%%xmm1" : : "m" (gfpshufb[l][0][0][0]));
-		asm volatile("movdqa %0,%%xmm7" : : "m" (gfpshufb[l][0][1][0]));
+		asm volatile("movdqa %0,%%xmm1" : : "m" (gfgenpshufb[l][0][0][0]));
+		asm volatile("movdqa %0,%%xmm7" : : "m" (gfgenpshufb[l][0][1][0]));
 		asm volatile("pshufb %xmm4,%xmm1");
 		asm volatile("pshufb %xmm5,%xmm7");
 		asm volatile("pxor   %xmm7,%xmm1");
 
-		asm volatile("movdqa %0,%%xmm2" : : "m" (gfpshufb[l][1][0][0]));
-		asm volatile("movdqa %0,%%xmm7" : : "m" (gfpshufb[l][1][1][0]));
+		asm volatile("movdqa %0,%%xmm2" : : "m" (gfgenpshufb[l][1][0][0]));
+		asm volatile("movdqa %0,%%xmm7" : : "m" (gfgenpshufb[l][1][1][0]));
 		asm volatile("pshufb %xmm4,%xmm2");
 		asm volatile("pshufb %xmm5,%xmm7");
 		asm volatile("pxor   %xmm7,%xmm2");
 
-		asm volatile("movdqa %0,%%xmm3" : : "m" (gfpshufb[l][2][0][0]));
-		asm volatile("movdqa %0,%%xmm7" : : "m" (gfpshufb[l][2][1][0]));
+		asm volatile("movdqa %0,%%xmm3" : : "m" (gfgenpshufb[l][2][0][0]));
+		asm volatile("movdqa %0,%%xmm7" : : "m" (gfgenpshufb[l][2][1][0]));
 		asm volatile("pshufb %xmm4,%xmm3");
 		asm volatile("pshufb %xmm5,%xmm7");
 		asm volatile("pxor   %xmm7,%xmm3");
@@ -1274,22 +1274,22 @@ void raidPP_ssse3(unsigned char** vbuf, unsigned data, unsigned size)
 			asm volatile("pand   %xmm7,%xmm4");
 			asm volatile("pand   %xmm7,%xmm5");
 
-			asm volatile("movdqa %0,%%xmm6" : : "m" (gfpshufb[d][0][0][0]));
-			asm volatile("movdqa %0,%%xmm7" : : "m" (gfpshufb[d][0][1][0]));
+			asm volatile("movdqa %0,%%xmm6" : : "m" (gfgenpshufb[d][0][0][0]));
+			asm volatile("movdqa %0,%%xmm7" : : "m" (gfgenpshufb[d][0][1][0]));
 			asm volatile("pshufb %xmm4,%xmm6");
 			asm volatile("pshufb %xmm5,%xmm7");
 			asm volatile("pxor   %xmm6,%xmm1");
 			asm volatile("pxor   %xmm7,%xmm1");
 
-			asm volatile("movdqa %0,%%xmm6" : : "m" (gfpshufb[d][1][0][0]));
-			asm volatile("movdqa %0,%%xmm7" : : "m" (gfpshufb[d][1][1][0]));
+			asm volatile("movdqa %0,%%xmm6" : : "m" (gfgenpshufb[d][1][0][0]));
+			asm volatile("movdqa %0,%%xmm7" : : "m" (gfgenpshufb[d][1][1][0]));
 			asm volatile("pshufb %xmm4,%xmm6");
 			asm volatile("pshufb %xmm5,%xmm7");
 			asm volatile("pxor   %xmm6,%xmm2");
 			asm volatile("pxor   %xmm7,%xmm2");
 
-			asm volatile("movdqa %0,%%xmm6" : : "m" (gfpshufb[d][2][0][0]));
-			asm volatile("movdqa %0,%%xmm7" : : "m" (gfpshufb[d][2][1][0]));
+			asm volatile("movdqa %0,%%xmm6" : : "m" (gfgenpshufb[d][2][0][0]));
+			asm volatile("movdqa %0,%%xmm7" : : "m" (gfgenpshufb[d][2][1][0]));
 			asm volatile("pshufb %xmm4,%xmm6");
 			asm volatile("pshufb %xmm5,%xmm7");
 			asm volatile("pxor   %xmm6,%xmm3");
@@ -1362,20 +1362,20 @@ void raidPP_ssse3ext(unsigned char** vbuf, unsigned data, unsigned size)
 		asm volatile("pand   %xmm15,%xmm10");
 		asm volatile("pand   %xmm15,%xmm11");
 
-		asm volatile("movdqa %0,%%xmm2" : : "m" (gfpshufb[l][0][0][0]));
-		asm volatile("movdqa %0,%%xmm13" : : "m" (gfpshufb[l][0][1][0]));
+		asm volatile("movdqa %0,%%xmm2" : : "m" (gfgenpshufb[l][0][0][0]));
+		asm volatile("movdqa %0,%%xmm13" : : "m" (gfgenpshufb[l][0][1][0]));
 		asm volatile("pshufb %xmm10,%xmm2");
 		asm volatile("pshufb %xmm11,%xmm13");
 		asm volatile("pxor   %xmm13,%xmm2");
 
-		asm volatile("movdqa %0,%%xmm3" : : "m" (gfpshufb[l][1][0][0]));
-		asm volatile("movdqa %0,%%xmm13" : : "m" (gfpshufb[l][1][1][0]));
+		asm volatile("movdqa %0,%%xmm3" : : "m" (gfgenpshufb[l][1][0][0]));
+		asm volatile("movdqa %0,%%xmm13" : : "m" (gfgenpshufb[l][1][1][0]));
 		asm volatile("pshufb %xmm10,%xmm3");
 		asm volatile("pshufb %xmm11,%xmm13");
 		asm volatile("pxor   %xmm13,%xmm3");
 
-		asm volatile("movdqa %0,%%xmm4" : : "m" (gfpshufb[l][2][0][0]));
-		asm volatile("movdqa %0,%%xmm13" : : "m" (gfpshufb[l][2][1][0]));
+		asm volatile("movdqa %0,%%xmm4" : : "m" (gfgenpshufb[l][2][0][0]));
+		asm volatile("movdqa %0,%%xmm13" : : "m" (gfgenpshufb[l][2][1][0]));
 		asm volatile("pshufb %xmm10,%xmm4");
 		asm volatile("pshufb %xmm11,%xmm13");
 		asm volatile("pxor   %xmm13,%xmm4");
@@ -1398,22 +1398,22 @@ void raidPP_ssse3ext(unsigned char** vbuf, unsigned data, unsigned size)
 			asm volatile("pand   %xmm15,%xmm10");
 			asm volatile("pand   %xmm15,%xmm11");
 
-			asm volatile("movdqa %0,%%xmm12" : : "m" (gfpshufb[d][0][0][0]));
-			asm volatile("movdqa %0,%%xmm13" : : "m" (gfpshufb[d][0][1][0]));
+			asm volatile("movdqa %0,%%xmm12" : : "m" (gfgenpshufb[d][0][0][0]));
+			asm volatile("movdqa %0,%%xmm13" : : "m" (gfgenpshufb[d][0][1][0]));
 			asm volatile("pshufb %xmm10,%xmm12");
 			asm volatile("pshufb %xmm11,%xmm13");
 			asm volatile("pxor   %xmm12,%xmm2");
 			asm volatile("pxor   %xmm13,%xmm2");
 
-			asm volatile("movdqa %0,%%xmm12" : : "m" (gfpshufb[d][1][0][0]));
-			asm volatile("movdqa %0,%%xmm13" : : "m" (gfpshufb[d][1][1][0]));
+			asm volatile("movdqa %0,%%xmm12" : : "m" (gfgenpshufb[d][1][0][0]));
+			asm volatile("movdqa %0,%%xmm13" : : "m" (gfgenpshufb[d][1][1][0]));
 			asm volatile("pshufb %xmm10,%xmm12");
 			asm volatile("pshufb %xmm11,%xmm13");
 			asm volatile("pxor   %xmm12,%xmm3");
 			asm volatile("pxor   %xmm13,%xmm3");
 
-			asm volatile("movdqa %0,%%xmm12" : : "m" (gfpshufb[d][2][0][0]));
-			asm volatile("movdqa %0,%%xmm13" : : "m" (gfpshufb[d][2][1][0]));
+			asm volatile("movdqa %0,%%xmm12" : : "m" (gfgenpshufb[d][2][0][0]));
+			asm volatile("movdqa %0,%%xmm13" : : "m" (gfgenpshufb[d][2][1][0]));
 			asm volatile("pshufb %xmm10,%xmm12");
 			asm volatile("pshufb %xmm11,%xmm13");
 			asm volatile("pxor   %xmm12,%xmm4");
@@ -1481,11 +1481,11 @@ void raidHP_int8(unsigned char** vbuf, unsigned data, unsigned size)
 			d0 = v_8(vbuf[d][i]);
 
 			p0 ^= d0;
-			q0 ^= gfmul[d0][gfmatrix[1][d]];
-			r0 ^= gfmul[d0][gfmatrix[2][d]];
-			s0 ^= gfmul[d0][gfmatrix[3][d]];
-			t0 ^= gfmul[d0][gfmatrix[4][d]];
-			u0 ^= gfmul[d0][gfmatrix[5][d]];
+			q0 ^= gfmul[d0][gfgen[1][d]];
+			r0 ^= gfmul[d0][gfgen[2][d]];
+			s0 ^= gfmul[d0][gfgen[3][d]];
+			t0 ^= gfmul[d0][gfgen[4][d]];
+			u0 ^= gfmul[d0][gfgen[5][d]];
 		}
 		
 		/* first disk with all coefficients at 1 */
@@ -1549,26 +1549,26 @@ void raidHP_ssse3(unsigned char** vbuf, unsigned data, unsigned size)
 		asm volatile("pand   %xmm7,%xmm4");
 		asm volatile("pand   %xmm7,%xmm5");
 
-		asm volatile("movdqa %0,%%xmm0" : : "m" (gfpshufb[l][0][0][0]));
-		asm volatile("movdqa %0,%%xmm7" : : "m" (gfpshufb[l][0][1][0]));
+		asm volatile("movdqa %0,%%xmm0" : : "m" (gfgenpshufb[l][0][0][0]));
+		asm volatile("movdqa %0,%%xmm7" : : "m" (gfgenpshufb[l][0][1][0]));
 		asm volatile("pshufb %xmm4,%xmm0");
 		asm volatile("pshufb %xmm5,%xmm7");
 		asm volatile("pxor   %xmm7,%xmm0");
 
-		asm volatile("movdqa %0,%%xmm1" : : "m" (gfpshufb[l][1][0][0]));
-		asm volatile("movdqa %0,%%xmm7" : : "m" (gfpshufb[l][1][1][0]));
+		asm volatile("movdqa %0,%%xmm1" : : "m" (gfgenpshufb[l][1][0][0]));
+		asm volatile("movdqa %0,%%xmm7" : : "m" (gfgenpshufb[l][1][1][0]));
 		asm volatile("pshufb %xmm4,%xmm1");
 		asm volatile("pshufb %xmm5,%xmm7");
 		asm volatile("pxor   %xmm7,%xmm1");
 
-		asm volatile("movdqa %0,%%xmm2" : : "m" (gfpshufb[l][2][0][0]));
-		asm volatile("movdqa %0,%%xmm7" : : "m" (gfpshufb[l][2][1][0]));
+		asm volatile("movdqa %0,%%xmm2" : : "m" (gfgenpshufb[l][2][0][0]));
+		asm volatile("movdqa %0,%%xmm7" : : "m" (gfgenpshufb[l][2][1][0]));
 		asm volatile("pshufb %xmm4,%xmm2");
 		asm volatile("pshufb %xmm5,%xmm7");
 		asm volatile("pxor   %xmm7,%xmm2");
 
-		asm volatile("movdqa %0,%%xmm3" : : "m" (gfpshufb[l][3][0][0]));
-		asm volatile("movdqa %0,%%xmm7" : : "m" (gfpshufb[l][3][1][0]));
+		asm volatile("movdqa %0,%%xmm3" : : "m" (gfgenpshufb[l][3][0][0]));
+		asm volatile("movdqa %0,%%xmm7" : : "m" (gfgenpshufb[l][3][1][0]));
 		asm volatile("pshufb %xmm4,%xmm3");
 		asm volatile("pshufb %xmm5,%xmm7");
 		asm volatile("pxor   %xmm7,%xmm3");
@@ -1598,29 +1598,29 @@ void raidHP_ssse3(unsigned char** vbuf, unsigned data, unsigned size)
 			asm volatile("pand   %xmm7,%xmm4");
 			asm volatile("pand   %xmm7,%xmm5");
 
-			asm volatile("movdqa %0,%%xmm6" : : "m" (gfpshufb[d][0][0][0]));
-			asm volatile("movdqa %0,%%xmm7" : : "m" (gfpshufb[d][0][1][0]));
+			asm volatile("movdqa %0,%%xmm6" : : "m" (gfgenpshufb[d][0][0][0]));
+			asm volatile("movdqa %0,%%xmm7" : : "m" (gfgenpshufb[d][0][1][0]));
 			asm volatile("pshufb %xmm4,%xmm6");
 			asm volatile("pshufb %xmm5,%xmm7");
 			asm volatile("pxor   %xmm6,%xmm0");
 			asm volatile("pxor   %xmm7,%xmm0");
 
-			asm volatile("movdqa %0,%%xmm6" : : "m" (gfpshufb[d][1][0][0]));
-			asm volatile("movdqa %0,%%xmm7" : : "m" (gfpshufb[d][1][1][0]));
+			asm volatile("movdqa %0,%%xmm6" : : "m" (gfgenpshufb[d][1][0][0]));
+			asm volatile("movdqa %0,%%xmm7" : : "m" (gfgenpshufb[d][1][1][0]));
 			asm volatile("pshufb %xmm4,%xmm6");
 			asm volatile("pshufb %xmm5,%xmm7");
 			asm volatile("pxor   %xmm6,%xmm1");
 			asm volatile("pxor   %xmm7,%xmm1");
 
-			asm volatile("movdqa %0,%%xmm6" : : "m" (gfpshufb[d][2][0][0]));
-			asm volatile("movdqa %0,%%xmm7" : : "m" (gfpshufb[d][2][1][0]));
+			asm volatile("movdqa %0,%%xmm6" : : "m" (gfgenpshufb[d][2][0][0]));
+			asm volatile("movdqa %0,%%xmm7" : : "m" (gfgenpshufb[d][2][1][0]));
 			asm volatile("pshufb %xmm4,%xmm6");
 			asm volatile("pshufb %xmm5,%xmm7");
 			asm volatile("pxor   %xmm6,%xmm2");
 			asm volatile("pxor   %xmm7,%xmm2");
 
-			asm volatile("movdqa %0,%%xmm6" : : "m" (gfpshufb[d][3][0][0]));
-			asm volatile("movdqa %0,%%xmm7" : : "m" (gfpshufb[d][3][1][0]));
+			asm volatile("movdqa %0,%%xmm6" : : "m" (gfgenpshufb[d][3][0][0]));
+			asm volatile("movdqa %0,%%xmm7" : : "m" (gfgenpshufb[d][3][1][0]));
 			asm volatile("pshufb %xmm4,%xmm6");
 			asm volatile("pshufb %xmm5,%xmm7");
 			asm volatile("pxor   %xmm6,%xmm3");
@@ -1698,26 +1698,26 @@ void raidHP_ssse3ext(unsigned char** vbuf, unsigned data, unsigned size)
 		asm volatile("pand   %xmm15,%xmm10");
 		asm volatile("pand   %xmm15,%xmm11");
 
-		asm volatile("movdqa %0,%%xmm2" : : "m" (gfpshufb[l][0][0][0]));
-		asm volatile("movdqa %0,%%xmm13" : : "m" (gfpshufb[l][0][1][0]));
+		asm volatile("movdqa %0,%%xmm2" : : "m" (gfgenpshufb[l][0][0][0]));
+		asm volatile("movdqa %0,%%xmm13" : : "m" (gfgenpshufb[l][0][1][0]));
 		asm volatile("pshufb %xmm10,%xmm2");
 		asm volatile("pshufb %xmm11,%xmm13");
 		asm volatile("pxor   %xmm13,%xmm2");
 
-		asm volatile("movdqa %0,%%xmm3" : : "m" (gfpshufb[l][1][0][0]));
-		asm volatile("movdqa %0,%%xmm13" : : "m" (gfpshufb[l][1][1][0]));
+		asm volatile("movdqa %0,%%xmm3" : : "m" (gfgenpshufb[l][1][0][0]));
+		asm volatile("movdqa %0,%%xmm13" : : "m" (gfgenpshufb[l][1][1][0]));
 		asm volatile("pshufb %xmm10,%xmm3");
 		asm volatile("pshufb %xmm11,%xmm13");
 		asm volatile("pxor   %xmm13,%xmm3");
 
-		asm volatile("movdqa %0,%%xmm4" : : "m" (gfpshufb[l][2][0][0]));
-		asm volatile("movdqa %0,%%xmm13" : : "m" (gfpshufb[l][2][1][0]));
+		asm volatile("movdqa %0,%%xmm4" : : "m" (gfgenpshufb[l][2][0][0]));
+		asm volatile("movdqa %0,%%xmm13" : : "m" (gfgenpshufb[l][2][1][0]));
 		asm volatile("pshufb %xmm10,%xmm4");
 		asm volatile("pshufb %xmm11,%xmm13");
 		asm volatile("pxor   %xmm13,%xmm4");
 
-		asm volatile("movdqa %0,%%xmm5" : : "m" (gfpshufb[l][3][0][0]));
-		asm volatile("movdqa %0,%%xmm13" : : "m" (gfpshufb[l][3][1][0]));
+		asm volatile("movdqa %0,%%xmm5" : : "m" (gfgenpshufb[l][3][0][0]));
+		asm volatile("movdqa %0,%%xmm13" : : "m" (gfgenpshufb[l][3][1][0]));
 		asm volatile("pshufb %xmm10,%xmm5");
 		asm volatile("pshufb %xmm11,%xmm13");
 		asm volatile("pxor   %xmm13,%xmm5");
@@ -1740,29 +1740,29 @@ void raidHP_ssse3ext(unsigned char** vbuf, unsigned data, unsigned size)
 			asm volatile("pand   %xmm15,%xmm10");
 			asm volatile("pand   %xmm15,%xmm11");
 
-			asm volatile("movdqa %0,%%xmm12" : : "m" (gfpshufb[d][0][0][0]));
-			asm volatile("movdqa %0,%%xmm13" : : "m" (gfpshufb[d][0][1][0]));
+			asm volatile("movdqa %0,%%xmm12" : : "m" (gfgenpshufb[d][0][0][0]));
+			asm volatile("movdqa %0,%%xmm13" : : "m" (gfgenpshufb[d][0][1][0]));
 			asm volatile("pshufb %xmm10,%xmm12");
 			asm volatile("pshufb %xmm11,%xmm13");
 			asm volatile("pxor   %xmm12,%xmm2");
 			asm volatile("pxor   %xmm13,%xmm2");
 
-			asm volatile("movdqa %0,%%xmm12" : : "m" (gfpshufb[d][1][0][0]));
-			asm volatile("movdqa %0,%%xmm13" : : "m" (gfpshufb[d][1][1][0]));
+			asm volatile("movdqa %0,%%xmm12" : : "m" (gfgenpshufb[d][1][0][0]));
+			asm volatile("movdqa %0,%%xmm13" : : "m" (gfgenpshufb[d][1][1][0]));
 			asm volatile("pshufb %xmm10,%xmm12");
 			asm volatile("pshufb %xmm11,%xmm13");
 			asm volatile("pxor   %xmm12,%xmm3");
 			asm volatile("pxor   %xmm13,%xmm3");
 
-			asm volatile("movdqa %0,%%xmm12" : : "m" (gfpshufb[d][2][0][0]));
-			asm volatile("movdqa %0,%%xmm13" : : "m" (gfpshufb[d][2][1][0]));
+			asm volatile("movdqa %0,%%xmm12" : : "m" (gfgenpshufb[d][2][0][0]));
+			asm volatile("movdqa %0,%%xmm13" : : "m" (gfgenpshufb[d][2][1][0]));
 			asm volatile("pshufb %xmm10,%xmm12");
 			asm volatile("pshufb %xmm11,%xmm13");
 			asm volatile("pxor   %xmm12,%xmm4");
 			asm volatile("pxor   %xmm13,%xmm4");
 
-			asm volatile("movdqa %0,%%xmm12" : : "m" (gfpshufb[d][3][0][0]));
-			asm volatile("movdqa %0,%%xmm13" : : "m" (gfpshufb[d][3][1][0]));
+			asm volatile("movdqa %0,%%xmm12" : : "m" (gfgenpshufb[d][3][0][0]));
+			asm volatile("movdqa %0,%%xmm13" : : "m" (gfgenpshufb[d][3][1][0]));
 			asm volatile("pshufb %xmm10,%xmm12");
 			asm volatile("pshufb %xmm11,%xmm13");
 			asm volatile("pxor   %xmm12,%xmm5");
@@ -1883,11 +1883,11 @@ static inline const unsigned char* table(unsigned char v)
  */
 static void raid_delta_gen(unsigned level, const int* d, const int* c, unsigned char** vbuf, unsigned data, unsigned char* zero, unsigned size)
 {
-	unsigned char* p[6];
-	unsigned char* pa[6];
+	unsigned char* p[RAID_PARITY_MAX];
+	unsigned char* pa[RAID_PARITY_MAX];
 	unsigned i;
 
-	assert(level > 0 && level <= 6);
+	assert(level > 0 && level <= RAID_PARITY_MAX);
 
 	for(i=0;i<level;++i) {
 		/* keep a copy of the parity buffer */
@@ -2020,7 +2020,7 @@ static void raid6_recov_2data(const int* d, const int* c, unsigned char** vbuf,
  */
 static unsigned char A(unsigned p, unsigned d)
 {
-	return gfmatrix[p][d];
+	return gfgen[p][d];
 }
 
 /**
diff --git a/raid.h b/raid.h
index 49b3b65f..e87ec54d 100644
--- a/raid.h
+++ b/raid.h
@@ -21,6 +21,11 @@
 /****************************************************************************/
 /* raid */
 
+/**
+ * Max level of parity supported.
+ */
+#define RAID_PARITY_MAX 6
+
 /**
  * Maximum number of data disks.
  * Limit of the parity generator matrix used.
diff --git a/state.h b/state.h
index 66e77384..d38846ae 100644
--- a/state.h
+++ b/state.h
@@ -29,12 +29,12 @@
 #define LEV_MAX 6
 
 /**
- * Returns the parity name: Parity, Q-Parity, R-Parity, S-Parity.
+ * Returns the parity name: Parity, Q-Parity, R-Parity, S-Parity, T-Parity, U-Parity.
  */
 const char* lev_name(unsigned level);
 
 /**
- * Returns the parity name used in the config file: parity, q-parity, r-parity, s-parity.
+ * Returns the parity name used in the config file: parity, q-parity, r-parity, s-parity, t-parity, u-parity.
  */
 const char* lev_config_name(unsigned level);
 
diff --git a/tables.h b/tables.h
index c251f511..8a55e3d2 100644
--- a/tables.h
+++ b/tables.h
@@ -8797,7 +8797,7 @@ const unsigned char __attribute__((aligned(256))) gfinv[256] =
 };
 
 /**
- * Normalized Extended Cauchy matrix used to generate parity.
+ * Cauchy matrix used to generate parity.
  * This matrix is valid for up to 6 parity with 251 data disks.
  *
  * 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 
@@ -8807,7 +8807,7 @@ const unsigned char __attribute__((aligned(256))) gfinv[256] =
  * 01 97 7f 9c 7c 18 bd a2 58 1a da 74 70 a3 e5 47 29 07 f5 80 23 e9 fa 46 54 a0 99 95 53 9b 0b c7 09 c0 78 89 92 e3 0d b0 2a 8c fb 17 3f 26 65 87 27 5c 66 61 79 4d 32 b3 8d 52 e2 82 3d f9 c5 02 bc 4c 73 48 62 af ba 41 d9 c4 2f b1 33 b8 15 7d cf 3a a9 5f 84 6d 34 1b 44 94 72 81 42 be cc 4b 0a 6f 5a 22 36 b5 3c 9d 13 7e 08 dd d6 5e 04 fc 5b ec ef f1 6e 1e 77 24 e6 c6 aa cb fd 51 67 06 6a 4a 88 db b2 c2 5d 43 40 f7 50 a8 f2 7a 71 a4 d2 bf 31 90 19 9a 8e f6 c3 a6 e7 60 12 ee 2d de 38 e8 b7 98 c1 28 f3 05 96 63 d1 b9 14 9f 1d 83 68 75 ed 16 03 ce e4 df e0 10 ae 69 55 91 2e 4e fe 21 1f 9e e1 d5 cd ca f0 8b 2b c9 8a 93 bb 57 20 86 1c a1 4f 3e 25 d4 6c a5 6b a7 37 ff 39 35 0c f8 ea 56 45 8f 2c 59 ab 85 eb 49 0f dc d8 76 b6 f4 0e 11 b4 d0 30 d3 3b ad d7 
  * 01 2b 3f cf 73 2c d6 ed cb 74 15 78 8a c1 17 c9 89 68 21 ab 76 3b 4b 5a 6e 0e b9 d3 b6 3e 36 86 bf a2 a7 30 14 eb c7 2d 96 67 20 b5 9a e0 a8 c6 80 04 8d fe 75 5e 23 ca 8f 48 99 0d df 8e b8 70 29 9c 44 69 3d a5 c2 90 d2 1c 9b 02 1d 98 93 ec 84 e8 64 4c 3a 8b 97 f3 e5 c0 7d 26 c8 08 a0 62 82 55 f7 33 f6 51 63 4d 77 da fd c3 38 6d ee 09 47 a3 05 de a6 f1 22 25 6a 0c 81 b2 6b 58 d5 b3 fc fb 28 7f 07 dc 7a 9e d0 37 b4 e1 1a 24 03 ae 94 ba 88 2f ea 2e 8c 5b bb 79 d1 11 ff a4 19 3c 2a 4e 52 e3 95 bd 31 5d 35 4a 41 c4 db 42 c5 0b 49 1b 7c e4 b0 9d 45 f0 a9 61 57 06 d4 40 91 56 13 fa 87 ac 27 54 dd 59 1f 71 39 43 6c f9 be 4f f4 1e 32 cd e9 7e 7b 66 5f ef e7 6f 0a 60 d7 b7 83 92 e2 af 72 f8 b1 50 10 ce 18 53 a1 cc ad 12 34 0f f5 aa 16 e6 f2 d8 85 9f bc 
  */
-const unsigned char  __attribute__((aligned(256))) gfmatrix[6][256] =
+const unsigned char  __attribute__((aligned(256))) gfgen[6][256] =
 {
 	{
 		0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
@@ -9017,12 +9017,12 @@ const unsigned char  __attribute__((aligned(256))) gfmatrix[6][256] =
 
 #if defined(__i386__) || defined(__x86_64__)
 /**
- * PSHUFB tables for the Extended Cauchy matrix.
+ * PSHUFB tables for the Cauchy matrix.
  *
  * Indexes are [DISK][PARITY - 2][LH].
  * Where DISK is from 0 to 250, PARITY from 2 to 5, LH from 0 to 1.
  */
-const unsigned char  __attribute__((aligned(256))) gfpshufb[251][4][2][16] =
+const unsigned char  __attribute__((aligned(256))) gfgenpshufb[251][4][2][16] =
 {
 	{
 		{