diff --git a/contracts/dao-dao-core/schema/dao-dao-core.json b/contracts/dao-dao-core/schema/dao-dao-core.json
index fec05f159..c2e9cf422 100644
--- a/contracts/dao-dao-core/schema/dao-dao-core.json
+++ b/contracts/dao-dao-core/schema/dao-dao-core.json
@@ -1029,7 +1029,7 @@
                     ]
                   },
                   "channel_id": {
-                    "description": "exisiting channel to send the tokens over",
+                    "description": "existing channel to send the tokens over",
                     "type": "string"
                   },
                   "timeout": {
@@ -1147,7 +1147,7 @@
             "minimum": 0.0
           },
           "revision": {
-            "description": "the version that the client is currently on (eg. after reseting the chain this could increment 1 as height drops to 0)",
+            "description": "the version that the client is currently on (e.g. after resetting the chain this could increment 1 as height drops to 0)",
             "type": "integer",
             "format": "uint64",
             "minimum": 0.0
@@ -1398,7 +1398,7 @@
                     }
                   },
                   "label": {
-                    "description": "A human-readbale label for the contract",
+                    "description": "A human-readable label for the contract.\n\nValid values should: - not be empty - not be bigger than 128 bytes (or some chain-specific limit) - not start / end with whitespace",
                     "type": "string"
                   },
                   "msg": {
diff --git a/contracts/external/dao-migrator/schema/dao-migrator.json b/contracts/external/dao-migrator/schema/dao-migrator.json
index 3e47c1302..db060770c 100644
--- a/contracts/external/dao-migrator/schema/dao-migrator.json
+++ b/contracts/external/dao-migrator/schema/dao-migrator.json
@@ -1045,7 +1045,7 @@
                     ]
                   },
                   "channel_id": {
-                    "description": "exisiting channel to send the tokens over",
+                    "description": "existing channel to send the tokens over",
                     "type": "string"
                   },
                   "timeout": {
@@ -1163,7 +1163,7 @@
             "minimum": 0.0
           },
           "revision": {
-            "description": "the version that the client is currently on (eg. after reseting the chain this could increment 1 as height drops to 0)",
+            "description": "the version that the client is currently on (e.g. after resetting the chain this could increment 1 as height drops to 0)",
             "type": "integer",
             "format": "uint64",
             "minimum": 0.0
@@ -1600,7 +1600,7 @@
                     }
                   },
                   "label": {
-                    "description": "A human-readbale label for the contract",
+                    "description": "A human-readable label for the contract.\n\nValid values should: - not be empty - not be bigger than 128 bytes (or some chain-specific limit) - not start / end with whitespace",
                     "type": "string"
                   },
                   "msg": {
@@ -2899,7 +2899,7 @@
                       ]
                     },
                     "channel_id": {
-                      "description": "exisiting channel to send the tokens over",
+                      "description": "existing channel to send the tokens over",
                       "type": "string"
                     },
                     "timeout": {
@@ -3017,7 +3017,7 @@
               "minimum": 0.0
             },
             "revision": {
-              "description": "the version that the client is currently on (eg. after reseting the chain this could increment 1 as height drops to 0)",
+              "description": "the version that the client is currently on (e.g. after resetting the chain this could increment 1 as height drops to 0)",
               "type": "integer",
               "format": "uint64",
               "minimum": 0.0
@@ -3490,7 +3490,7 @@
                       }
                     },
                     "label": {
-                      "description": "A human-readbale label for the contract",
+                      "description": "A human-readable label for the contract.\n\nValid values should: - not be empty - not be bigger than 128 bytes (or some chain-specific limit) - not start / end with whitespace",
                       "type": "string"
                     },
                     "msg": {
@@ -4080,7 +4080,7 @@
                       ]
                     },
                     "channel_id": {
-                      "description": "exisiting channel to send the tokens over",
+                      "description": "existing channel to send the tokens over",
                       "type": "string"
                     },
                     "timeout": {
@@ -4198,7 +4198,7 @@
               "minimum": 0.0
             },
             "revision": {
-              "description": "the version that the client is currently on (eg. after reseting the chain this could increment 1 as height drops to 0)",
+              "description": "the version that the client is currently on (e.g. after resetting the chain this could increment 1 as height drops to 0)",
               "type": "integer",
               "format": "uint64",
               "minimum": 0.0
@@ -4651,7 +4651,7 @@
                       }
                     },
                     "label": {
-                      "description": "A human-readbale label for the contract",
+                      "description": "A human-readable label for the contract.\n\nValid values should: - not be empty - not be bigger than 128 bytes (or some chain-specific limit) - not start / end with whitespace",
                       "type": "string"
                     },
                     "msg": {
@@ -5206,7 +5206,7 @@
                       ]
                     },
                     "channel_id": {
-                      "description": "exisiting channel to send the tokens over",
+                      "description": "existing channel to send the tokens over",
                       "type": "string"
                     },
                     "timeout": {
@@ -5324,7 +5324,7 @@
               "minimum": 0.0
             },
             "revision": {
-              "description": "the version that the client is currently on (eg. after reseting the chain this could increment 1 as height drops to 0)",
+              "description": "the version that the client is currently on (e.g. after resetting the chain this could increment 1 as height drops to 0)",
               "type": "integer",
               "format": "uint64",
               "minimum": 0.0
@@ -5797,7 +5797,7 @@
                       }
                     },
                     "label": {
-                      "description": "A human-readbale label for the contract",
+                      "description": "A human-readable label for the contract.\n\nValid values should: - not be empty - not be bigger than 128 bytes (or some chain-specific limit) - not start / end with whitespace",
                       "type": "string"
                     },
                     "msg": {
diff --git a/contracts/pre-propose/dao-pre-propose-approval-single/schema/dao-pre-propose-approval-single.json b/contracts/pre-propose/dao-pre-propose-approval-single/schema/dao-pre-propose-approval-single.json
index c11084723..e8675b00a 100644
--- a/contracts/pre-propose/dao-pre-propose-approval-single/schema/dao-pre-propose-approval-single.json
+++ b/contracts/pre-propose/dao-pre-propose-approval-single/schema/dao-pre-propose-approval-single.json
@@ -816,7 +816,7 @@
                     ]
                   },
                   "channel_id": {
-                    "description": "exisiting channel to send the tokens over",
+                    "description": "existing channel to send the tokens over",
                     "type": "string"
                   },
                   "timeout": {
@@ -934,7 +934,7 @@
             "minimum": 0.0
           },
           "revision": {
-            "description": "the version that the client is currently on (eg. after reseting the chain this could increment 1 as height drops to 0)",
+            "description": "the version that the client is currently on (e.g. after resetting the chain this could increment 1 as height drops to 0)",
             "type": "integer",
             "format": "uint64",
             "minimum": 0.0
@@ -1273,7 +1273,7 @@
                     }
                   },
                   "label": {
-                    "description": "A human-readbale label for the contract",
+                    "description": "A human-readable label for the contract.\n\nValid values should: - not be empty - not be bigger than 128 bytes (or some chain-specific limit) - not start / end with whitespace",
                     "type": "string"
                   },
                   "msg": {
diff --git a/contracts/pre-propose/dao-pre-propose-multiple/schema/dao-pre-propose-multiple.json b/contracts/pre-propose/dao-pre-propose-multiple/schema/dao-pre-propose-multiple.json
index d0fb4ab83..e2972c646 100644
--- a/contracts/pre-propose/dao-pre-propose-multiple/schema/dao-pre-propose-multiple.json
+++ b/contracts/pre-propose/dao-pre-propose-multiple/schema/dao-pre-propose-multiple.json
@@ -734,7 +734,7 @@
                     ]
                   },
                   "channel_id": {
-                    "description": "exisiting channel to send the tokens over",
+                    "description": "existing channel to send the tokens over",
                     "type": "string"
                   },
                   "timeout": {
@@ -852,7 +852,7 @@
             "minimum": 0.0
           },
           "revision": {
-            "description": "the version that the client is currently on (eg. after reseting the chain this could increment 1 as height drops to 0)",
+            "description": "the version that the client is currently on (e.g. after resetting the chain this could increment 1 as height drops to 0)",
             "type": "integer",
             "format": "uint64",
             "minimum": 0.0
@@ -1228,7 +1228,7 @@
                     }
                   },
                   "label": {
-                    "description": "A human-readbale label for the contract",
+                    "description": "A human-readable label for the contract.\n\nValid values should: - not be empty - not be bigger than 128 bytes (or some chain-specific limit) - not start / end with whitespace",
                     "type": "string"
                   },
                   "msg": {
diff --git a/contracts/pre-propose/dao-pre-propose-single/schema/dao-pre-propose-single.json b/contracts/pre-propose/dao-pre-propose-single/schema/dao-pre-propose-single.json
index 9cf71147a..815c31c6b 100644
--- a/contracts/pre-propose/dao-pre-propose-single/schema/dao-pre-propose-single.json
+++ b/contracts/pre-propose/dao-pre-propose-single/schema/dao-pre-propose-single.json
@@ -734,7 +734,7 @@
                     ]
                   },
                   "channel_id": {
-                    "description": "exisiting channel to send the tokens over",
+                    "description": "existing channel to send the tokens over",
                     "type": "string"
                   },
                   "timeout": {
@@ -852,7 +852,7 @@
             "minimum": 0.0
           },
           "revision": {
-            "description": "the version that the client is currently on (eg. after reseting the chain this could increment 1 as height drops to 0)",
+            "description": "the version that the client is currently on (e.g. after resetting the chain this could increment 1 as height drops to 0)",
             "type": "integer",
             "format": "uint64",
             "minimum": 0.0
@@ -1192,7 +1192,7 @@
                     }
                   },
                   "label": {
-                    "description": "A human-readbale label for the contract",
+                    "description": "A human-readable label for the contract.\n\nValid values should: - not be empty - not be bigger than 128 bytes (or some chain-specific limit) - not start / end with whitespace",
                     "type": "string"
                   },
                   "msg": {
diff --git a/contracts/proposal/dao-proposal-condorcet/schema/dao-proposal-condorcet.json b/contracts/proposal/dao-proposal-condorcet/schema/dao-proposal-condorcet.json
index bf32a13d6..88f46d48b 100644
--- a/contracts/proposal/dao-proposal-condorcet/schema/dao-proposal-condorcet.json
+++ b/contracts/proposal/dao-proposal-condorcet/schema/dao-proposal-condorcet.json
@@ -586,7 +586,7 @@
                     ]
                   },
                   "channel_id": {
-                    "description": "exisiting channel to send the tokens over",
+                    "description": "existing channel to send the tokens over",
                     "type": "string"
                   },
                   "timeout": {
@@ -704,7 +704,7 @@
             "minimum": 0.0
           },
           "revision": {
-            "description": "the version that the client is currently on (eg. after reseting the chain this could increment 1 as height drops to 0)",
+            "description": "the version that the client is currently on (e.g. after resetting the chain this could increment 1 as height drops to 0)",
             "type": "integer",
             "format": "uint64",
             "minimum": 0.0
@@ -956,7 +956,7 @@
                     }
                   },
                   "label": {
-                    "description": "A human-readbale label for the contract",
+                    "description": "A human-readable label for the contract.\n\nValid values should: - not be empty - not be bigger than 128 bytes (or some chain-specific limit) - not start / end with whitespace",
                     "type": "string"
                   },
                   "msg": {
@@ -1727,7 +1727,7 @@
                       ]
                     },
                     "channel_id": {
-                      "description": "exisiting channel to send the tokens over",
+                      "description": "existing channel to send the tokens over",
                       "type": "string"
                     },
                     "timeout": {
@@ -1845,7 +1845,7 @@
               "minimum": 0.0
             },
             "revision": {
-              "description": "the version that the client is currently on (eg. after reseting the chain this could increment 1 as height drops to 0)",
+              "description": "the version that the client is currently on (e.g. after resetting the chain this could increment 1 as height drops to 0)",
               "type": "integer",
               "format": "uint64",
               "minimum": 0.0
@@ -2250,7 +2250,7 @@
                       }
                     },
                     "label": {
-                      "description": "A human-readbale label for the contract",
+                      "description": "A human-readable label for the contract.\n\nValid values should: - not be empty - not be bigger than 128 bytes (or some chain-specific limit) - not start / end with whitespace",
                       "type": "string"
                     },
                     "msg": {
diff --git a/contracts/proposal/dao-proposal-multiple/schema/dao-proposal-multiple.json b/contracts/proposal/dao-proposal-multiple/schema/dao-proposal-multiple.json
index 3783a86e8..8d67f6e3c 100644
--- a/contracts/proposal/dao-proposal-multiple/schema/dao-proposal-multiple.json
+++ b/contracts/proposal/dao-proposal-multiple/schema/dao-proposal-multiple.json
@@ -1019,7 +1019,7 @@
                     ]
                   },
                   "channel_id": {
-                    "description": "exisiting channel to send the tokens over",
+                    "description": "existing channel to send the tokens over",
                     "type": "string"
                   },
                   "timeout": {
@@ -1137,7 +1137,7 @@
             "minimum": 0.0
           },
           "revision": {
-            "description": "the version that the client is currently on (eg. after reseting the chain this could increment 1 as height drops to 0)",
+            "description": "the version that the client is currently on (e.g. after resetting the chain this could increment 1 as height drops to 0)",
             "type": "integer",
             "format": "uint64",
             "minimum": 0.0
@@ -1521,7 +1521,7 @@
                     }
                   },
                   "label": {
-                    "description": "A human-readbale label for the contract",
+                    "description": "A human-readable label for the contract.\n\nValid values should: - not be empty - not be bigger than 128 bytes (or some chain-specific limit) - not start / end with whitespace",
                     "type": "string"
                   },
                   "msg": {
@@ -2785,7 +2785,7 @@
                       ]
                     },
                     "channel_id": {
-                      "description": "exisiting channel to send the tokens over",
+                      "description": "existing channel to send the tokens over",
                       "type": "string"
                     },
                     "timeout": {
@@ -2903,7 +2903,7 @@
               "minimum": 0.0
             },
             "revision": {
-              "description": "the version that the client is currently on (eg. after reseting the chain this could increment 1 as height drops to 0)",
+              "description": "the version that the client is currently on (e.g. after resetting the chain this could increment 1 as height drops to 0)",
               "type": "integer",
               "format": "uint64",
               "minimum": 0.0
@@ -3350,7 +3350,7 @@
                       }
                     },
                     "label": {
-                      "description": "A human-readbale label for the contract",
+                      "description": "A human-readable label for the contract.\n\nValid values should: - not be empty - not be bigger than 128 bytes (or some chain-specific limit) - not start / end with whitespace",
                       "type": "string"
                     },
                     "msg": {
@@ -3966,7 +3966,7 @@
                       ]
                     },
                     "channel_id": {
-                      "description": "exisiting channel to send the tokens over",
+                      "description": "existing channel to send the tokens over",
                       "type": "string"
                     },
                     "timeout": {
@@ -4084,7 +4084,7 @@
               "minimum": 0.0
             },
             "revision": {
-              "description": "the version that the client is currently on (eg. after reseting the chain this could increment 1 as height drops to 0)",
+              "description": "the version that the client is currently on (e.g. after resetting the chain this could increment 1 as height drops to 0)",
               "type": "integer",
               "format": "uint64",
               "minimum": 0.0
@@ -4512,7 +4512,7 @@
                       }
                     },
                     "label": {
-                      "description": "A human-readbale label for the contract",
+                      "description": "A human-readable label for the contract.\n\nValid values should: - not be empty - not be bigger than 128 bytes (or some chain-specific limit) - not start / end with whitespace",
                       "type": "string"
                     },
                     "msg": {
@@ -5104,7 +5104,7 @@
                       ]
                     },
                     "channel_id": {
-                      "description": "exisiting channel to send the tokens over",
+                      "description": "existing channel to send the tokens over",
                       "type": "string"
                     },
                     "timeout": {
@@ -5222,7 +5222,7 @@
               "minimum": 0.0
             },
             "revision": {
-              "description": "the version that the client is currently on (eg. after reseting the chain this could increment 1 as height drops to 0)",
+              "description": "the version that the client is currently on (e.g. after resetting the chain this could increment 1 as height drops to 0)",
               "type": "integer",
               "format": "uint64",
               "minimum": 0.0
@@ -5669,7 +5669,7 @@
                       }
                     },
                     "label": {
-                      "description": "A human-readbale label for the contract",
+                      "description": "A human-readable label for the contract.\n\nValid values should: - not be empty - not be bigger than 128 bytes (or some chain-specific limit) - not start / end with whitespace",
                       "type": "string"
                     },
                     "msg": {
diff --git a/contracts/proposal/dao-proposal-single/schema/dao-proposal-single.json b/contracts/proposal/dao-proposal-single/schema/dao-proposal-single.json
index 87f802625..44da656fc 100644
--- a/contracts/proposal/dao-proposal-single/schema/dao-proposal-single.json
+++ b/contracts/proposal/dao-proposal-single/schema/dao-proposal-single.json
@@ -1045,7 +1045,7 @@
                     ]
                   },
                   "channel_id": {
-                    "description": "exisiting channel to send the tokens over",
+                    "description": "existing channel to send the tokens over",
                     "type": "string"
                   },
                   "timeout": {
@@ -1163,7 +1163,7 @@
             "minimum": 0.0
           },
           "revision": {
-            "description": "the version that the client is currently on (eg. after reseting the chain this could increment 1 as height drops to 0)",
+            "description": "the version that the client is currently on (e.g. after resetting the chain this could increment 1 as height drops to 0)",
             "type": "integer",
             "format": "uint64",
             "minimum": 0.0
@@ -1600,7 +1600,7 @@
                     }
                   },
                   "label": {
-                    "description": "A human-readbale label for the contract",
+                    "description": "A human-readable label for the contract.\n\nValid values should: - not be empty - not be bigger than 128 bytes (or some chain-specific limit) - not start / end with whitespace",
                     "type": "string"
                   },
                   "msg": {
@@ -2899,7 +2899,7 @@
                       ]
                     },
                     "channel_id": {
-                      "description": "exisiting channel to send the tokens over",
+                      "description": "existing channel to send the tokens over",
                       "type": "string"
                     },
                     "timeout": {
@@ -3017,7 +3017,7 @@
               "minimum": 0.0
             },
             "revision": {
-              "description": "the version that the client is currently on (eg. after reseting the chain this could increment 1 as height drops to 0)",
+              "description": "the version that the client is currently on (e.g. after resetting the chain this could increment 1 as height drops to 0)",
               "type": "integer",
               "format": "uint64",
               "minimum": 0.0
@@ -3490,7 +3490,7 @@
                       }
                     },
                     "label": {
-                      "description": "A human-readbale label for the contract",
+                      "description": "A human-readable label for the contract.\n\nValid values should: - not be empty - not be bigger than 128 bytes (or some chain-specific limit) - not start / end with whitespace",
                       "type": "string"
                     },
                     "msg": {
@@ -4080,7 +4080,7 @@
                       ]
                     },
                     "channel_id": {
-                      "description": "exisiting channel to send the tokens over",
+                      "description": "existing channel to send the tokens over",
                       "type": "string"
                     },
                     "timeout": {
@@ -4198,7 +4198,7 @@
               "minimum": 0.0
             },
             "revision": {
-              "description": "the version that the client is currently on (eg. after reseting the chain this could increment 1 as height drops to 0)",
+              "description": "the version that the client is currently on (e.g. after resetting the chain this could increment 1 as height drops to 0)",
               "type": "integer",
               "format": "uint64",
               "minimum": 0.0
@@ -4651,7 +4651,7 @@
                       }
                     },
                     "label": {
-                      "description": "A human-readbale label for the contract",
+                      "description": "A human-readable label for the contract.\n\nValid values should: - not be empty - not be bigger than 128 bytes (or some chain-specific limit) - not start / end with whitespace",
                       "type": "string"
                     },
                     "msg": {
@@ -5206,7 +5206,7 @@
                       ]
                     },
                     "channel_id": {
-                      "description": "exisiting channel to send the tokens over",
+                      "description": "existing channel to send the tokens over",
                       "type": "string"
                     },
                     "timeout": {
@@ -5324,7 +5324,7 @@
               "minimum": 0.0
             },
             "revision": {
-              "description": "the version that the client is currently on (eg. after reseting the chain this could increment 1 as height drops to 0)",
+              "description": "the version that the client is currently on (e.g. after resetting the chain this could increment 1 as height drops to 0)",
               "type": "integer",
               "format": "uint64",
               "minimum": 0.0
@@ -5797,7 +5797,7 @@
                       }
                     },
                     "label": {
-                      "description": "A human-readbale label for the contract",
+                      "description": "A human-readable label for the contract.\n\nValid values should: - not be empty - not be bigger than 128 bytes (or some chain-specific limit) - not start / end with whitespace",
                       "type": "string"
                     },
                     "msg": {
diff --git a/contracts/voting/dao-voting-token-staked/schema/dao-voting-token-factory-staked.json b/contracts/voting/dao-voting-token-staked/schema/dao-voting-token-staked.json
similarity index 99%
rename from contracts/voting/dao-voting-token-staked/schema/dao-voting-token-factory-staked.json
rename to contracts/voting/dao-voting-token-staked/schema/dao-voting-token-staked.json
index 0622e2358..b102a0e25 100644
--- a/contracts/voting/dao-voting-token-staked/schema/dao-voting-token-factory-staked.json
+++ b/contracts/voting/dao-voting-token-staked/schema/dao-voting-token-staked.json
@@ -7,8 +7,7 @@
     "title": "InstantiateMsg",
     "type": "object",
     "required": [
-      "token_info",
-      "token_issuer_code_id"
+      "token_info"
     ],
     "properties": {
       "active_threshold": {
@@ -30,12 +29,6 @@
           }
         ]
       },
