diff --git a/src/05-variable.go b/src/05-variables.go
similarity index 100%
rename from src/05-variable.go
rename to src/05-variables.go
diff --git a/src/09-input.go b/src/09-reading-input.go
similarity index 100%
rename from src/09-input.go
rename to src/09-reading-input.go
diff --git a/src/18-guard.go b/src/18-guard.go
deleted file mode 100644
index ab39ecb..0000000
--- a/src/18-guard.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package main
-
-import "fmt"
-
-func main() {
-	x := make(map[string]string)
-	x["here"] = "yep"
-	if name, ok := x["not here"]; ok {    
-	    fmt.Println(name)
-	} else {
-		fmt.Println("missing")
-	}
-	if name, ok := x["here"]; ok {    
-	    fmt.Println(name)
-	}
-}
diff --git a/src/18-ok-guards.go b/src/18-ok-guards.go
new file mode 100644
index 0000000..d31f35f
--- /dev/null
+++ b/src/18-ok-guards.go
@@ -0,0 +1,19 @@
+                                    // Ok Guard
+package main
+
+import "fmt"
+
+func main() {
+	x := make(map[string]string)
+	x["here"] = "yes"
+
+	if name, ok := x["?"]; ok {    
+	    fmt.Println(name)
+	} else {
+		fmt.Println("miss")
+	}
+
+	if name, ok := x["here"]; ok {
+	    fmt.Println(name)
+	}
+}