diff --git a/cmd/eyes/main.go b/cmd/eyes/main.go
index 8253ecd2c2..b915b09e93 100644
--- a/cmd/eyes/main.go
+++ b/cmd/eyes/main.go
@@ -20,7 +20,7 @@ func BuildApp() basecoin.Handler {
 	).
 		// We do this to demo real usage, also embeds it under it's own namespace
 		Dispatch(
-			stack.WrapHandler(etc.NewHandler()),
+			stack.WrapHandler(eyes.NewHandler()),
 		)
 }
 
diff --git a/cmd/eyescli/main.go b/cmd/eyescli/main.go
index 86bc156a3c..7b89a5d91d 100644
--- a/cmd/eyescli/main.go
+++ b/cmd/eyescli/main.go
@@ -15,7 +15,7 @@ import (
 	rpccmd "github.com/tendermint/basecoin/client/commands/rpc"
 	"github.com/tendermint/basecoin/client/commands/seeds"
 	txcmd "github.com/tendermint/basecoin/client/commands/txs"
-	etccmd "github.com/tendermint/basecoin/modules/eyes/commands"
+	eyescmd "github.com/tendermint/basecoin/modules/eyes/commands"
 )
 
 // EyesCli - main basecoin client command
@@ -34,7 +34,7 @@ func main() {
 		query.TxQueryCmd,
 		query.KeyQueryCmd,
 		// this is our custom parser
-		etccmd.EtcQueryCmd,
+		eyescmd.EyesQueryCmd,
 	)
 
 	// no middleware wrapers
