diff --git a/examples/basecoin/x/cool/handler.go b/examples/basecoin/x/cool/handler.go
index 968f15c9a..c0aae11bb 100644
--- a/examples/basecoin/x/cool/handler.go
+++ b/examples/basecoin/x/cool/handler.go
@@ -42,16 +42,10 @@ func handleSetTrendMsg(ctx sdk.Context, cm Mapper, msg SetTrendMsg) sdk.Result {
 // Handle QuizMsg This is the engine of your module
 func handleQuizMsg(ctx sdk.Context, ck bank.CoinKeeper, cm Mapper, msg QuizMsg) sdk.Result {
 
-	whatsCool := cm.GetCool(ctx)
+	currentTrend := cm.GetTrend(ctx)
 
-	// set default if nothing is set
-	//if whatsCool == "" {
-	//cm.SetTrend(ctx, "icecold")
-	//}
-
-	if msg.CoolAnswer == whatsCool {
-
-		bonusCoins := sdk.Coins{{whatsCool, 69}}
+	if msg.CoolAnswer == currentTrend {
+		bonusCoins := sdk.Coins{{currentTrend, 69}}
 		_, err := ck.AddCoins(ctx, msg.Sender, bonusCoins)
 		if err != nil {
 			return err.Result()
diff --git a/examples/basecoin/x/cool/mapper.go b/examples/basecoin/x/cool/mapper.go
index 712246589..2e0a791fa 100644
--- a/examples/basecoin/x/cool/mapper.go
+++ b/examples/basecoin/x/cool/mapper.go
@@ -13,18 +13,18 @@ func NewMapper(key sdk.StoreKey) Mapper {
 	return Mapper{key}
 }
 
-// Key to knowing whats cool
-var coolKey = []byte("WhatsCoolKey")
+// Key to knowing the trend on the streets!
+var trendKey = []byte("TrendKey")
 
 // Implements sdk.AccountMapper.
-func (am Mapper) GetCool(ctx sdk.Context) string {
+func (am Mapper) GetTrend(ctx sdk.Context) string {
 	store := ctx.KVStore(am.key)
-	bz := store.Get(coolKey)
+	bz := store.Get(trendKey)
 	return string(bz)
 }
 
 // Implements sdk.AccountMapper.
-func (am Mapper) SetTrend(ctx sdk.Context, whatscool string) {
+func (am Mapper) SetTrend(ctx sdk.Context, newTrend string) {
 	store := ctx.KVStore(am.key)
-	store.Set(coolKey, []byte(whatscool))
+	store.Set(trendKey, []byte(newTrend))
 }