commit 66ccf648ea395dbd447a415f7437cd5f98dabe54
author Marat Dukhan <maratek@google.com> Mon Sep 28 16:23:42 2020 -0700
committer XNNPACK Team <xnnpack-github-robot@google.com> Mon Sep 28 16:24:15 2020 -0700
tree 7873620337660b56e30f6452302a9c66194b2be3
parent c3001e1d289f30afba3a9c55d6c6d4869a3d5d05

Rename QS8 generator templates

PiperOrigin-RevId: 334260510

src/qs8-dwconv/gen/up16x9-minmax-avx2-mul16.c

diff --git a/src/qs8-dwconv/gen/up16x9-minmax-avx2-mul16.c b/src/qs8-dwconv/gen/up16x9-minmax-avx2-mul16.c
index 162273e..1dc427b 100644
--- a/src/qs8-dwconv/gen/up16x9-minmax-avx2-mul16.c
+++ b/src/qs8-dwconv/gen/up16x9-minmax-avx2-mul16.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-dwconv/up-avx2-mul16.c.in
+//   Template: src/qs8-dwconv/unipass-avx2-mul16.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-dwconv/gen/up16x9-minmax-avx2-mul32.c

diff --git a/src/qs8-dwconv/gen/up16x9-minmax-avx2-mul32.c b/src/qs8-dwconv/gen/up16x9-minmax-avx2-mul32.c
index 37e11e9..c23fc81 100644
--- a/src/qs8-dwconv/gen/up16x9-minmax-avx2-mul32.c
+++ b/src/qs8-dwconv/gen/up16x9-minmax-avx2-mul32.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-dwconv/up-avx2-mul32.c.in
+//   Template: src/qs8-dwconv/unipass-avx2-mul32.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-dwconv/gen/up16x9-minmax-avx512skx-mul32.c

diff --git a/src/qs8-dwconv/gen/up16x9-minmax-avx512skx-mul32.c b/src/qs8-dwconv/gen/up16x9-minmax-avx512skx-mul32.c
index 09d152d..78c542a 100644
--- a/src/qs8-dwconv/gen/up16x9-minmax-avx512skx-mul32.c
+++ b/src/qs8-dwconv/gen/up16x9-minmax-avx512skx-mul32.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-dwconv/up-avx512skx-mul32.c.in
+//   Template: src/qs8-dwconv/unipass-avx512skx-mul32.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-dwconv/gen/up16x9-minmax-neon-mul16.c

diff --git a/src/qs8-dwconv/gen/up16x9-minmax-neon-mul16.c b/src/qs8-dwconv/gen/up16x9-minmax-neon-mul16.c
index 4ddf400..6daee4f 100644
--- a/src/qs8-dwconv/gen/up16x9-minmax-neon-mul16.c
+++ b/src/qs8-dwconv/gen/up16x9-minmax-neon-mul16.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-dwconv/up-neon-mul16.c.in
+//   Template: src/qs8-dwconv/unipass-neon-mul16.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-dwconv/gen/up16x9-minmax-sse2-mul16.c

diff --git a/src/qs8-dwconv/gen/up16x9-minmax-sse2-mul16.c b/src/qs8-dwconv/gen/up16x9-minmax-sse2-mul16.c
index 229a291..ee07325 100644
--- a/src/qs8-dwconv/gen/up16x9-minmax-sse2-mul16.c
+++ b/src/qs8-dwconv/gen/up16x9-minmax-sse2-mul16.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-dwconv/up-sse-mul16.c.in
+//   Template: src/qs8-dwconv/unipass-sse-mul16.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-dwconv/gen/up16x9-minmax-sse41-mul16.c

diff --git a/src/qs8-dwconv/gen/up16x9-minmax-sse41-mul16.c b/src/qs8-dwconv/gen/up16x9-minmax-sse41-mul16.c
index e0af7c4..3e2f7f8 100644
--- a/src/qs8-dwconv/gen/up16x9-minmax-sse41-mul16.c
+++ b/src/qs8-dwconv/gen/up16x9-minmax-sse41-mul16.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-dwconv/up-sse-mul16.c.in
+//   Template: src/qs8-dwconv/unipass-sse-mul16.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-dwconv/gen/up16x9-minmax-ssse3-mul16.c

diff --git a/src/qs8-dwconv/gen/up16x9-minmax-ssse3-mul16.c b/src/qs8-dwconv/gen/up16x9-minmax-ssse3-mul16.c
index f1e6f22..90f98d8 100644
--- a/src/qs8-dwconv/gen/up16x9-minmax-ssse3-mul16.c
+++ b/src/qs8-dwconv/gen/up16x9-minmax-ssse3-mul16.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-dwconv/up-sse-mul16.c.in
+//   Template: src/qs8-dwconv/unipass-sse-mul16.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-dwconv/gen/up16x9-minmax-wasmsimd-mul16.c

diff --git a/src/qs8-dwconv/gen/up16x9-minmax-wasmsimd-mul16.c b/src/qs8-dwconv/gen/up16x9-minmax-wasmsimd-mul16.c
index 8187d94..eb7b3cf 100644
--- a/src/qs8-dwconv/gen/up16x9-minmax-wasmsimd-mul16.c
+++ b/src/qs8-dwconv/gen/up16x9-minmax-wasmsimd-mul16.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-dwconv/up-wasmsimd-mul16.c.in
+//   Template: src/qs8-dwconv/unipass-wasmsimd-mul16.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-dwconv/gen/up24x9-minmax-avx2-mul32.c

diff --git a/src/qs8-dwconv/gen/up24x9-minmax-avx2-mul32.c b/src/qs8-dwconv/gen/up24x9-minmax-avx2-mul32.c
index 0cf5e7e..f04663f 100644
--- a/src/qs8-dwconv/gen/up24x9-minmax-avx2-mul32.c
+++ b/src/qs8-dwconv/gen/up24x9-minmax-avx2-mul32.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-dwconv/up-avx2-mul32.c.in
+//   Template: src/qs8-dwconv/unipass-avx2-mul32.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-dwconv/gen/up24x9-minmax-neon-mul16.c

diff --git a/src/qs8-dwconv/gen/up24x9-minmax-neon-mul16.c b/src/qs8-dwconv/gen/up24x9-minmax-neon-mul16.c
index 3cd1182..0de9001 100644
--- a/src/qs8-dwconv/gen/up24x9-minmax-neon-mul16.c
+++ b/src/qs8-dwconv/gen/up24x9-minmax-neon-mul16.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-dwconv/up-neon-mul16.c.in
+//   Template: src/qs8-dwconv/unipass-neon-mul16.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-dwconv/gen/up24x9-minmax-sse2-mul16.c

diff --git a/src/qs8-dwconv/gen/up24x9-minmax-sse2-mul16.c b/src/qs8-dwconv/gen/up24x9-minmax-sse2-mul16.c
index d635df3..8eda6f8 100644
--- a/src/qs8-dwconv/gen/up24x9-minmax-sse2-mul16.c
+++ b/src/qs8-dwconv/gen/up24x9-minmax-sse2-mul16.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-dwconv/up-sse-mul16.c.in
+//   Template: src/qs8-dwconv/unipass-sse-mul16.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-dwconv/gen/up24x9-minmax-sse41-mul16.c

diff --git a/src/qs8-dwconv/gen/up24x9-minmax-sse41-mul16.c b/src/qs8-dwconv/gen/up24x9-minmax-sse41-mul16.c
index cfd8b96..29b11f3 100644
--- a/src/qs8-dwconv/gen/up24x9-minmax-sse41-mul16.c
+++ b/src/qs8-dwconv/gen/up24x9-minmax-sse41-mul16.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-dwconv/up-sse-mul16.c.in
+//   Template: src/qs8-dwconv/unipass-sse-mul16.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-dwconv/gen/up24x9-minmax-ssse3-mul16.c

diff --git a/src/qs8-dwconv/gen/up24x9-minmax-ssse3-mul16.c b/src/qs8-dwconv/gen/up24x9-minmax-ssse3-mul16.c
index 5844152..d3934a0 100644
--- a/src/qs8-dwconv/gen/up24x9-minmax-ssse3-mul16.c
+++ b/src/qs8-dwconv/gen/up24x9-minmax-ssse3-mul16.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-dwconv/up-sse-mul16.c.in
+//   Template: src/qs8-dwconv/unipass-sse-mul16.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-dwconv/gen/up24x9-minmax-wasmsimd-mul16.c

diff --git a/src/qs8-dwconv/gen/up24x9-minmax-wasmsimd-mul16.c b/src/qs8-dwconv/gen/up24x9-minmax-wasmsimd-mul16.c
index 93d8847..f5efd68 100644
--- a/src/qs8-dwconv/gen/up24x9-minmax-wasmsimd-mul16.c
+++ b/src/qs8-dwconv/gen/up24x9-minmax-wasmsimd-mul16.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-dwconv/up-wasmsimd-mul16.c.in
+//   Template: src/qs8-dwconv/unipass-wasmsimd-mul16.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-dwconv/gen/up32x9-minmax-avx2-mul16.c

diff --git a/src/qs8-dwconv/gen/up32x9-minmax-avx2-mul16.c b/src/qs8-dwconv/gen/up32x9-minmax-avx2-mul16.c
index 356f546..4972c11 100644
--- a/src/qs8-dwconv/gen/up32x9-minmax-avx2-mul16.c
+++ b/src/qs8-dwconv/gen/up32x9-minmax-avx2-mul16.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-dwconv/up-avx2-mul16.c.in
+//   Template: src/qs8-dwconv/unipass-avx2-mul16.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-dwconv/gen/up32x9-minmax-avx2-mul32.c

diff --git a/src/qs8-dwconv/gen/up32x9-minmax-avx2-mul32.c b/src/qs8-dwconv/gen/up32x9-minmax-avx2-mul32.c
index 2496d39..579b30b 100644
--- a/src/qs8-dwconv/gen/up32x9-minmax-avx2-mul32.c
+++ b/src/qs8-dwconv/gen/up32x9-minmax-avx2-mul32.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-dwconv/up-avx2-mul32.c.in
+//   Template: src/qs8-dwconv/unipass-avx2-mul32.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-dwconv/gen/up32x9-minmax-avx512skx-mul32.c

