diff --git a/docs/kickstart/debugging?.md b/docs/kickstart/debugging.md
similarity index 55%
rename from docs/kickstart/debugging?.md
rename to docs/kickstart/debugging.md
index 5b79ff7..854aa01 100644
--- a/docs/kickstart/debugging?.md
+++ b/docs/kickstart/debugging.md
@@ -1,15 +1,15 @@
-# kickstart.debugging?
+# kickstart.debugging
 
 Returns 0 if you are debugging, and 1 if not
 
 ### Example
 
 ```bash
-$ kickstart.debugging? || echo nope
+$ kickstart.debugging || echo nope
 nope
 
-$ set -x; kickstart.debugging? && echo yup; set +x;
-+ kickstart.debugging?
+$ set -x; kickstart.debugging && echo yup; set +x;
++ kickstart.debugging
 + grep xtrace
 + kickstart.stream.contains on
 + grep -q on
diff --git a/docs/kickstart/user/exists?.md b/docs/kickstart/user/exists.md
similarity index 100%
rename from docs/kickstart/user/exists?.md
rename to docs/kickstart/user/exists.md
diff --git a/docs/kickstart/user/homeFolder.md b/docs/kickstart/user/homeFolder.md
deleted file mode 100644
index 93ae680..0000000
--- a/docs/kickstart/user/homeFolder.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# kickstart.user.homeFolder user
-
-Looks up the `user` home folder on the `/etc/passwd` file.
-
-### Example
-
-```bash
-$ kickstart.user.homeFolder vagrant
-/home/vagrant
-
-$ kickstart.user.homeFolder root
-/root
-
-$ kickstart.user.homeFolder no-user-existing
-
-```
diff --git a/docs/kickstart/user/home_folder.md b/docs/kickstart/user/home_folder.md
new file mode 100644
index 0000000..fb57026
--- /dev/null
+++ b/docs/kickstart/user/home_folder.md
@@ -0,0 +1,16 @@
+# kickstart.user.home_folder user
+
+Looks up the `user` home folder on the `/etc/passwd` file.
+
+### Example
+
+```bash
+$ kickstart.user.home_folder vagrant
+/home/vagrant
+
+$ kickstart.user.home_folder root
+/root
+
+$ kickstart.user.home_folder no-user-existing
+
+```
diff --git a/docs/kickstart/user/root?.md b/docs/kickstart/user/is_root.md
similarity index 61%
rename from docs/kickstart/user/root?.md
rename to docs/kickstart/user/is_root.md
index a16e657..2975d3b 100644
--- a/docs/kickstart/user/root?.md
+++ b/docs/kickstart/user/is_root.md
@@ -1,4 +1,4 @@
-# kickstart.user.root?
+# kickstart.user.is_root
 
 Return 0 if the user running is root and 1 if not.
 
@@ -8,6 +8,6 @@ Return 0 if the user running is root and 1 if not.
 ```bash
 $ whoami
 root
-$ kickstart.user.root? && echo yup
+$ kickstart.user.is_root && echo yup
 yup
 ```
diff --git a/kickstart/recipes/kickstart.sh b/kickstart/recipes/kickstart.sh
index 3b57ea8..1a56736 100644
--- a/kickstart/recipes/kickstart.sh
+++ b/kickstart/recipes/kickstart.sh
@@ -8,16 +8,16 @@ kickstart.context() {
   kickstart_context="$*"
 }
 
-kickstart.debugging?() {
+kickstart.debugging() {
   set -o | grep xtrace | kickstart.stream.contains on
 }
 
 kickstart.mute() {
   kickstart.info "Running \"$*\""
-  if kickstart.debugging?; then
-    "$*"
+  if kickstart.debugging; then
+    "$@"
   else
-    "$*" >/dev/null 2>&1
+    "$@" >/dev/null 2>&1
   fi
   return $?
 }
diff --git a/kickstart/recipes/kickstart/os.sh b/kickstart/recipes/kickstart/os.sh
index 3b9cc29..417c3e7 100644
--- a/kickstart/recipes/kickstart/os.sh
+++ b/kickstart/recipes/kickstart/os.sh
@@ -6,7 +6,7 @@ kickstart.os() {
 }
 
 kickstart.os.is() {
-  [[ $(kickstart.os) == "$1" ]]
+  [[ "$(kickstart.os)" == "$1" ]]
 }
 
 kickstart.os.codename() {
diff --git a/kickstart/recipes/kickstart/user.sh b/kickstart/recipes/kickstart/user.sh
index 0759832..ab8dbad 100644
--- a/kickstart/recipes/kickstart/user.sh
+++ b/kickstart/recipes/kickstart/user.sh
@@ -1,9 +1,9 @@
-kickstart.user.exists?() {
+kickstart.user.exists() {
   kickstart.mute id "$1"
 }
 
 kickstart.user.create() {
-  kickstart.user.exists? "$1" || ( useradd -m -s /bin/bash -U -p "$(openssl passwd -1 "$2")" "$1" )
+  kickstart.user.exists "$1" || ( useradd -m -s /bin/bash -U -p "$(openssl passwd -1 "$2")" "$1" )
 }
 
 kickstart.user.is_on_group() {
@@ -22,7 +22,7 @@ kickstart.user.remove_group() {
     usermod -G "$(kickstart.print_with_separator , "${groups[*]}")" "$1"
 }
 
-kickstart.user.homeFolder() {
+kickstart.user.home_folder() {
   grep ^"$1" /etc/passwd | cut -d: -f 6
 }
 
@@ -57,6 +57,6 @@ kickstart.user.exec() {
   sudo -H -u "$user" bash -c "$command"
 }
 
-kickstart.user.root?() {
+kickstart.user.is_root() {
   [ "$(whoami)" == root ]
 }