diff --git a/build/params_2k.go b/build/params_2k.go
index a0ceb8fff..26afdbabe 100644
--- a/build/params_2k.go
+++ b/build/params_2k.go
@@ -51,7 +51,7 @@ var UpgradeHyperdriveHeight = abi.ChainEpoch(-16)
 var UpgradeChocolateHeight = abi.ChainEpoch(-17)
 
 var UpgradeOhSnapHeight = abi.ChainEpoch(-18)
-var UpgradeFVM1Height = abi.ChainEpoch(-19)
+var UpgradeSkyrHeight = abi.ChainEpoch(-19)
 
 var ActorsCIDs = map[actors.Version]cid.Cid{}
 
@@ -97,7 +97,7 @@ func init() {
 	UpgradeHyperdriveHeight = getUpgradeHeight("LOTUS_HYPERDRIVE_HEIGHT", UpgradeHyperdriveHeight)
 	UpgradeChocolateHeight = getUpgradeHeight("LOTUS_CHOCOLATE_HEIGHT", UpgradeChocolateHeight)
 	UpgradeOhSnapHeight = getUpgradeHeight("LOTUS_OHSNAP_HEIGHT", UpgradeOhSnapHeight)
-	UpgradeFVM1Height = getUpgradeHeight("LOTUS_FVM1_HEIGHT", UpgradeFVM1Height)
+	UpgradeSkyrHeight = getUpgradeHeight("LOTUS_SKYR_HEIGHT", UpgradeSkyrHeight)
 
 	BuildType |= Build2k
 
diff --git a/build/params_butterfly.go b/build/params_butterfly.go
index 741e57a2c..7f94cdad1 100644
--- a/build/params_butterfly.go
+++ b/build/params_butterfly.go
@@ -47,7 +47,7 @@ const UpgradeChocolateHeight = -17
 
 const UpgradeOhSnapHeight = 240
 
-var UpgradeFVM1Height = abi.ChainEpoch(99999999999999)
+var UpgradeSkyrHeight = abi.ChainEpoch(99999999999999)
 
 var ActorsCIDs = map[actors.Version]cid.Cid{}
 
diff --git a/build/params_calibnet.go b/build/params_calibnet.go
index cdd4b2b69..2b8853e52 100644
--- a/build/params_calibnet.go
+++ b/build/params_calibnet.go
@@ -60,7 +60,7 @@ const UpgradeChocolateHeight = 312746
 // 2022-02-10T19:23:00Z
 const UpgradeOhSnapHeight = 682006
 
-var UpgradeFVM1Height = abi.ChainEpoch(99999999999999)
+var UpgradeSkyrHeight = abi.ChainEpoch(99999999999999)
 
 var ActorsCIDs = map[actors.Version]cid.Cid{}
 
diff --git a/build/params_interop.go b/build/params_interop.go
index dfe22559b..a5a72c3a7 100644
--- a/build/params_interop.go
+++ b/build/params_interop.go
@@ -51,7 +51,7 @@ var UpgradeTurboHeight = abi.ChainEpoch(-15)
 var UpgradeHyperdriveHeight = abi.ChainEpoch(-16)
 var UpgradeChocolateHeight = abi.ChainEpoch(-17)
 var UpgradeOhSnapHeight = abi.ChainEpoch(-18)
-var UpgradeFVM1Height = abi.ChainEpoch(100)
+var UpgradeSkyrHeight = abi.ChainEpoch(100)
 
 var ActorsCIDs = map[actors.Version]cid.Cid{
 	actors.Version8: MustParseCid("bafy2bzaceadr77tamp35bbb3rtio4ver4pnk2cbxqif3nn3mrmxra2nlvwoce"),
@@ -103,7 +103,7 @@ func init() {
 	UpgradeHyperdriveHeight = getUpgradeHeight("LOTUS_HYPERDRIVE_HEIGHT", UpgradeHyperdriveHeight)
 	UpgradeChocolateHeight = getUpgradeHeight("LOTUS_CHOCOLATE_HEIGHT", UpgradeChocolateHeight)
 	UpgradeOhSnapHeight = getUpgradeHeight("LOTUS_OHSNAP_HEIGHT", UpgradeOhSnapHeight)
-	UpgradeFVM1Height = getUpgradeHeight("LOTUS_FVM1_HEIGHT", UpgradeFVM1Height)
+	UpgradeSkyrHeight = getUpgradeHeight("LOTUS_SKYR_HEIGHT", UpgradeSkyrHeight)
 
 	BuildType |= BuildInteropnet
 	SetAddressNetwork(address.Testnet)
diff --git a/build/params_mainnet.go b/build/params_mainnet.go
index 085ac4713..100492c64 100644
--- a/build/params_mainnet.go
+++ b/build/params_mainnet.go
@@ -73,9 +73,9 @@ const UpgradeHyperdriveHeight = 892800
 const UpgradeChocolateHeight = 1231620
 
 // 2022-03-01T15:00:00Z
-var UpgradeOhSnapHeight = abi.ChainEpoch(1594680)
+const UpgradeOhSnapHeight = 1594680
 
-var UpgradeFVM1Height = abi.ChainEpoch(99999999999999)
+var UpgradeSkyrHeight = abi.ChainEpoch(99999999999999)
 
 var ActorsCIDs = map[actors.Version]cid.Cid{}
 
@@ -84,8 +84,8 @@ func init() {
 		SetAddressNetwork(address.Mainnet)
 	}
 
-	if os.Getenv("LOTUS_DISABLE_SNAPDEALS") == "1" {
-		UpgradeOhSnapHeight = math.MaxInt64
+	if os.Getenv("LOTUS_DISABLE_SKYR") == "1" {
+		UpgradeSkyrHeight = math.MaxInt64
 	}
 
 	Devnet = false
diff --git a/build/params_testground.go b/build/params_testground.go
index 2d824bb44..9c3aa0eea 100644
--- a/build/params_testground.go
+++ b/build/params_testground.go
@@ -101,7 +101,7 @@ var (
 	UpgradeHyperdriveHeight abi.ChainEpoch = -15
 	UpgradeChocolateHeight  abi.ChainEpoch = -16
 	UpgradeOhSnapHeight     abi.ChainEpoch = -17
-	UpgradeFVM1Height       abi.ChainEpoch = -18
+	UpgradeSkyrHeight       abi.ChainEpoch = -18
 
 	DrandSchedule = map[abi.ChainEpoch]DrandEnum{
 		0: DrandMainnet,
diff --git a/chain/consensus/filcns/upgrades.go b/chain/consensus/filcns/upgrades.go
index 233cbeecd..d2a182917 100644
--- a/chain/consensus/filcns/upgrades.go
+++ b/chain/consensus/filcns/upgrades.go
@@ -175,7 +175,7 @@ func DefaultUpgradeSchedule() stmgr.UpgradeSchedule {
 		}},
 		Expensive: true,
 	}, {
-		Height:    build.UpgradeFVM1Height,
+		Height:    build.UpgradeSkyrHeight,
 		Network:   network.Version16,
 		Migration: UpgradeActorsV8,
 		PreMigrations: []stmgr.PreMigration{{
diff --git a/node/impl/full/gas.go b/node/impl/full/gas.go
index 64152b0b4..624296254 100644
--- a/node/impl/full/gas.go
+++ b/node/impl/full/gas.go
@@ -300,7 +300,7 @@ func gasEstimateGasLimit(
 
 	transitionalMulti := 1.0
 	// Overestimate gas around the upgrade
-	if ts.Height() <= build.UpgradeFVM1Height && (build.UpgradeFVM1Height-ts.Height() <= 20) {
+	if ts.Height() <= build.UpgradeSkyrHeight && (build.UpgradeSkyrHeight-ts.Height() <= 20) {
 		transitionalMulti = 2.0
 
 		func() {