diff --git a/src/qs8-dwconv/gen/up32x9-minmax-avx512skx-mul32.c b/src/qs8-dwconv/gen/up32x9-minmax-avx512skx-mul32.c
index ac65e35..d9e52a7 100644
--- a/src/qs8-dwconv/gen/up32x9-minmax-avx512skx-mul32.c
+++ b/src/qs8-dwconv/gen/up32x9-minmax-avx512skx-mul32.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-dwconv/up-avx512skx-mul32.c.in
+//   Template: src/qs8-dwconv/unipass-avx512skx-mul32.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-dwconv/gen/up32x9-minmax-neon-mul16.c

diff --git a/src/qs8-dwconv/gen/up32x9-minmax-neon-mul16.c b/src/qs8-dwconv/gen/up32x9-minmax-neon-mul16.c
index 196e897..e0e6458 100644
--- a/src/qs8-dwconv/gen/up32x9-minmax-neon-mul16.c
+++ b/src/qs8-dwconv/gen/up32x9-minmax-neon-mul16.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-dwconv/up-neon-mul16.c.in
+//   Template: src/qs8-dwconv/unipass-neon-mul16.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-dwconv/gen/up8x9-minmax-avx2-mul32.c

diff --git a/src/qs8-dwconv/gen/up8x9-minmax-avx2-mul32.c b/src/qs8-dwconv/gen/up8x9-minmax-avx2-mul32.c
index cf29082..3e82ebf 100644
--- a/src/qs8-dwconv/gen/up8x9-minmax-avx2-mul32.c
+++ b/src/qs8-dwconv/gen/up8x9-minmax-avx2-mul32.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-dwconv/up-avx2-mul32.c.in
+//   Template: src/qs8-dwconv/unipass-avx2-mul32.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-dwconv/gen/up8x9-minmax-neon-mul16.c

diff --git a/src/qs8-dwconv/gen/up8x9-minmax-neon-mul16.c b/src/qs8-dwconv/gen/up8x9-minmax-neon-mul16.c
index 3400d02..1b13e62 100644
--- a/src/qs8-dwconv/gen/up8x9-minmax-neon-mul16.c
+++ b/src/qs8-dwconv/gen/up8x9-minmax-neon-mul16.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-dwconv/up-neon-mul16.c.in
+//   Template: src/qs8-dwconv/unipass-neon-mul16.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-dwconv/gen/up8x9-minmax-sse2-mul16.c

diff --git a/src/qs8-dwconv/gen/up8x9-minmax-sse2-mul16.c b/src/qs8-dwconv/gen/up8x9-minmax-sse2-mul16.c
index 7f1ca14..554a00a 100644
--- a/src/qs8-dwconv/gen/up8x9-minmax-sse2-mul16.c
+++ b/src/qs8-dwconv/gen/up8x9-minmax-sse2-mul16.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-dwconv/up-sse-mul16.c.in
+//   Template: src/qs8-dwconv/unipass-sse-mul16.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-dwconv/gen/up8x9-minmax-sse41-mul16.c

diff --git a/src/qs8-dwconv/gen/up8x9-minmax-sse41-mul16.c b/src/qs8-dwconv/gen/up8x9-minmax-sse41-mul16.c
index 30ce087..38d707a 100644
--- a/src/qs8-dwconv/gen/up8x9-minmax-sse41-mul16.c
+++ b/src/qs8-dwconv/gen/up8x9-minmax-sse41-mul16.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-dwconv/up-sse-mul16.c.in
+//   Template: src/qs8-dwconv/unipass-sse-mul16.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-dwconv/gen/up8x9-minmax-ssse3-mul16.c

diff --git a/src/qs8-dwconv/gen/up8x9-minmax-ssse3-mul16.c b/src/qs8-dwconv/gen/up8x9-minmax-ssse3-mul16.c
index ac06f19..f21866a 100644
--- a/src/qs8-dwconv/gen/up8x9-minmax-ssse3-mul16.c
+++ b/src/qs8-dwconv/gen/up8x9-minmax-ssse3-mul16.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-dwconv/up-sse-mul16.c.in
+//   Template: src/qs8-dwconv/unipass-sse-mul16.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-dwconv/gen/up8x9-minmax-wasmsimd-mul16.c

diff --git a/src/qs8-dwconv/gen/up8x9-minmax-wasmsimd-mul16.c b/src/qs8-dwconv/gen/up8x9-minmax-wasmsimd-mul16.c
index 66b9a2a..cd229d5 100644
--- a/src/qs8-dwconv/gen/up8x9-minmax-wasmsimd-mul16.c
+++ b/src/qs8-dwconv/gen/up8x9-minmax-wasmsimd-mul16.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-dwconv/up-wasmsimd-mul16.c.in
+//   Template: src/qs8-dwconv/unipass-wasmsimd-mul16.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-dwconv/unipass-avx2-mul16.c.in

diff --git a/src/qs8-dwconv/up-avx2-mul16.c.in b/src/qs8-dwconv/unipass-avx2-mul16.c.in
similarity index 100%
rename from src/qs8-dwconv/up-avx2-mul16.c.in
rename to src/qs8-dwconv/unipass-avx2-mul16.c.in

src/qs8-dwconv/unipass-avx2-mul32.c.in

diff --git a/src/qs8-dwconv/up-avx2-mul32.c.in b/src/qs8-dwconv/unipass-avx2-mul32.c.in
similarity index 100%
rename from src/qs8-dwconv/up-avx2-mul32.c.in
rename to src/qs8-dwconv/unipass-avx2-mul32.c.in

src/qs8-dwconv/unipass-avx512skx-mul32.c.in

diff --git a/src/qs8-dwconv/up-avx512skx-mul32.c.in b/src/qs8-dwconv/unipass-avx512skx-mul32.c.in
similarity index 100%
rename from src/qs8-dwconv/up-avx512skx-mul32.c.in
rename to src/qs8-dwconv/unipass-avx512skx-mul32.c.in

src/qs8-dwconv/unipass-neon-mul16.c.in

diff --git a/src/qs8-dwconv/up-neon-mul16.c.in b/src/qs8-dwconv/unipass-neon-mul16.c.in
similarity index 100%
rename from src/qs8-dwconv/up-neon-mul16.c.in
rename to src/qs8-dwconv/unipass-neon-mul16.c.in

src/qs8-dwconv/unipass-sse-mul16.c.in

diff --git a/src/qs8-dwconv/up-sse-mul16.c.in b/src/qs8-dwconv/unipass-sse-mul16.c.in
similarity index 100%
rename from src/qs8-dwconv/up-sse-mul16.c.in
rename to src/qs8-dwconv/unipass-sse-mul16.c.in

src/qs8-dwconv/unipass-wasmsimd-mul16.c.in

diff --git a/src/qs8-dwconv/up-wasmsimd-mul16.c.in b/src/qs8-dwconv/unipass-wasmsimd-mul16.c.in
similarity index 100%
rename from src/qs8-dwconv/up-wasmsimd-mul16.c.in
rename to src/qs8-dwconv/unipass-wasmsimd-mul16.c.in

src/qs8-gemm/MRx16c8-avx512skx.c.in

diff --git a/src/qs8-gemm/MRx16c8-minmax-avx512skx.c.in b/src/qs8-gemm/MRx16c8-avx512skx.c.in
similarity index 100%
rename from src/qs8-gemm/MRx16c8-minmax-avx512skx.c.in
rename to src/qs8-gemm/MRx16c8-avx512skx.c.in

src/qs8-gemm/MRx4c2-sse.c.in

diff --git a/src/qs8-gemm/MRx4c2-minmax-sse.c.in b/src/qs8-gemm/MRx4c2-sse.c.in
similarity index 100%
rename from src/qs8-gemm/MRx4c2-minmax-sse.c.in
rename to src/qs8-gemm/MRx4c2-sse.c.in

src/qs8-gemm/MRx4c8-sse.c.in

diff --git a/src/qs8-gemm/MRx4c8-minmax-sse.c.in b/src/qs8-gemm/MRx4c8-sse.c.in
similarity index 100%
rename from src/qs8-gemm/MRx4c8-minmax-sse.c.in
rename to src/qs8-gemm/MRx4c8-sse.c.in

src/qs8-gemm/MRx4c8-wasmsimd.c.in

diff --git a/src/qs8-gemm/MRx4c8-minmax-wasmsimd.c.in b/src/qs8-gemm/MRx4c8-wasmsimd.c.in
similarity index 100%
rename from src/qs8-gemm/MRx4c8-minmax-wasmsimd.c.in
rename to src/qs8-gemm/MRx4c8-wasmsimd.c.in

src/qs8-gemm/MRx8c8-avx2.c.in

diff --git a/src/qs8-gemm/MRx8c8-minmax-avx2.c.in b/src/qs8-gemm/MRx8c8-avx2.c.in
similarity index 100%
rename from src/qs8-gemm/MRx8c8-minmax-avx2.c.in
rename to src/qs8-gemm/MRx8c8-avx2.c.in

src/qs8-gemm/MRxNRc4-neondot.c.in

diff --git a/src/qs8-gemm/MRxNRc4-minmax-neondot.c.in b/src/qs8-gemm/MRxNRc4-neondot.c.in
similarity index 100%
rename from src/qs8-gemm/MRxNRc4-minmax-neondot.c.in
rename to src/qs8-gemm/MRxNRc4-neondot.c.in

src/qs8-gemm/MRxNRc4-scalar.c.in

diff --git a/src/qs8-gemm/MRxNRc4-minmax-scalar.c.in b/src/qs8-gemm/MRxNRc4-scalar.c.in
similarity index 100%
rename from src/qs8-gemm/MRxNRc4-minmax-scalar.c.in
rename to src/qs8-gemm/MRxNRc4-scalar.c.in

src/qs8-gemm/gen/12x4c4-minmax-scalar.c

diff --git a/src/qs8-gemm/gen/12x4c4-minmax-scalar.c b/src/qs8-gemm/gen/12x4c4-minmax-scalar.c
index 8690ca8..db87ecb 100644
--- a/src/qs8-gemm/gen/12x4c4-minmax-scalar.c
+++ b/src/qs8-gemm/gen/12x4c4-minmax-scalar.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-gemm/MRxNRc4-minmax-scalar.c.in
+//   Template: src/qs8-gemm/MRxNRc4-scalar.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-gemm/gen/12x8c4-minmax-neondot.c

diff --git a/src/qs8-gemm/gen/12x8c4-minmax-neondot.c b/src/qs8-gemm/gen/12x8c4-minmax-neondot.c
index 3ab406c..a693476 100644
--- a/src/qs8-gemm/gen/12x8c4-minmax-neondot.c
+++ b/src/qs8-gemm/gen/12x8c4-minmax-neondot.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-gemm/MRxNRc4-minmax-neondot.c.in
+//   Template: src/qs8-gemm/MRxNRc4-neondot.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-gemm/gen/1x16-minmax-neon-mlal-lane.c

