diff --git a/about_allocation.go b/about_allocation.go
index 6785571..8ab7498 100644
--- a/about_allocation.go
+++ b/about_allocation.go
@@ -1,4 +1,4 @@
-package go_koans
+package gokoans
 
 func aboutAllocation() {
 	a := new(int)
diff --git a/about_anonymous_functions.go b/about_anonymous_functions.go
index 4ef5aed..d17bbd2 100644
--- a/about_anonymous_functions.go
+++ b/about_anonymous_functions.go
@@ -1,4 +1,4 @@
-package go_koans
+package gokoans
 
 func aboutAnonymousFunctions() {
 	{
diff --git a/about_arrays.go b/about_arrays.go
index de270c7..fbed78b 100644
--- a/about_arrays.go
+++ b/about_arrays.go
@@ -1,4 +1,4 @@
-package go_koans
+package gokoans
 
 func aboutArrays() {
 	fruits := [4]string{"apple", "orange", "mango"}
@@ -13,14 +13,14 @@ func aboutArrays() {
 
 	assert(fruits == [4]string{}) // comparing arrays is not like comparing apples and oranges
 
-	tasty_fruits := fruits[1:3]           // defining oneself as a variation of another
-	assert(tasty_fruits[0] == __string__) // slices of arrays share some data
-	assert(tasty_fruits[1] == __string__) // albeit slightly askewed
+	tastyFruits := fruits[1:3]           // defining oneself as a variation of another
+	assert(tastyFruits[0] == __string__) // slices of arrays share some data
+	assert(tastyFruits[1] == __string__) // albeit slightly askewed
 
-	assert(len(tasty_fruits) == __int__) // its length is manifest
-	assert(cap(tasty_fruits) == __int__) // but its capacity is surprising!
+	assert(len(tastyFruits) == __int__) // its length is manifest
+	assert(cap(tastyFruits) == __int__) // but its capacity is surprising!
 
-	tasty_fruits[0] = "lemon" // are their shared roots truly identical?
+	tastyFruits[0] = "lemon" // are their shared roots truly identical?
 
 	assert(fruits[0] == __string__) // has this element remained the same?
 	assert(fruits[1] == __string__) // how about the second?
diff --git a/about_basics.go b/about_basics.go
index 85e1f70..00ad063 100644
--- a/about_basics.go
+++ b/about_basics.go
@@ -1,4 +1,4 @@
-package go_koans
+package gokoans
 
 func aboutBasics() {
 	assert(__bool__ == true)  // what is truth?
diff --git a/about_channels.go b/about_channels.go
index 00561b2..e47e932 100644
--- a/about_channels.go
+++ b/about_channels.go
@@ -1,4 +1,4 @@
-package go_koans
+package gokoans
 
 func aboutChannels() {
 	ch := make(chan string, 2)
diff --git a/about_common_interfaces.go b/about_common_interfaces.go
index d987e96..ff1b4b9 100644
--- a/about_common_interfaces.go
+++ b/about_common_interfaces.go
@@ -1,4 +1,4 @@
-package go_koans
+package gokoans
 
 import "bytes"
 
diff --git a/about_concurrency.go b/about_concurrency.go
index 2921e6b..3e6b49c 100644
--- a/about_concurrency.go
+++ b/about_concurrency.go
@@ -1,4 +1,4 @@
-package go_koans
+package gokoans
 
 func isPrimeNumber(possiblePrime int) bool {
 	for underPrime := 2; underPrime < possiblePrime; underPrime++ {
diff --git a/about_control_flow.go b/about_control_flow.go
index 34cca53..edf56ba 100644
--- a/about_control_flow.go
+++ b/about_control_flow.go
@@ -1,4 +1,4 @@
-package go_koans
+package gokoans
 
 import "fmt"
 
diff --git a/about_enumeration.go b/about_enumeration.go
index b474bd2..cbdb7db 100644
--- a/about_enumeration.go
+++ b/about_enumeration.go
@@ -1,4 +1,4 @@
-package go_koans
+package gokoans
 
 func aboutEnumeration() {
 	{
diff --git a/about_files.go b/about_files.go
index cecb028..5f908e2 100644
--- a/about_files.go
+++ b/about_files.go
@@ -1,4 +1,4 @@
-package go_koans
+package gokoans
 
 import "io/ioutil"
 import "strings"
diff --git a/about_interfaces.go b/about_interfaces.go
index cf264b2..b54789f 100644
--- a/about_interfaces.go
+++ b/about_interfaces.go
@@ -1,4 +1,4 @@
-package go_koans
+package gokoans
 
 func aboutInterfaces() {
 	bob := new(human)     // bob is a kind of *human
diff --git a/about_maps.go b/about_maps.go
index 32abc1d..6d90083 100644
--- a/about_maps.go
+++ b/about_maps.go
@@ -1,4 +1,4 @@
-package go_koans
+package gokoans
 
 func aboutMaps() {
 	ages := map[string]int{
diff --git a/about_panics.go b/about_panics.go
index 0b77485..ebe01ff 100644
--- a/about_panics.go
+++ b/about_panics.go
@@ -1,4 +1,4 @@
-package go_koans
+package gokoans
 
 func divideFourBy(i int) int {
 	return 4 / i
diff --git a/about_pointers.go b/about_pointers.go
index 140e4a3..b6c9c8f 100644
--- a/about_pointers.go
+++ b/about_pointers.go
@@ -1,4 +1,4 @@
-package go_koans
+package gokoans
 
 func aboutPointers() {
 	{
diff --git a/about_slices.go b/about_slices.go
index 317d847..13532e6 100644
--- a/about_slices.go
+++ b/about_slices.go
@@ -1,4 +1,4 @@
-package go_koans
+package gokoans
 
 func aboutSlices() {
 	fruits := []string{"apple", "orange", "mango"}
@@ -6,18 +6,18 @@ func aboutSlices() {
 	assert(fruits[0] == __string__) // slices seem like arrays
 	assert(len(fruits) == __int__)  // in nearly all respects
 
-	tasty_fruits := fruits[1:3]           // we can even slice slices
-	assert(tasty_fruits[0] == __string__) // slices of slices also share the underlying data
+	tastyFruits := fruits[1:3]           // we can even slice slices
+	assert(tastyFruits[0] == __string__) // slices of slices also share the underlying data
 
-	pregnancy_slots := []string{"baby", "baby", "lemon"}
-	assert(cap(pregnancy_slots) == __int__) // the capacity is initially the length
+	pregnancySlots := []string{"baby", "baby", "lemon"}
+	assert(cap(pregnancySlots) == __int__) // the capacity is initially the length
 
-	pregnancy_slots = append(pregnancy_slots, "baby!")
-	assert(len(pregnancy_slots) == __int__) // slices can be extended with append(), much like realloc in C
-	assert(cap(pregnancy_slots) == __int__) // but with better optimizations
+	pregnancySlots = append(pregnancySlots, "baby!")
+	assert(len(pregnancySlots) == __int__) // slices can be extended with append(), much like realloc in C
+	assert(cap(pregnancySlots) == __int__) // but with better optimizations
 
-	pregnancy_slots = append(pregnancy_slots, "another baby!?", "yet another, oh dear!", "they must be Catholic")
+	pregnancySlots = append(pregnancySlots, "another baby!?", "yet another, oh dear!", "they must be Catholic")
 
-	assert(len(pregnancy_slots) == __int__) // append() can take N arguments to append to the slice
-	assert(cap(pregnancy_slots) == __int__) // the capacity optimizations have a guessable algorithm
+	assert(len(pregnancySlots) == __int__) // append() can take N arguments to append to the slice
+	assert(cap(pregnancySlots) == __int__) // the capacity optimizations have a guessable algorithm
 }
diff --git a/about_strings.go b/about_strings.go
index 41b07f5..594d5b2 100644
--- a/about_strings.go
+++ b/about_strings.go
@@ -1,4 +1,4 @@
-package go_koans
+package gokoans
 
 import "fmt"
 
diff --git a/about_structs.go b/about_structs.go
index 95ec486..dec6d03 100644
--- a/about_structs.go
+++ b/about_structs.go
@@ -1,4 +1,4 @@
-package go_koans
+package gokoans
 
 func aboutStructs() {
 	var bob struct {
diff --git a/about_types.go b/about_types.go
index 4d2849a..639dbf9 100644
--- a/about_types.go
+++ b/about_types.go
@@ -1,4 +1,4 @@
-package go_koans
+package gokoans
 
 type coolNumber int
 
diff --git a/about_variadic_functions.go b/about_variadic_functions.go
index 4720457..b0514fa 100644
--- a/about_variadic_functions.go
+++ b/about_variadic_functions.go
@@ -1,4 +1,4 @@
-package go_koans
+package gokoans
 
 import "strings"
 
diff --git a/setup_koans_test.go b/setup_koans_test.go
index d0c133f..bc8b612 100644
--- a/setup_koans_test.go
+++ b/setup_koans_test.go
@@ -1,4 +1,4 @@
-package go_koans
+package gokoans
 
 import (
 	"fmt"