diff --git a/CHANGELOG.md b/CHANGELOG.md
index f637386b1a8..09146d36213 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -63,6 +63,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Bug Fixes
 
+* [#6840](https://github.com/osmosis-labs/osmosis/pull/6840) fix: change TypeMsgUnbondConvertAndStake value to "unbond_convert_and_stake" and improve error message when epoch currentEpochStartHeight less than zero
 * [#6769](https://github.com/osmosis-labs/osmosis/pull/6769) fix: improve dust handling in EstimateTradeBasedOnPriceImpact
 
 ## v20.0.0
diff --git a/x/epochs/types/genesis.go b/x/epochs/types/genesis.go
index 98b42b28e19..cf60354782b 100644
--- a/x/epochs/types/genesis.go
+++ b/x/epochs/types/genesis.go
@@ -50,7 +50,7 @@ func (epoch EpochInfo) Validate() error {
 		return errors.New("epoch CurrentEpoch must be non-negative")
 	}
 	if epoch.CurrentEpochStartHeight < 0 {
-		return errors.New("epoch CurrentEpoch must be non-negative")
+		return errors.New("epoch CurrentEpochStartHeight must be non-negative")
 	}
 	return nil
 }
diff --git a/x/superfluid/types/msgs.go b/x/superfluid/types/msgs.go
index 3c693c4fee2..7c7c752f955 100644
--- a/x/superfluid/types/msgs.go
+++ b/x/superfluid/types/msgs.go
@@ -23,7 +23,7 @@ const (
 	TypeMsgUnlockAndMigrateShares                       = "unlock_and_migrate_shares"
 	TypeMsgCreateFullRangePositionAndSuperfluidDelegate = "create_full_range_position_and_delegate"
 	TypeMsgAddToConcentratedLiquiditySuperfluidPosition = "add_to_concentrated_liquidity_superfluid_position"
-	TypeMsgUnbondConvertAndStake                        = "add_to_concentrated_liquidity_superfluid_position"
+	TypeMsgUnbondConvertAndStake                        = "unbond_convert_and_stake"
 )
 
 var _ sdk.Msg = &MsgSuperfluidDelegate{}