@@ -43,8 +43,8 @@ func main() {
 
 	// just the etc commands
 	txcmd.RootCmd.AddCommand(
-		etccmd.SetTxCmd,
-		etccmd.RemoveTxCmd,
+		eyescmd.SetTxCmd,
+		eyescmd.RemoveTxCmd,
 	)
 
 	// Set up the various commands to use
diff --git a/modules/eyes/commands/query.go b/modules/eyes/commands/query.go
index eea6c3d11a..c6a45101a1 100644
--- a/modules/eyes/commands/query.go
+++ b/modules/eyes/commands/query.go
@@ -14,15 +14,15 @@ import (
 	"github.com/tendermint/basecoin/stack"
 )
 
-// EtcQueryCmd - command to query raw data
-var EtcQueryCmd = &cobra.Command{
-	Use:   "etc [key]",
-	Short: "Get data stored under key in etc",
-	RunE:  commands.RequireInit(etcQueryCmd),
+// EyesQueryCmd - command to query raw data
+var EyesQueryCmd = &cobra.Command{
+	Use:   "eyes [key]",
+	Short: "Get data stored under key in eyes",
+	RunE:  commands.RequireInit(eyesQueryCmd),
 }
 
-func etcQueryCmd(cmd *cobra.Command, args []string) error {
-	var res etc.Data
+func eyesQueryCmd(cmd *cobra.Command, args []string) error {
+	var res eyes.Data
 
 	arg, err := commands.GetOneArg(args, "key")
 	if err != nil {
@@ -33,7 +33,7 @@ func etcQueryCmd(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
-	key = stack.PrefixedKey(etc.Name, key)
+	key = stack.PrefixedKey(eyes.Name, key)
 	prove := !viper.GetBool(commands.FlagTrustNode)
 	height, err := query.GetParsed(key, &res, prove)
 	if err != nil {
diff --git a/modules/eyes/commands/tx.go b/modules/eyes/commands/tx.go
index 612ed1c5f7..6c7c0368c7 100644
--- a/modules/eyes/commands/tx.go
+++ b/modules/eyes/commands/tx.go
@@ -47,7 +47,7 @@ func setTxCmd(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
-	tx := etc.NewSetTx(key, value)
+	tx := eyes.NewSetTx(key, value)
 	return txs.DoTx(tx)
 }
 
@@ -58,6 +58,6 @@ func removeTxCmd(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
-	tx := etc.NewRemoveTx(key)
+	tx := eyes.NewRemoveTx(key)
 	return txs.DoTx(tx)
 }
diff --git a/modules/eyes/errors.go b/modules/eyes/errors.go
index 9eab3cf579..8b6c1a71f5 100644
--- a/modules/eyes/errors.go
+++ b/modules/eyes/errors.go
@@ -1,4 +1,4 @@
-package etc
+package eyes
 
 import (
 	"fmt"
diff --git a/modules/eyes/handler.go b/modules/eyes/handler.go
index c979813e7f..eb759056a7 100644
--- a/modules/eyes/handler.go
+++ b/modules/eyes/handler.go
@@ -1,4 +1,4 @@
-package etc
+package eyes
 
 import (
 	"github.com/tendermint/basecoin"
@@ -9,7 +9,7 @@ import (
 
 const (
 	// Name of the module for registering it
-	Name = "etc"
+	Name = "eyes"
 
 	// CostSet is the gas needed for the set operation
 	CostSet uint64 = 10
diff --git a/modules/eyes/handler_test.go b/modules/eyes/handler_test.go
index 28827dc9b4..0bf510fb69 100644
--- a/modules/eyes/handler_test.go
+++ b/modules/eyes/handler_test.go
@@ -1,4 +1,4 @@
-package etc
+package eyes
 
 import (
 	"testing"
diff --git a/modules/eyes/store.go b/modules/eyes/store.go
index 458b1d3aba..38d892064f 100644
--- a/modules/eyes/store.go
+++ b/modules/eyes/store.go
@@ -1,4 +1,4 @@
-package etc
+package eyes
 
 import "github.com/tendermint/go-wire/data"
 
diff --git a/modules/eyes/tx.go b/modules/eyes/tx.go
index 12921443d0..943742b287 100644
--- a/modules/eyes/tx.go
+++ b/modules/eyes/tx.go
@@ -1,4 +1,4 @@
-package etc
+package eyes
 
 import (
 	"github.com/tendermint/basecoin"
diff --git a/tests/cli/eyes.sh b/tests/cli/eyes.sh
index 5ca9935073..7a2f256554 100755
--- a/tests/cli/eyes.sh
+++ b/tests/cli/eyes.sh
@@ -40,7 +40,7 @@ test00SetGetRemove() {
     KEY="CAFE6000"
     VALUE="F00D4200"
 
-    assertFalse "line=${LINENO} data present" "${CLIENT_EXE} query etc ${KEY}"
+    assertFalse "line=${LINENO} data present" "${CLIENT_EXE} query eyes ${KEY}"
 
     # set data
     TXRES=$(${CLIENT_EXE} tx set --key=${KEY} --value=${VALUE})
@@ -49,7 +49,7 @@ test00SetGetRemove() {
     TX_HEIGHT=$(echo $TXRES | jq .height)
 
     # make sure it is set
-    DATA=$(${CLIENT_EXE} query etc ${KEY})
+    DATA=$(${CLIENT_EXE} query eyes ${KEY})
     assertTrue "line=${LINENO} data not set" $?
     assertEquals "line=${LINENO}" "\"${VALUE}\"" $(echo $DATA | jq .data.value)
 
@@ -58,7 +58,7 @@ test00SetGetRemove() {
     assertTrue "line=${LINENO}, found tx" $?
     if [ -n "$DEBUG" ]; then echo $TX; echo; fi
 
-    assertEquals "line=${LINENO}, proper type" "\"etc/set\"" $(echo $TX | jq .data.type)
+    assertEquals "line=${LINENO}, proper type" "\"eyes/set\"" $(echo $TX | jq .data.type)
     assertEquals "line=${LINENO}, proper key" "\"${KEY}\"" $(echo $TX | jq .data.data.key)
     assertEquals "line=${LINENO}, proper value" "\"${VALUE}\"" $(echo $TX | jq .data.data.value)
 }