diff --git a/CMakeLists.txt b/CMakeLists.txt
index f13abb1626..cc0850b23c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1005,7 +1005,7 @@ set(ZLIB_PRIVATE_HDRS
     adler32_p.h
     chunkset_tpl.h
     compare256_rle.h
-    cpu_functions.h
+    arch_functions.h
     cpu_features.h
     crc32_braid_p.h
     crc32_braid_comb_p.h
diff --git a/arch/s390/crc32-vx.c b/arch/s390/crc32-vx.c
index f794e3bdd2..b3dcbf7030 100644
--- a/arch/s390/crc32-vx.c
+++ b/arch/s390/crc32-vx.c
@@ -13,7 +13,7 @@
  */
 
 #include "zbuild.h"
-#include "cpu_functions.h"
+#include "arch_functions.h"
 
 #include <vecintrin.h>
 
diff --git a/arch/x86/adler32_avx512.c b/arch/x86/adler32_avx512.c
index 49101f0915..626c4807f8 100644
--- a/arch/x86/adler32_avx512.c
+++ b/arch/x86/adler32_avx512.c
@@ -10,7 +10,7 @@
 
 #include "zbuild.h"
 #include "adler32_p.h"
-#include "cpu_functions.h"
+#include "arch_functions.h"
 #include <immintrin.h>
 #include "x86_intrins.h"
 #include "adler32_avx512_p.h"
diff --git a/arch/x86/adler32_avx512_vnni.c b/arch/x86/adler32_avx512_vnni.c
index bfcb944c75..4c5cfc1cad 100644
--- a/arch/x86/adler32_avx512_vnni.c
+++ b/arch/x86/adler32_avx512_vnni.c
@@ -11,7 +11,7 @@
 
 #include "zbuild.h"
 #include "adler32_p.h"
-#include "cpu_functions.h"
+#include "arch_functions.h"
 #include <immintrin.h>
 #include "x86_intrins.h"
 #include "adler32_avx512_p.h"
diff --git a/cpu_functions.h b/arch_functions.h
similarity index 92%
rename from cpu_functions.h
rename to arch_functions.h
index d2a925fd84..9a7f8d9379 100644
--- a/cpu_functions.h
+++ b/arch_functions.h
@@ -1,4 +1,4 @@
-/* cpu_functions.h -- CPU-specific function prototypes.
+/* arch_functions.h -- Arch-specific function prototypes.
  * Copyright (C) 2017 Hans Kristian Rosbach
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
diff --git a/functable.c b/functable.c
index 348f45ca33..ebbd3ac3c8 100644
--- a/functable.c
+++ b/functable.c
@@ -6,7 +6,7 @@
 #include "zbuild.h"
 #include "functable.h"
 #include "cpu_features.h"
-#include "cpu_functions.h"
+#include "arch_functions.h"
 
 #if defined(_MSC_VER)
 #  include <intrin.h>
diff --git a/test/benchmarks/benchmark_adler32.cc b/test/benchmarks/benchmark_adler32.cc
index 1d0433f2ee..fd86145782 100644
--- a/test/benchmarks/benchmark_adler32.cc
+++ b/test/benchmarks/benchmark_adler32.cc
@@ -11,7 +11,7 @@
 extern "C" {
 #  include "zbuild.h"
 #  include "zutil_p.h"
-#  include "cpu_functions.h"
+#  include "arch_functions.h"
 #  include "../test_cpu_features.h"
 }
 
diff --git a/test/benchmarks/benchmark_adler32_copy.cc b/test/benchmarks/benchmark_adler32_copy.cc
index 57d07aec5a..7992bdd5a4 100644
--- a/test/benchmarks/benchmark_adler32_copy.cc
+++ b/test/benchmarks/benchmark_adler32_copy.cc
@@ -12,7 +12,7 @@
 extern "C" {
 #  include "zbuild.h"
 #  include "zutil_p.h"
-#  include "cpu_functions.h"
+#  include "arch_functions.h"
 #  include "../test_cpu_features.h"
 }
 
diff --git a/test/benchmarks/benchmark_compare256.cc b/test/benchmarks/benchmark_compare256.cc
index 34e8557fd2..188539df51 100644
--- a/test/benchmarks/benchmark_compare256.cc
+++ b/test/benchmarks/benchmark_compare256.cc
@@ -10,7 +10,7 @@
 extern "C" {
 #  include "zbuild.h"
 #  include "zutil_p.h"
-#  include "cpu_functions.h"
+#  include "arch_functions.h"
 #  include "../test_cpu_features.h"
 }
 
diff --git a/test/benchmarks/benchmark_crc32.cc b/test/benchmarks/benchmark_crc32.cc
index 5b45a3c320..062d229184 100644
--- a/test/benchmarks/benchmark_crc32.cc
+++ b/test/benchmarks/benchmark_crc32.cc
@@ -11,7 +11,7 @@
 extern "C" {
 #  include "zbuild.h"
 #  include "zutil_p.h"
-#  include "cpu_functions.h"
+#  include "arch_functions.h"
 #  include "../test_cpu_features.h"
 }
 
diff --git a/test/benchmarks/benchmark_slidehash.cc b/test/benchmarks/benchmark_slidehash.cc
index b2af8fb9d3..e15caa4f55 100644
--- a/test/benchmarks/benchmark_slidehash.cc
+++ b/test/benchmarks/benchmark_slidehash.cc
@@ -11,7 +11,7 @@ extern "C" {
 #  include "zbuild.h"
 #  include "zutil_p.h"
 #  include "deflate.h"
-#  include "cpu_functions.h"
+#  include "arch_functions.h"
 #  include "../test_cpu_features.h"
 }
 
diff --git a/test/test_adler32.cc b/test/test_adler32.cc
index 87ae258890..2d3f4a98cf 100644
--- a/test/test_adler32.cc
+++ b/test/test_adler32.cc
@@ -10,7 +10,7 @@
 
 extern "C" {
 #  include "zbuild.h"
-#  include "cpu_functions.h"
+#  include "arch_functions.h"
 #  include "test_cpu_features.h"
 }
 
diff --git a/test/test_compare256.cc b/test/test_compare256.cc
index 4151fab12b..9aa7c977bc 100644
--- a/test/test_compare256.cc
+++ b/test/test_compare256.cc
@@ -10,7 +10,7 @@
 extern "C" {
 #  include "zbuild.h"
 #  include "zutil.h"
-#  include "cpu_functions.h"
+#  include "arch_functions.h"
 #  include "test_cpu_features.h"
 }
 
diff --git a/test/test_crc32.cc b/test/test_crc32.cc
index 40b5975d81..83bf311316 100644
--- a/test/test_crc32.cc
+++ b/test/test_crc32.cc
@@ -11,7 +11,7 @@
 
 extern "C" {
 #  include "zbuild.h"
-#  include "cpu_functions.h"
+#  include "arch_functions.h"
 #  include "test_cpu_features.h"
 }