diff --git a/src/qs8-gemm/gen/1x16-minmax-neon-mlal-lane.c b/src/qs8-gemm/gen/1x16-minmax-neon-mlal-lane.c
index b1cf7b2..84adcb6 100644
--- a/src/qs8-gemm/gen/1x16-minmax-neon-mlal-lane.c
+++ b/src/qs8-gemm/gen/1x16-minmax-neon-mlal-lane.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-gemm/minmax-neon-mlal-lane.c.in
+//   Template: src/qs8-gemm/neon-mlal-lane.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-gemm/gen/1x16c4-minmax-neondot.c

diff --git a/src/qs8-gemm/gen/1x16c4-minmax-neondot.c b/src/qs8-gemm/gen/1x16c4-minmax-neondot.c
index d3a5bbb..cd8f44f 100644
--- a/src/qs8-gemm/gen/1x16c4-minmax-neondot.c
+++ b/src/qs8-gemm/gen/1x16c4-minmax-neondot.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-gemm/MRxNRc4-minmax-neondot.c.in
+//   Template: src/qs8-gemm/MRxNRc4-neondot.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-gemm/gen/1x16c8-minmax-avx512skx.c

diff --git a/src/qs8-gemm/gen/1x16c8-minmax-avx512skx.c b/src/qs8-gemm/gen/1x16c8-minmax-avx512skx.c
index c72a127..e03b182 100644
--- a/src/qs8-gemm/gen/1x16c8-minmax-avx512skx.c
+++ b/src/qs8-gemm/gen/1x16c8-minmax-avx512skx.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-gemm/MRx16c8-minmax-avx512skx.c.in
+//   Template: src/qs8-gemm/MRx16c8-avx512skx.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-gemm/gen/1x4c2-minmax-sse2-ld128.c

diff --git a/src/qs8-gemm/gen/1x4c2-minmax-sse2-ld128.c b/src/qs8-gemm/gen/1x4c2-minmax-sse2-ld128.c
index f941add..36d08bb 100644
--- a/src/qs8-gemm/gen/1x4c2-minmax-sse2-ld128.c
+++ b/src/qs8-gemm/gen/1x4c2-minmax-sse2-ld128.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-gemm/MRx4c2-minmax-sse.c.in
+//   Template: src/qs8-gemm/MRx4c2-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-gemm/gen/1x4c2-minmax-sse2-ld64.c

diff --git a/src/qs8-gemm/gen/1x4c2-minmax-sse2-ld64.c b/src/qs8-gemm/gen/1x4c2-minmax-sse2-ld64.c
index 613d20f..96aae54 100644
--- a/src/qs8-gemm/gen/1x4c2-minmax-sse2-ld64.c
+++ b/src/qs8-gemm/gen/1x4c2-minmax-sse2-ld64.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-gemm/MRx4c2-minmax-sse.c.in
+//   Template: src/qs8-gemm/MRx4c2-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-gemm/gen/1x4c2-minmax-sse41-ld128.c

diff --git a/src/qs8-gemm/gen/1x4c2-minmax-sse41-ld128.c b/src/qs8-gemm/gen/1x4c2-minmax-sse41-ld128.c
index 4ae7e4f..45fee98 100644
--- a/src/qs8-gemm/gen/1x4c2-minmax-sse41-ld128.c
+++ b/src/qs8-gemm/gen/1x4c2-minmax-sse41-ld128.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-gemm/MRx4c2-minmax-sse.c.in
+//   Template: src/qs8-gemm/MRx4c2-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-gemm/gen/1x4c2-minmax-sse41-ld64.c

diff --git a/src/qs8-gemm/gen/1x4c2-minmax-sse41-ld64.c b/src/qs8-gemm/gen/1x4c2-minmax-sse41-ld64.c
index d52c15e..de32f50 100644
--- a/src/qs8-gemm/gen/1x4c2-minmax-sse41-ld64.c
+++ b/src/qs8-gemm/gen/1x4c2-minmax-sse41-ld64.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-gemm/MRx4c2-minmax-sse.c.in
+//   Template: src/qs8-gemm/MRx4c2-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-gemm/gen/1x4c2-minmax-ssse3-ld128.c

diff --git a/src/qs8-gemm/gen/1x4c2-minmax-ssse3-ld128.c b/src/qs8-gemm/gen/1x4c2-minmax-ssse3-ld128.c
index 449b186..9e517ba 100644
--- a/src/qs8-gemm/gen/1x4c2-minmax-ssse3-ld128.c
+++ b/src/qs8-gemm/gen/1x4c2-minmax-ssse3-ld128.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-gemm/MRx4c2-minmax-sse.c.in
+//   Template: src/qs8-gemm/MRx4c2-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-gemm/gen/1x4c2-minmax-ssse3-ld64.c

diff --git a/src/qs8-gemm/gen/1x4c2-minmax-ssse3-ld64.c b/src/qs8-gemm/gen/1x4c2-minmax-ssse3-ld64.c
index 4caa45f..7529af6 100644
--- a/src/qs8-gemm/gen/1x4c2-minmax-ssse3-ld64.c
+++ b/src/qs8-gemm/gen/1x4c2-minmax-ssse3-ld64.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-gemm/MRx4c2-minmax-sse.c.in
+//   Template: src/qs8-gemm/MRx4c2-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-gemm/gen/1x4c2-minmax-xop-ld128.c

diff --git a/src/qs8-gemm/gen/1x4c2-minmax-xop-ld128.c b/src/qs8-gemm/gen/1x4c2-minmax-xop-ld128.c
index 82803f8..464f22f 100644
--- a/src/qs8-gemm/gen/1x4c2-minmax-xop-ld128.c
+++ b/src/qs8-gemm/gen/1x4c2-minmax-xop-ld128.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-gemm/MRx4c2-minmax-sse.c.in
+//   Template: src/qs8-gemm/MRx4c2-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-gemm/gen/1x4c2-minmax-xop-ld64.c

diff --git a/src/qs8-gemm/gen/1x4c2-minmax-xop-ld64.c b/src/qs8-gemm/gen/1x4c2-minmax-xop-ld64.c
index fffad65..8038248 100644
--- a/src/qs8-gemm/gen/1x4c2-minmax-xop-ld64.c
+++ b/src/qs8-gemm/gen/1x4c2-minmax-xop-ld64.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-gemm/MRx4c2-minmax-sse.c.in
+//   Template: src/qs8-gemm/MRx4c2-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-gemm/gen/1x4c2-xw-minmax-sse2.c

diff --git a/src/qs8-gemm/gen/1x4c2-xw-minmax-sse2.c b/src/qs8-gemm/gen/1x4c2-xw-minmax-sse2.c
index 8aa74c3..70c7dd0 100644
--- a/src/qs8-gemm/gen/1x4c2-xw-minmax-sse2.c
+++ b/src/qs8-gemm/gen/1x4c2-xw-minmax-sse2.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-gemm/MRx4c2-minmax-sse.c.in
+//   Template: src/qs8-gemm/MRx4c2-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-gemm/gen/1x4c2-xw-minmax-sse41.c

diff --git a/src/qs8-gemm/gen/1x4c2-xw-minmax-sse41.c b/src/qs8-gemm/gen/1x4c2-xw-minmax-sse41.c
index 9311057..d5fa2c3 100644
--- a/src/qs8-gemm/gen/1x4c2-xw-minmax-sse41.c
+++ b/src/qs8-gemm/gen/1x4c2-xw-minmax-sse41.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-gemm/MRx4c2-minmax-sse.c.in
+//   Template: src/qs8-gemm/MRx4c2-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-gemm/gen/1x4c2-xw-minmax-ssse3.c

diff --git a/src/qs8-gemm/gen/1x4c2-xw-minmax-ssse3.c b/src/qs8-gemm/gen/1x4c2-xw-minmax-ssse3.c
index 22608bc..40b3ea8 100644
--- a/src/qs8-gemm/gen/1x4c2-xw-minmax-ssse3.c
+++ b/src/qs8-gemm/gen/1x4c2-xw-minmax-ssse3.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-gemm/MRx4c2-minmax-sse.c.in
+//   Template: src/qs8-gemm/MRx4c2-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-gemm/gen/1x4c2-xw-minmax-xop.c

diff --git a/src/qs8-gemm/gen/1x4c2-xw-minmax-xop.c b/src/qs8-gemm/gen/1x4c2-xw-minmax-xop.c
index d3aa022..624ac2b 100644
--- a/src/qs8-gemm/gen/1x4c2-xw-minmax-xop.c
+++ b/src/qs8-gemm/gen/1x4c2-xw-minmax-xop.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-gemm/MRx4c2-minmax-sse.c.in
+//   Template: src/qs8-gemm/MRx4c2-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-gemm/gen/1x4c8-minmax-sse2-ld128.c

diff --git a/src/qs8-gemm/gen/1x4c8-minmax-sse2-ld128.c b/src/qs8-gemm/gen/1x4c8-minmax-sse2-ld128.c
index bcd837a..87d81ff 100644
--- a/src/qs8-gemm/gen/1x4c8-minmax-sse2-ld128.c
+++ b/src/qs8-gemm/gen/1x4c8-minmax-sse2-ld128.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-gemm/MRx4c8-minmax-sse.c.in
+//   Template: src/qs8-gemm/MRx4c8-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-gemm/gen/1x4c8-minmax-sse2-ld64.c

diff --git a/src/qs8-gemm/gen/1x4c8-minmax-sse2-ld64.c b/src/qs8-gemm/gen/1x4c8-minmax-sse2-ld64.c
index f34f97a..3467c1e 100644
--- a/src/qs8-gemm/gen/1x4c8-minmax-sse2-ld64.c
+++ b/src/qs8-gemm/gen/1x4c8-minmax-sse2-ld64.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-gemm/MRx4c8-minmax-sse.c.in
+//   Template: src/qs8-gemm/MRx4c8-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-gemm/gen/1x4c8-minmax-sse41-ld128.c

diff --git a/src/qs8-gemm/gen/1x4c8-minmax-sse41-ld128.c b/src/qs8-gemm/gen/1x4c8-minmax-sse41-ld128.c
index a8f4601..e7b623c 100644
--- a/src/qs8-gemm/gen/1x4c8-minmax-sse41-ld128.c
+++ b/src/qs8-gemm/gen/1x4c8-minmax-sse41-ld128.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-gemm/MRx4c8-minmax-sse.c.in
+//   Template: src/qs8-gemm/MRx4c8-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-gemm/gen/1x4c8-minmax-sse41-ld64.c

