diff --git a/CHANGELOG.md b/CHANGELOG.md
index f12eaa4203..8a0bed5b18 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -100,7 +100,7 @@ FEATURES
 * [gaiacli] Support queries for candidates, delegator-bonds
 * [gaiad] Added `gaiad export` command to export current state to JSON
 * [x/bank] Tx tags with sender/recipient for indexing & later retrieval
-* [x/stake] Tx tags with delegator/candidate for delegation & unbonding, and candidate info for declare candidate / edit candidacy
+* [x/stake] Tx tags with delegator/candidate for delegation & unbonding, and candidate info for declare candidate / edit validator
 
 IMPROVEMENTS
 
@@ -134,7 +134,7 @@ BREAKING CHANGES
 
 FEATURES:
 
-* Gaia stake commands include, DeclareCandidacy, EditCandidacy, Delegate, Unbond
+* Gaia stake commands include, CreateValidator, EditValidator, Delegate, Unbond
 * MountStoreWithDB without providing a custom store works.
 * Repo is now lint compliant / GoMetaLinter with tendermint-lint integrated into CI
 * Better key output, pubkey go-amino hex bytes now output by default
diff --git a/cmd/gaia/app/app_test.go b/cmd/gaia/app/app_test.go
index b6f1c9e03c..13ffdc33b7 100644
--- a/cmd/gaia/app/app_test.go
+++ b/cmd/gaia/app/app_test.go
@@ -394,13 +394,13 @@ func TestStakeMsgs(t *testing.T) {
 	require.Equal(t, acc1, res1)
 	require.Equal(t, acc2, res2)
 
-	// Declare Candidacy
+	// Create Validator
 
 	description := stake.NewDescription("foo_moniker", "", "", "")
-	declareCandidacyMsg := stake.NewMsgDeclareCandidacy(
+	createValidatorMsg := stake.NewMsgCreateValidator(
 		addr1, priv1.PubKey(), bondCoin, description,
 	)
-	SignCheckDeliver(t, gapp, declareCandidacyMsg, []int64{0}, true, priv1)
+	SignCheckDeliver(t, gapp, createValidatorMsg, []int64{0}, true, priv1)
 
 	ctxDeliver := gapp.BaseApp.NewContext(false, abci.Header{})
 	res1 = gapp.accountMapper.GetAccount(ctxDeliver, addr1)
@@ -415,13 +415,13 @@ func TestStakeMsgs(t *testing.T) {
 	bond, found := gapp.stakeKeeper.GetDelegation(ctxDeliver, addr1, addr1)
 	require.True(sdk.RatEq(t, sdk.NewRat(10), bond.Shares))
 
-	// Edit Candidacy
+	// Edit Validator
 
 	description = stake.NewDescription("bar_moniker", "", "", "")
-	editCandidacyMsg := stake.NewMsgEditCandidacy(
+	editValidatorMsg := stake.NewMsgEditValidator(
 		addr1, description,
 	)
-	SignDeliver(t, gapp, editCandidacyMsg, []int64{1}, true, priv1)
+	SignDeliver(t, gapp, editValidatorMsg, []int64{1}, true, priv1)
 
 	validator, found = gapp.stakeKeeper.GetValidator(ctxDeliver, addr1)
 	require.True(t, found)
diff --git a/cmd/gaia/cli_test/cli_test.go b/cmd/gaia/cli_test/cli_test.go
index 8d98486d72..79deaeb983 100644
--- a/cmd/gaia/cli_test/cli_test.go
+++ b/cmd/gaia/cli_test/cli_test.go
@@ -105,7 +105,7 @@ func TestGaiaCLICreateValidator(t *testing.T) {
 	//valAddr := sdk.Address((valPrivkey.PubKey().Address()))
 	//bechVal, err := sdk.Bech32CosmosifyVal(valAddr)
 
-	// declare candidacy
+	// create validator
 	cvStr := fmt.Sprintf("gaiacli create-validator %v", flags)
 	cvStr += fmt.Sprintf(" --name=%v", "bar")
 	cvStr += fmt.Sprintf(" --validator-address=%v", barCech)
diff --git a/examples/basecoin/cmd/basecli/main.go b/examples/basecoin/cmd/basecli/main.go
index f5385b5596..6540af38aa 100644
--- a/examples/basecoin/cmd/basecli/main.go
+++ b/examples/basecoin/cmd/basecli/main.go
@@ -59,8 +59,8 @@ func main() {
 			bankcmd.SendTxCmd(cdc),
 			ibccmd.IBCTransferCmd(cdc),
 			ibccmd.IBCRelayCmd(cdc),
-			stakecmd.GetCmdDeclareCandidacy(cdc),
-			stakecmd.GetCmdEditCandidacy(cdc),
+			stakecmd.GetCmdCreateValidator(cdc),
+			stakecmd.GetCmdEditValidator(cdc),
 			stakecmd.GetCmdDelegate(cdc),
 			stakecmd.GetCmdUnbond(cdc),
 		)...)
diff --git a/examples/democoin/x/simplestake/msgs.go b/examples/democoin/x/simplestake/msgs.go
index 01797a65bf..605f6f4e23 100644
--- a/examples/democoin/x/simplestake/msgs.go
+++ b/examples/democoin/x/simplestake/msgs.go
@@ -26,7 +26,7 @@ func NewMsgBond(addr sdk.Address, stake sdk.Coin, pubKey crypto.PubKey) MsgBond
 }
 
 //nolint
-func (msg MsgBond) Type() string              { return moduleName } //TODO update "stake/declarecandidacy"
+func (msg MsgBond) Type() string              { return moduleName } //TODO update "stake/createvalidator"
 func (msg MsgBond) GetSigners() []sdk.Address { return []sdk.Address{msg.Address} }
 
 // basic validation of the bond message
@@ -65,7 +65,7 @@ func NewMsgUnbond(addr sdk.Address) MsgUnbond {
 }
 
 //nolint
-func (msg MsgUnbond) Type() string              { return moduleName } //TODO update "stake/declarecandidacy"
+func (msg MsgUnbond) Type() string              { return moduleName } //TODO update "stake/createvalidator"
 func (msg MsgUnbond) GetSigners() []sdk.Address { return []sdk.Address{msg.Address} }
 func (msg MsgUnbond) ValidateBasic() sdk.Error  { return nil }
 
diff --git a/x/slashing/keeper_test.go b/x/slashing/keeper_test.go
index 3d6da8c232..a385627737 100644
--- a/x/slashing/keeper_test.go
+++ b/x/slashing/keeper_test.go
@@ -16,7 +16,7 @@ func TestHandleDoubleSign(t *testing.T) {
 	// initial setup
 	ctx, ck, sk, keeper := createTestInput(t)
 	addr, val, amt := addrs[0], pks[0], int64(100)
-	got := stake.NewHandler(sk)(ctx, newTestMsgDeclareCandidacy(addr, val, amt))
+	got := stake.NewHandler(sk)(ctx, newTestMsgCreateValidator(addr, val, amt))
 	require.True(t, got.IsOK())
 	sk.Tick(ctx)
 	require.Equal(t, ck.GetCoins(ctx, addr), sdk.Coins{{sk.GetParams(ctx).BondDenom, initCoins - amt}})
@@ -39,7 +39,7 @@ func TestHandleAbsentValidator(t *testing.T) {
 	addr, val, amt := addrs[0], pks[0], int64(100)
 	sh := stake.NewHandler(sk)
 	slh := NewHandler(keeper)
-	got := sh(ctx, newTestMsgDeclareCandidacy(addr, val, amt))
+	got := sh(ctx, newTestMsgCreateValidator(addr, val, amt))
 	require.True(t, got.IsOK())
 	sk.Tick(ctx)
 	require.Equal(t, ck.GetCoins(ctx, addr), sdk.Coins{{sk.GetParams(ctx).BondDenom, initCoins - amt}})
diff --git a/x/slashing/test_common.go b/x/slashing/test_common.go
index 0228e9498b..c76eaadde7 100644
--- a/x/slashing/test_common.go
+++ b/x/slashing/test_common.go
@@ -85,8 +85,8 @@ func testAddr(addr string) sdk.Address {
 	return res
 }
 
-func newTestMsgDeclareCandidacy(address sdk.Address, pubKey crypto.PubKey, amt int64) stake.MsgDeclareCandidacy {
-	return stake.MsgDeclareCandidacy{
+func newTestMsgCreateValidator(address sdk.Address, pubKey crypto.PubKey, amt int64) stake.MsgCreateValidator {
+	return stake.MsgCreateValidator{
 		Description:   stake.Description{},
 		ValidatorAddr: address,
 		PubKey:        pubKey,
diff --git a/x/stake/client/cli/tx.go b/x/stake/client/cli/tx.go
index 5cd2656b62..3abd366ece 100644
--- a/x/stake/client/cli/tx.go
+++ b/x/stake/client/cli/tx.go
@@ -13,7 +13,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/x/stake"
 )
 
-// create declare candidacy command
+// create create validator command
 func GetCmdCreateValidator(cdc *wire.Codec) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "create-validator",
@@ -47,7 +47,7 @@ func GetCmdCreateValidator(cdc *wire.Codec) *cobra.Command {
 				Website:  viper.GetString(FlagWebsite),
 				Details:  viper.GetString(FlagDetails),
 			}
-			msg := stake.NewMsgDeclareCandidacy(validatorAddr, pk, amount, description)
+			msg := stake.NewMsgCreateValidator(validatorAddr, pk, amount, description)
 
 			// build and sign the transaction, then broadcast to Tendermint
 			res, err := ctx.EnsureSignBuildBroadcast(ctx.FromAddressName, msg, cdc)
@@ -67,7 +67,7 @@ func GetCmdCreateValidator(cdc *wire.Codec) *cobra.Command {
 	return cmd
 }
 
-// create edit candidacy command
+// create edit validator command
 func GetCmdEditValidator(cdc *wire.Codec) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "edit-validator",
@@ -84,7 +84,7 @@ func GetCmdEditValidator(cdc *wire.Codec) *cobra.Command {
 				Website:  viper.GetString(FlagWebsite),
 				Details:  viper.GetString(FlagDetails),
 			}
-			msg := stake.NewMsgEditCandidacy(validatorAddr, description)
+			msg := stake.NewMsgEditValidator(validatorAddr, description)
 
 			// build and sign the transaction, then broadcast to Tendermint
 			ctx := context.NewCoreContextFromViper().WithDecoder(authcmd.GetAccountDecoder(cdc))
@@ -104,7 +104,7 @@ func GetCmdEditValidator(cdc *wire.Codec) *cobra.Command {
 	return cmd
 }
 
-// create edit candidacy command
+// create edit validator command
 func GetCmdDelegate(cdc *wire.Codec) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "delegate",
@@ -142,7 +142,7 @@ func GetCmdDelegate(cdc *wire.Codec) *cobra.Command {
 	return cmd
 }
 
-// create edit candidacy command
+// create edit validator command
 func GetCmdUnbond(cdc *wire.Codec) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "unbond",
diff --git a/x/stake/errors.go b/x/stake/errors.go
index 77090d9dc3..0ae57530ad 100644
--- a/x/stake/errors.go
+++ b/x/stake/errors.go
@@ -73,10 +73,10 @@ func ErrBadDelegatorAddr(codespace sdk.CodespaceType) sdk.Error {
 	return newError(codespace, CodeInvalidValidator, "Delegator does not exist for that address")
 }
 func ErrValidatorExistsAddr(codespace sdk.CodespaceType) sdk.Error {
-	return newError(codespace, CodeInvalidValidator, "Validator already exist, cannot re-declare candidacy")
+	return newError(codespace, CodeInvalidValidator, "Validator already exist, cannot re-create validator")
 }
 func ErrValidatorRevoked(codespace sdk.CodespaceType) sdk.Error {
-	return newError(codespace, CodeInvalidValidator, "Candidacy for this address is currently revoked")
+	return newError(codespace, CodeInvalidValidator, "Validator for this address is currently revoked")
 }
 func ErrMissingSignature(codespace sdk.CodespaceType) sdk.Error {
 	return newError(codespace, CodeInvalidValidator, "Missing signature")
diff --git a/x/stake/handler.go b/x/stake/handler.go
index 6f2360adf7..b1c6a95b59 100644
--- a/x/stake/handler.go
+++ b/x/stake/handler.go
@@ -11,10 +11,10 @@ func NewHandler(k Keeper) sdk.Handler {
 	return func(ctx sdk.Context, msg sdk.Msg) sdk.Result {
 		// NOTE msg already has validate basic run
 		switch msg := msg.(type) {
-		case MsgDeclareCandidacy:
-			return handleMsgDeclareCandidacy(ctx, msg, k)
-		case MsgEditCandidacy:
-			return handleMsgEditCandidacy(ctx, msg, k)
+		case MsgCreateValidator:
+			return handleMsgCreateValidator(ctx, msg, k)
+		case MsgEditValidator:
+			return handleMsgEditValidator(ctx, msg, k)
 		case MsgDelegate:
 			return handleMsgDelegate(ctx, msg, k)
 		case MsgUnbond:
@@ -39,7 +39,7 @@ func NewEndBlocker(k Keeper) sdk.EndBlocker {
 // These functions assume everything has been authenticated,
 // now we just perform action and save
 
-func handleMsgDeclareCandidacy(ctx sdk.Context, msg MsgDeclareCandidacy, k Keeper) sdk.Result {
+func handleMsgCreateValidator(ctx sdk.Context, msg MsgCreateValidator, k Keeper) sdk.Result {
 
 	// check to see if the pubkey or sender has been registered before
 	_, found := k.GetValidator(ctx, msg.ValidatorAddr)
@@ -57,7 +57,7 @@ func handleMsgDeclareCandidacy(ctx sdk.Context, msg MsgDeclareCandidacy, k Keepe
 	k.setValidator(ctx, validator)
 	k.setValidatorByPubKeyIndex(ctx, validator)
 	tags := sdk.NewTags(
-		"action", []byte("declareCandidacy"),
+		"action", []byte("createValidator"),
 		"validator", msg.ValidatorAddr.Bytes(),
 		"moniker", []byte(msg.Description.Moniker),
 		"identity", []byte(msg.Description.Identity),
@@ -75,7 +75,7 @@ func handleMsgDeclareCandidacy(ctx sdk.Context, msg MsgDeclareCandidacy, k Keepe
 	}
 }
 
-func handleMsgEditCandidacy(ctx sdk.Context, msg MsgEditCandidacy, k Keeper) sdk.Result {
+func handleMsgEditValidator(ctx sdk.Context, msg MsgEditValidator, k Keeper) sdk.Result {
 
 	// validator must already be registered
 	validator, found := k.GetValidator(ctx, msg.ValidatorAddr)
@@ -95,7 +95,7 @@ func handleMsgEditCandidacy(ctx sdk.Context, msg MsgEditCandidacy, k Keeper) sdk
 
 	k.updateValidator(ctx, validator)
 	tags := sdk.NewTags(
-		"action", []byte("editCandidacy"),
+		"action", []byte("editValidator"),
 		"validator", msg.ValidatorAddr.Bytes(),
 		"moniker", []byte(msg.Description.Moniker),
 		"identity", []byte(msg.Description.Identity),
@@ -207,14 +207,14 @@ func handleMsgUnbond(ctx sdk.Context, msg MsgUnbond, k Keeper) sdk.Result {
 	bond.Shares = bond.Shares.Sub(delShares)
 
 	// remove the bond
-	revokeCandidacy := false
+	revokeValidator := false
 	if bond.Shares.IsZero() {
 
 		// if the bond is the owner of the validator then
-		// trigger a revoke candidacy
+		// trigger a revoke validator
 		if bytes.Equal(bond.DelegatorAddr, validator.Owner) &&
 			validator.Revoked == false {
-			revokeCandidacy = true
+			revokeValidator = true
 		}
 
 		k.removeDelegation(ctx, bond)
@@ -233,7 +233,7 @@ func handleMsgUnbond(ctx sdk.Context, msg MsgUnbond, k Keeper) sdk.Result {
 
 	/////////////////////////////////////
 	// revoke validator if necessary
-	if revokeCandidacy {
+	if revokeValidator {
 		validator.Revoked = true
 	}
 
diff --git a/x/stake/handler_test.go b/x/stake/handler_test.go
index 19848e8e6d..0c086f06db 100644
--- a/x/stake/handler_test.go
+++ b/x/stake/handler_test.go
@@ -14,8 +14,8 @@ import (
 
 //______________________________________________________________________
 
-func newTestMsgDeclareCandidacy(address sdk.Address, pubKey crypto.PubKey, amt int64) MsgDeclareCandidacy {
-	return MsgDeclareCandidacy{
+func newTestMsgCreateValidator(address sdk.Address, pubKey crypto.PubKey, amt int64) MsgCreateValidator {
+	return MsgCreateValidator{
 		Description:   Description{},
 		ValidatorAddr: address,
 		PubKey:        pubKey,
@@ -33,13 +33,13 @@ func newTestMsgDelegate(delegatorAddr, validatorAddr sdk.Address, amt int64) Msg
 
 //______________________________________________________________________
 
-func TestDuplicatesMsgDeclareCandidacy(t *testing.T) {
+func TestDuplicatesMsgCreateValidator(t *testing.T) {
 	ctx, _, keeper := createTestInput(t, false, 1000)
 
 	validatorAddr := addrs[0]
 	pk := pks[0]
-	msgDeclareCandidacy := newTestMsgDeclareCandidacy(validatorAddr, pk, 10)
-	got := handleMsgDeclareCandidacy(ctx, msgDeclareCandidacy, keeper)
+	msgCreateValidator := newTestMsgCreateValidator(validatorAddr, pk, 10)
+	got := handleMsgCreateValidator(ctx, msgCreateValidator, keeper)
 	assert.True(t, got.IsOK(), "%v", got)
 	validator, found := keeper.GetValidator(ctx, validatorAddr)
 	require.True(t, found)
@@ -51,8 +51,8 @@ func TestDuplicatesMsgDeclareCandidacy(t *testing.T) {
 	assert.Equal(t, Description{}, validator.Description)
 
 	// one validator cannot bond twice
-	msgDeclareCandidacy.PubKey = pks[1]
-	got = handleMsgDeclareCandidacy(ctx, msgDeclareCandidacy, keeper)
+	msgCreateValidator.PubKey = pks[1]
+	got = handleMsgCreateValidator(ctx, msgCreateValidator, keeper)
 	assert.False(t, got.IsOK(), "%v", got)
 }
 
@@ -64,10 +64,10 @@ func TestIncrementsMsgDelegate(t *testing.T) {
 	bondAmount := int64(10)
 	validatorAddr, delegatorAddr := addrs[0], addrs[1]
 
-	// first declare candidacy
-	msgDeclareCandidacy := newTestMsgDeclareCandidacy(validatorAddr, pks[0], bondAmount)
-	got := handleMsgDeclareCandidacy(ctx, msgDeclareCandidacy, keeper)
-	assert.True(t, got.IsOK(), "expected declare candidacy msg to be ok, got %v", got)
+	// first create validator
+	msgCreateValidator := newTestMsgCreateValidator(validatorAddr, pks[0], bondAmount)
+	got := handleMsgCreateValidator(ctx, msgCreateValidator, keeper)
+	assert.True(t, got.IsOK(), "expected create validator msg to be ok, got %v", got)
 
 	validator, found := keeper.GetValidator(ctx, validatorAddr)
 	require.True(t, found)
@@ -134,12 +134,12 @@ func TestIncrementsMsgUnbond(t *testing.T) {
 	ctx, accMapper, keeper := createTestInput(t, false, initBond)
 	params := keeper.GetParams(ctx)
 
-	// declare candidacy, delegate
+	// create validator, delegate
 	validatorAddr, delegatorAddr := addrs[0], addrs[1]
 
-	msgDeclareCandidacy := newTestMsgDeclareCandidacy(validatorAddr, pks[0], initBond)
-	got := handleMsgDeclareCandidacy(ctx, msgDeclareCandidacy, keeper)
-	assert.True(t, got.IsOK(), "expected declare-candidacy to be ok, got %v", got)
+	msgCreateValidator := newTestMsgCreateValidator(validatorAddr, pks[0], initBond)
+	got := handleMsgCreateValidator(ctx, msgCreateValidator, keeper)
+	assert.True(t, got.IsOK(), "expected create-validator to be ok, got %v", got)
 
 	msgDelegate := newTestMsgDelegate(delegatorAddr, validatorAddr, initBond)
 	got = handleMsgDelegate(ctx, msgDelegate, keeper)
@@ -216,7 +216,7 @@ func TestIncrementsMsgUnbond(t *testing.T) {
 		"got: %v\nmsgUnbond: %v\nshares: %v\nleftBonded: %v\n", got, msgUnbond, unbondSharesStr, leftBonded)
 }
 
-func TestMultipleMsgDeclareCandidacy(t *testing.T) {
+func TestMultipleMsgCreateValidator(t *testing.T) {
 	initBond := int64(1000)
 	ctx, accMapper, keeper := createTestInput(t, false, initBond)
 	params := keeper.GetParams(ctx)
@@ -224,8 +224,8 @@ func TestMultipleMsgDeclareCandidacy(t *testing.T) {
 
 	// bond them all
 	for i, validatorAddr := range validatorAddrs {
-		msgDeclareCandidacy := newTestMsgDeclareCandidacy(validatorAddr, pks[i], 10)
-		got := handleMsgDeclareCandidacy(ctx, msgDeclareCandidacy, keeper)
+		msgCreateValidator := newTestMsgCreateValidator(validatorAddr, pks[i], 10)
+		got := handleMsgCreateValidator(ctx, msgCreateValidator, keeper)
 		require.True(t, got.IsOK(), "expected msg %d to be ok, got %v", i, got)
 
 		//Check that the account is bonded
@@ -266,8 +266,8 @@ func TestMultipleMsgDelegate(t *testing.T) {
 	validatorAddr, delegatorAddrs := addrs[0], addrs[1:]
 
 	//first make a validator
-	msgDeclareCandidacy := newTestMsgDeclareCandidacy(validatorAddr, pks[0], 10)
-	got := handleMsgDeclareCandidacy(ctx, msgDeclareCandidacy, keeper)
+	msgCreateValidator := newTestMsgCreateValidator(validatorAddr, pks[0], 10)
+	got := handleMsgCreateValidator(ctx, msgCreateValidator, keeper)
 	require.True(t, got.IsOK(), "expected msg to be ok, got %v", got)
 
 	// delegate multiple parties
@@ -294,14 +294,14 @@ func TestMultipleMsgDelegate(t *testing.T) {
 	}
 }
 
-func TestVoidCandidacy(t *testing.T) {
+func TestRevokeValidator(t *testing.T) {
 	ctx, _, keeper := createTestInput(t, false, 1000)
 	validatorAddr, delegatorAddr := addrs[0], addrs[1]
 
 	// create the validator
-	msgDeclareCandidacy := newTestMsgDeclareCandidacy(validatorAddr, pks[0], 10)
-	got := handleMsgDeclareCandidacy(ctx, msgDeclareCandidacy, keeper)
-	require.True(t, got.IsOK(), "expected no error on runMsgDeclareCandidacy")
+	msgCreateValidator := newTestMsgCreateValidator(validatorAddr, pks[0], 10)
+	got := handleMsgCreateValidator(ctx, msgCreateValidator, keeper)
+	require.True(t, got.IsOK(), "expected no error on runMsgCreateValidator")
 
 	// bond a delegator
 	msgDelegate := newTestMsgDelegate(delegatorAddr, validatorAddr, 10)
@@ -311,7 +311,7 @@ func TestVoidCandidacy(t *testing.T) {
 	// unbond the validators bond portion
 	msgUnbondValidator := NewMsgUnbond(validatorAddr, validatorAddr, "10")
 	got = handleMsgUnbond(ctx, msgUnbondValidator, keeper)
-	require.True(t, got.IsOK(), "expected no error on runMsgDeclareCandidacy")
+	require.True(t, got.IsOK(), "expected no error on runMsgCreateValidator")
 	validator, found := keeper.GetValidator(ctx, validatorAddr)
 	require.True(t, found)
 	require.True(t, validator.Revoked)
@@ -323,9 +323,9 @@ func TestVoidCandidacy(t *testing.T) {
 	// test that the delegator can still withdraw their bonds
 	msgUnbondDelegator := NewMsgUnbond(delegatorAddr, validatorAddr, "10")
 	got = handleMsgUnbond(ctx, msgUnbondDelegator, keeper)
-	require.True(t, got.IsOK(), "expected no error on runMsgDeclareCandidacy")
+	require.True(t, got.IsOK(), "expected no error on runMsgCreateValidator")
 
 	// verify that the pubkey can now be reused
-	got = handleMsgDeclareCandidacy(ctx, msgDeclareCandidacy, keeper)
+	got = handleMsgCreateValidator(ctx, msgCreateValidator, keeper)
 	assert.True(t, got.IsOK(), "expected ok, got %v", got)
 }
diff --git a/x/stake/msg.go b/x/stake/msg.go
index 67d9597cac..40bf609eec 100644
--- a/x/stake/msg.go
+++ b/x/stake/msg.go
@@ -15,21 +15,21 @@ const MsgType = "stake"
 const StakingToken = "steak"
 
 //Verify interface at compile time
-var _, _, _, _ sdk.Msg = &MsgDeclareCandidacy{}, &MsgEditCandidacy{}, &MsgDelegate{}, &MsgUnbond{}
+var _, _, _, _ sdk.Msg = &MsgCreateValidator{}, &MsgEditValidator{}, &MsgDelegate{}, &MsgUnbond{}
 
 //______________________________________________________________________
 
-// MsgDeclareCandidacy - struct for unbonding transactions
-type MsgDeclareCandidacy struct {
+// MsgCreateValidator - struct for unbonding transactions
+type MsgCreateValidator struct {
 	Description
 	ValidatorAddr sdk.Address   `json:"address"`
 	PubKey        crypto.PubKey `json:"pubkey"`
 	Bond          sdk.Coin      `json:"bond"`
 }
 
-func NewMsgDeclareCandidacy(validatorAddr sdk.Address, pubkey crypto.PubKey,
-	bond sdk.Coin, description Description) MsgDeclareCandidacy {
-	return MsgDeclareCandidacy{
+func NewMsgCreateValidator(validatorAddr sdk.Address, pubkey crypto.PubKey,
+	bond sdk.Coin, description Description) MsgCreateValidator {
+	return MsgCreateValidator{
 		Description:   description,
 		ValidatorAddr: validatorAddr,
 		PubKey:        pubkey,
@@ -38,18 +38,18 @@ func NewMsgDeclareCandidacy(validatorAddr sdk.Address, pubkey crypto.PubKey,
 }
 
 //nolint
-func (msg MsgDeclareCandidacy) Type() string { return MsgType } //TODO update "stake/declarecandidacy"
-func (msg MsgDeclareCandidacy) GetSigners() []sdk.Address {
+func (msg MsgCreateValidator) Type() string { return MsgType }
+func (msg MsgCreateValidator) GetSigners() []sdk.Address {
 	return []sdk.Address{msg.ValidatorAddr}
 }
 
 // get the bytes for the message signer to sign on
-func (msg MsgDeclareCandidacy) GetSignBytes() []byte {
+func (msg MsgCreateValidator) GetSignBytes() []byte {
 	return msgCdc.MustMarshalBinary(msg)
 }
 
 // quick validity check
-func (msg MsgDeclareCandidacy) ValidateBasic() sdk.Error {
+func (msg MsgCreateValidator) ValidateBasic() sdk.Error {
 	if msg.ValidatorAddr == nil {
 		return ErrValidatorEmpty(DefaultCodespace)
 	}
@@ -68,27 +68,27 @@ func (msg MsgDeclareCandidacy) ValidateBasic() sdk.Error {
 
 //______________________________________________________________________
 
-// MsgEditCandidacy - struct for editing a validator
-type MsgEditCandidacy struct {
+// MsgEditValidator - struct for editing a validator
+type MsgEditValidator struct {
 	Description
 	ValidatorAddr sdk.Address `json:"address"`
 }
 
-func NewMsgEditCandidacy(validatorAddr sdk.Address, description Description) MsgEditCandidacy {
-	return MsgEditCandidacy{
+func NewMsgEditValidator(validatorAddr sdk.Address, description Description) MsgEditValidator {
+	return MsgEditValidator{
 		Description:   description,
 		ValidatorAddr: validatorAddr,
 	}
 }
 
 //nolint
-func (msg MsgEditCandidacy) Type() string { return MsgType } //TODO update "stake/msgeditcandidacy"
-func (msg MsgEditCandidacy) GetSigners() []sdk.Address {
+func (msg MsgEditValidator) Type() string { return MsgType }
+func (msg MsgEditValidator) GetSigners() []sdk.Address {
 	return []sdk.Address{msg.ValidatorAddr}
 }
 
 // get the bytes for the message signer to sign on
-func (msg MsgEditCandidacy) GetSignBytes() []byte {
+func (msg MsgEditValidator) GetSignBytes() []byte {
 	b, err := msgCdc.MarshalJSON(msg)
 	if err != nil {
 		panic(err)
@@ -97,7 +97,7 @@ func (msg MsgEditCandidacy) GetSignBytes() []byte {
 }
 
 // quick validity check
-func (msg MsgEditCandidacy) ValidateBasic() sdk.Error {
+func (msg MsgEditValidator) ValidateBasic() sdk.Error {
 	if msg.ValidatorAddr == nil {
 		return ErrValidatorEmpty(DefaultCodespace)
 	}
@@ -126,7 +126,7 @@ func NewMsgDelegate(delegatorAddr, validatorAddr sdk.Address, bond sdk.Coin) Msg
 }
 
 //nolint
-func (msg MsgDelegate) Type() string { return MsgType } //TODO update "stake/msgeditcandidacy"
+func (msg MsgDelegate) Type() string { return MsgType }
 func (msg MsgDelegate) GetSigners() []sdk.Address {
 	return []sdk.Address{msg.DelegatorAddr}
 }
@@ -175,7 +175,7 @@ func NewMsgUnbond(delegatorAddr, validatorAddr sdk.Address, shares string) MsgUn
 }
 
 //nolint
-func (msg MsgUnbond) Type() string              { return MsgType } //TODO update "stake/msgeditcandidacy"
+func (msg MsgUnbond) Type() string              { return MsgType }
 func (msg MsgUnbond) GetSigners() []sdk.Address { return []sdk.Address{msg.DelegatorAddr} }
 
 // get the bytes for the message signer to sign on
diff --git a/x/stake/msg_test.go b/x/stake/msg_test.go
index 03a5fbf62f..863613a039 100644
--- a/x/stake/msg_test.go
+++ b/x/stake/msg_test.go
@@ -18,8 +18,8 @@ var (
 	coinNegNotAtoms  = sdk.Coin{"foo", -10000}
 )
 
-// test ValidateBasic for MsgDeclareCandidacy
-func TestMsgDeclareCandidacy(t *testing.T) {
+// test ValidateBasic for MsgCreateValidator
+func TestMsgCreateValidator(t *testing.T) {
 	tests := []struct {
 		name, moniker, identity, website, details string
 		validatorAddr                             sdk.Address
@@ -40,7 +40,7 @@ func TestMsgDeclareCandidacy(t *testing.T) {
 
 	for _, tc := range tests {
 		description := NewDescription(tc.moniker, tc.identity, tc.website, tc.details)
-		msg := NewMsgDeclareCandidacy(tc.validatorAddr, tc.pubkey, tc.bond, description)
+		msg := NewMsgCreateValidator(tc.validatorAddr, tc.pubkey, tc.bond, description)
 		if tc.expectPass {
 			assert.Nil(t, msg.ValidateBasic(), "test: %v", tc.name)
 		} else {
@@ -49,8 +49,8 @@ func TestMsgDeclareCandidacy(t *testing.T) {
 	}
 }
 
-// test ValidateBasic for MsgEditCandidacy
-func TestMsgEditCandidacy(t *testing.T) {
+// test ValidateBasic for MsgEditValidator
+func TestMsgEditValidator(t *testing.T) {
 	tests := []struct {
 		name, moniker, identity, website, details string
 		validatorAddr                             sdk.Address
@@ -64,7 +64,7 @@ func TestMsgEditCandidacy(t *testing.T) {
 
 	for _, tc := range tests {
 		description := NewDescription(tc.moniker, tc.identity, tc.website, tc.details)
-		msg := NewMsgEditCandidacy(tc.validatorAddr, description)
+		msg := NewMsgEditValidator(tc.validatorAddr, description)
 		if tc.expectPass {
 			assert.Nil(t, msg.ValidateBasic(), "test: %v", tc.name)
 		} else {
@@ -139,8 +139,8 @@ func TestMsgUnbond(t *testing.T) {
 //tests := []struct {
 //tx sdk.Msg
 //}{
-//{NewMsgDeclareCandidacy(addrs[0], pks[0], bond, Description{})},
-//{NewMsgEditCandidacy(addrs[0], Description{})},
+//{NewMsgCreateValidator(addrs[0], pks[0], bond, Description{})},
+//{NewMsgEditValidator(addrs[0], Description{})},
 //{NewMsgDelegate(addrs[0], addrs[1], bond)},
 //{NewMsgUnbond(addrs[0], addrs[1], strconv.Itoa(bondAmt))},
 //}
diff --git a/x/stake/test_common.go b/x/stake/test_common.go
index 9f52ad8de9..ae4adf4d8f 100644
--- a/x/stake/test_common.go
+++ b/x/stake/test_common.go
@@ -68,8 +68,8 @@ func makeTestCodec() *wire.Codec {
 	cdc.RegisterInterface((*sdk.Msg)(nil), nil)
 	cdc.RegisterConcrete(bank.MsgSend{}, "test/stake/Send", nil)
 	cdc.RegisterConcrete(bank.MsgIssue{}, "test/stake/Issue", nil)
-	cdc.RegisterConcrete(MsgDeclareCandidacy{}, "test/stake/DeclareCandidacy", nil)
-	cdc.RegisterConcrete(MsgEditCandidacy{}, "test/stake/EditCandidacy", nil)
+	cdc.RegisterConcrete(MsgCreateValidator{}, "test/stake/CreateValidator", nil)
+	cdc.RegisterConcrete(MsgEditValidator{}, "test/stake/EditValidator", nil)
 	cdc.RegisterConcrete(MsgUnbond{}, "test/stake/Unbond", nil)
 
 	// Register AppAccount
diff --git a/x/stake/wire.go b/x/stake/wire.go
index fb1a1c8867..c0b0be71fa 100644
--- a/x/stake/wire.go
+++ b/x/stake/wire.go
@@ -6,8 +6,8 @@ import (
 
 // Register concrete types on wire codec
 func RegisterWire(cdc *wire.Codec) {
-	cdc.RegisterConcrete(MsgDeclareCandidacy{}, "cosmos-sdk/MsgDeclareCandidacy", nil)
-	cdc.RegisterConcrete(MsgEditCandidacy{}, "cosmos-sdk/MsgEditCandidacy", nil)
+	cdc.RegisterConcrete(MsgCreateValidator{}, "cosmos-sdk/MsgCreateValidator", nil)
+	cdc.RegisterConcrete(MsgEditValidator{}, "cosmos-sdk/MsgEditValidator", nil)
 	cdc.RegisterConcrete(MsgDelegate{}, "cosmos-sdk/MsgDelegate", nil)
 	cdc.RegisterConcrete(MsgUnbond{}, "cosmos-sdk/MsgUnbond", nil)
 }