diff --git a/src/apdu_sign.c b/src/apdu_sign.c
index 0cc9566c..1fa780a1 100644
--- a/src/apdu_sign.c
+++ b/src/apdu_sign.c
@@ -2,7 +2,7 @@
 
 #include "apdu.h"
 #include "baking_auth.h"
-#include "base58.h"
+#include "base58_encoding.h"
 #include "globals.h"
 #include "keys.h"
 #include "memory.h"
diff --git a/src/base58.c b/src/base58_encoding.c
similarity index 98%
rename from src/base58.c
rename to src/base58_encoding.c
index 0080e897..72028f3c 100644
--- a/src/base58.c
+++ b/src/base58_encoding.c
@@ -11,7 +11,7 @@
 #include <string.h>
 #include <sys/types.h>
 
-#include "base58.h"
+#include "base58_encoding.h"
 
 #define MAX_ENC_INPUT_SIZE 120
 
diff --git a/src/base58.h b/src/base58_encoding.h
similarity index 100%
rename from src/base58.h
rename to src/base58_encoding.h
diff --git a/src/to_string.c b/src/to_string.c
index cd1e8c3c..83e730d1 100644
--- a/src/to_string.c
+++ b/src/to_string.c
@@ -1,7 +1,7 @@
 #include "to_string.h"
 
 #include "apdu.h"
-#include "base58.h"
+#include "base58_encoding.h"
 #include "keys.h"
 #include "delegates.h"
 
diff --git a/src/ui_sign_bagl.c b/src/ui_sign_bagl.c
index 80e79e42..5c742fb9 100644
--- a/src/ui_sign_bagl.c
+++ b/src/ui_sign_bagl.c
@@ -3,7 +3,7 @@
 
 #include "apdu.h"
 #include "baking_auth.h"
-#include "base58.h"
+#include "base58_encoding.h"
 #include "globals.h"
 #include "keys.h"
 #include "memory.h"
diff --git a/src/ui_sign_nbgl.c b/src/ui_sign_nbgl.c
index 74d23a77..702f8fbb 100644
--- a/src/ui_sign_nbgl.c
+++ b/src/ui_sign_nbgl.c
@@ -4,7 +4,7 @@
 
 #include "apdu.h"
 #include "baking_auth.h"
-#include "base58.h"
+#include "base58_encoding.h"
 #include "globals.h"
 #include "keys.h"
 #include "memory.h"