diff --git a/src/qs8-gemm/gen/1x4c8-minmax-sse41-ld64.c b/src/qs8-gemm/gen/1x4c8-minmax-sse41-ld64.c
index fb60371..6db42e2 100644
--- a/src/qs8-gemm/gen/1x4c8-minmax-sse41-ld64.c
+++ b/src/qs8-gemm/gen/1x4c8-minmax-sse41-ld64.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-gemm/MRx4c8-minmax-sse.c.in
+//   Template: src/qs8-gemm/MRx4c8-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-gemm/gen/1x4c8-minmax-ssse3-ld128.c

diff --git a/src/qs8-gemm/gen/1x4c8-minmax-ssse3-ld128.c b/src/qs8-gemm/gen/1x4c8-minmax-ssse3-ld128.c
index 9f6f286..d0323dd 100644
--- a/src/qs8-gemm/gen/1x4c8-minmax-ssse3-ld128.c
+++ b/src/qs8-gemm/gen/1x4c8-minmax-ssse3-ld128.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-gemm/MRx4c8-minmax-sse.c.in
+//   Template: src/qs8-gemm/MRx4c8-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-gemm/gen/1x4c8-minmax-ssse3-ld64.c

diff --git a/src/qs8-gemm/gen/1x4c8-minmax-ssse3-ld64.c b/src/qs8-gemm/gen/1x4c8-minmax-ssse3-ld64.c
index 88303dc..c8cd8ad 100644
--- a/src/qs8-gemm/gen/1x4c8-minmax-ssse3-ld64.c
+++ b/src/qs8-gemm/gen/1x4c8-minmax-ssse3-ld64.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-gemm/MRx4c8-minmax-sse.c.in
+//   Template: src/qs8-gemm/MRx4c8-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-gemm/gen/1x4c8-minmax-wasmsimd-ld128.c

diff --git a/src/qs8-gemm/gen/1x4c8-minmax-wasmsimd-ld128.c b/src/qs8-gemm/gen/1x4c8-minmax-wasmsimd-ld128.c
index bb79ff0..ba3e4f1 100644
--- a/src/qs8-gemm/gen/1x4c8-minmax-wasmsimd-ld128.c
+++ b/src/qs8-gemm/gen/1x4c8-minmax-wasmsimd-ld128.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-gemm/MRx4c8-minmax-wasmsimd.c.in
+//   Template: src/qs8-gemm/MRx4c8-wasmsimd.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-gemm/gen/1x4c8-minmax-wasmsimd-ld64.c

diff --git a/src/qs8-gemm/gen/1x4c8-minmax-wasmsimd-ld64.c b/src/qs8-gemm/gen/1x4c8-minmax-wasmsimd-ld64.c
index fbe7505..428426a 100644
--- a/src/qs8-gemm/gen/1x4c8-minmax-wasmsimd-ld64.c
+++ b/src/qs8-gemm/gen/1x4c8-minmax-wasmsimd-ld64.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-gemm/MRx4c8-minmax-wasmsimd.c.in
+//   Template: src/qs8-gemm/MRx4c8-wasmsimd.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-gemm/gen/1x4c8-minmax-xop-ld128.c

diff --git a/src/qs8-gemm/gen/1x4c8-minmax-xop-ld128.c b/src/qs8-gemm/gen/1x4c8-minmax-xop-ld128.c
index 21e1e0b..e89b0a2 100644
--- a/src/qs8-gemm/gen/1x4c8-minmax-xop-ld128.c
+++ b/src/qs8-gemm/gen/1x4c8-minmax-xop-ld128.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-gemm/MRx4c8-minmax-sse.c.in
+//   Template: src/qs8-gemm/MRx4c8-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-gemm/gen/1x4c8-minmax-xop-ld64.c

diff --git a/src/qs8-gemm/gen/1x4c8-minmax-xop-ld64.c b/src/qs8-gemm/gen/1x4c8-minmax-xop-ld64.c
index f517ed9..f281502 100644
--- a/src/qs8-gemm/gen/1x4c8-minmax-xop-ld64.c
+++ b/src/qs8-gemm/gen/1x4c8-minmax-xop-ld64.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-gemm/MRx4c8-minmax-sse.c.in
+//   Template: src/qs8-gemm/MRx4c8-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-gemm/gen/1x4c8-xw-minmax-sse2.c

diff --git a/src/qs8-gemm/gen/1x4c8-xw-minmax-sse2.c b/src/qs8-gemm/gen/1x4c8-xw-minmax-sse2.c
index ca26117..84cd542 100644
--- a/src/qs8-gemm/gen/1x4c8-xw-minmax-sse2.c
+++ b/src/qs8-gemm/gen/1x4c8-xw-minmax-sse2.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-gemm/MRx4c8-minmax-sse.c.in
+//   Template: src/qs8-gemm/MRx4c8-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-gemm/gen/1x4c8-xw-minmax-sse41.c

diff --git a/src/qs8-gemm/gen/1x4c8-xw-minmax-sse41.c b/src/qs8-gemm/gen/1x4c8-xw-minmax-sse41.c
index 4f54eb8..59b547c 100644
--- a/src/qs8-gemm/gen/1x4c8-xw-minmax-sse41.c
+++ b/src/qs8-gemm/gen/1x4c8-xw-minmax-sse41.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-gemm/MRx4c8-minmax-sse.c.in
+//   Template: src/qs8-gemm/MRx4c8-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-gemm/gen/1x4c8-xw-minmax-ssse3.c

diff --git a/src/qs8-gemm/gen/1x4c8-xw-minmax-ssse3.c b/src/qs8-gemm/gen/1x4c8-xw-minmax-ssse3.c
index 9ab6e7e..6e1f9c9 100644
--- a/src/qs8-gemm/gen/1x4c8-xw-minmax-ssse3.c
+++ b/src/qs8-gemm/gen/1x4c8-xw-minmax-ssse3.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-gemm/MRx4c8-minmax-sse.c.in
+//   Template: src/qs8-gemm/MRx4c8-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-gemm/gen/1x4c8-xw-minmax-wasmsimd.c

diff --git a/src/qs8-gemm/gen/1x4c8-xw-minmax-wasmsimd.c b/src/qs8-gemm/gen/1x4c8-xw-minmax-wasmsimd.c
index b4c02c9..7cc7643 100644
--- a/src/qs8-gemm/gen/1x4c8-xw-minmax-wasmsimd.c
+++ b/src/qs8-gemm/gen/1x4c8-xw-minmax-wasmsimd.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-gemm/MRx4c8-minmax-wasmsimd.c.in
+//   Template: src/qs8-gemm/MRx4c8-wasmsimd.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-gemm/gen/1x4c8-xw-minmax-xop.c

diff --git a/src/qs8-gemm/gen/1x4c8-xw-minmax-xop.c b/src/qs8-gemm/gen/1x4c8-xw-minmax-xop.c
index 5b90a03..29349f9 100644
--- a/src/qs8-gemm/gen/1x4c8-xw-minmax-xop.c
+++ b/src/qs8-gemm/gen/1x4c8-xw-minmax-xop.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-gemm/MRx4c8-minmax-sse.c.in
+//   Template: src/qs8-gemm/MRx4c8-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-gemm/gen/1x8-minmax-neon-mlal-lane.c

diff --git a/src/qs8-gemm/gen/1x8-minmax-neon-mlal-lane.c b/src/qs8-gemm/gen/1x8-minmax-neon-mlal-lane.c
index 848daf4..cd31490 100644
--- a/src/qs8-gemm/gen/1x8-minmax-neon-mlal-lane.c
+++ b/src/qs8-gemm/gen/1x8-minmax-neon-mlal-lane.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-gemm/minmax-neon-mlal-lane.c.in
+//   Template: src/qs8-gemm/neon-mlal-lane.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-gemm/gen/1x8c4-minmax-neondot.c

diff --git a/src/qs8-gemm/gen/1x8c4-minmax-neondot.c b/src/qs8-gemm/gen/1x8c4-minmax-neondot.c
index d5a56f8..3ce1f0d 100644
--- a/src/qs8-gemm/gen/1x8c4-minmax-neondot.c
+++ b/src/qs8-gemm/gen/1x8c4-minmax-neondot.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-gemm/MRxNRc4-minmax-neondot.c.in
+//   Template: src/qs8-gemm/MRxNRc4-neondot.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-gemm/gen/1x8c8-minmax-avx2.c

diff --git a/src/qs8-gemm/gen/1x8c8-minmax-avx2.c b/src/qs8-gemm/gen/1x8c8-minmax-avx2.c
index ee3ea21..29b2e86 100644
--- a/src/qs8-gemm/gen/1x8c8-minmax-avx2.c
+++ b/src/qs8-gemm/gen/1x8c8-minmax-avx2.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-gemm/MRx8c8-minmax-avx2.c.in
+//   Template: src/qs8-gemm/MRx8c8-avx2.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-gemm/gen/1x8c8-xw-minmax-avx2.c

diff --git a/src/qs8-gemm/gen/1x8c8-xw-minmax-avx2.c b/src/qs8-gemm/gen/1x8c8-xw-minmax-avx2.c
index 564a7d5..e039738 100644
--- a/src/qs8-gemm/gen/1x8c8-xw-minmax-avx2.c
+++ b/src/qs8-gemm/gen/1x8c8-xw-minmax-avx2.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-gemm/MRx8c8-minmax-avx2.c.in
+//   Template: src/qs8-gemm/MRx8c8-avx2.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-gemm/gen/2x16-minmax-neon-mlal-lane.c

diff --git a/src/qs8-gemm/gen/2x16-minmax-neon-mlal-lane.c b/src/qs8-gemm/gen/2x16-minmax-neon-mlal-lane.c
index b2e14ce..54e4bfc 100644
--- a/src/qs8-gemm/gen/2x16-minmax-neon-mlal-lane.c
+++ b/src/qs8-gemm/gen/2x16-minmax-neon-mlal-lane.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-gemm/minmax-neon-mlal-lane.c.in
+//   Template: src/qs8-gemm/neon-mlal-lane.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-gemm/gen/2x16c8-minmax-avx512skx.c

