diff --git a/README.md b/README.md
index a277608a3..d864403e9 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,6 @@
 kaniko is a tool to build unpriviliged container images from a Dockerfile. It doesn't depend on a Docker daemon, which enables building container images in environments that can't easily or securely run a Docker daemon, such as a standard Kubernetes cluster. 
 
 The majority of Dockerfile commands can be executed with kaniko, but we're still working on supporting the following commands:
-* ADD
 * VOLUME
 * SHELL
 * HEALTHCHECK
diff --git a/integration_tests/dockerfiles/config_test_add.json b/integration_tests/dockerfiles/config_test_add.json
index b6d7a2020..135cd04a3 100644
--- a/integration_tests/dockerfiles/config_test_add.json
+++ b/integration_tests/dockerfiles/config_test_add.json
@@ -1,7 +1,7 @@
 [
   {
-    "Image1": "gcr.io/kbuild-test/docker-test-add:latest",
-    "Image2": "gcr.io/kbuild-test/kbuild-test-add:latest",
+    "Image1": "gcr.io/kaniko-test/docker-test-add:latest",
+    "Image2": "gcr.io/kaniko-test/kaniko-test-add:latest",
     "DiffType": "File",
     "Diff": {
       "Adds": null,
diff --git a/integration_tests/dockerfiles/config_test_bucket_buildcontext.json b/integration_tests/dockerfiles/config_test_bucket_buildcontext.json
index 690bbea5a..04c066831 100644
--- a/integration_tests/dockerfiles/config_test_bucket_buildcontext.json
+++ b/integration_tests/dockerfiles/config_test_bucket_buildcontext.json
@@ -1,7 +1,7 @@
 [
   {
-    "Image1": "gcr.io/kbuild-test/docker-test-bucket-buildcontext:latest",
-    "Image2": "gcr.io/kbuild-test/kbuild-test-bucket-buildcontext:latest",
+    "Image1": "gcr.io/kaniko-test/docker-test-bucket-buildcontext:latest",
+    "Image2": "gcr.io/kaniko-test/kaniko-test-bucket-buildcontext:latest",
     "DiffType": "File",
     "Diff": {
       "Adds": null,
diff --git a/pkg/constants/constants.go b/pkg/constants/constants.go
index 46b5a697c..004bb3c89 100644
--- a/pkg/constants/constants.go
+++ b/pkg/constants/constants.go
@@ -26,8 +26,8 @@ const (
 	// WorkspaceDir is the path to the workspace directory
 	WorkspaceDir = "/workspace"
 
-	//KbuildDir is the path to the kbuild directory
-	KbuildDir = "/kbuild"
+	//KanikoDir is the path to the Kaniko directory
+	KanikoDir = "/kaniko"
 
 	WhitelistPath = "/proc/self/mountinfo"
 
diff --git a/pkg/util/bucket_util.go b/pkg/util/bucket_util.go
index c96bb715c..043c2890f 100644
--- a/pkg/util/bucket_util.go
+++ b/pkg/util/bucket_util.go
@@ -25,7 +25,7 @@ import (
 	"path/filepath"
 )
 
-// UnpackTarFromGCSBucket unpacks the kbuild.tar file in the given bucket to the given directory
+// UnpackTarFromGCSBucket unpacks the context.tar.gz file in the given bucket to the given directory
 func UnpackTarFromGCSBucket(bucketName, directory string) error {
 	// Get the tar from the bucket
 	tarPath, err := getTarFromBucket(bucketName, directory)
@@ -41,7 +41,7 @@ func UnpackTarFromGCSBucket(bucketName, directory string) error {
 	return os.Remove(tarPath)
 }
 
-// getTarFromBucket gets kbuild.tar from the GCS bucket and saves it to the filesystem
+// getTarFromBucket gets context.tar.gz from the GCS bucket and saves it to the filesystem
 // It returns the path to the tar file
 func getTarFromBucket(bucketName, directory string) (string, error) {
 	ctx := context.Background()
@@ -50,7 +50,7 @@ func getTarFromBucket(bucketName, directory string) (string, error) {
 		return "", err
 	}
 	bucket := client.Bucket(bucketName)
-	// Get the tarfile kbuild.tar from the GCS bucket, and save it to a tar object
+	// Get the tarfile context.tar.gz from the GCS bucket, and save it to a tar object
 	reader, err := bucket.Object(constants.ContextTar).NewReader(ctx)
 	if err != nil {
 		return "", err