diff --git a/pkg/atlas/atlas.go b/pkg/atlas/atlas.go
index 305c355..700be09 100644
--- a/pkg/atlas/atlas.go
+++ b/pkg/atlas/atlas.go
@@ -11,16 +11,16 @@ type Tile byte
 
 const (
 	// TileNone is a keyword for nothing
-	TileNone = iota
+	TileNone = Tile(0)
 
 	// TileRock is solid rock ground
-	TileRock
+	TileRock = Tile(1)
 
 	// TileGravel is loose rocks
-	TileGravel
+	TileGravel = Tile(2)
 
 	// TileSand is sand
-	TileSand
+	TileSand = Tile(3)
 )
 
 // Glyph returns the glyph for this tile type
diff --git a/pkg/atlas/objects.go b/pkg/atlas/objects.go
index 032ca10..52d88df 100644
--- a/pkg/atlas/objects.go
+++ b/pkg/atlas/objects.go
@@ -8,16 +8,16 @@ type ObjectType byte
 // Types of objects
 const (
 	// ObjectNone represents no object at all
-	ObjectNone = iota
+	ObjectNone = ObjectType(0)
 
 	// ObjectRover represents a live rover
-	ObjectRoverLive
+	ObjectRoverLive = ObjectType(1)
 
 	// ObjectSmallRock is a small stashable rock
-	ObjectRockSmall
+	ObjectRockSmall = ObjectType(2)
 
 	// ObjectLargeRock is a large blocking rock
-	ObjectRockLarge
+	ObjectRockLarge = ObjectType(3)
 )
 
 // Glyph returns the glyph for this object type