diff --git a/src/qs8-gemm/gen/2x16c8-minmax-avx512skx.c b/src/qs8-gemm/gen/2x16c8-minmax-avx512skx.c
index 48d5a97..bfc594b 100644
--- a/src/qs8-gemm/gen/2x16c8-minmax-avx512skx.c
+++ b/src/qs8-gemm/gen/2x16c8-minmax-avx512skx.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-gemm/MRx16c8-minmax-avx512skx.c.in
+//   Template: src/qs8-gemm/MRx16c8-avx512skx.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-gemm/gen/2x4c8-minmax-sse2-ld128.c

diff --git a/src/qs8-gemm/gen/2x4c8-minmax-sse2-ld128.c b/src/qs8-gemm/gen/2x4c8-minmax-sse2-ld128.c
index c910bc2..2dea0d2 100644
--- a/src/qs8-gemm/gen/2x4c8-minmax-sse2-ld128.c
+++ b/src/qs8-gemm/gen/2x4c8-minmax-sse2-ld128.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-gemm/MRx4c8-minmax-sse.c.in
+//   Template: src/qs8-gemm/MRx4c8-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-gemm/gen/2x4c8-minmax-sse2-ld64.c

diff --git a/src/qs8-gemm/gen/2x4c8-minmax-sse2-ld64.c b/src/qs8-gemm/gen/2x4c8-minmax-sse2-ld64.c
index 0c122ff..52c118d 100644
--- a/src/qs8-gemm/gen/2x4c8-minmax-sse2-ld64.c
+++ b/src/qs8-gemm/gen/2x4c8-minmax-sse2-ld64.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-gemm/MRx4c8-minmax-sse.c.in
+//   Template: src/qs8-gemm/MRx4c8-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-gemm/gen/2x4c8-minmax-sse41-ld128.c

diff --git a/src/qs8-gemm/gen/2x4c8-minmax-sse41-ld128.c b/src/qs8-gemm/gen/2x4c8-minmax-sse41-ld128.c
index 19aee70..166947b 100644
--- a/src/qs8-gemm/gen/2x4c8-minmax-sse41-ld128.c
+++ b/src/qs8-gemm/gen/2x4c8-minmax-sse41-ld128.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-gemm/MRx4c8-minmax-sse.c.in
+//   Template: src/qs8-gemm/MRx4c8-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-gemm/gen/2x4c8-minmax-sse41-ld64.c

diff --git a/src/qs8-gemm/gen/2x4c8-minmax-sse41-ld64.c b/src/qs8-gemm/gen/2x4c8-minmax-sse41-ld64.c
index f2da59d..139c4cf 100644
--- a/src/qs8-gemm/gen/2x4c8-minmax-sse41-ld64.c
+++ b/src/qs8-gemm/gen/2x4c8-minmax-sse41-ld64.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-gemm/MRx4c8-minmax-sse.c.in
+//   Template: src/qs8-gemm/MRx4c8-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-gemm/gen/2x4c8-minmax-ssse3-ld128.c

diff --git a/src/qs8-gemm/gen/2x4c8-minmax-ssse3-ld128.c b/src/qs8-gemm/gen/2x4c8-minmax-ssse3-ld128.c
index 918afc5..0d0262a 100644
--- a/src/qs8-gemm/gen/2x4c8-minmax-ssse3-ld128.c
+++ b/src/qs8-gemm/gen/2x4c8-minmax-ssse3-ld128.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-gemm/MRx4c8-minmax-sse.c.in
+//   Template: src/qs8-gemm/MRx4c8-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-gemm/gen/2x4c8-minmax-ssse3-ld64.c

diff --git a/src/qs8-gemm/gen/2x4c8-minmax-ssse3-ld64.c b/src/qs8-gemm/gen/2x4c8-minmax-ssse3-ld64.c
index 142fb58..08b9f64 100644
--- a/src/qs8-gemm/gen/2x4c8-minmax-ssse3-ld64.c
+++ b/src/qs8-gemm/gen/2x4c8-minmax-ssse3-ld64.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-gemm/MRx4c8-minmax-sse.c.in
+//   Template: src/qs8-gemm/MRx4c8-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-gemm/gen/2x4c8-minmax-wasmsimd-ld128.c

diff --git a/src/qs8-gemm/gen/2x4c8-minmax-wasmsimd-ld128.c b/src/qs8-gemm/gen/2x4c8-minmax-wasmsimd-ld128.c
index 473f8dc..a77acde 100644
--- a/src/qs8-gemm/gen/2x4c8-minmax-wasmsimd-ld128.c
+++ b/src/qs8-gemm/gen/2x4c8-minmax-wasmsimd-ld128.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-gemm/MRx4c8-minmax-wasmsimd.c.in
+//   Template: src/qs8-gemm/MRx4c8-wasmsimd.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-gemm/gen/2x4c8-minmax-wasmsimd-ld64.c

diff --git a/src/qs8-gemm/gen/2x4c8-minmax-wasmsimd-ld64.c b/src/qs8-gemm/gen/2x4c8-minmax-wasmsimd-ld64.c
index 9f04c81..c3f5483 100644
--- a/src/qs8-gemm/gen/2x4c8-minmax-wasmsimd-ld64.c
+++ b/src/qs8-gemm/gen/2x4c8-minmax-wasmsimd-ld64.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-gemm/MRx4c8-minmax-wasmsimd.c.in
+//   Template: src/qs8-gemm/MRx4c8-wasmsimd.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-gemm/gen/2x4c8-minmax-xop-ld128.c

diff --git a/src/qs8-gemm/gen/2x4c8-minmax-xop-ld128.c b/src/qs8-gemm/gen/2x4c8-minmax-xop-ld128.c
index 924d4f8..83ccb6a 100644
--- a/src/qs8-gemm/gen/2x4c8-minmax-xop-ld128.c
+++ b/src/qs8-gemm/gen/2x4c8-minmax-xop-ld128.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-gemm/MRx4c8-minmax-sse.c.in
+//   Template: src/qs8-gemm/MRx4c8-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-gemm/gen/2x4c8-minmax-xop-ld64.c

diff --git a/src/qs8-gemm/gen/2x4c8-minmax-xop-ld64.c b/src/qs8-gemm/gen/2x4c8-minmax-xop-ld64.c
index 42473e8..e918a7a 100644
--- a/src/qs8-gemm/gen/2x4c8-minmax-xop-ld64.c
+++ b/src/qs8-gemm/gen/2x4c8-minmax-xop-ld64.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-gemm/MRx4c8-minmax-sse.c.in
+//   Template: src/qs8-gemm/MRx4c8-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-gemm/gen/2x4c8-xw-minmax-sse2.c

diff --git a/src/qs8-gemm/gen/2x4c8-xw-minmax-sse2.c b/src/qs8-gemm/gen/2x4c8-xw-minmax-sse2.c
index a01b37a..38cc155 100644
--- a/src/qs8-gemm/gen/2x4c8-xw-minmax-sse2.c
+++ b/src/qs8-gemm/gen/2x4c8-xw-minmax-sse2.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-gemm/MRx4c8-minmax-sse.c.in
+//   Template: src/qs8-gemm/MRx4c8-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-gemm/gen/2x4c8-xw-minmax-sse41.c

diff --git a/src/qs8-gemm/gen/2x4c8-xw-minmax-sse41.c b/src/qs8-gemm/gen/2x4c8-xw-minmax-sse41.c
index bf0a9cd..0202b27 100644
--- a/src/qs8-gemm/gen/2x4c8-xw-minmax-sse41.c
+++ b/src/qs8-gemm/gen/2x4c8-xw-minmax-sse41.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-gemm/MRx4c8-minmax-sse.c.in
+//   Template: src/qs8-gemm/MRx4c8-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-gemm/gen/2x4c8-xw-minmax-ssse3.c

diff --git a/src/qs8-gemm/gen/2x4c8-xw-minmax-ssse3.c b/src/qs8-gemm/gen/2x4c8-xw-minmax-ssse3.c
index d35662c..79f8767 100644
--- a/src/qs8-gemm/gen/2x4c8-xw-minmax-ssse3.c
+++ b/src/qs8-gemm/gen/2x4c8-xw-minmax-ssse3.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-gemm/MRx4c8-minmax-sse.c.in
+//   Template: src/qs8-gemm/MRx4c8-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-gemm/gen/2x4c8-xw-minmax-wasmsimd.c

diff --git a/src/qs8-gemm/gen/2x4c8-xw-minmax-wasmsimd.c b/src/qs8-gemm/gen/2x4c8-xw-minmax-wasmsimd.c
index 201af1d..00a234e 100644
--- a/src/qs8-gemm/gen/2x4c8-xw-minmax-wasmsimd.c
+++ b/src/qs8-gemm/gen/2x4c8-xw-minmax-wasmsimd.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-gemm/MRx4c8-minmax-wasmsimd.c.in
+//   Template: src/qs8-gemm/MRx4c8-wasmsimd.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-gemm/gen/2x4c8-xw-minmax-xop.c

diff --git a/src/qs8-gemm/gen/2x4c8-xw-minmax-xop.c b/src/qs8-gemm/gen/2x4c8-xw-minmax-xop.c
index 8980cbf..1969160 100644
--- a/src/qs8-gemm/gen/2x4c8-xw-minmax-xop.c
+++ b/src/qs8-gemm/gen/2x4c8-xw-minmax-xop.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-gemm/MRx4c8-minmax-sse.c.in
+//   Template: src/qs8-gemm/MRx4c8-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-gemm/gen/2x8c8-minmax-avx2.c

diff --git a/src/qs8-gemm/gen/2x8c8-minmax-avx2.c b/src/qs8-gemm/gen/2x8c8-minmax-avx2.c
index 173f2f5..677a96b 100644
--- a/src/qs8-gemm/gen/2x8c8-minmax-avx2.c
+++ b/src/qs8-gemm/gen/2x8c8-minmax-avx2.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-gemm/MRx8c8-minmax-avx2.c.in
+//   Template: src/qs8-gemm/MRx8c8-avx2.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-gemm/gen/2x8c8-xw-minmax-avx2.c

diff --git a/src/qs8-gemm/gen/2x8c8-xw-minmax-avx2.c b/src/qs8-gemm/gen/2x8c8-xw-minmax-avx2.c
index e1239a4..bc7a3b3 100644
--- a/src/qs8-gemm/gen/2x8c8-xw-minmax-avx2.c
+++ b/src/qs8-gemm/gen/2x8c8-xw-minmax-avx2.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-gemm/MRx8c8-minmax-avx2.c.in
+//   Template: src/qs8-gemm/MRx8c8-avx2.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-gemm/gen/3x16c8-minmax-avx512skx.c