-      "token_issuer_code_id": {
-        "description": "The code id of the cw-tokenfactory-issuer contract",
-        "type": "integer",
-        "format": "uint64",
-        "minimum": 0.0
-      },
       "unstaking_duration": {
         "description": "How long until the tokens become liquid again",
         "anyOf": [
@@ -223,7 +216,8 @@
         "type": "object",
         "required": [
           "initial_balances",
-          "subdenom"
+          "subdenom",
+          "token_issuer_code_id"
         ],
         "properties": {
           "initial_balances": {
@@ -258,6 +252,12 @@
           "subdenom": {
             "description": "The subdenom of the token to create, will also be used as an alias for the denom. The Token Factory denom will have the format of factory/{contract_address}/{subdenom}",
             "type": "string"
+          },
+          "token_issuer_code_id": {
+            "description": "The code id of the cw-tokenfactory-issuer contract",
+            "type": "integer",
+            "format": "uint64",
+            "minimum": 0.0
           }
         },
         "additionalProperties": false
@@ -265,7 +265,7 @@
       "TokenInfo": {
         "oneOf": [
           {
-            "description": "Uses an existing Token Factory token and creates a new issuer contract. Full setup, such as transferring ownership or setting up MsgSetBeforeSendHook, must be done manually. Note, for chain controlled denoms or IBC tokens use dao-voting-token-staked.",
+            "description": "Uses an existing Token Factory token and creates a new issuer contract. Full setup, such as transferring ownership or setting up MsgSetBeforeSendHook, must be done manually.",
             "type": "object",
             "required": [
               "existing"