diff --git a/.gitattributes b/.gitattributes
index a0fa567da81b5..c692c1668a2be 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,2 @@
 src/ecmult_static_pre_g.h linguist-generated
-src/ecmult_gen_static_prec_table.h linguist-generated
+src/precomputed_ecmult_gen.h linguist-generated
diff --git a/Makefile.am b/Makefile.am
index 2fa114778c61d..68b258cade1fb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -150,11 +150,11 @@ precompute_ecmult_gen_LDADD = $(SECP_LIBS) $(COMMON_LIB)
 src/ecmult_static_pre_g.h:
 	$(MAKE) $(AM_MAKEFLAGS) precompute_ecmult$(EXEEXT)
 	./precompute_ecmult$(EXEEXT)
-src/ecmult_gen_static_prec_table.h:
+src/precomputed_ecmult_gen.h:
 	$(MAKE) $(AM_MAKEFLAGS) precompute_ecmult_gen$(EXEEXT)
 	./precompute_ecmult_gen$(EXEEXT)
 
-PRECOMP = src/ecmult_gen_static_prec_table.h src/ecmult_static_pre_g.h
+PRECOMP = src/precomputed_ecmult_gen.h src/ecmult_static_pre_g.h
 noinst_HEADERS += $(PRECOMP)
 precomp: $(PRECOMP)
 
diff --git a/src/ecmult_gen_impl.h b/src/ecmult_gen_impl.h
index 6a6ab9a4b517b..2c8a503acc483 100644
--- a/src/ecmult_gen_impl.h
+++ b/src/ecmult_gen_impl.h
@@ -12,7 +12,7 @@
 #include "group.h"
 #include "ecmult_gen.h"
 #include "hash_impl.h"
-#include "ecmult_gen_static_prec_table.h"
+#include "precomputed_ecmult_gen.h"
 
 static void secp256k1_ecmult_gen_context_build(secp256k1_ecmult_gen_context *ctx) {
     secp256k1_ecmult_gen_blind(ctx, NULL);
diff --git a/src/precompute_ecmult_gen.c b/src/precompute_ecmult_gen.c
index 5f8d274abbc7b..21580cb0fa4a9 100644
--- a/src/precompute_ecmult_gen.c
+++ b/src/precompute_ecmult_gen.c
@@ -15,7 +15,7 @@
 #include "ecmult_gen_prec_impl.h"
 
 int main(int argc, char **argv) {
-    const char outfile[] = "src/ecmult_gen_static_prec_table.h";
+    const char outfile[] = "src/precomputed_ecmult_gen.h";
     FILE* fp;
     int bits;
 
@@ -30,8 +30,8 @@ int main(int argc, char **argv) {
 
     fprintf(fp, "/* This file was automatically generated by precompute_ecmult_gen. */\n");
     fprintf(fp, "/* See ecmult_gen_impl.h for details about the contents of this file. */\n");
-    fprintf(fp, "#ifndef SECP256K1_ECMULT_GEN_STATIC_PREC_TABLE_H\n");
-    fprintf(fp, "#define SECP256K1_ECMULT_GEN_STATIC_PREC_TABLE_H\n");
+    fprintf(fp, "#ifndef SECP256K1_PRECOMPUTED_ECMULT_GEN_H\n");
+    fprintf(fp, "#define SECP256K1_PRECOMPUTED_ECMULT_GEN_H\n");
 
     fprintf(fp, "#include \"group.h\"\n");
 
@@ -76,7 +76,7 @@ int main(int argc, char **argv) {
     fprintf(fp, "};\n");
     fprintf(fp, "#endif /* EXHAUSTIVE_TEST_ORDER */\n");
     fprintf(fp, "#undef SC\n");
-    fprintf(fp, "#endif /* SECP256K1_ECMULT_GEN_STATIC_PREC_TABLE_H */\n");
+    fprintf(fp, "#endif /* SECP256K1_PRECOMPUTED_ECMULT_GEN_H */\n");
     fclose(fp);
 
     return 0;
diff --git a/src/ecmult_gen_static_prec_table.h b/src/precomputed_ecmult_gen.h
similarity index 99%
rename from src/ecmult_gen_static_prec_table.h
rename to src/precomputed_ecmult_gen.h
index 057976b8c0e66..6f191beaa1e1b 100644
--- a/src/ecmult_gen_static_prec_table.h
+++ b/src/precomputed_ecmult_gen.h
@@ -1,7 +1,7 @@
 /* This file was automatically generated by precompute_ecmult_gen. */
 /* See ecmult_gen_impl.h for details about the contents of this file. */
-#ifndef SECP256K1_ECMULT_GEN_STATIC_PREC_TABLE_H
-#define SECP256K1_ECMULT_GEN_STATIC_PREC_TABLE_H
+#ifndef SECP256K1_PRECOMPUTED_ECMULT_GEN_H
+#define SECP256K1_PRECOMPUTED_ECMULT_GEN_H
 #include "group.h"
 #define S(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p) SECP256K1_GE_STORAGE_CONST(0x##a##u,0x##b##u,0x##c##u,0x##d##u,0x##e##u,0x##f##u,0x##g##u,0x##h##u,0x##i##u,0x##j##u,0x##k##u,0x##l##u,0x##m##u,0x##n##u,0x##o##u,0x##p##u)
 #ifdef EXHAUSTIVE_TEST_ORDER
@@ -9745,4 +9745,4 @@ S(9de52b81,157165cc,aef44485,4c2b3535,a599a79,80d024de,5334b385,ecbb2e91,74fca16
 };
 #endif /* EXHAUSTIVE_TEST_ORDER */
 #undef SC
-#endif /* SECP256K1_ECMULT_GEN_STATIC_PREC_TABLE_H */
+#endif /* SECP256K1_PRECOMPUTED_ECMULT_GEN_H */