diff --git a/src/qs8-gemm/gen/3x16c8-minmax-avx512skx.c b/src/qs8-gemm/gen/3x16c8-minmax-avx512skx.c
index cef06f3..b5e91ec 100644
--- a/src/qs8-gemm/gen/3x16c8-minmax-avx512skx.c
+++ b/src/qs8-gemm/gen/3x16c8-minmax-avx512skx.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-gemm/MRx16c8-minmax-avx512skx.c.in
+//   Template: src/qs8-gemm/MRx16c8-avx512skx.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-gemm/gen/3x4c8-minmax-sse2-ld128.c

diff --git a/src/qs8-gemm/gen/3x4c8-minmax-sse2-ld128.c b/src/qs8-gemm/gen/3x4c8-minmax-sse2-ld128.c
index 8e46804..709ef30 100644
--- a/src/qs8-gemm/gen/3x4c8-minmax-sse2-ld128.c
+++ b/src/qs8-gemm/gen/3x4c8-minmax-sse2-ld128.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-gemm/MRx4c8-minmax-sse.c.in
+//   Template: src/qs8-gemm/MRx4c8-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-gemm/gen/3x4c8-minmax-sse2-ld64.c

diff --git a/src/qs8-gemm/gen/3x4c8-minmax-sse2-ld64.c b/src/qs8-gemm/gen/3x4c8-minmax-sse2-ld64.c
index ee45fd9..c01210e 100644
--- a/src/qs8-gemm/gen/3x4c8-minmax-sse2-ld64.c
+++ b/src/qs8-gemm/gen/3x4c8-minmax-sse2-ld64.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-gemm/MRx4c8-minmax-sse.c.in
+//   Template: src/qs8-gemm/MRx4c8-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-gemm/gen/3x4c8-minmax-sse41-ld128.c

diff --git a/src/qs8-gemm/gen/3x4c8-minmax-sse41-ld128.c b/src/qs8-gemm/gen/3x4c8-minmax-sse41-ld128.c
index af544e0..fe38e93 100644
--- a/src/qs8-gemm/gen/3x4c8-minmax-sse41-ld128.c
+++ b/src/qs8-gemm/gen/3x4c8-minmax-sse41-ld128.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-gemm/MRx4c8-minmax-sse.c.in
+//   Template: src/qs8-gemm/MRx4c8-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-gemm/gen/3x4c8-minmax-sse41-ld64.c

diff --git a/src/qs8-gemm/gen/3x4c8-minmax-sse41-ld64.c b/src/qs8-gemm/gen/3x4c8-minmax-sse41-ld64.c
index 95f5eb6..f511ba1 100644
--- a/src/qs8-gemm/gen/3x4c8-minmax-sse41-ld64.c
+++ b/src/qs8-gemm/gen/3x4c8-minmax-sse41-ld64.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-gemm/MRx4c8-minmax-sse.c.in
+//   Template: src/qs8-gemm/MRx4c8-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-gemm/gen/3x4c8-minmax-ssse3-ld128.c

diff --git a/src/qs8-gemm/gen/3x4c8-minmax-ssse3-ld128.c b/src/qs8-gemm/gen/3x4c8-minmax-ssse3-ld128.c
index d61399b..166acff 100644
--- a/src/qs8-gemm/gen/3x4c8-minmax-ssse3-ld128.c
+++ b/src/qs8-gemm/gen/3x4c8-minmax-ssse3-ld128.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-gemm/MRx4c8-minmax-sse.c.in
+//   Template: src/qs8-gemm/MRx4c8-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-gemm/gen/3x4c8-minmax-ssse3-ld64.c

diff --git a/src/qs8-gemm/gen/3x4c8-minmax-ssse3-ld64.c b/src/qs8-gemm/gen/3x4c8-minmax-ssse3-ld64.c
index 0ed76e4..255c8e2 100644
--- a/src/qs8-gemm/gen/3x4c8-minmax-ssse3-ld64.c
+++ b/src/qs8-gemm/gen/3x4c8-minmax-ssse3-ld64.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-gemm/MRx4c8-minmax-sse.c.in
+//   Template: src/qs8-gemm/MRx4c8-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-gemm/gen/3x4c8-minmax-wasmsimd-ld128.c

diff --git a/src/qs8-gemm/gen/3x4c8-minmax-wasmsimd-ld128.c b/src/qs8-gemm/gen/3x4c8-minmax-wasmsimd-ld128.c
index 1129910..8a037ed 100644
--- a/src/qs8-gemm/gen/3x4c8-minmax-wasmsimd-ld128.c
+++ b/src/qs8-gemm/gen/3x4c8-minmax-wasmsimd-ld128.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-gemm/MRx4c8-minmax-wasmsimd.c.in
+//   Template: src/qs8-gemm/MRx4c8-wasmsimd.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-gemm/gen/3x4c8-minmax-wasmsimd-ld64.c

diff --git a/src/qs8-gemm/gen/3x4c8-minmax-wasmsimd-ld64.c b/src/qs8-gemm/gen/3x4c8-minmax-wasmsimd-ld64.c
index 63627e4..f63c0f0 100644
--- a/src/qs8-gemm/gen/3x4c8-minmax-wasmsimd-ld64.c
+++ b/src/qs8-gemm/gen/3x4c8-minmax-wasmsimd-ld64.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-gemm/MRx4c8-minmax-wasmsimd.c.in
+//   Template: src/qs8-gemm/MRx4c8-wasmsimd.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-gemm/gen/3x4c8-minmax-xop-ld128.c

diff --git a/src/qs8-gemm/gen/3x4c8-minmax-xop-ld128.c b/src/qs8-gemm/gen/3x4c8-minmax-xop-ld128.c
index d3b8352..f3beb05 100644
--- a/src/qs8-gemm/gen/3x4c8-minmax-xop-ld128.c
+++ b/src/qs8-gemm/gen/3x4c8-minmax-xop-ld128.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-gemm/MRx4c8-minmax-sse.c.in
+//   Template: src/qs8-gemm/MRx4c8-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-gemm/gen/3x4c8-minmax-xop-ld64.c

diff --git a/src/qs8-gemm/gen/3x4c8-minmax-xop-ld64.c b/src/qs8-gemm/gen/3x4c8-minmax-xop-ld64.c
index 4e6859e..f82a244 100644
--- a/src/qs8-gemm/gen/3x4c8-minmax-xop-ld64.c
+++ b/src/qs8-gemm/gen/3x4c8-minmax-xop-ld64.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-gemm/MRx4c8-minmax-sse.c.in
+//   Template: src/qs8-gemm/MRx4c8-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-gemm/gen/3x4c8-xw-minmax-sse2.c

diff --git a/src/qs8-gemm/gen/3x4c8-xw-minmax-sse2.c b/src/qs8-gemm/gen/3x4c8-xw-minmax-sse2.c
index 4b52313..1da482f 100644
--- a/src/qs8-gemm/gen/3x4c8-xw-minmax-sse2.c
+++ b/src/qs8-gemm/gen/3x4c8-xw-minmax-sse2.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-gemm/MRx4c8-minmax-sse.c.in
+//   Template: src/qs8-gemm/MRx4c8-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-gemm/gen/3x4c8-xw-minmax-sse41.c

diff --git a/src/qs8-gemm/gen/3x4c8-xw-minmax-sse41.c b/src/qs8-gemm/gen/3x4c8-xw-minmax-sse41.c
index 57072db..27ec277 100644
--- a/src/qs8-gemm/gen/3x4c8-xw-minmax-sse41.c
+++ b/src/qs8-gemm/gen/3x4c8-xw-minmax-sse41.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-gemm/MRx4c8-minmax-sse.c.in
+//   Template: src/qs8-gemm/MRx4c8-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-gemm/gen/3x4c8-xw-minmax-ssse3.c

diff --git a/src/qs8-gemm/gen/3x4c8-xw-minmax-ssse3.c b/src/qs8-gemm/gen/3x4c8-xw-minmax-ssse3.c
index 64a1377..93fe44b 100644
--- a/src/qs8-gemm/gen/3x4c8-xw-minmax-ssse3.c
+++ b/src/qs8-gemm/gen/3x4c8-xw-minmax-ssse3.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-gemm/MRx4c8-minmax-sse.c.in
+//   Template: src/qs8-gemm/MRx4c8-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-gemm/gen/3x4c8-xw-minmax-wasmsimd.c

diff --git a/src/qs8-gemm/gen/3x4c8-xw-minmax-wasmsimd.c b/src/qs8-gemm/gen/3x4c8-xw-minmax-wasmsimd.c
index 0e343b6..4258337 100644
--- a/src/qs8-gemm/gen/3x4c8-xw-minmax-wasmsimd.c
+++ b/src/qs8-gemm/gen/3x4c8-xw-minmax-wasmsimd.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-gemm/MRx4c8-minmax-wasmsimd.c.in
+//   Template: src/qs8-gemm/MRx4c8-wasmsimd.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-gemm/gen/3x4c8-xw-minmax-xop.c

diff --git a/src/qs8-gemm/gen/3x4c8-xw-minmax-xop.c b/src/qs8-gemm/gen/3x4c8-xw-minmax-xop.c
index f138082..0f8932b 100644
--- a/src/qs8-gemm/gen/3x4c8-xw-minmax-xop.c
+++ b/src/qs8-gemm/gen/3x4c8-xw-minmax-xop.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-gemm/MRx4c8-minmax-sse.c.in
+//   Template: src/qs8-gemm/MRx4c8-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-gemm/gen/3x8c8-minmax-avx2.c

diff --git a/src/qs8-gemm/gen/3x8c8-minmax-avx2.c b/src/qs8-gemm/gen/3x8c8-minmax-avx2.c
index 7850c43..f4d3c06 100644
--- a/src/qs8-gemm/gen/3x8c8-minmax-avx2.c
+++ b/src/qs8-gemm/gen/3x8c8-minmax-avx2.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-gemm/MRx8c8-minmax-avx2.c.in
+//   Template: src/qs8-gemm/MRx8c8-avx2.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-gemm/gen/3x8c8-xw-minmax-avx2.c

diff --git a/src/qs8-gemm/gen/3x8c8-xw-minmax-avx2.c b/src/qs8-gemm/gen/3x8c8-xw-minmax-avx2.c
index 91ce11f..370b8d7 100644
--- a/src/qs8-gemm/gen/3x8c8-xw-minmax-avx2.c
+++ b/src/qs8-gemm/gen/3x8c8-xw-minmax-avx2.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-gemm/MRx8c8-minmax-avx2.c.in
+//   Template: src/qs8-gemm/MRx8c8-avx2.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-gemm/gen/4x16c4-minmax-neondot.c

