diff --git a/client/config.go b/client/config.go
index fcb2523753..a1d38a016f 100644
--- a/client/config.go
+++ b/client/config.go
@@ -1,15 +1,15 @@
 package client
 
 import (
-	"github.com/spf13/cobra"
-	"github.com/mitchellh/go-homedir"
 	"bufio"
-	"path"
-	"os"
-	"io/ioutil"
-	"github.com/pelletier/go-toml"
 	"fmt"
 	"github.com/cosmos/cosmos-sdk/types"
+	"github.com/mitchellh/go-homedir"
+	"github.com/pelletier/go-toml"
+	"github.com/spf13/cobra"
+	"io/ioutil"
+	"os"
+	"path"
 )
 
 type cliConfig struct {
@@ -34,7 +34,7 @@ func ConfigCmd() *cobra.Command {
 	return cfg
 }
 
-func runConfigCmd(cmd *cobra.Command, args [] string) error {
+func runConfigCmd(cmd *cobra.Command, args []string) error {
 	home, err := homedir.Dir()
 	if err != nil {
 		return err
diff --git a/client/lcd/certificates.go b/client/lcd/certificates.go
index f47f2397c7..1516ed35af 100644
--- a/client/lcd/certificates.go
+++ b/client/lcd/certificates.go
@@ -43,7 +43,7 @@ func generateSelfSignedCert(host string) (certBytes []byte, priv *ecdsa.PrivateK
 		KeyUsage:              x509.KeyUsageKeyEncipherment | x509.KeyUsageDigitalSignature | x509.KeyUsageCertSign,
 		ExtKeyUsage:           []x509.ExtKeyUsage{x509.ExtKeyUsageServerAuth},
 		BasicConstraintsValid: true,
-		IsCA: true,
+		IsCA:                  true,
 	}
 	hosts := strings.Split(host, ",")
 	for _, h := range hosts {
diff --git a/client/rpc/status.go b/client/rpc/status.go
index 6c42701754..049910ed10 100644
--- a/client/rpc/status.go
+++ b/client/rpc/status.go
@@ -9,8 +9,8 @@ import (
 
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/context"
-	ctypes "github.com/tendermint/tendermint/rpc/core/types"
 	"github.com/spf13/viper"
+	ctypes "github.com/tendermint/tendermint/rpc/core/types"
 )
 
 func statusCommand() *cobra.Command {
diff --git a/cmd/gaia/app/benchmarks/txsize_test.go b/cmd/gaia/app/benchmarks/txsize_test.go
index 83e51c0416..186ad87e58 100644
--- a/cmd/gaia/app/benchmarks/txsize_test.go
+++ b/cmd/gaia/app/benchmarks/txsize_test.go
@@ -26,7 +26,7 @@ func ExampleTxSendSize() {
 		Outputs: []bank.Output{bank.NewOutput(addr2, coins)},
 	}
 	sig, _ := priv1.Sign(msg1.GetSignBytes())
-	sigs := []auth.StdSignature{auth.StdSignature{nil, sig, 0, 0}}
+	sigs := []auth.StdSignature{{nil, sig, 0, 0}}
 	tx := auth.NewStdTx([]sdk.Msg{msg1}, auth.NewStdFee(0, coins...), sigs, "")
 	fmt.Println(len(cdc.MustMarshalBinaryBare([]sdk.Msg{msg1})))
 	fmt.Println(len(cdc.MustMarshalBinaryBare(tx)))
diff --git a/cmd/gaia/cli_test/cli_test.go b/cmd/gaia/cli_test/cli_test.go
index 5b204f4df7..04bc4c84a5 100644
--- a/cmd/gaia/cli_test/cli_test.go
+++ b/cmd/gaia/cli_test/cli_test.go
@@ -7,8 +7,8 @@ import (
 	"fmt"
 	"io/ioutil"
 	"os"
-	"testing"
 	"path"
+	"testing"
 
 	"github.com/stretchr/testify/require"
 
diff --git a/cmd/gaia/cmd/gaiacli/main.go b/cmd/gaia/cmd/gaiacli/main.go
index 2f66caadd6..5be9d76e82 100644
--- a/cmd/gaia/cmd/gaiacli/main.go
+++ b/cmd/gaia/cmd/gaiacli/main.go
@@ -18,9 +18,9 @@ import (
 	stakecmd "github.com/cosmos/cosmos-sdk/x/stake/client/cli"
 
 	"github.com/cosmos/cosmos-sdk/cmd/gaia/app"
-	"path"
-	"os"
 	"github.com/spf13/viper"
+	"os"
+	"path"
 )
 
 const (
@@ -152,7 +152,7 @@ func initConfig(cmd *cobra.Command) error {
 	}
 
 	if err := viper.BindPFlag(cli.EncodingFlag, cmd.PersistentFlags().Lookup(cli.EncodingFlag)); err != nil {
-	    return err
+		return err
 	}
 	return viper.BindPFlag(cli.OutputFlag, cmd.PersistentFlags().Lookup(cli.OutputFlag))
 }
diff --git a/crypto/keys/keybase.go b/crypto/keys/keybase.go
index c9bfd08129..99632e7642 100644
--- a/crypto/keys/keybase.go
+++ b/crypto/keys/keybase.go
@@ -9,12 +9,12 @@ import (
 	"github.com/cosmos/cosmos-sdk/crypto"
 	"github.com/cosmos/cosmos-sdk/crypto/keys/bip39"
 	"github.com/cosmos/cosmos-sdk/crypto/keys/hd"
+	"github.com/cosmos/cosmos-sdk/types"
 	"github.com/pkg/errors"
 	tmcrypto "github.com/tendermint/tendermint/crypto"
 	"github.com/tendermint/tendermint/crypto/encoding/amino"
 	"github.com/tendermint/tendermint/crypto/secp256k1"
 	dbm "github.com/tendermint/tendermint/libs/db"
-	"github.com/cosmos/cosmos-sdk/types"
 )
 
 var _ Keybase = dbKeybase{}
diff --git a/crypto/keys/keybase_test.go b/crypto/keys/keybase_test.go
index 2a602461a1..3273c229af 100644
--- a/crypto/keys/keybase_test.go
+++ b/crypto/keys/keybase_test.go
@@ -10,8 +10,8 @@ import (
 	"github.com/tendermint/tendermint/crypto"
 	"github.com/tendermint/tendermint/crypto/ed25519"
 
-	dbm "github.com/tendermint/tendermint/libs/db"
 	"github.com/cosmos/cosmos-sdk/types"
+	dbm "github.com/tendermint/tendermint/libs/db"
 )
 
 func init() {
@@ -403,4 +403,4 @@ func ExampleNew() {
 
 func accAddr(info Info) types.AccAddress {
 	return (types.AccAddress)(info.GetPubKey().Address())
-}
\ No newline at end of file
+}
diff --git a/types/address_test.go b/types/address_test.go
index 6c6c78d6ec..e2ec36876c 100644
--- a/types/address_test.go
+++ b/types/address_test.go
@@ -10,7 +10,7 @@ import (
 	"github.com/tendermint/tendermint/crypto/ed25519"
 
 	"github.com/cosmos/cosmos-sdk/types"
-	)
+)
 
 var invalidStrs = []string{
 	"",
diff --git a/types/coin_test.go b/types/coin_test.go
index ba7038010a..bc04412791 100644
--- a/types/coin_test.go
+++ b/types/coin_test.go
@@ -443,7 +443,7 @@ func BenchmarkCoinsAdditionIntersect(b *testing.B) {
 		}
 	}
 
-	benchmarkSizes := [][]int{[]int{1, 1}, []int{5, 5}, []int{5, 20}, []int{1, 1000}, []int{2, 1000}}
+	benchmarkSizes := [][]int{{1, 1}, {5, 5}, {5, 20}, {1, 1000}, {2, 1000}}
 	for i := 0; i < len(benchmarkSizes); i++ {
 		sizeA := benchmarkSizes[i][0]
 		sizeB := benchmarkSizes[i][1]
@@ -469,7 +469,7 @@ func BenchmarkCoinsAdditionNoIntersect(b *testing.B) {
 		}
 	}
 
-	benchmarkSizes := [][]int{[]int{1, 1}, []int{5, 5}, []int{5, 20}, []int{1, 1000}, []int{2, 1000}, []int{1000, 2}}
+	benchmarkSizes := [][]int{{1, 1}, {5, 5}, {5, 20}, {1, 1000}, {2, 1000}, {1000, 2}}
 	for i := 0; i < len(benchmarkSizes); i++ {
 		sizeA := benchmarkSizes[i][0]
 		sizeB := benchmarkSizes[i][1]
diff --git a/types/utils.go b/types/utils.go
index 95fc779d73..b196acb230 100644
--- a/types/utils.go
+++ b/types/utils.go
@@ -51,4 +51,4 @@ func DefaultChainID() (string, error) {
 	}
 
 	return doc.ChainID, nil
-}
\ No newline at end of file
+}
diff --git a/x/stake/keeper/validator_test.go b/x/stake/keeper/validator_test.go
index 566e8a46f8..7533fed6e9 100644
--- a/x/stake/keeper/validator_test.go
+++ b/x/stake/keeper/validator_test.go
@@ -71,7 +71,7 @@ func TestSetValidator(t *testing.T) {
 	require.Equal(t, 1, len(resVals))
 	require.True(ValEq(t, validator, resVals[0]))
 
-	updates := keeper.GetValidTendermintUpdates(ctx)
+	updates := keeper.GetTendermintUpdates(ctx)
 	require.Equal(t, 1, len(updates))
 	require.Equal(t, validator.ABCIValidatorUpdate(), updates[0])
 
@@ -675,7 +675,7 @@ func TestFullValidatorSetPowerChange(t *testing.T) {
 	assert.True(ValEq(t, validators[2], resValidators[1]))
 }
 
-func TestGetValidTendermintUpdatesAllNone(t *testing.T) {
+func TestGetTendermintUpdatesAllNone(t *testing.T) {
 	ctx, _, keeper := CreateTestInput(t, false, 1000)
 
 	amts := []int64{10, 20}
@@ -693,17 +693,17 @@ func TestGetValidTendermintUpdatesAllNone(t *testing.T) {
 
 	// test from nothing to something
 	//  tendermintUpdate set: {} -> {c1, c3}
-	require.Equal(t, 0, len(keeper.GetValidTendermintUpdates(ctx)))
+	require.Equal(t, 0, len(keeper.GetTendermintUpdates(ctx)))
 	validators[0] = keeper.UpdateValidator(ctx, validators[0])
 	validators[1] = keeper.UpdateValidator(ctx, validators[1])
 
-	updates := keeper.GetValidTendermintUpdates(ctx)
+	updates := keeper.GetTendermintUpdates(ctx)
 	assert.Equal(t, 2, len(updates))
 	assert.Equal(t, validators[0].ABCIValidatorUpdate(), updates[0])
 	assert.Equal(t, validators[1].ABCIValidatorUpdate(), updates[1])
 }
 
-func TestGetValidTendermintUpdatesIdentical(t *testing.T) {
+func TestGetTendermintUpdatesIdentical(t *testing.T) {
 	ctx, _, keeper := CreateTestInput(t, false, 1000)
 
 	amts := []int64{10, 20}
@@ -717,16 +717,16 @@ func TestGetValidTendermintUpdatesIdentical(t *testing.T) {
 	validators[0] = keeper.UpdateValidator(ctx, validators[0])
 	validators[1] = keeper.UpdateValidator(ctx, validators[1])
 	clearTendermintUpdates(ctx, keeper)
-	require.Equal(t, 0, len(keeper.GetValidTendermintUpdates(ctx)))
+	require.Equal(t, 0, len(keeper.GetTendermintUpdates(ctx)))
 
 	// test identical,
 	//  tendermintUpdate set: {} -> {}
 	validators[0] = keeper.UpdateValidator(ctx, validators[0])
 	validators[1] = keeper.UpdateValidator(ctx, validators[1])
-	require.Equal(t, 0, len(keeper.GetValidTendermintUpdates(ctx)))
+	require.Equal(t, 0, len(keeper.GetTendermintUpdates(ctx)))
 }
 
-func TestGetValidTendermintUpdatesSingleValueChange(t *testing.T) {
+func TestGetTendermintUpdatesSingleValueChange(t *testing.T) {
 	ctx, _, keeper := CreateTestInput(t, false, 1000)
 
 	amts := []int64{10, 20}
@@ -740,7 +740,7 @@ func TestGetValidTendermintUpdatesSingleValueChange(t *testing.T) {
 	validators[0] = keeper.UpdateValidator(ctx, validators[0])
 	validators[1] = keeper.UpdateValidator(ctx, validators[1])
 	clearTendermintUpdates(ctx, keeper)
-	require.Equal(t, 0, len(keeper.GetValidTendermintUpdates(ctx)))
+	require.Equal(t, 0, len(keeper.GetTendermintUpdates(ctx)))
 
 	// test single value change
 	//  tendermintUpdate set: {} -> {c1'}
@@ -748,13 +748,13 @@ func TestGetValidTendermintUpdatesSingleValueChange(t *testing.T) {
 	validators[0].Tokens = sdk.NewDec(600)
 	validators[0] = keeper.UpdateValidator(ctx, validators[0])
 
-	updates := keeper.GetValidTendermintUpdates(ctx)
+	updates := keeper.GetTendermintUpdates(ctx)
 
 	require.Equal(t, 1, len(updates))
 	require.Equal(t, validators[0].ABCIValidatorUpdate(), updates[0])
 }
 
-func TestGetValidTendermintUpdatesMultipleValueChange(t *testing.T) {
+func TestGetTendermintUpdatesMultipleValueChange(t *testing.T) {
 	ctx, _, keeper := CreateTestInput(t, false, 1000)
 
 	amts := []int64{10, 20}
@@ -768,7 +768,7 @@ func TestGetValidTendermintUpdatesMultipleValueChange(t *testing.T) {
 	validators[0] = keeper.UpdateValidator(ctx, validators[0])
 	validators[1] = keeper.UpdateValidator(ctx, validators[1])
 	clearTendermintUpdates(ctx, keeper)
-	require.Equal(t, 0, len(keeper.GetValidTendermintUpdates(ctx)))
+	require.Equal(t, 0, len(keeper.GetTendermintUpdates(ctx)))
 
 	// test multiple value change
 	//  tendermintUpdate set: {c1, c3} -> {c1', c3'}
@@ -779,13 +779,13 @@ func TestGetValidTendermintUpdatesMultipleValueChange(t *testing.T) {
 	validators[0] = keeper.UpdateValidator(ctx, validators[0])
 	validators[1] = keeper.UpdateValidator(ctx, validators[1])
 
-	updates := keeper.GetValidTendermintUpdates(ctx)
+	updates := keeper.GetTendermintUpdates(ctx)
 	require.Equal(t, 2, len(updates))
 	require.Equal(t, validators[0].ABCIValidatorUpdate(), updates[0])
 	require.Equal(t, validators[1].ABCIValidatorUpdate(), updates[1])
 }
 
-func TestGetValidTendermintUpdatesInserted(t *testing.T) {
+func TestGetTendermintUpdatesInserted(t *testing.T) {
 	ctx, _, keeper := CreateTestInput(t, false, 1000)
 
 	amts := []int64{10, 20, 5, 15, 25}
@@ -799,12 +799,12 @@ func TestGetValidTendermintUpdatesInserted(t *testing.T) {
 	validators[0] = keeper.UpdateValidator(ctx, validators[0])
 	validators[1] = keeper.UpdateValidator(ctx, validators[1])
 	clearTendermintUpdates(ctx, keeper)
-	require.Equal(t, 0, len(keeper.GetValidTendermintUpdates(ctx)))
+	require.Equal(t, 0, len(keeper.GetTendermintUpdates(ctx)))
 
 	// test validtor added at the beginning
 	//  tendermintUpdate set: {} -> {c0}
 	validators[2] = keeper.UpdateValidator(ctx, validators[2])
-	updates := keeper.GetValidTendermintUpdates(ctx)
+	updates := keeper.GetTendermintUpdates(ctx)
 	require.Equal(t, 1, len(updates))
 	require.Equal(t, validators[2].ABCIValidatorUpdate(), updates[0])
 
@@ -812,7 +812,7 @@ func TestGetValidTendermintUpdatesInserted(t *testing.T) {
 	//  tendermintUpdate set: {} -> {c0}
 	clearTendermintUpdates(ctx, keeper)
 	validators[3] = keeper.UpdateValidator(ctx, validators[3])
-	updates = keeper.GetValidTendermintUpdates(ctx)
+	updates = keeper.GetTendermintUpdates(ctx)
 	require.Equal(t, 1, len(updates))
 	require.Equal(t, validators[3].ABCIValidatorUpdate(), updates[0])
 
@@ -820,12 +820,12 @@ func TestGetValidTendermintUpdatesInserted(t *testing.T) {
 	//  tendermintUpdate set: {} -> {c0}
 	clearTendermintUpdates(ctx, keeper)
 	validators[4] = keeper.UpdateValidator(ctx, validators[4])
-	updates = keeper.GetValidTendermintUpdates(ctx)
+	updates = keeper.GetTendermintUpdates(ctx)
 	require.Equal(t, 1, len(updates))
 	require.Equal(t, validators[4].ABCIValidatorUpdate(), updates[0])
 }
 
-func TestGetValidTendermintUpdatesWithCliffValidator(t *testing.T) {
+func TestGetTendermintUpdatesWithCliffValidator(t *testing.T) {
 	ctx, _, keeper := CreateTestInput(t, false, 1000)
 	params := types.DefaultParams()
 	params.MaxValidators = 2
@@ -842,31 +842,31 @@ func TestGetValidTendermintUpdatesWithCliffValidator(t *testing.T) {
 	validators[0] = keeper.UpdateValidator(ctx, validators[0])
 	validators[1] = keeper.UpdateValidator(ctx, validators[1])
 	clearTendermintUpdates(ctx, keeper)
-	require.Equal(t, 0, len(keeper.GetValidTendermintUpdates(ctx)))
+	require.Equal(t, 0, len(keeper.GetTendermintUpdates(ctx)))
 
 	// test validator added at the end but not inserted in the valset
 	//  tendermintUpdate set: {} -> {}
 	keeper.UpdateValidator(ctx, validators[2])
-	updates := keeper.GetValidTendermintUpdates(ctx)
+	updates := keeper.GetTendermintUpdates(ctx)
 	require.Equal(t, 0, len(updates))
 
 	// test validator change its power and become a gotValidator (pushing out an existing)
 	//  tendermintUpdate set: {}     -> {c0, c4}
 	clearTendermintUpdates(ctx, keeper)
-	require.Equal(t, 0, len(keeper.GetValidTendermintUpdates(ctx)))
+	require.Equal(t, 0, len(keeper.GetTendermintUpdates(ctx)))
 
 	pool := keeper.GetPool(ctx)
 	validators[2], pool, _ = validators[2].AddTokensFromDel(pool, sdk.NewInt(10))
 	keeper.SetPool(ctx, pool)
 	validators[2] = keeper.UpdateValidator(ctx, validators[2])
 
-	updates = keeper.GetValidTendermintUpdates(ctx)
+	updates = keeper.GetTendermintUpdates(ctx)
 	require.Equal(t, 2, len(updates), "%v", updates)
 	require.Equal(t, validators[0].ABCIValidatorUpdateZero(), updates[0])
 	require.Equal(t, validators[2].ABCIValidatorUpdate(), updates[1])
 }
 
-func TestGetValidTendermintUpdatesPowerDecrease(t *testing.T) {
+func TestGetTendermintUpdatesPowerDecrease(t *testing.T) {
 	ctx, _, keeper := CreateTestInput(t, false, 1000)
 
 	amts := []int64{100, 100}
@@ -880,7 +880,7 @@ func TestGetValidTendermintUpdatesPowerDecrease(t *testing.T) {
 	validators[0] = keeper.UpdateValidator(ctx, validators[0])
 	validators[1] = keeper.UpdateValidator(ctx, validators[1])
 	clearTendermintUpdates(ctx, keeper)
-	require.Equal(t, 0, len(keeper.GetValidTendermintUpdates(ctx)))
+	require.Equal(t, 0, len(keeper.GetTendermintUpdates(ctx)))
 
 	// check initial power
 	require.Equal(t, sdk.NewDec(100).RoundInt64(), validators[0].GetPower().RoundInt64())
@@ -900,13 +900,13 @@ func TestGetValidTendermintUpdatesPowerDecrease(t *testing.T) {
 	require.Equal(t, sdk.NewDec(70).RoundInt64(), validators[1].GetPower().RoundInt64())
 
 	// Tendermint updates should reflect power change
-	updates := keeper.GetValidTendermintUpdates(ctx)
+	updates := keeper.GetTendermintUpdates(ctx)
 	require.Equal(t, 2, len(updates))
 	require.Equal(t, validators[0].ABCIValidatorUpdate(), updates[0])
 	require.Equal(t, validators[1].ABCIValidatorUpdate(), updates[1])
 }
 
-func TestGetValidTendermintUpdatesNewValidator(t *testing.T) {
+func TestGetTendermintUpdatesNewValidator(t *testing.T) {
 	ctx, _, keeper := CreateTestInput(t, false, 1000)
 	params := keeper.GetParams(ctx)
 	params.MaxValidators = uint16(3)
@@ -930,13 +930,13 @@ func TestGetValidTendermintUpdatesNewValidator(t *testing.T) {
 	}
 
 	// verify initial Tendermint updates are correct
-	updates := keeper.GetValidTendermintUpdates(ctx)
+	updates := keeper.GetTendermintUpdates(ctx)
 	require.Equal(t, len(validators), len(updates))
-	require.Equal(t, validators[0].ABCIValidator(), updates[0])
-	require.Equal(t, validators[1].ABCIValidator(), updates[1])
+	require.Equal(t, validators[0].ABCIValidatorUpdate(), updates[0])
+	require.Equal(t, validators[1].ABCIValidatorUpdate(), updates[1])
 
 	clearTendermintUpdates(ctx, keeper)
-	require.Equal(t, 0, len(keeper.GetValidTendermintUpdates(ctx)))
+	require.Equal(t, 0, len(keeper.GetTendermintUpdates(ctx)))
 
 	// update initial validator set
 	for i, amt := range amts {
@@ -974,14 +974,14 @@ func TestGetValidTendermintUpdatesNewValidator(t *testing.T) {
 	validator = keeper.UpdateValidator(ctx, validator)
 
 	// verify initial Tendermint updates are correct
-	updates = keeper.GetValidTendermintUpdates(ctx)
+	updates = keeper.GetTendermintUpdates(ctx)
 	require.Equal(t, len(validators)+1, len(updates))
-	require.Equal(t, validator.ABCIValidator(), updates[0])
-	require.Equal(t, validators[0].ABCIValidator(), updates[1])
-	require.Equal(t, validators[1].ABCIValidator(), updates[2])
+	require.Equal(t, validator.ABCIValidatorUpdate(), updates[0])
+	require.Equal(t, validators[0].ABCIValidatorUpdate(), updates[1])
+	require.Equal(t, validators[1].ABCIValidatorUpdate(), updates[2])
 }
 
-func TestGetValidTendermintUpdatesBondTransition(t *testing.T) {
+func TestGetTendermintUpdatesBondTransition(t *testing.T) {
 	ctx, _, keeper := CreateTestInput(t, false, 1000)
 	params := keeper.GetParams(ctx)
 	params.MaxValidators = uint16(2)
@@ -1006,13 +1006,13 @@ func TestGetValidTendermintUpdatesBondTransition(t *testing.T) {
 	}
 
 	// verify initial Tendermint updates are correct
-	updates := keeper.GetValidTendermintUpdates(ctx)
+	updates := keeper.GetTendermintUpdates(ctx)
 	require.Equal(t, 2, len(updates))
-	require.Equal(t, validators[2].ABCIValidator(), updates[0])
-	require.Equal(t, validators[1].ABCIValidator(), updates[1])
+	require.Equal(t, validators[2].ABCIValidatorUpdate(), updates[0])
+	require.Equal(t, validators[1].ABCIValidatorUpdate(), updates[1])
 
 	clearTendermintUpdates(ctx, keeper)
-	require.Equal(t, 0, len(keeper.GetValidTendermintUpdates(ctx)))
+	require.Equal(t, 0, len(keeper.GetTendermintUpdates(ctx)))
 
 	// delegate to validator with lowest power but not enough to bond
 	ctx = ctx.WithBlockHeight(1)
@@ -1027,7 +1027,7 @@ func TestGetValidTendermintUpdatesBondTransition(t *testing.T) {
 	validators[0] = keeper.UpdateValidator(ctx, validator)
 
 	// verify initial Tendermint updates are correct
-	require.Equal(t, 0, len(keeper.GetValidTendermintUpdates(ctx)))
+	require.Equal(t, 0, len(keeper.GetTendermintUpdates(ctx)))
 
 	// create a series of events that will bond and unbond the validator with
 	// lowest power in a single block context (height)
@@ -1048,12 +1048,12 @@ func TestGetValidTendermintUpdatesBondTransition(t *testing.T) {
 	validators[1] = keeper.UpdateValidator(ctx, validator)
 
 	// verify initial Tendermint updates are correct
-	updates = keeper.GetValidTendermintUpdates(ctx)
+	updates = keeper.GetTendermintUpdates(ctx)
 	require.Equal(t, 1, len(updates))
-	require.Equal(t, validators[1].ABCIValidator(), updates[0])
+	require.Equal(t, validators[1].ABCIValidatorUpdate(), updates[0])
 
 	clearTendermintUpdates(ctx, keeper)
-	require.Equal(t, 0, len(keeper.GetValidTendermintUpdates(ctx)))
+	require.Equal(t, 0, len(keeper.GetTendermintUpdates(ctx)))
 }
 
 func TestUpdateValidatorCommission(t *testing.T) {