diff --git a/tests/mocks/data-complete.json b/tests/mocks/data-complete.json
index 2e357f8..2cfb446 100644
--- a/tests/mocks/data-complete.json
+++ b/tests/mocks/data-complete.json
@@ -1,6 +1,6 @@
 {
   "name": "data-complete",
-  "container": "debian",
+  "image": "debian",
   "discard": [
     "README.md"
   ],
diff --git a/tests/mocks/data-no-discard.json b/tests/mocks/data-no-discard.json
index 612b532..8a54aa2 100644
--- a/tests/mocks/data-no-discard.json
+++ b/tests/mocks/data-no-discard.json
@@ -1,6 +1,6 @@
 {
   "name": "data-no-discard",
-  "container": "debian",
+  "image": "debian",
   "parse": [
     "Dockerfile",
     "PROJECT-README"
diff --git a/tests/mocks/data-no-move.json b/tests/mocks/data-no-move.json
index 5aa7aa6..c62556c 100644
--- a/tests/mocks/data-no-move.json
+++ b/tests/mocks/data-no-move.json
@@ -1,6 +1,6 @@
 {
   "name": "data-no-move",
-  "container": "debian",
+  "image": "debian",
   "discard": [
     "README.md"
   ],
diff --git a/tests/mocks/data-parse-all.json b/tests/mocks/data-parse-all.json
index 108e378..cf3da2d 100644
--- a/tests/mocks/data-parse-all.json
+++ b/tests/mocks/data-parse-all.json
@@ -1,6 +1,6 @@
 {
   "name": "data-parse-all",
-  "container": "debian",
+  "image": "debian",
   "parse":["**"],
   "discard": [
     "README.md"
diff --git a/tests/mocks/data.json b/tests/mocks/data.json
index 8ac4ee8..54a5c98 100644
--- a/tests/mocks/data.json
+++ b/tests/mocks/data.json
@@ -1,4 +1,4 @@
 {
     "name": "newproject",
-    "container":"alpine"
+    "image":"alpine"
 }
diff --git a/tests/mocks/template-no-data/Dockerfile b/tests/mocks/template-no-data/Dockerfile
index 2c94e06..02f3b27 100644
--- a/tests/mocks/template-no-data/Dockerfile
+++ b/tests/mocks/template-no-data/Dockerfile
@@ -1 +1 @@
-FROM {{ container }}
+FROM {{ image }}
diff --git a/tests/mocks/template/Dockerfile b/tests/mocks/template/Dockerfile
index 2c94e06..02f3b27 100644
--- a/tests/mocks/template/Dockerfile
+++ b/tests/mocks/template/Dockerfile
@@ -1 +1 @@
-FROM {{ container }}
+FROM {{ image }}
diff --git a/tests/mocks/template/template.json b/tests/mocks/template/template.json
index 9f1621d..dae5a3e 100644
--- a/tests/mocks/template/template.json
+++ b/tests/mocks/template/template.json
@@ -1,6 +1,6 @@
 {
   "name": "newproject",
-  "container": "debian",
+  "image": "debian",
   "discard": [
     "README.md",
     "template.json"
diff --git a/tests/test.js b/tests/test.js
index c44a8a8..04fa445 100644
--- a/tests/test.js
+++ b/tests/test.js
@@ -18,7 +18,7 @@ describe('Test basic example', function () {
         pollinate({
             "inputs": [
                 "howardroark/webapp",
-                "{\"name\":\"newproject\",\"container\":\"alpine\"}"
+                "{\"name\":\"newproject\",\"image\":\"alpine\"}"
             ],
             "options": {
                 //..
@@ -67,7 +67,7 @@ describe('Test basic example', function () {
         pollinate({
             "inputs": [
                 "https://github.com/howardroark/webapp.git",
-                "{\"name\":\"newproject\",\"container\":\"alpine\"}"
+                "{\"name\":\"newproject\",\"image\":\"alpine\"}"
             ],
             "options": {
                 //..
@@ -82,7 +82,7 @@ describe('Test basic example', function () {
         pollinate({
             "inputs": [
                 "https://github.com/howardroark/webapp.git",
-                "{\"name\":\"newproject\",\"container\":\"alpine\", \"keepHistory\":true}"
+                "{\"name\":\"newproject\",\"image\":\"alpine\", \"keepHistory\":true}"
             ],
             "options": {
                 //..
@@ -101,7 +101,7 @@ describe('Test basic example', function () {
         pollinate({
             "inputs": [
                 "https://github.com/howardroark/webapp.git",
-                "{\"name\":\"newproject\",\"container\":\"alpine\"}"
+                "{\"name\":\"newproject\",\"image\":\"alpine\"}"
             ],
             "options": {
                 //..
@@ -126,7 +126,7 @@ describe('Test basic example', function () {
             ],
             "options": {
                 "name": "test",
-                "container": "ubuntu"
+                "image": "ubuntu"
             }
         }, function (err, result) {
             assert.isNull(err);
@@ -138,7 +138,7 @@ describe('Test basic example', function () {
         pollinate({
             "inputs": [
                 "howardroark/webapp#test-branch",
-                "{\"name\":\"newproject\",\"container\":\"alpine\"}"
+                "{\"name\":\"newproject\",\"image\":\"alpine\"}"
             ],
             "options": {
                 //..
@@ -157,7 +157,7 @@ describe('Test basic example', function () {
         pollinate({
             "inputs": [
                 "https://github.com/howardroark/webapp.git#test-branch",
-                "{\"name\":\"newproject\",\"container\":\"alpine\"}"
+                "{\"name\":\"newproject\",\"image\":\"alpine\"}"
             ],
             "options": {
                 //..