diff --git a/a3p-integration/proposals/n:upgrade-next/.gitignore b/a3p-integration/proposals/a:upgrade-17/.gitignore
similarity index 100%
rename from a3p-integration/proposals/n:upgrade-next/.gitignore
rename to a3p-integration/proposals/a:upgrade-17/.gitignore
diff --git a/a3p-integration/proposals/n:upgrade-next/.yarnrc.yml b/a3p-integration/proposals/a:upgrade-17/.yarnrc.yml
similarity index 100%
rename from a3p-integration/proposals/n:upgrade-next/.yarnrc.yml
rename to a3p-integration/proposals/a:upgrade-17/.yarnrc.yml
diff --git a/a3p-integration/proposals/n:upgrade-next/README.md b/a3p-integration/proposals/a:upgrade-17/README.md
similarity index 100%
rename from a3p-integration/proposals/n:upgrade-next/README.md
rename to a3p-integration/proposals/a:upgrade-17/README.md
diff --git a/a3p-integration/proposals/n:upgrade-next/agd-tools.js b/a3p-integration/proposals/a:upgrade-17/agd-tools.js
similarity index 100%
rename from a3p-integration/proposals/n:upgrade-next/agd-tools.js
rename to a3p-integration/proposals/a:upgrade-17/agd-tools.js
diff --git a/a3p-integration/proposals/n:upgrade-next/initial.test.js b/a3p-integration/proposals/a:upgrade-17/initial.test.js
similarity index 100%
rename from a3p-integration/proposals/n:upgrade-next/initial.test.js
rename to a3p-integration/proposals/a:upgrade-17/initial.test.js
diff --git a/a3p-integration/proposals/n:upgrade-next/localchain.test.js b/a3p-integration/proposals/a:upgrade-17/localchain.test.js
similarity index 100%
rename from a3p-integration/proposals/n:upgrade-next/localchain.test.js
rename to a3p-integration/proposals/a:upgrade-17/localchain.test.js
diff --git a/a3p-integration/proposals/n:upgrade-next/package.json b/a3p-integration/proposals/a:upgrade-17/package.json
similarity index 94%
rename from a3p-integration/proposals/n:upgrade-next/package.json
rename to a3p-integration/proposals/a:upgrade-17/package.json
index c3bd2a7c3c10..96cd73c9ed99 100644
--- a/a3p-integration/proposals/n:upgrade-next/package.json
+++ b/a3p-integration/proposals/a:upgrade-17/package.json
@@ -2,7 +2,7 @@
   "agoricProposal": {
     "releaseNotes": false,
     "sdkImageTag": "unreleased",
-    "planName": "UNRELEASED_A3P_INTEGRATION",
+    "planName": "agoric-upgrade-17",
     "upgradeInfo": {
       "coreProposals": []
     },
diff --git a/a3p-integration/proposals/n:upgrade-next/prepare.sh b/a3p-integration/proposals/a:upgrade-17/prepare.sh
similarity index 100%
rename from a3p-integration/proposals/n:upgrade-next/prepare.sh
rename to a3p-integration/proposals/a:upgrade-17/prepare.sh
diff --git a/a3p-integration/proposals/n:upgrade-next/priceFeed-follower-auction.test.js b/a3p-integration/proposals/a:upgrade-17/priceFeed-follower-auction.test.js
similarity index 100%
rename from a3p-integration/proposals/n:upgrade-next/priceFeed-follower-auction.test.js
rename to a3p-integration/proposals/a:upgrade-17/priceFeed-follower-auction.test.js
diff --git a/a3p-integration/proposals/n:upgrade-next/provisionPool.test.js b/a3p-integration/proposals/a:upgrade-17/provisionPool.test.js
similarity index 100%
rename from a3p-integration/proposals/n:upgrade-next/provisionPool.test.js
rename to a3p-integration/proposals/a:upgrade-17/provisionPool.test.js
diff --git a/a3p-integration/proposals/n:upgrade-next/synthetic-chain-excerpt.js b/a3p-integration/proposals/a:upgrade-17/synthetic-chain-excerpt.js
similarity index 100%
rename from a3p-integration/proposals/n:upgrade-next/synthetic-chain-excerpt.js
rename to a3p-integration/proposals/a:upgrade-17/synthetic-chain-excerpt.js
diff --git a/a3p-integration/proposals/n:upgrade-next/test.sh b/a3p-integration/proposals/a:upgrade-17/test.sh
similarity index 100%
rename from a3p-integration/proposals/n:upgrade-next/test.sh
rename to a3p-integration/proposals/a:upgrade-17/test.sh
diff --git a/a3p-integration/proposals/n:upgrade-next/tsconfig.json b/a3p-integration/proposals/a:upgrade-17/tsconfig.json
similarity index 100%
rename from a3p-integration/proposals/n:upgrade-next/tsconfig.json
rename to a3p-integration/proposals/a:upgrade-17/tsconfig.json
diff --git a/a3p-integration/proposals/n:upgrade-next/vatDetails.js b/a3p-integration/proposals/a:upgrade-17/vatDetails.js
similarity index 100%
rename from a3p-integration/proposals/n:upgrade-next/vatDetails.js
rename to a3p-integration/proposals/a:upgrade-17/vatDetails.js
diff --git a/a3p-integration/proposals/n:upgrade-next/yarn.lock b/a3p-integration/proposals/a:upgrade-17/yarn.lock
similarity index 100%
rename from a3p-integration/proposals/n:upgrade-next/yarn.lock
rename to a3p-integration/proposals/a:upgrade-17/yarn.lock
diff --git a/golang/cosmos/app/app.go b/golang/cosmos/app/app.go
index 52eb932eaa01..8d301b7ada62 100644
--- a/golang/cosmos/app/app.go
+++ b/golang/cosmos/app/app.go
@@ -876,7 +876,7 @@ func NewAgoricApp(
 	for _, name := range upgradeNamesOfThisVersion {
 		app.UpgradeKeeper.SetUpgradeHandler(
 			name,
-			unreleasedUpgradeHandler(app, name),
+			upgrade17Handler(app, name),
 		)
 	}
 
diff --git a/golang/cosmos/app/upgrade.go b/golang/cosmos/app/upgrade.go
index 12cd6eb4a775..b668280e286b 100644
--- a/golang/cosmos/app/upgrade.go
+++ b/golang/cosmos/app/upgrade.go
@@ -11,11 +11,8 @@ import (
 )
 
 var upgradeNamesOfThisVersion = []string{
-	"UNRELEASED_BASIC", // no-frills
-	"UNRELEASED_A3P_INTEGRATION",
-	"UNRELEASED_main",
-	"UNRELEASED_devnet",
-	"UNRELEASED_REAPPLY",
+	"agoric-upgrade-17",
+	"agorictest-upgrade-17",
 }
 
 // isUpgradeNameOfThisVersion returns whether the provided plan name is a
@@ -72,8 +69,8 @@ func isFirstTimeUpgradeOfThisVersion(app *GaiaApp, ctx sdk.Context) bool {
 	return true
 }
 
-// unreleasedUpgradeHandler performs standard upgrade actions plus custom actions for the unreleased upgrade.
-func unreleasedUpgradeHandler(app *GaiaApp, targetUpgrade string) func(sdk.Context, upgradetypes.Plan, module.VersionMap) (module.VersionMap, error) {
+// upgrade17Handler performs standard upgrade actions plus custom actions for upgrade-17.
+func upgrade17Handler(app *GaiaApp, targetUpgrade string) func(sdk.Context, upgradetypes.Plan, module.VersionMap) (module.VersionMap, error) {
 	return func(ctx sdk.Context, plan upgradetypes.Plan, fromVm module.VersionMap) (module.VersionMap, error) {
 		app.CheckControllerInited(false)