Rename QS8 generator templates

PiperOrigin-RevId: 334260510
diff --git a/src/qs8-igemm/gen/12x8c4-minmax-neondot.c b/src/qs8-igemm/gen/12x8c4-minmax-neondot.c
index 7c2199e..4ecc1e7 100644
--- a/src/qs8-igemm/gen/12x8c4-minmax-neondot.c
+++ b/src/qs8-igemm/gen/12x8c4-minmax-neondot.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-igemm/MRxNRc4-minmax-neondot.c.in
+//   Template: src/qs8-igemm/MRxNRc4-neondot.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC
diff --git a/src/qs8-igemm/gen/1x16-minmax-neon-mlal-lane.c b/src/qs8-igemm/gen/1x16-minmax-neon-mlal-lane.c
index a427ff8..efb5d0b 100644
--- a/src/qs8-igemm/gen/1x16-minmax-neon-mlal-lane.c
+++ b/src/qs8-igemm/gen/1x16-minmax-neon-mlal-lane.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-igemm/minmax-neon-mlal-lane.c.in
+//   Template: src/qs8-igemm/neon-mlal-lane.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC
diff --git a/src/qs8-igemm/gen/1x16c4-minmax-neondot.c b/src/qs8-igemm/gen/1x16c4-minmax-neondot.c
index a5a0392..984dfb8 100644
--- a/src/qs8-igemm/gen/1x16c4-minmax-neondot.c
+++ b/src/qs8-igemm/gen/1x16c4-minmax-neondot.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-igemm/MRxNRc4-minmax-neondot.c.in
+//   Template: src/qs8-igemm/MRxNRc4-neondot.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC
diff --git a/src/qs8-igemm/gen/1x16c8-minmax-avx512skx.c b/src/qs8-igemm/gen/1x16c8-minmax-avx512skx.c
index b582354..924734f 100644
--- a/src/qs8-igemm/gen/1x16c8-minmax-avx512skx.c
+++ b/src/qs8-igemm/gen/1x16c8-minmax-avx512skx.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-igemm/MRx16c8-minmax-avx512skx.c.in
+//   Template: src/qs8-igemm/MRx16c8-avx512skx.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC
diff --git a/src/qs8-igemm/gen/1x4c2-minmax-sse2-ld128.c b/src/qs8-igemm/gen/1x4c2-minmax-sse2-ld128.c
index 54e0aa1..42dc29e 100644
--- a/src/qs8-igemm/gen/1x4c2-minmax-sse2-ld128.c
+++ b/src/qs8-igemm/gen/1x4c2-minmax-sse2-ld128.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-igemm/MRx4c2-minmax-sse.c.in
+//   Template: src/qs8-igemm/MRx4c2-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC
diff --git a/src/qs8-igemm/gen/1x4c2-minmax-sse2-ld64.c b/src/qs8-igemm/gen/1x4c2-minmax-sse2-ld64.c
index fd979ea..d78c425 100644
--- a/src/qs8-igemm/gen/1x4c2-minmax-sse2-ld64.c
+++ b/src/qs8-igemm/gen/1x4c2-minmax-sse2-ld64.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-igemm/MRx4c2-minmax-sse.c.in
+//   Template: src/qs8-igemm/MRx4c2-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC
diff --git a/src/qs8-igemm/gen/1x4c2-minmax-sse41-ld128.c b/src/qs8-igemm/gen/1x4c2-minmax-sse41-ld128.c
index 114a70e..0d5b1dc 100644
--- a/src/qs8-igemm/gen/1x4c2-minmax-sse41-ld128.c
+++ b/src/qs8-igemm/gen/1x4c2-minmax-sse41-ld128.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-igemm/MRx4c2-minmax-sse.c.in
+//   Template: src/qs8-igemm/MRx4c2-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC
diff --git a/src/qs8-igemm/gen/1x4c2-minmax-sse41-ld64.c b/src/qs8-igemm/gen/1x4c2-minmax-sse41-ld64.c
index b8628ee..2827d03 100644
--- a/src/qs8-igemm/gen/1x4c2-minmax-sse41-ld64.c
+++ b/src/qs8-igemm/gen/1x4c2-minmax-sse41-ld64.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-igemm/MRx4c2-minmax-sse.c.in
+//   Template: src/qs8-igemm/MRx4c2-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC
diff --git a/src/qs8-igemm/gen/1x4c2-minmax-ssse3-ld128.c b/src/qs8-igemm/gen/1x4c2-minmax-ssse3-ld128.c
index ad1d1d1..b9aba97 100644
--- a/src/qs8-igemm/gen/1x4c2-minmax-ssse3-ld128.c
+++ b/src/qs8-igemm/gen/1x4c2-minmax-ssse3-ld128.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-igemm/MRx4c2-minmax-sse.c.in
+//   Template: src/qs8-igemm/MRx4c2-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC
diff --git a/src/qs8-igemm/gen/1x4c2-minmax-ssse3-ld64.c b/src/qs8-igemm/gen/1x4c2-minmax-ssse3-ld64.c
index 3ebfba0..862a3f6 100644
--- a/src/qs8-igemm/gen/1x4c2-minmax-ssse3-ld64.c
+++ b/src/qs8-igemm/gen/1x4c2-minmax-ssse3-ld64.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-igemm/MRx4c2-minmax-sse.c.in
+//   Template: src/qs8-igemm/MRx4c2-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC
diff --git a/src/qs8-igemm/gen/1x4c2-minmax-xop-ld128.c b/src/qs8-igemm/gen/1x4c2-minmax-xop-ld128.c
index 6f8c549..5882450 100644
--- a/src/qs8-igemm/gen/1x4c2-minmax-xop-ld128.c
+++ b/src/qs8-igemm/gen/1x4c2-minmax-xop-ld128.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-igemm/MRx4c2-minmax-sse.c.in
+//   Template: src/qs8-igemm/MRx4c2-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC
diff --git a/src/qs8-igemm/gen/1x4c2-minmax-xop-ld64.c b/src/qs8-igemm/gen/1x4c2-minmax-xop-ld64.c
index 8f0a307..5aafdf0 100644
--- a/src/qs8-igemm/gen/1x4c2-minmax-xop-ld64.c
+++ b/src/qs8-igemm/gen/1x4c2-minmax-xop-ld64.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-igemm/MRx4c2-minmax-sse.c.in
+//   Template: src/qs8-igemm/MRx4c2-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC
diff --git a/src/qs8-igemm/gen/1x4c8-minmax-sse2-ld128.c b/src/qs8-igemm/gen/1x4c8-minmax-sse2-ld128.c
index 0fa7a40..fe9eb8c 100644
--- a/src/qs8-igemm/gen/1x4c8-minmax-sse2-ld128.c
+++ b/src/qs8-igemm/gen/1x4c8-minmax-sse2-ld128.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-igemm/MRx4c8-minmax-sse.c.in
+//   Template: src/qs8-igemm/MRx4c8-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC
diff --git a/src/qs8-igemm/gen/1x4c8-minmax-sse2-ld64.c b/src/qs8-igemm/gen/1x4c8-minmax-sse2-ld64.c
index 5663b4a..2dd1d31 100644
--- a/src/qs8-igemm/gen/1x4c8-minmax-sse2-ld64.c
+++ b/src/qs8-igemm/gen/1x4c8-minmax-sse2-ld64.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-igemm/MRx4c8-minmax-sse.c.in
+//   Template: src/qs8-igemm/MRx4c8-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC
diff --git a/src/qs8-igemm/gen/1x4c8-minmax-sse41-ld128.c b/src/qs8-igemm/gen/1x4c8-minmax-sse41-ld128.c
index c0cb2bb..10b9d02 100644
--- a/src/qs8-igemm/gen/1x4c8-minmax-sse41-ld128.c
+++ b/src/qs8-igemm/gen/1x4c8-minmax-sse41-ld128.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-igemm/MRx4c8-minmax-sse.c.in
+//   Template: src/qs8-igemm/MRx4c8-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC
diff --git a/src/qs8-igemm/gen/1x4c8-minmax-sse41-ld64.c b/src/qs8-igemm/gen/1x4c8-minmax-sse41-ld64.c
index 64626b1..c171ead 100644
--- a/src/qs8-igemm/gen/1x4c8-minmax-sse41-ld64.c
+++ b/src/qs8-igemm/gen/1x4c8-minmax-sse41-ld64.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-igemm/MRx4c8-minmax-sse.c.in
+//   Template: src/qs8-igemm/MRx4c8-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC
diff --git a/src/qs8-igemm/gen/1x4c8-minmax-ssse3-ld128.c b/src/qs8-igemm/gen/1x4c8-minmax-ssse3-ld128.c
index 20f15c0..561d72f 100644
--- a/src/qs8-igemm/gen/1x4c8-minmax-ssse3-ld128.c
+++ b/src/qs8-igemm/gen/1x4c8-minmax-ssse3-ld128.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-igemm/MRx4c8-minmax-sse.c.in
+//   Template: src/qs8-igemm/MRx4c8-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC
diff --git a/src/qs8-igemm/gen/1x4c8-minmax-ssse3-ld64.c b/src/qs8-igemm/gen/1x4c8-minmax-ssse3-ld64.c
index b99ad3c..f95561d 100644
--- a/src/qs8-igemm/gen/1x4c8-minmax-ssse3-ld64.c
+++ b/src/qs8-igemm/gen/1x4c8-minmax-ssse3-ld64.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-igemm/MRx4c8-minmax-sse.c.in
+//   Template: src/qs8-igemm/MRx4c8-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC
diff --git a/src/qs8-igemm/gen/1x4c8-minmax-wasmsimd-ld128.c b/src/qs8-igemm/gen/1x4c8-minmax-wasmsimd-ld128.c
index 1c607df..8a104c0 100644
--- a/src/qs8-igemm/gen/1x4c8-minmax-wasmsimd-ld128.c
+++ b/src/qs8-igemm/gen/1x4c8-minmax-wasmsimd-ld128.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-igemm/MRx4c8-minmax-wasmsimd.c.in
+//   Template: src/qs8-igemm/MRx4c8-wasmsimd.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC
diff --git a/src/qs8-igemm/gen/1x4c8-minmax-wasmsimd-ld64.c b/src/qs8-igemm/gen/1x4c8-minmax-wasmsimd-ld64.c
index c95a831..15bc8bb 100644
--- a/src/qs8-igemm/gen/1x4c8-minmax-wasmsimd-ld64.c
+++ b/src/qs8-igemm/gen/1x4c8-minmax-wasmsimd-ld64.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-igemm/MRx4c8-minmax-wasmsimd.c.in
+//   Template: src/qs8-igemm/MRx4c8-wasmsimd.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC
diff --git a/src/qs8-igemm/gen/1x4c8-minmax-xop-ld128.c b/src/qs8-igemm/gen/1x4c8-minmax-xop-ld128.c
index 628673f..0686d4e 100644
--- a/src/qs8-igemm/gen/1x4c8-minmax-xop-ld128.c
+++ b/src/qs8-igemm/gen/1x4c8-minmax-xop-ld128.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-igemm/MRx4c8-minmax-sse.c.in
+//   Template: src/qs8-igemm/MRx4c8-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC
diff --git a/src/qs8-igemm/gen/1x4c8-minmax-xop-ld64.c b/src/qs8-igemm/gen/1x4c8-minmax-xop-ld64.c
index 07ad7d8..fb46c83 100644
--- a/src/qs8-igemm/gen/1x4c8-minmax-xop-ld64.c
+++ b/src/qs8-igemm/gen/1x4c8-minmax-xop-ld64.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-igemm/MRx4c8-minmax-sse.c.in
+//   Template: src/qs8-igemm/MRx4c8-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC
diff --git a/src/qs8-igemm/gen/1x8-minmax-neon-mlal-lane.c b/src/qs8-igemm/gen/1x8-minmax-neon-mlal-lane.c
index 398896f..e7c6297 100644
--- a/src/qs8-igemm/gen/1x8-minmax-neon-mlal-lane.c
+++ b/src/qs8-igemm/gen/1x8-minmax-neon-mlal-lane.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-igemm/minmax-neon-mlal-lane.c.in
+//   Template: src/qs8-igemm/neon-mlal-lane.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC
diff --git a/src/qs8-igemm/gen/1x8c4-minmax-neondot.c b/src/qs8-igemm/gen/1x8c4-minmax-neondot.c
index 4752af8..2a885c4 100644
--- a/src/qs8-igemm/gen/1x8c4-minmax-neondot.c
+++ b/src/qs8-igemm/gen/1x8c4-minmax-neondot.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-igemm/MRxNRc4-minmax-neondot.c.in
+//   Template: src/qs8-igemm/MRxNRc4-neondot.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC
diff --git a/src/qs8-igemm/gen/1x8c8-minmax-avx2.c b/src/qs8-igemm/gen/1x8c8-minmax-avx2.c
index 253a294..4eaa400 100644
--- a/src/qs8-igemm/gen/1x8c8-minmax-avx2.c
+++ b/src/qs8-igemm/gen/1x8c8-minmax-avx2.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-igemm/MRx8c8-minmax-avx2.c.in
+//   Template: src/qs8-igemm/MRx8c8-avx2.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC
diff --git a/src/qs8-igemm/gen/2x16-minmax-neon-mlal-lane.c b/src/qs8-igemm/gen/2x16-minmax-neon-mlal-lane.c
index 99c9ec0..bbe66cd 100644
--- a/src/qs8-igemm/gen/2x16-minmax-neon-mlal-lane.c
+++ b/src/qs8-igemm/gen/2x16-minmax-neon-mlal-lane.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-igemm/minmax-neon-mlal-lane.c.in
+//   Template: src/qs8-igemm/neon-mlal-lane.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC
diff --git a/src/qs8-igemm/gen/2x16c8-minmax-avx512skx.c b/src/qs8-igemm/gen/2x16c8-minmax-avx512skx.c
index 3222bc1..347ed78 100644
--- a/src/qs8-igemm/gen/2x16c8-minmax-avx512skx.c
+++ b/src/qs8-igemm/gen/2x16c8-minmax-avx512skx.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-igemm/MRx16c8-minmax-avx512skx.c.in
+//   Template: src/qs8-igemm/MRx16c8-avx512skx.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC
diff --git a/src/qs8-igemm/gen/2x4c8-minmax-sse2-ld128.c b/src/qs8-igemm/gen/2x4c8-minmax-sse2-ld128.c
index 8730e85..906861e 100644
--- a/src/qs8-igemm/gen/2x4c8-minmax-sse2-ld128.c
+++ b/src/qs8-igemm/gen/2x4c8-minmax-sse2-ld128.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-igemm/MRx4c8-minmax-sse.c.in
+//   Template: src/qs8-igemm/MRx4c8-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC
diff --git a/src/qs8-igemm/gen/2x4c8-minmax-sse2-ld64.c b/src/qs8-igemm/gen/2x4c8-minmax-sse2-ld64.c
index f1fd923..3a728bd 100644
--- a/src/qs8-igemm/gen/2x4c8-minmax-sse2-ld64.c
+++ b/src/qs8-igemm/gen/2x4c8-minmax-sse2-ld64.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-igemm/MRx4c8-minmax-sse.c.in
+//   Template: src/qs8-igemm/MRx4c8-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC
diff --git a/src/qs8-igemm/gen/2x4c8-minmax-sse41-ld128.c b/src/qs8-igemm/gen/2x4c8-minmax-sse41-ld128.c
index 02aad95..6d68d36 100644
--- a/src/qs8-igemm/gen/2x4c8-minmax-sse41-ld128.c
+++ b/src/qs8-igemm/gen/2x4c8-minmax-sse41-ld128.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-igemm/MRx4c8-minmax-sse.c.in
+//   Template: src/qs8-igemm/MRx4c8-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC
diff --git a/src/qs8-igemm/gen/2x4c8-minmax-sse41-ld64.c b/src/qs8-igemm/gen/2x4c8-minmax-sse41-ld64.c
index a061e70..c7b7392 100644
--- a/src/qs8-igemm/gen/2x4c8-minmax-sse41-ld64.c
+++ b/src/qs8-igemm/gen/2x4c8-minmax-sse41-ld64.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-igemm/MRx4c8-minmax-sse.c.in
+//   Template: src/qs8-igemm/MRx4c8-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC
diff --git a/src/qs8-igemm/gen/2x4c8-minmax-ssse3-ld128.c b/src/qs8-igemm/gen/2x4c8-minmax-ssse3-ld128.c
index 9716b38..2b1d86a 100644
--- a/src/qs8-igemm/gen/2x4c8-minmax-ssse3-ld128.c
+++ b/src/qs8-igemm/gen/2x4c8-minmax-ssse3-ld128.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-igemm/MRx4c8-minmax-sse.c.in
+//   Template: src/qs8-igemm/MRx4c8-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC
diff --git a/src/qs8-igemm/gen/2x4c8-minmax-ssse3-ld64.c b/src/qs8-igemm/gen/2x4c8-minmax-ssse3-ld64.c
index 8188e89..15e19f9 100644
--- a/src/qs8-igemm/gen/2x4c8-minmax-ssse3-ld64.c
+++ b/src/qs8-igemm/gen/2x4c8-minmax-ssse3-ld64.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-igemm/MRx4c8-minmax-sse.c.in
+//   Template: src/qs8-igemm/MRx4c8-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC
diff --git a/src/qs8-igemm/gen/2x4c8-minmax-wasmsimd-ld128.c b/src/qs8-igemm/gen/2x4c8-minmax-wasmsimd-ld128.c
index 69b585b..11188d4 100644
--- a/src/qs8-igemm/gen/2x4c8-minmax-wasmsimd-ld128.c
+++ b/src/qs8-igemm/gen/2x4c8-minmax-wasmsimd-ld128.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-igemm/MRx4c8-minmax-wasmsimd.c.in
+//   Template: src/qs8-igemm/MRx4c8-wasmsimd.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC
diff --git a/src/qs8-igemm/gen/2x4c8-minmax-wasmsimd-ld64.c b/src/qs8-igemm/gen/2x4c8-minmax-wasmsimd-ld64.c
index f27c1f7..a85d4d7 100644
--- a/src/qs8-igemm/gen/2x4c8-minmax-wasmsimd-ld64.c
+++ b/src/qs8-igemm/gen/2x4c8-minmax-wasmsimd-ld64.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-igemm/MRx4c8-minmax-wasmsimd.c.in
+//   Template: src/qs8-igemm/MRx4c8-wasmsimd.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC
diff --git a/src/qs8-igemm/gen/2x4c8-minmax-xop-ld128.c b/src/qs8-igemm/gen/2x4c8-minmax-xop-ld128.c
index b593564..00d6188 100644
--- a/src/qs8-igemm/gen/2x4c8-minmax-xop-ld128.c
+++ b/src/qs8-igemm/gen/2x4c8-minmax-xop-ld128.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-igemm/MRx4c8-minmax-sse.c.in
+//   Template: src/qs8-igemm/MRx4c8-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC
diff --git a/src/qs8-igemm/gen/2x4c8-minmax-xop-ld64.c b/src/qs8-igemm/gen/2x4c8-minmax-xop-ld64.c
index e4dbfda..70458bd 100644
--- a/src/qs8-igemm/gen/2x4c8-minmax-xop-ld64.c
+++ b/src/qs8-igemm/gen/2x4c8-minmax-xop-ld64.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-igemm/MRx4c8-minmax-sse.c.in
+//   Template: src/qs8-igemm/MRx4c8-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC
diff --git a/src/qs8-igemm/gen/2x8c8-minmax-avx2.c b/src/qs8-igemm/gen/2x8c8-minmax-avx2.c
index 882ec87..d3060c3 100644
--- a/src/qs8-igemm/gen/2x8c8-minmax-avx2.c
+++ b/src/qs8-igemm/gen/2x8c8-minmax-avx2.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-igemm/MRx8c8-minmax-avx2.c.in
+//   Template: src/qs8-igemm/MRx8c8-avx2.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC
diff --git a/src/qs8-igemm/gen/3x16c8-minmax-avx512skx.c b/src/qs8-igemm/gen/3x16c8-minmax-avx512skx.c
index c62c648..3fe63e4 100644
--- a/src/qs8-igemm/gen/3x16c8-minmax-avx512skx.c
+++ b/src/qs8-igemm/gen/3x16c8-minmax-avx512skx.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-igemm/MRx16c8-minmax-avx512skx.c.in
+//   Template: src/qs8-igemm/MRx16c8-avx512skx.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC
diff --git a/src/qs8-igemm/gen/3x4c8-minmax-sse2-ld128.c b/src/qs8-igemm/gen/3x4c8-minmax-sse2-ld128.c
index 39006f9..dd940c0 100644
--- a/src/qs8-igemm/gen/3x4c8-minmax-sse2-ld128.c
+++ b/src/qs8-igemm/gen/3x4c8-minmax-sse2-ld128.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-igemm/MRx4c8-minmax-sse.c.in
+//   Template: src/qs8-igemm/MRx4c8-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC
diff --git a/src/qs8-igemm/gen/3x4c8-minmax-sse2-ld64.c b/src/qs8-igemm/gen/3x4c8-minmax-sse2-ld64.c
index f00670e..4904a1c 100644
--- a/src/qs8-igemm/gen/3x4c8-minmax-sse2-ld64.c
+++ b/src/qs8-igemm/gen/3x4c8-minmax-sse2-ld64.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-igemm/MRx4c8-minmax-sse.c.in
+//   Template: src/qs8-igemm/MRx4c8-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC
diff --git a/src/qs8-igemm/gen/3x4c8-minmax-sse41-ld128.c b/src/qs8-igemm/gen/3x4c8-minmax-sse41-ld128.c
index d980431..14d7f8c 100644
--- a/src/qs8-igemm/gen/3x4c8-minmax-sse41-ld128.c
+++ b/src/qs8-igemm/gen/3x4c8-minmax-sse41-ld128.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-igemm/MRx4c8-minmax-sse.c.in
+//   Template: src/qs8-igemm/MRx4c8-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC
diff --git a/src/qs8-igemm/gen/3x4c8-minmax-sse41-ld64.c b/src/qs8-igemm/gen/3x4c8-minmax-sse41-ld64.c
index d31ea02..5450387 100644
--- a/src/qs8-igemm/gen/3x4c8-minmax-sse41-ld64.c
+++ b/src/qs8-igemm/gen/3x4c8-minmax-sse41-ld64.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-igemm/MRx4c8-minmax-sse.c.in
+//   Template: src/qs8-igemm/MRx4c8-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC
diff --git a/src/qs8-igemm/gen/3x4c8-minmax-ssse3-ld128.c b/src/qs8-igemm/gen/3x4c8-minmax-ssse3-ld128.c
index 46d7597..3f3aefa 100644
--- a/src/qs8-igemm/gen/3x4c8-minmax-ssse3-ld128.c
+++ b/src/qs8-igemm/gen/3x4c8-minmax-ssse3-ld128.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-igemm/MRx4c8-minmax-sse.c.in
+//   Template: src/qs8-igemm/MRx4c8-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC
diff --git a/src/qs8-igemm/gen/3x4c8-minmax-ssse3-ld64.c b/src/qs8-igemm/gen/3x4c8-minmax-ssse3-ld64.c
index c027d9d..8cca813 100644
--- a/src/qs8-igemm/gen/3x4c8-minmax-ssse3-ld64.c
+++ b/src/qs8-igemm/gen/3x4c8-minmax-ssse3-ld64.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-igemm/MRx4c8-minmax-sse.c.in
+//   Template: src/qs8-igemm/MRx4c8-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC
diff --git a/src/qs8-igemm/gen/3x4c8-minmax-wasmsimd-ld128.c b/src/qs8-igemm/gen/3x4c8-minmax-wasmsimd-ld128.c
index efe7c1c..0c95932 100644
--- a/src/qs8-igemm/gen/3x4c8-minmax-wasmsimd-ld128.c
+++ b/src/qs8-igemm/gen/3x4c8-minmax-wasmsimd-ld128.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-igemm/MRx4c8-minmax-wasmsimd.c.in
+//   Template: src/qs8-igemm/MRx4c8-wasmsimd.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC
diff --git a/src/qs8-igemm/gen/3x4c8-minmax-wasmsimd-ld64.c b/src/qs8-igemm/gen/3x4c8-minmax-wasmsimd-ld64.c
index 5f34912..7f22e3d 100644
--- a/src/qs8-igemm/gen/3x4c8-minmax-wasmsimd-ld64.c
+++ b/src/qs8-igemm/gen/3x4c8-minmax-wasmsimd-ld64.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-igemm/MRx4c8-minmax-wasmsimd.c.in
+//   Template: src/qs8-igemm/MRx4c8-wasmsimd.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC
diff --git a/src/qs8-igemm/gen/3x4c8-minmax-xop-ld128.c b/src/qs8-igemm/gen/3x4c8-minmax-xop-ld128.c
index 332f586..1760fc0 100644
--- a/src/qs8-igemm/gen/3x4c8-minmax-xop-ld128.c
+++ b/src/qs8-igemm/gen/3x4c8-minmax-xop-ld128.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-igemm/MRx4c8-minmax-sse.c.in
+//   Template: src/qs8-igemm/MRx4c8-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC
diff --git a/src/qs8-igemm/gen/3x4c8-minmax-xop-ld64.c b/src/qs8-igemm/gen/3x4c8-minmax-xop-ld64.c
index a960382..c215aa9 100644
--- a/src/qs8-igemm/gen/3x4c8-minmax-xop-ld64.c
+++ b/src/qs8-igemm/gen/3x4c8-minmax-xop-ld64.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-igemm/MRx4c8-minmax-sse.c.in
+//   Template: src/qs8-igemm/MRx4c8-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC
diff --git a/src/qs8-igemm/gen/3x8c8-minmax-avx2.c b/src/qs8-igemm/gen/3x8c8-minmax-avx2.c
index be5404c..4269041 100644
--- a/src/qs8-igemm/gen/3x8c8-minmax-avx2.c
+++ b/src/qs8-igemm/gen/3x8c8-minmax-avx2.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-igemm/MRx8c8-minmax-avx2.c.in
+//   Template: src/qs8-igemm/MRx8c8-avx2.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC
diff --git a/src/qs8-igemm/gen/4x16c4-minmax-neondot.c b/src/qs8-igemm/gen/4x16c4-minmax-neondot.c
index c5a134a..253ba24 100644
--- a/src/qs8-igemm/gen/4x16c4-minmax-neondot.c
+++ b/src/qs8-igemm/gen/4x16c4-minmax-neondot.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-igemm/MRxNRc4-minmax-neondot.c.in
+//   Template: src/qs8-igemm/MRxNRc4-neondot.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC
diff --git a/src/qs8-igemm/gen/4x16c8-minmax-avx512skx.c b/src/qs8-igemm/gen/4x16c8-minmax-avx512skx.c
index 3807343..b16ed2c 100644
--- a/src/qs8-igemm/gen/4x16c8-minmax-avx512skx.c
+++ b/src/qs8-igemm/gen/4x16c8-minmax-avx512skx.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-igemm/MRx16c8-minmax-avx512skx.c.in
+//   Template: src/qs8-igemm/MRx16c8-avx512skx.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC
diff --git a/src/qs8-igemm/gen/4x4c2-minmax-sse2-ld128.c b/src/qs8-igemm/gen/4x4c2-minmax-sse2-ld128.c
index 43f3fab..89c7807 100644
--- a/src/qs8-igemm/gen/4x4c2-minmax-sse2-ld128.c
+++ b/src/qs8-igemm/gen/4x4c2-minmax-sse2-ld128.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-igemm/MRx4c2-minmax-sse.c.in
+//   Template: src/qs8-igemm/MRx4c2-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC
diff --git a/src/qs8-igemm/gen/4x4c2-minmax-sse2-ld64.c b/src/qs8-igemm/gen/4x4c2-minmax-sse2-ld64.c
index 380a15c..7b5ce73 100644
--- a/src/qs8-igemm/gen/4x4c2-minmax-sse2-ld64.c
+++ b/src/qs8-igemm/gen/4x4c2-minmax-sse2-ld64.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-igemm/MRx4c2-minmax-sse.c.in
+//   Template: src/qs8-igemm/MRx4c2-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC
diff --git a/src/qs8-igemm/gen/4x4c2-minmax-sse41-ld128.c b/src/qs8-igemm/gen/4x4c2-minmax-sse41-ld128.c
index 9289bfa..6fc97cc 100644
--- a/src/qs8-igemm/gen/4x4c2-minmax-sse41-ld128.c
+++ b/src/qs8-igemm/gen/4x4c2-minmax-sse41-ld128.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-igemm/MRx4c2-minmax-sse.c.in
+//   Template: src/qs8-igemm/MRx4c2-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC
diff --git a/src/qs8-igemm/gen/4x4c2-minmax-sse41-ld64.c b/src/qs8-igemm/gen/4x4c2-minmax-sse41-ld64.c
index 049e011..4978b7b 100644
--- a/src/qs8-igemm/gen/4x4c2-minmax-sse41-ld64.c
+++ b/src/qs8-igemm/gen/4x4c2-minmax-sse41-ld64.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-igemm/MRx4c2-minmax-sse.c.in
+//   Template: src/qs8-igemm/MRx4c2-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC
diff --git a/src/qs8-igemm/gen/4x4c2-minmax-ssse3-ld128.c b/src/qs8-igemm/gen/4x4c2-minmax-ssse3-ld128.c
index 02cd2b3..82cfd1f 100644
--- a/src/qs8-igemm/gen/4x4c2-minmax-ssse3-ld128.c
+++ b/src/qs8-igemm/gen/4x4c2-minmax-ssse3-ld128.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-igemm/MRx4c2-minmax-sse.c.in
+//   Template: src/qs8-igemm/MRx4c2-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC
diff --git a/src/qs8-igemm/gen/4x4c2-minmax-ssse3-ld64.c b/src/qs8-igemm/gen/4x4c2-minmax-ssse3-ld64.c
index 9d0c86c..8a2def1 100644
--- a/src/qs8-igemm/gen/4x4c2-minmax-ssse3-ld64.c
+++ b/src/qs8-igemm/gen/4x4c2-minmax-ssse3-ld64.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-igemm/MRx4c2-minmax-sse.c.in
+//   Template: src/qs8-igemm/MRx4c2-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC
diff --git a/src/qs8-igemm/gen/4x4c2-minmax-xop-ld128.c b/src/qs8-igemm/gen/4x4c2-minmax-xop-ld128.c
index e336411..b1b6880 100644
--- a/src/qs8-igemm/gen/4x4c2-minmax-xop-ld128.c
+++ b/src/qs8-igemm/gen/4x4c2-minmax-xop-ld128.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-igemm/MRx4c2-minmax-sse.c.in
+//   Template: src/qs8-igemm/MRx4c2-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC
diff --git a/src/qs8-igemm/gen/4x4c2-minmax-xop-ld64.c b/src/qs8-igemm/gen/4x4c2-minmax-xop-ld64.c
index 00dc48a..7f3c778 100644
--- a/src/qs8-igemm/gen/4x4c2-minmax-xop-ld64.c
+++ b/src/qs8-igemm/gen/4x4c2-minmax-xop-ld64.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-igemm/MRx4c2-minmax-sse.c.in
+//   Template: src/qs8-igemm/MRx4c2-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC
diff --git a/src/qs8-igemm/gen/4x8-minmax-neon-mlal-lane.c b/src/qs8-igemm/gen/4x8-minmax-neon-mlal-lane.c
index 476232a..2f2ba67 100644
--- a/src/qs8-igemm/gen/4x8-minmax-neon-mlal-lane.c
+++ b/src/qs8-igemm/gen/4x8-minmax-neon-mlal-lane.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-igemm/minmax-neon-mlal-lane.c.in
+//   Template: src/qs8-igemm/neon-mlal-lane.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC
diff --git a/src/qs8-igemm/gen/4x8c4-minmax-neondot.c b/src/qs8-igemm/gen/4x8c4-minmax-neondot.c
index 3a720aa..3f66a4b 100644
--- a/src/qs8-igemm/gen/4x8c4-minmax-neondot.c
+++ b/src/qs8-igemm/gen/4x8c4-minmax-neondot.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-igemm/MRxNRc4-minmax-neondot.c.in
+//   Template: src/qs8-igemm/MRxNRc4-neondot.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC
diff --git a/src/qs8-igemm/gen/6x16c4-minmax-neondot.c b/src/qs8-igemm/gen/6x16c4-minmax-neondot.c
index eb32042..58a80c8 100644
--- a/src/qs8-igemm/gen/6x16c4-minmax-neondot.c
+++ b/src/qs8-igemm/gen/6x16c4-minmax-neondot.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-igemm/MRxNRc4-minmax-neondot.c.in
+//   Template: src/qs8-igemm/MRxNRc4-neondot.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC
diff --git a/src/qs8-igemm/gen/6x8c4-minmax-neondot.c b/src/qs8-igemm/gen/6x8c4-minmax-neondot.c
index 1e6c3fa..cf724cf 100644
--- a/src/qs8-igemm/gen/6x8c4-minmax-neondot.c
+++ b/src/qs8-igemm/gen/6x8c4-minmax-neondot.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-igemm/MRxNRc4-minmax-neondot.c.in
+//   Template: src/qs8-igemm/MRxNRc4-neondot.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC
diff --git a/src/qs8-igemm/gen/8x16c4-minmax-neondot.c b/src/qs8-igemm/gen/8x16c4-minmax-neondot.c
index 2fd6d3f..bb7c0f1 100644
--- a/src/qs8-igemm/gen/8x16c4-minmax-neondot.c
+++ b/src/qs8-igemm/gen/8x16c4-minmax-neondot.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-igemm/MRxNRc4-minmax-neondot.c.in
+//   Template: src/qs8-igemm/MRxNRc4-neondot.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC
diff --git a/src/qs8-igemm/gen/8x8c4-minmax-neondot.c b/src/qs8-igemm/gen/8x8c4-minmax-neondot.c
index 9d81fb5..7bdc2f3 100644
--- a/src/qs8-igemm/gen/8x8c4-minmax-neondot.c
+++ b/src/qs8-igemm/gen/8x8c4-minmax-neondot.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-igemm/MRxNRc4-minmax-neondot.c.in
+//   Template: src/qs8-igemm/MRxNRc4-neondot.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC