diff --git a/src/apps/common/signverify.py b/src/apps/common/signverify.py
index 33ff3ef5d8..c3c00b0581 100644
--- a/src/apps/common/signverify.py
+++ b/src/apps/common/signverify.py
@@ -1,6 +1,6 @@
 from trezor.crypto.hashlib import sha256
 
-from .signtx import HashWriter, write_varint
+from apps.wallet.sign_tx.signing import HashWriter, write_varint
 
 def message_digest(coin, message):
 
diff --git a/src/apps/wallet/__init__.py b/src/apps/wallet/__init__.py
index 6a25612556..502b44d53a 100644
--- a/src/apps/wallet/__init__.py
+++ b/src/apps/wallet/__init__.py
@@ -54,8 +54,8 @@ def dispatch_SignIdentity(*args, **kwargs):
 
 @unimport
 def dispatch_CipherKeyValue(*args, **kwargs):
-    from .cipherkeyvalue import layout_cipherkeyvalue
-    return layout_cipherkeyvalue(*args, **kwargs)
+    from .cipher_key_value import layout_cipher_key_value
+    return layout_cipher_key_value(*args, **kwargs)
 
 
 def boot():