diff --git a/src/qs8-gemm/gen/4x16c4-minmax-neondot.c b/src/qs8-gemm/gen/4x16c4-minmax-neondot.c
index 4fb0616..f651597 100644
--- a/src/qs8-gemm/gen/4x16c4-minmax-neondot.c
+++ b/src/qs8-gemm/gen/4x16c4-minmax-neondot.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-gemm/MRxNRc4-minmax-neondot.c.in
+//   Template: src/qs8-gemm/MRxNRc4-neondot.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-gemm/gen/4x16c8-minmax-avx512skx.c

diff --git a/src/qs8-gemm/gen/4x16c8-minmax-avx512skx.c b/src/qs8-gemm/gen/4x16c8-minmax-avx512skx.c
index 90bb35c..0ded25f 100644
--- a/src/qs8-gemm/gen/4x16c8-minmax-avx512skx.c
+++ b/src/qs8-gemm/gen/4x16c8-minmax-avx512skx.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-gemm/MRx16c8-minmax-avx512skx.c.in
+//   Template: src/qs8-gemm/MRx16c8-avx512skx.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-gemm/gen/4x4c2-minmax-sse2-ld128.c

diff --git a/src/qs8-gemm/gen/4x4c2-minmax-sse2-ld128.c b/src/qs8-gemm/gen/4x4c2-minmax-sse2-ld128.c
index a5cd365..88b2a44 100644
--- a/src/qs8-gemm/gen/4x4c2-minmax-sse2-ld128.c
+++ b/src/qs8-gemm/gen/4x4c2-minmax-sse2-ld128.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-gemm/MRx4c2-minmax-sse.c.in
+//   Template: src/qs8-gemm/MRx4c2-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-gemm/gen/4x4c2-minmax-sse2-ld64.c

diff --git a/src/qs8-gemm/gen/4x4c2-minmax-sse2-ld64.c b/src/qs8-gemm/gen/4x4c2-minmax-sse2-ld64.c
index 169e5ab..bd28fe4 100644
--- a/src/qs8-gemm/gen/4x4c2-minmax-sse2-ld64.c
+++ b/src/qs8-gemm/gen/4x4c2-minmax-sse2-ld64.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-gemm/MRx4c2-minmax-sse.c.in
+//   Template: src/qs8-gemm/MRx4c2-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-gemm/gen/4x4c2-minmax-sse41-ld128.c

diff --git a/src/qs8-gemm/gen/4x4c2-minmax-sse41-ld128.c b/src/qs8-gemm/gen/4x4c2-minmax-sse41-ld128.c
index 9a04530..8395f05 100644
--- a/src/qs8-gemm/gen/4x4c2-minmax-sse41-ld128.c
+++ b/src/qs8-gemm/gen/4x4c2-minmax-sse41-ld128.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-gemm/MRx4c2-minmax-sse.c.in
+//   Template: src/qs8-gemm/MRx4c2-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-gemm/gen/4x4c2-minmax-sse41-ld64.c

diff --git a/src/qs8-gemm/gen/4x4c2-minmax-sse41-ld64.c b/src/qs8-gemm/gen/4x4c2-minmax-sse41-ld64.c
index 27bfec4..c06b1f3 100644
--- a/src/qs8-gemm/gen/4x4c2-minmax-sse41-ld64.c
+++ b/src/qs8-gemm/gen/4x4c2-minmax-sse41-ld64.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-gemm/MRx4c2-minmax-sse.c.in
+//   Template: src/qs8-gemm/MRx4c2-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-gemm/gen/4x4c2-minmax-ssse3-ld128.c

diff --git a/src/qs8-gemm/gen/4x4c2-minmax-ssse3-ld128.c b/src/qs8-gemm/gen/4x4c2-minmax-ssse3-ld128.c
index f330450..0d91bcb 100644
--- a/src/qs8-gemm/gen/4x4c2-minmax-ssse3-ld128.c
+++ b/src/qs8-gemm/gen/4x4c2-minmax-ssse3-ld128.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-gemm/MRx4c2-minmax-sse.c.in
+//   Template: src/qs8-gemm/MRx4c2-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-gemm/gen/4x4c2-minmax-ssse3-ld64.c

diff --git a/src/qs8-gemm/gen/4x4c2-minmax-ssse3-ld64.c b/src/qs8-gemm/gen/4x4c2-minmax-ssse3-ld64.c
index d901c1a..e3c1141 100644
--- a/src/qs8-gemm/gen/4x4c2-minmax-ssse3-ld64.c
+++ b/src/qs8-gemm/gen/4x4c2-minmax-ssse3-ld64.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-gemm/MRx4c2-minmax-sse.c.in
+//   Template: src/qs8-gemm/MRx4c2-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-gemm/gen/4x4c2-minmax-xop-ld128.c

diff --git a/src/qs8-gemm/gen/4x4c2-minmax-xop-ld128.c b/src/qs8-gemm/gen/4x4c2-minmax-xop-ld128.c
index a355d50..24f9fde 100644
--- a/src/qs8-gemm/gen/4x4c2-minmax-xop-ld128.c
+++ b/src/qs8-gemm/gen/4x4c2-minmax-xop-ld128.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-gemm/MRx4c2-minmax-sse.c.in
+//   Template: src/qs8-gemm/MRx4c2-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-gemm/gen/4x4c2-minmax-xop-ld64.c

diff --git a/src/qs8-gemm/gen/4x4c2-minmax-xop-ld64.c b/src/qs8-gemm/gen/4x4c2-minmax-xop-ld64.c
index 0ecbf9d..a06cd6c 100644
--- a/src/qs8-gemm/gen/4x4c2-minmax-xop-ld64.c
+++ b/src/qs8-gemm/gen/4x4c2-minmax-xop-ld64.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-gemm/MRx4c2-minmax-sse.c.in
+//   Template: src/qs8-gemm/MRx4c2-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-gemm/gen/4x4c2-xw-minmax-sse2.c

diff --git a/src/qs8-gemm/gen/4x4c2-xw-minmax-sse2.c b/src/qs8-gemm/gen/4x4c2-xw-minmax-sse2.c
index 863668d..0b90db8 100644
--- a/src/qs8-gemm/gen/4x4c2-xw-minmax-sse2.c
+++ b/src/qs8-gemm/gen/4x4c2-xw-minmax-sse2.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-gemm/MRx4c2-minmax-sse.c.in
+//   Template: src/qs8-gemm/MRx4c2-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-gemm/gen/4x4c2-xw-minmax-sse41.c

diff --git a/src/qs8-gemm/gen/4x4c2-xw-minmax-sse41.c b/src/qs8-gemm/gen/4x4c2-xw-minmax-sse41.c
index 5acf178..100c932 100644
--- a/src/qs8-gemm/gen/4x4c2-xw-minmax-sse41.c
+++ b/src/qs8-gemm/gen/4x4c2-xw-minmax-sse41.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-gemm/MRx4c2-minmax-sse.c.in
+//   Template: src/qs8-gemm/MRx4c2-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-gemm/gen/4x4c2-xw-minmax-ssse3.c

diff --git a/src/qs8-gemm/gen/4x4c2-xw-minmax-ssse3.c b/src/qs8-gemm/gen/4x4c2-xw-minmax-ssse3.c
index bb19e7b..4ae78f7 100644
--- a/src/qs8-gemm/gen/4x4c2-xw-minmax-ssse3.c
+++ b/src/qs8-gemm/gen/4x4c2-xw-minmax-ssse3.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-gemm/MRx4c2-minmax-sse.c.in
+//   Template: src/qs8-gemm/MRx4c2-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-gemm/gen/4x4c2-xw-minmax-xop.c

diff --git a/src/qs8-gemm/gen/4x4c2-xw-minmax-xop.c b/src/qs8-gemm/gen/4x4c2-xw-minmax-xop.c
index e18b091..b6275df 100644
--- a/src/qs8-gemm/gen/4x4c2-xw-minmax-xop.c
+++ b/src/qs8-gemm/gen/4x4c2-xw-minmax-xop.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-gemm/MRx4c2-minmax-sse.c.in
+//   Template: src/qs8-gemm/MRx4c2-sse.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-gemm/gen/4x8-minmax-neon-mlal-lane.c

diff --git a/src/qs8-gemm/gen/4x8-minmax-neon-mlal-lane.c b/src/qs8-gemm/gen/4x8-minmax-neon-mlal-lane.c
index c4093bb..2592771 100644
--- a/src/qs8-gemm/gen/4x8-minmax-neon-mlal-lane.c
+++ b/src/qs8-gemm/gen/4x8-minmax-neon-mlal-lane.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-gemm/minmax-neon-mlal-lane.c.in
+//   Template: src/qs8-gemm/neon-mlal-lane.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-gemm/gen/4x8c4-minmax-neondot.c

diff --git a/src/qs8-gemm/gen/4x8c4-minmax-neondot.c b/src/qs8-gemm/gen/4x8c4-minmax-neondot.c
index dbdaee9..c1199f5 100644
--- a/src/qs8-gemm/gen/4x8c4-minmax-neondot.c
+++ b/src/qs8-gemm/gen/4x8c4-minmax-neondot.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-gemm/MRxNRc4-minmax-neondot.c.in
+//   Template: src/qs8-gemm/MRxNRc4-neondot.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-gemm/gen/6x16c4-minmax-neondot.c

diff --git a/src/qs8-gemm/gen/6x16c4-minmax-neondot.c b/src/qs8-gemm/gen/6x16c4-minmax-neondot.c
index 803a242..7cf7166 100644
--- a/src/qs8-gemm/gen/6x16c4-minmax-neondot.c
+++ b/src/qs8-gemm/gen/6x16c4-minmax-neondot.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-gemm/MRxNRc4-minmax-neondot.c.in
+//   Template: src/qs8-gemm/MRxNRc4-neondot.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-gemm/gen/6x8c4-minmax-neondot.c

diff --git a/src/qs8-gemm/gen/6x8c4-minmax-neondot.c b/src/qs8-gemm/gen/6x8c4-minmax-neondot.c
index 689fc14..3af0fd8 100644
--- a/src/qs8-gemm/gen/6x8c4-minmax-neondot.c
+++ b/src/qs8-gemm/gen/6x8c4-minmax-neondot.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-gemm/MRxNRc4-minmax-neondot.c.in
+//   Template: src/qs8-gemm/MRxNRc4-neondot.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-gemm/gen/8x16c4-minmax-neondot.c

