don't rename package without need.

gobot/main.go

@@ -6,8 +6,8 @@ import (
 	"math/rand"
 	"time"
 
-	hbclient "bitbucket.org/hackerbots/client"
-	hbserver "bitbucket.org/hackerbots/server"
+	"bitbucket.org/hackerbots/client"
+	"bitbucket.org/hackerbots/server"
 )
 
 var hp = flag.Int("hp", 50, "")
@@ -22,7 +22,7 @@ var weaponSpeed = flag.Int("wspeed", 50, "weapons speed")
 
 // XXX: add TurnSpeed, WeaponDamage, WeaponSpeed
 
-var server = flag.String("server", "localhost", "server hostname")
+var serverHostname = flag.String("server", "localhost", "server hostname")
 var port = flag.Int("port", 8666, "server port")
 var botname = flag.String("name", "gobot", "the name that other players will see")
 var verbose = flag.Bool("verbose", false, "run verbosly")
@@ -39,13 +39,13 @@ func main() {
 		gameId = flag.Arg(0)
 	}
 
-	c := &hbclient.Client{
-		Server: *server,
+	c := &client.Client{
+		Server: *serverHostname,
 		Port:   *port,
 		Name:   *botname,
 		GameId: gameId,
 		// XXX: update with missing fields
-		StatsReq: hbserver.StatsRequest{
+		StatsReq: server.StatsRequest{
 			Hp:            *hp,
 			Speed:         *speed,
 			Acceleration:  *acceleration,
@@ -65,7 +65,7 @@ func main() {
 		log.Fatal("%s: failed to negociate: %s", c.Name, err)
 	}
 
-	c.Player = hbclient.NewSimplePlayer(
+	c.Player = client.NewSimplePlayer(
 		c.Game.BoardSize.Width,
 		c.Game.BoardSize.Height,
 	)