diff --git a/guestbook/frontend-controller.json b/guestbook/frontend-controller.json
index 7c8febe3..7575b475 100644
--- a/guestbook/frontend-controller.json
+++ b/guestbook/frontend-controller.json
@@ -3,7 +3,7 @@
     "desiredState": {
       "replicas": 3,
       "replicasInSet": {"name": "frontend"},
-      "taskTemplate": {
+      "podTemplate": {
         "desiredState": {
            "manifest": {
              "containers": [{
diff --git a/guestbook/guestbook.md b/guestbook/guestbook.md
index bc229229..b48e1e8d 100644
--- a/guestbook/guestbook.md
+++ b/guestbook/guestbook.md
@@ -82,7 +82,7 @@ Although the redis master is a single task, the redis read slaves are a 'replica
     "desiredState": {
       "replicas": 2,
       "replicasInSet": {"name": "redis-slave"},
-      "taskTemplate": {
+      "podTemplate": {
         "desiredState": {
            "manifest": {
              "containers": [{
@@ -149,7 +149,7 @@ This is a simple PHP server that is configured to talk to both the slave and mas
     "desiredState": {
       "replicas": 3,
       "replicasInSet": {"name": "frontend"},
-      "taskTemplate": {
+      "podTemplate": {
         "desiredState": {
            "manifest": {
              "containers": [{
diff --git a/guestbook/redis-slave-controller.json b/guestbook/redis-slave-controller.json
index dd51a258..ee6a31e0 100644
--- a/guestbook/redis-slave-controller.json
+++ b/guestbook/redis-slave-controller.json
@@ -3,7 +3,7 @@
     "desiredState": {
       "replicas": 2,
       "replicasInSet": {"name": "redisslave"},
-      "taskTemplate": {
+      "podTemplate": {
         "desiredState": {
            "manifest": {
              "containers": [{