diff --git a/src/qs8-gemm/gen/8x16c4-minmax-neondot.c b/src/qs8-gemm/gen/8x16c4-minmax-neondot.c
index 395d2a8..62bb42c 100644
--- a/src/qs8-gemm/gen/8x16c4-minmax-neondot.c
+++ b/src/qs8-gemm/gen/8x16c4-minmax-neondot.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-gemm/MRxNRc4-minmax-neondot.c.in
+//   Template: src/qs8-gemm/MRxNRc4-neondot.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-gemm/gen/8x8c4-minmax-neondot.c

diff --git a/src/qs8-gemm/gen/8x8c4-minmax-neondot.c b/src/qs8-gemm/gen/8x8c4-minmax-neondot.c
index 2163428..4c84498 100644
--- a/src/qs8-gemm/gen/8x8c4-minmax-neondot.c
+++ b/src/qs8-gemm/gen/8x8c4-minmax-neondot.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-gemm/MRxNRc4-minmax-neondot.c.in
+//   Template: src/qs8-gemm/MRxNRc4-neondot.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-gemm/gen/8x8c4-minmax-scalar.c

diff --git a/src/qs8-gemm/gen/8x8c4-minmax-scalar.c b/src/qs8-gemm/gen/8x8c4-minmax-scalar.c
index d0bc380..a07ea26 100644
--- a/src/qs8-gemm/gen/8x8c4-minmax-scalar.c
+++ b/src/qs8-gemm/gen/8x8c4-minmax-scalar.c
@@ -1,5 +1,5 @@
 // Auto-generated file. Do not edit!
-//   Template: src/qs8-gemm/MRxNRc4-minmax-scalar.c.in
+//   Template: src/qs8-gemm/MRxNRc4-scalar.c.in
 //   Generator: tools/xngen
 //
 // Copyright 2020 Google LLC

src/qs8-gemm/neon-mlal-lane.c.in

diff --git a/src/qs8-gemm/minmax-neon-mlal-lane.c.in b/src/qs8-gemm/neon-mlal-lane.c.in
similarity index 100%
rename from src/qs8-gemm/minmax-neon-mlal-lane.c.in
rename to src/qs8-gemm/neon-mlal-lane.c.in

src/qs8-igemm/MRx16c8-avx512skx.c.in

diff --git a/src/qs8-igemm/MRx16c8-minmax-avx512skx.c.in b/src/qs8-igemm/MRx16c8-avx512skx.c.in
similarity index 100%
rename from src/qs8-igemm/MRx16c8-minmax-avx512skx.c.in
rename to src/qs8-igemm/MRx16c8-avx512skx.c.in

src/qs8-igemm/MRx4c2-sse.c.in

diff --git a/src/qs8-igemm/MRx4c2-minmax-sse.c.in b/src/qs8-igemm/MRx4c2-sse.c.in
similarity index 100%
rename from src/qs8-igemm/MRx4c2-minmax-sse.c.in
rename to src/qs8-igemm/MRx4c2-sse.c.in

src/qs8-igemm/MRx4c8-sse.c.in

diff --git a/src/qs8-igemm/MRx4c8-minmax-sse.c.in b/src/qs8-igemm/MRx4c8-sse.c.in
similarity index 100%
rename from src/qs8-igemm/MRx4c8-minmax-sse.c.in
rename to src/qs8-igemm/MRx4c8-sse.c.in

src/qs8-igemm/MRx4c8-wasmsimd.c.in

diff --git a/src/qs8-igemm/MRx4c8-minmax-wasmsimd.c.in b/src/qs8-igemm/MRx4c8-wasmsimd.c.in
similarity index 100%
rename from src/qs8-igemm/MRx4c8-minmax-wasmsimd.c.in
rename to src/qs8-igemm/MRx4c8-wasmsimd.c.in

src/qs8-igemm/MRx8c8-avx2.c.in

diff --git a/src/qs8-igemm/MRx8c8-minmax-avx2.c.in b/src/qs8-igemm/MRx8c8-avx2.c.in
similarity index 100%
rename from src/qs8-igemm/MRx8c8-minmax-avx2.c.in
rename to src/qs8-igemm/MRx8c8-avx2.c.in

src/qs8-igemm/MRxNRc4-neondot.c.in

diff --git a/src/qs8-igemm/MRxNRc4-minmax-neondot.c.in b/src/qs8-igemm/MRxNRc4-neondot.c.in
similarity index 100%
rename from src/qs8-igemm/MRxNRc4-minmax-neondot.c.in
rename to src/qs8-igemm/MRxNRc4-neondot.c.in

src/qs8-igemm/gen/12x8c4-minmax-neondot.c

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

src/qs8-igemm/gen/1x16-minmax-neon-mlal-lane.c

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

src/qs8-igemm/gen/1x16c4-minmax-neondot.c

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

src/qs8-igemm/gen/1x16c8-minmax-avx512skx.c

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

src/qs8-igemm/gen/1x4c2-minmax-sse2-ld128.c

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

src/qs8-igemm/gen/1x4c2-minmax-sse2-ld64.c

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

src/qs8-igemm/gen/1x4c2-minmax-sse41-ld128.c

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

src/qs8-igemm/gen/1x4c2-minmax-sse41-ld64.c

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

src/qs8-igemm/gen/1x4c2-minmax-ssse3-ld128.c

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

src/qs8-igemm/gen/1x4c2-minmax-ssse3-ld64.c

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

src/qs8-igemm/gen/1x4c2-minmax-xop-ld128.c

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

src/qs8-igemm/gen/1x4c2-minmax-xop-ld64.c

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

src/qs8-igemm/gen/1x4c8-minmax-sse2-ld128.c

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

src/qs8-igemm/gen/1x4c8-minmax-sse2-ld64.c

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

src/qs8-igemm/gen/1x4c8-minmax-sse41-ld128.c

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

src/qs8-igemm/gen/1x4c8-minmax-sse41-ld64.c

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

src/qs8-igemm/gen/1x4c8-minmax-ssse3-ld128.c

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

src/qs8-igemm/gen/1x4c8-minmax-ssse3-ld64.c

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

src/qs8-igemm/gen/1x4c8-minmax-wasmsimd-ld128.c

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

src/qs8-igemm/gen/1x4c8-minmax-wasmsimd-ld64.c

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

src/qs8-igemm/gen/1x4c8-minmax-xop-ld128.c

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

src/qs8-igemm/gen/1x4c8-minmax-xop-ld64.c

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

src/qs8-igemm/gen/1x8-minmax-neon-mlal-lane.c

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

src/qs8-igemm/gen/1x8c4-minmax-neondot.c

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

src/qs8-igemm/gen/1x8c8-minmax-avx2.c

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

src/qs8-igemm/gen/2x16-minmax-neon-mlal-lane.c

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

src/qs8-igemm/gen/2x16c8-minmax-avx512skx.c

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

src/qs8-igemm/gen/2x4c8-minmax-sse2-ld128.c

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

src/qs8-igemm/gen/2x4c8-minmax-sse2-ld64.c

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

src/qs8-igemm/gen/2x4c8-minmax-sse41-ld128.c

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

src/qs8-igemm/gen/2x4c8-minmax-sse41-ld64.c

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

src/qs8-igemm/gen/2x4c8-minmax-ssse3-ld128.c

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

src/qs8-igemm/gen/2x4c8-minmax-ssse3-ld64.c

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

src/qs8-igemm/gen/2x4c8-minmax-wasmsimd-ld128.c

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

src/qs8-igemm/gen/2x4c8-minmax-wasmsimd-ld64.c

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

src/qs8-igemm/gen/2x4c8-minmax-xop-ld128.c

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

src/qs8-igemm/gen/2x4c8-minmax-xop-ld64.c

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

src/qs8-igemm/gen/2x8c8-minmax-avx2.c

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

src/qs8-igemm/gen/3x16c8-minmax-avx512skx.c

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

src/qs8-igemm/gen/3x4c8-minmax-sse2-ld128.c

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

src/qs8-igemm/gen/3x4c8-minmax-sse2-ld64.c

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

src/qs8-igemm/gen/3x4c8-minmax-sse41-ld128.c

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

src/qs8-igemm/gen/3x4c8-minmax-sse41-ld64.c

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

src/qs8-igemm/gen/3x4c8-minmax-ssse3-ld128.c

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

src/qs8-igemm/gen/3x4c8-minmax-ssse3-ld64.c

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

src/qs8-igemm/gen/3x4c8-minmax-wasmsimd-ld128.c

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

src/qs8-igemm/gen/3x4c8-minmax-wasmsimd-ld64.c

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

src/qs8-igemm/gen/3x4c8-minmax-xop-ld128.c

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

src/qs8-igemm/gen/3x4c8-minmax-xop-ld64.c

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

src/qs8-igemm/gen/3x8c8-minmax-avx2.c

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

src/qs8-igemm/gen/4x16c4-minmax-neondot.c

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

src/qs8-igemm/gen/4x16c8-minmax-avx512skx.c

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

src/qs8-igemm/gen/4x4c2-minmax-sse2-ld128.c

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

src/qs8-igemm/gen/4x4c2-minmax-sse2-ld64.c

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

src/qs8-igemm/gen/4x4c2-minmax-sse41-ld128.c

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

src/qs8-igemm/gen/4x4c2-minmax-sse41-ld64.c

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

src/qs8-igemm/gen/4x4c2-minmax-ssse3-ld128.c

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

src/qs8-igemm/gen/4x4c2-minmax-ssse3-ld64.c

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

src/qs8-igemm/gen/4x4c2-minmax-xop-ld128.c

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

src/qs8-igemm/gen/4x4c2-minmax-xop-ld64.c

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

src/qs8-igemm/gen/4x8-minmax-neon-mlal-lane.c

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

src/qs8-igemm/gen/4x8c4-minmax-neondot.c

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

src/qs8-igemm/gen/6x16c4-minmax-neondot.c

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

src/qs8-igemm/gen/6x8c4-minmax-neondot.c

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

src/qs8-igemm/gen/8x16c4-minmax-neondot.c

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

src/qs8-igemm/gen/8x8c4-minmax-neondot.c

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

src/qs8-igemm/neon-mlal-lane.c.in

diff --git a/src/qs8-igemm/minmax-neon-mlal-lane.c.in b/src/qs8-igemm/neon-mlal-lane.c.in
similarity index 100%
rename from src/qs8-igemm/minmax-neon-mlal-lane.c.in
rename to src/qs8-igemm/neon-mlal-lane.c.in