diff --git a/contracts/cw2981-royalties/schema/cw2981-royalties.json b/contracts/cw2981-royalties/schema/cw2981-royalties.json
index adc5f438b..aa960907e 100644
--- a/contracts/cw2981-royalties/schema/cw2981-royalties.json
+++ b/contracts/cw2981-royalties/schema/cw2981-royalties.json
@@ -1261,7 +1261,7 @@
       ],
       "properties": {
         "tokens": {
-          "description": "Contains all token_ids in lexicographical ordering If there are more than `limit`, use `start_from` in future queries to achieve pagination.",
+          "description": "Contains all token_ids in lexicographical ordering If there are more than `limit`, use `start_after` in future queries to achieve pagination.",
           "type": "array",
           "items": {
             "type": "string"
@@ -1904,7 +1904,7 @@
       ],
       "properties": {
         "tokens": {
-          "description": "Contains all token_ids in lexicographical ordering If there are more than `limit`, use `start_from` in future queries to achieve pagination.",
+          "description": "Contains all token_ids in lexicographical ordering If there are more than `limit`, use `start_after` in future queries to achieve pagination.",
           "type": "array",
           "items": {
             "type": "string"
diff --git a/contracts/cw721-base/schema/cw721-base.json b/contracts/cw721-base/schema/cw721-base.json
index 6bd12e5de..aca1b3439 100644
--- a/contracts/cw721-base/schema/cw721-base.json
+++ b/contracts/cw721-base/schema/cw721-base.json
@@ -1070,7 +1070,7 @@
       ],
       "properties": {
         "tokens": {
-          "description": "Contains all token_ids in lexicographical ordering If there are more than `limit`, use `start_from` in future queries to achieve pagination.",
+          "description": "Contains all token_ids in lexicographical ordering If there are more than `limit`, use `start_after` in future queries to achieve pagination.",
           "type": "array",
           "items": {
             "type": "string"
@@ -1669,7 +1669,7 @@
       ],
       "properties": {
         "tokens": {
-          "description": "Contains all token_ids in lexicographical ordering If there are more than `limit`, use `start_from` in future queries to achieve pagination.",
+          "description": "Contains all token_ids in lexicographical ordering If there are more than `limit`, use `start_after` in future queries to achieve pagination.",
           "type": "array",
           "items": {
             "type": "string"
diff --git a/contracts/cw721-base/src/lib.rs b/contracts/cw721-base/src/lib.rs
index c2eb10bee..28f1801eb 100644
--- a/contracts/cw721-base/src/lib.rs
+++ b/contracts/cw721-base/src/lib.rs
@@ -4,7 +4,7 @@ pub mod helpers;
 pub mod msg;
 mod query;
 pub mod state;
-mod upgrades;
+pub mod upgrades;
 
 #[cfg(test)]
 mod contract_tests;
diff --git a/contracts/cw721-metadata-onchain/schema/cw721-metadata-onchain.json b/contracts/cw721-metadata-onchain/schema/cw721-metadata-onchain.json
index 7115bad36..ea0ee7afb 100644
--- a/contracts/cw721-metadata-onchain/schema/cw721-metadata-onchain.json
+++ b/contracts/cw721-metadata-onchain/schema/cw721-metadata-onchain.json
@@ -1157,7 +1157,7 @@
       ],
       "properties": {
         "tokens": {
-          "description": "Contains all token_ids in lexicographical ordering If there are more than `limit`, use `start_from` in future queries to achieve pagination.",
+          "description": "Contains all token_ids in lexicographical ordering If there are more than `limit`, use `start_after` in future queries to achieve pagination.",
           "type": "array",
           "items": {
             "type": "string"
@@ -1756,7 +1756,7 @@
       ],
       "properties": {
         "tokens": {
-          "description": "Contains all token_ids in lexicographical ordering If there are more than `limit`, use `start_from` in future queries to achieve pagination.",
+          "description": "Contains all token_ids in lexicographical ordering If there are more than `limit`, use `start_after` in future queries to achieve pagination.",
           "type": "array",
           "items": {
             "type": "string"
diff --git a/contracts/cw721-non-transferable/schema/tokens_response.json b/contracts/cw721-non-transferable/schema/tokens_response.json
index 14499395f..4728d37e2 100644
--- a/contracts/cw721-non-transferable/schema/tokens_response.json
+++ b/contracts/cw721-non-transferable/schema/tokens_response.json
@@ -7,7 +7,7 @@
   ],
   "properties": {
     "tokens": {
-      "description": "Contains all token_ids in lexicographical ordering If there are more than `limit`, use `start_from` in future queries to achieve pagination.",
+      "description": "Contains all token_ids in lexicographical ordering If there are more than `limit`, use `start_after` in future queries to achieve pagination.",
       "type": "array",
       "items": {
         "type": "string"
diff --git a/packages/cw721/schema/tokens_response.json b/packages/cw721/schema/tokens_response.json
index 14499395f..4728d37e2 100644
--- a/packages/cw721/schema/tokens_response.json
+++ b/packages/cw721/schema/tokens_response.json
@@ -7,7 +7,7 @@
   ],
   "properties": {
     "tokens": {
-      "description": "Contains all token_ids in lexicographical ordering If there are more than `limit`, use `start_from` in future queries to achieve pagination.",
+      "description": "Contains all token_ids in lexicographical ordering If there are more than `limit`, use `start_after` in future queries to achieve pagination.",
       "type": "array",
       "items": {
         "type": "string"
diff --git a/packages/cw721/src/query.rs b/packages/cw721/src/query.rs
index 65de251bb..f336c7530 100644
--- a/packages/cw721/src/query.rs
+++ b/packages/cw721/src/query.rs
@@ -143,7 +143,7 @@ pub struct AllNftInfoResponse<T> {
 #[cw_serde]
 pub struct TokensResponse {
     /// Contains all token_ids in lexicographical ordering
-    /// If there are more than `limit`, use `start_from` in future queries
+    /// If there are more than `limit`, use `start_after` in future queries
     /// to achieve pagination.
     pub tokens: Vec<String>,
 }