diff --git a/kubernetes-templates/guestbook/0/frontend-service.yaml b/kubernetes-templates/guestbook/0/frontend-service.yaml
index 09bddf2..510b666 100644
--- a/kubernetes-templates/guestbook/0/frontend-service.yaml
+++ b/kubernetes-templates/guestbook/0/frontend-service.yaml
@@ -10,6 +10,6 @@ spec:
   type: LoadBalancer
   ports:
     # the port that this service should serve on
-    - port: "${SERVICE_PORT}"
+    - port: ${SERVICE_PORT}
   selector:
     name: ${FRONTEND_NAME}
diff --git a/kubernetes-templates/guestbook/0/rancher-compose.yml b/kubernetes-templates/guestbook/0/rancher-compose.yml
index 5ab145c..77e3fba 100644
--- a/kubernetes-templates/guestbook/0/rancher-compose.yml
+++ b/kubernetes-templates/guestbook/0/rancher-compose.yml
@@ -1,14 +1,14 @@
 .catalog:
-  name: "K8s Example Guestbook"
+  name: "K8s Guestbook"
   version: "1.0.0"
-  description: "It's a guestbook"
+  description: "It's a guestbook, I guess"
   questions:
     - variable: "SERVICE_NAME"
       label: "Service Name"
       required: true
       default: "frontend"
       type: "string"
-    - variable: "Service Port"
+    - variable: "SERVICE_PORT"
       label: "What port to listen on"
       required: true
       type: "int"
@@ -18,7 +18,7 @@
       required: true
       default: "frontend"
       type: "string"
-    - variable: "Frontend Scale"
+    - variable: "FRONTEND_REPLICAS"
       label: "Replicas for the frontend RC"
       required: true
       type: "int"
diff --git a/kubernetes-templates/guestbook/0/redis-master-service.yaml b/kubernetes-templates/guestbook/0/redis-master-service.yaml
index 75144a9..b200cd6 100644
--- a/kubernetes-templates/guestbook/0/redis-master-service.yaml
+++ b/kubernetes-templates/guestbook/0/redis-master-service.yaml
@@ -7,7 +7,7 @@ metadata:
 spec:
   ports:
     # the port that this service should serve on
-  - port: "6379"
-    targetPort: "6379"
+  - port: 6379
+    targetPort: 6379
   selector:
     name: redis-master