diff --git a/container/src/hledger-flow/accounts/blockchain-explorers/tezos/rules.d/baker.rules b/container/src/hledger-flow/accounts/blockchain-explorers/tezos/rules.d/baker.rules
index 4c59134..cfc8949 100644
--- a/container/src/hledger-flow/accounts/blockchain-explorers/tezos/rules.d/baker.rules
+++ b/container/src/hledger-flow/accounts/blockchain-explorers/tezos/rules.d/baker.rules
@@ -19,7 +19,7 @@
 
 # TODO: expand to all public baker payout addresses
 if %sender (^tz1c9HEyZdAWXZCLE7h3KcZCyykjZr7VY3QM$|^tz1Q8QkSBS63ZQnH3fBTiAMPes9R666Rn6Sc$|^tz1QS7N8HnRBG2RNh3Kjty58XFXuLFVdnKGY$|^tz1STpayh8rNYqpxVf3x86pWpzmcKwmrMvNv$|^tz1ShireJgwr8ag5dETMY4RNqkXeu1YgyDYC$|^tz1UQvdfQ2cwyDa6k6U62mkHWeULwBqCcJwN$|^tz1UZ17zNRQCm9xTu5KxDyAXyjTyqFSKmces$|^tz1W1en9UpMCH4ZJL8wQCh8JDKCZARyVx2co$|^tz1WkMMKx8BLMze2VdTL5CNsixyR1HA8wN51$|^tz1XWEi47p85eUwRZk2Xsp9VobSwUFq7GYKi$|^tz1Zf1QpMLhord5P7DZt3rvvnezCGkjXzBF8$|^tz1cXDqHit4wsNv6dFHggKxDUBdpTkAaizyx$|^tz1fishChEERnSesm8mHe7xsJJwymbHVLcYf$|^tz1grfW18aeMQ5kajyVxM7rewzXhWGLsXUtY$)
-  account2 income:%account_name:%subaccount_name:staking:XTZ
+  account2 income:%account_name:%subaccount_name:tezos:staking:XTZ
   comment type:%type, blockid:%block, subaccount_address:%subaccount_address, sender:%sender, alias:%alias, receiver:%receiver, txid:%hash, direction:%direction, taxed_as:INCOME
   comment2 %time +0000,INCOME,%account_name:%subaccount_name:tezos,XTZ,%volume,USD,,STAKING
 
diff --git a/container/src/hledger-flow/accounts/blockchain-explorers/tezos/tezos-shared.rules b/container/src/hledger-flow/accounts/blockchain-explorers/tezos/tezos-shared.rules
index 3caebf7..353a598 100644
--- a/container/src/hledger-flow/accounts/blockchain-explorers/tezos/tezos-shared.rules
+++ b/container/src/hledger-flow/accounts/blockchain-explorers/tezos/tezos-shared.rules
@@ -23,7 +23,7 @@ date %time
 description %time +0000
 
 # TODO: non-static symbol for asset support
-account1 assets:%account_name:%subaccount_name:XTZ
+account1 assets:%account_name:%subaccount_name:tezos:XTZ
 amount %volume XTZ
 
 comment type:%type, blockid:%block, subaccount_address:%subaccount_address, sender:%sender, receiver:%receiver, txid:%hash, direction:%direction
@@ -33,10 +33,10 @@ if %direction ^OUT$
 
 # Default transfers as equity accounts
 if %direction ^IN$
-  account2 equity:%account_name:%subaccount_name:withdrawal:XTZ
+  account2 equity:%account_name:%subaccount_name:tezos:withdrawal:XTZ
 
 if %direction ^OUT$
-  account2 equity:%account_name:%subaccount_name:deposit:XTZ
+  account2 equity:%account_name:%subaccount_name:tezos:deposit:XTZ
 
 # ---------------------------------------------------------------------------- #
 #                                   Statuses                                   #
@@ -52,9 +52,9 @@ if %status_ ^backtracked$
 
 if %direction ^OUT$
 & %fee [1-9]
-  account3 assets:%account_name:%subaccount_name:XTZ
+  account3 assets:%account_name:%subaccount_name:tezos:XTZ
   amount3 -%fee XTZ
-  account4 expenses:%account_name:%subaccount_name:fees:XTZ
+  account4 expenses:%account_name:%subaccount_name:tezos:fees:XTZ
   amount4 %fee XTZ
   comment type:%type, blockid:%block, subaccount_address:%subaccount_address, sender:%sender, receiver:%receiver, txid:%hash, direction:%direction, taxed_as:SPEND
   comment3 %time +0000,SPEND,%account_name:%subaccount_name:tezos,XTZ,%fee,USD,,FEE
@@ -70,8 +70,8 @@ if %direction ^OUT$
 #   - fees must be caught above (in this file)
 if %direction ^OUT$
 & %type ^delegation$
-  account1 assets:%account_name:%subaccount_name:XTZ
-  account2 assets:%account_name:%subaccount_name:XTZ
+  account1 assets:%account_name:%subaccount_name:tezos:XTZ
+  account2 assets:%account_name:%subaccount_name:tezos:XTZ
   comment type:%type, blockid:%block, subaccount_address:%subaccount_address, sender:%sender, txid:%hash, direction:%direction, taxed_as:SPEND
 
 # 0 value tx (plus fees)