diff --git a/src_features/signMessageEIP712/commands_712.c b/src_features/signMessageEIP712/commands_712.c
index fe2fb03..c1d3a56 100644
--- a/src_features/signMessageEIP712/commands_712.c
+++ b/src_features/signMessageEIP712/commands_712.c
@@ -5,7 +5,7 @@
 #include <stdbool.h>
 #include "commands_712.h"
 #include "apdu_constants.h"  // APDU response codes
-#include "context.h"
+#include "context_712.h"
 #include "field_hash.h"
 #include "path.h"
 #include "ui_logic.h"
diff --git a/src_features/signMessageEIP712/context.c b/src_features/signMessageEIP712/context_712.c
similarity index 98%
rename from src_features/signMessageEIP712/context.c
rename to src_features/signMessageEIP712/context_712.c
index 7b45518..829398c 100644
--- a/src_features/signMessageEIP712/context.c
+++ b/src_features/signMessageEIP712/context_712.c
@@ -2,7 +2,7 @@
 
 #include <string.h>
 #include <stdint.h>
-#include "context.h"
+#include "context_712.h"
 #include "mem.h"
 #include "mem_utils.h"
 #include "sol_typenames.h"
diff --git a/src_features/signMessageEIP712/context.h b/src_features/signMessageEIP712/context_712.h
similarity index 100%
rename from src_features/signMessageEIP712/context.h
rename to src_features/signMessageEIP712/context_712.h
diff --git a/src_features/signMessageEIP712/field_hash.c b/src_features/signMessageEIP712/field_hash.c
index 83aa45f..f472b6d 100644
--- a/src_features/signMessageEIP712/field_hash.c
+++ b/src_features/signMessageEIP712/field_hash.c
@@ -9,7 +9,7 @@
 #include "shared_context.h"
 #include "ui_logic.h"
 #include "ethUtils.h"        // KECCAK256_HASH_BYTESIZE
-#include "context.h"         // contract_addr
+#include "context_712.h"     // contract_addr
 #include "utils.h"           // u64_from_BE
 #include "apdu_constants.h"  // APDU response codes
 #include "typed_data.h"
diff --git a/src_features/signMessageEIP712/filtering.c b/src_features/signMessageEIP712/filtering.c
index a43c788..1ba40dc 100644
--- a/src_features/signMessageEIP712/filtering.c
+++ b/src_features/signMessageEIP712/filtering.c
@@ -4,7 +4,7 @@
 #include "hash_bytes.h"
 #include "ethUstream.h"      // INT256_LENGTH
 #include "apdu_constants.h"  // APDU return codes
-#include "context.h"
+#include "context_712.h"
 #include "commands_712.h"
 #include "typed_data.h"
 #include "path.h"
diff --git a/src_features/signMessageEIP712/path.c b/src_features/signMessageEIP712/path.c
index aa6fad1..998296c 100644
--- a/src_features/signMessageEIP712/path.c
+++ b/src_features/signMessageEIP712/path.c
@@ -4,7 +4,7 @@
 #include <string.h>
 #include "path.h"
 #include "mem.h"
-#include "context.h"
+#include "context_712.h"
 #include "commands_712.h"
 #include "type_hash.h"
 #include "shared_context.h"
diff --git a/src_features/signMessageEIP712/schema_hash.c b/src_features/signMessageEIP712/schema_hash.c
index 10af1e2..e47c2ee 100644
--- a/src_features/signMessageEIP712/schema_hash.c
+++ b/src_features/signMessageEIP712/schema_hash.c
@@ -4,7 +4,7 @@
 #include "hash_bytes.h"
 #include "typed_data.h"
 #include "format_hash_field_type.h"
-#include "context.h"
+#include "context_712.h"
 
 // the SDK does not define a SHA-224 type, define it here so it's easier
 // to understand in the code
diff --git a/src_features/signMessageEIP712/typed_data.c b/src_features/signMessageEIP712/typed_data.c
index 4239f86..a410ccf 100644
--- a/src_features/signMessageEIP712/typed_data.c
+++ b/src_features/signMessageEIP712/typed_data.c
@@ -5,7 +5,7 @@
 #include "typed_data.h"
 #include "sol_typenames.h"
 #include "apdu_constants.h"  // APDU response codes
-#include "context.h"
+#include "context_712.h"
 #include "mem.h"
 #include "mem_utils.h"
 
diff --git a/src_features/signMessageEIP712/ui_logic.c b/src_features/signMessageEIP712/ui_logic.c
index 3c6635a..1589b19 100644
--- a/src_features/signMessageEIP712/ui_logic.c
+++ b/src_features/signMessageEIP712/ui_logic.c
@@ -12,7 +12,7 @@
 #include "ethUtils.h"  // getEthDisplayableAddress
 #include "utils.h"     // uint256_to_decimal
 #include "common_712.h"
-#include "context.h"         // eip712_context_deinit
+#include "context_712.h"     // eip712_context_deinit
 #include "uint256.h"         // tostring256 && tostring256_signed
 #include "path.h"            // path_get_root_type
 #include "apdu_constants.h"  // APDU response codes