diff --git a/examples/basecoin/app/app.go b/examples/basecoin/app/app.go
index 871e3c18ec..e8d1a0011b 100644
--- a/examples/basecoin/app/app.go
+++ b/examples/basecoin/app/app.go
@@ -15,7 +15,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/x/auth"
 	"github.com/cosmos/cosmos-sdk/x/bank"
 	"github.com/cosmos/cosmos-sdk/x/ibc"
-	simplestake "github.com/cosmos/cosmos-sdk/x/simplestake"
+	"github.com/cosmos/cosmos-sdk/x/simplestake"
 
 	"github.com/cosmos/cosmos-sdk/examples/basecoin/types"
 	"github.com/cosmos/cosmos-sdk/examples/basecoin/x/cool"
diff --git a/x/simplestake/commands/commands.go b/x/simplestake/commands/commands.go
index 0bb9b5649f..19d6cddbf9 100644
--- a/x/simplestake/commands/commands.go
+++ b/x/simplestake/commands/commands.go
@@ -13,7 +13,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/client/builder"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/wire"
-	simplestake "github.com/cosmos/cosmos-sdk/x/simplestake"
+	"github.com/cosmos/cosmos-sdk/x/simplestake"
 )
 
 const (
diff --git a/x/simplestake/errors.go b/x/simplestake/errors.go
index 6c3e4d34b6..f69ffcbebb 100644
--- a/x/simplestake/errors.go
+++ b/x/simplestake/errors.go
@@ -1,11 +1,11 @@
-package staking
+package simplestake
 
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
 
 const (
-	// Staking errors reserve 300 - 399.
+	// simplestake errors reserve 300 - 399.
 	CodeEmptyValidator        sdk.CodeType = 300
 	CodeInvalidUnbond         sdk.CodeType = 301
 	CodeEmptyStake            sdk.CodeType = 302
diff --git a/x/simplestake/handler.go b/x/simplestake/handler.go
index b405490b16..31e5a7d246 100644
--- a/x/simplestake/handler.go
+++ b/x/simplestake/handler.go
@@ -1,4 +1,4 @@
-package staking
+package simplestake
 
 import (
 	abci "github.com/tendermint/abci/types"
@@ -6,7 +6,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
 
-// NewHandler returns a handler for "bank" type messages.
+// NewHandler returns a handler for "simplestake" type messages.
 func NewHandler(k Keeper) sdk.Handler {
 	return func(ctx sdk.Context, msg sdk.Msg) sdk.Result {
 		switch msg := msg.(type) {
diff --git a/x/simplestake/keeper.go b/x/simplestake/keeper.go
index d9fcf713c2..e5892f3e23 100644
--- a/x/simplestake/keeper.go
+++ b/x/simplestake/keeper.go
@@ -1,4 +1,4 @@
-package staking
+package simplestake
 
 import (
 	crypto "github.com/tendermint/go-crypto"
diff --git a/x/simplestake/keeper_test.go b/x/simplestake/keeper_test.go
index 1203658918..9f26155901 100644
--- a/x/simplestake/keeper_test.go
+++ b/x/simplestake/keeper_test.go
@@ -1,4 +1,4 @@
-package staking
+package simplestake
 
 import (
 	"fmt"
diff --git a/x/simplestake/msgs.go b/x/simplestake/msgs.go
index 23a5de25c8..2ab0e1bad2 100644
--- a/x/simplestake/msgs.go
+++ b/x/simplestake/msgs.go
@@ -1,4 +1,4 @@
-package staking
+package simplestake
 
 import (
 	"encoding/json"
diff --git a/x/simplestake/msgs_test.go b/x/simplestake/msgs_test.go
index 7c9dd228c0..49a8feec5b 100644
--- a/x/simplestake/msgs_test.go
+++ b/x/simplestake/msgs_test.go
@@ -1,4 +1,4 @@
-package staking
+package simplestake
 
 import (
 	"testing"
diff --git a/x/simplestake/types.go b/x/simplestake/types.go
index 9f1d045bc0..3371fc977f 100644
--- a/x/simplestake/types.go
+++ b/x/simplestake/types.go
@@ -1,4 +1,4 @@
-package staking
+package simplestake
 
 import crypto "github.com/tendermint/go-crypto"