diff --git a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Governance/AnswerPoll.hs b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Governance/AnswerPoll.hs
index fcf4658534..c7acc23f98 100644
--- a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Governance/AnswerPoll.hs
+++ b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Governance/AnswerPoll.hs
@@ -20,7 +20,7 @@ hprop_golden_shelleyGovernanceAnswerPollNeg1Invalid = propertyOnce . H.moduleWor
   outFile <- H.noteTempFile tempDir "answer-file.json"
 
   result <- tryExecCardanoCLI
-    [ "legacy", "governance", "answer-poll"
+    [ "shelley", "governance", "answer-poll"
     , "--poll-file", pollFile
     , "--answer", "-1"
     , "--out-file", outFile
@@ -37,7 +37,7 @@ hprop_golden_shelleyGovernanceAnswerPoll0 = propertyOnce . H.moduleWorkspace "go
   outFile <- H.noteTempFile tempDir "answer-file.json"
 
   void $ execCardanoCLI
-    [ "legacy", "governance", "answer-poll"
+    [ "shelley", "governance", "answer-poll"
     , "--poll-file", pollFile
     , "--answer", "0"
     , "--out-file", outFile
@@ -52,7 +52,7 @@ hprop_golden_shelleyGovernanceAnswerPollPos1 = propertyOnce . H.moduleWorkspace
   outFile <- H.noteTempFile tempDir "answer-file.json"
 
   void $ execCardanoCLI
-    [ "legacy", "governance", "answer-poll"
+    [ "shelley", "governance", "answer-poll"
     , "--poll-file", pollFile
     , "--answer", "1"
     , "--out-file", outFile
@@ -66,7 +66,7 @@ hprop_golden_shelleyGovernanceAnswerPollPos2Invalid = propertyOnce . H.moduleWor
   outFile <- H.noteTempFile tempDir "answer-file.json"
 
   result <- tryExecCardanoCLI
-    [ "legacy", "governance", "answer-poll"
+    [ "shelley", "governance", "answer-poll"
     , "--poll-file", pollFile
     , "--answer", "2"
     , "--out-file", outFile
diff --git a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Governance/CreatePoll.hs b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Governance/CreatePoll.hs
index 96ad904e68..5c401b6544 100644
--- a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Governance/CreatePoll.hs
+++ b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Governance/CreatePoll.hs
@@ -19,7 +19,7 @@ hprop_golden_shelleyGovernanceCreatePoll =
     pollFile <- noteTempFile tempDir "poll.json"
 
     stdout <- execCardanoCLI
-      [ "legacy", "governance", "create-poll"
+      [ "shelley", "governance", "create-poll"
       , "--question", "Pineapples on pizza?"
       , "--answer", "yes"
       , "--answer", "no"
@@ -39,7 +39,7 @@ hprop_golden_shelleyGovernanceCreateLongPoll =
     pollFile <- noteTempFile tempDir "poll.json"
 
     stdout <- execCardanoCLI
-      [ "legacy", "governance", "create-poll"
+      [ "shelley", "governance", "create-poll"
       , "--question", "What is the most adequate topping to put on a pizza (please consider all possibilities and take time to answer)?"
       , "--answer", "pineapples"
       , "--answer", "only traditional topics should go on a pizza, this isn't room for jokes"
diff --git a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Governance/VerifyPoll.hs b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Governance/VerifyPoll.hs
index 488a7e9564..3b6253ffee 100644
--- a/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Governance/VerifyPoll.hs
+++ b/cardano-cli/test/cardano-cli-golden/Test/Golden/Shelley/Governance/VerifyPoll.hs
@@ -27,7 +27,7 @@ hprop_golden_shelleyGovernanceVerifyPoll = propertyOnce $ do
     noteInputFile "test/cardano-cli-golden/files/golden/shelley/governance/cold.vk"
 
   stdout <- BSC.pack <$> execCardanoCLI
-    [ "legacy", "governance", "verify-poll"
+    [ "shelley", "governance", "verify-poll"
     , "--poll-file", pollFile
     , "--tx-file", txFile
     ]
@@ -45,7 +45,7 @@ hprop_golden_shelleyGovernanceVerifyPollMismatch = propertyOnce $ do
   txFile <- noteInputFile "test/cardano-cli-golden/files/golden/shelley/governance/verify/mismatch"
 
   result <- tryExecCardanoCLI
-    [ "legacy", "governance", "verify-poll"
+    [ "shelley", "governance", "verify-poll"
     , "--poll-file", pollFile
     , "--tx-file", txFile
     ]
@@ -58,7 +58,7 @@ hprop_golden_shelleyGovernanceVerifyPollNoAnswer = propertyOnce $ do
   txFile <- noteInputFile "test/cardano-cli-golden/files/golden/shelley/governance/verify/none"
 
   result <- tryExecCardanoCLI
-    [ "legacy", "governance", "verify-poll"
+    [ "shelley", "governance", "verify-poll"
     , "--poll-file", pollFile
     , "--tx-file", txFile
     ]
@@ -71,7 +71,7 @@ hprop_golden_shelleyGovernanceVerifyPollMalformedAnswer = propertyOnce $ do
   txFile <- noteInputFile "test/cardano-cli-golden/files/golden/shelley/governance/verify/malformed"
 
   result <- tryExecCardanoCLI
-    [ "legacy", "governance", "verify-poll"
+    [ "shelley", "governance", "verify-poll"
     , "--poll-file", pollFile
     , "--tx-file", txFile
     ]
@@ -84,7 +84,7 @@ hprop_golden_shelleyGovernanceVerifyPollInvalidAnswer = propertyOnce $ do
   txFile <- noteInputFile "test/cardano-cli-golden/files/golden/shelley/governance/verify/invalid"
 
   result <- tryExecCardanoCLI
-    [ "legacy", "governance", "verify-poll"
+    [ "shelley", "governance", "verify-poll"
     , "--poll-file", pollFile
     , "--tx-file", txFile
     ]
diff --git a/cardano-cli/test/cardano-cli-golden/Test/Golden/TxView.hs b/cardano-cli/test/cardano-cli-golden/Test/Golden/TxView.hs
index e29be1ff45..619df98809 100644
--- a/cardano-cli/test/cardano-cli-golden/Test/Golden/TxView.hs
+++ b/cardano-cli/test/cardano-cli-golden/Test/Golden/TxView.hs
@@ -259,7 +259,7 @@ hprop_golden_view_alonzo =
       -- Create update proposal
       void $
         execCardanoCLI
-          [ "legacy", "governance", "create-update-proposal"
+          [ "alonzo", "governance", "create-update-proposal"
           , "--epoch", "190"
           , "--genesis-verification-key-file"
           ,   "test/cardano-cli-golden/files/golden/shelley/keys/genesis_keys/verification_key"