diff --git a/README.md b/README.md
index 1a509a2d474..b515d24f42f 100644
--- a/README.md
+++ b/README.md
@@ -100,4 +100,4 @@ After deleting your cluster deployment you will see an uninstall job created. If
  1. You can manually run the uninstall code with hiveutil to delete AWS resources based on their tags.
     * Get your cluster UUID from the clusterdeployment.Spec.ClusterUUID.
     * `make hiveutil`
-    * `bin/hiveutil aws-tag-deprovision --loglevel=debug --cluster-name CLUSTER_NAME tectonicClusterID=CLUSTER_UUID kubernetes.io/cluster/CLUSTER_NAME=owned`
+    * `bin/hiveutil aws-tag-deprovision --loglevel=debug --cluster-name CLUSTER_NAME openshiftClusterID=CLUSTER_UUID kubernetes.io/cluster/CLUSTER_NAME=owned`
diff --git a/contrib/pkg/installmanager/installmanager.go b/contrib/pkg/installmanager/installmanager.go
index f6d4f82dc64..8518f69cb69 100644
--- a/contrib/pkg/installmanager/installmanager.go
+++ b/contrib/pkg/installmanager/installmanager.go
@@ -37,7 +37,7 @@ const (
 	// relative to our WorkDir.
 	metadataRelativePath                = "metadata.json"
 	adminKubeConfigRelativePath         = "auth/kubeconfig"
-	uuidKey                             = "tectonicClusterID"
+	uuidKey                             = "openshiftClusterID"
 	kubernetesKeyPrefix                 = "kubernetes.io/cluster/"
 	metadataConfigmapStringTemplate     = "%s-metadata"
 	adminKubeConfigSecretStringTemplate = "%s-admin-kubeconfig"
diff --git a/contrib/pkg/installmanager/installmanager_test.go b/contrib/pkg/installmanager/installmanager_test.go
index 837b590710b..5ebd37daf3a 100644
--- a/contrib/pkg/installmanager/installmanager_test.go
+++ b/contrib/pkg/installmanager/installmanager_test.go
@@ -50,7 +50,7 @@ const (
 echo "Fake Installer"
 echo $@
 WORKDIR=%s
-echo '{"clusterName":"test-cluster","aws":{"region":"us-east-1","identifier":{"tectonicClusterID":"fe953108-f64c-4166-bb8e-20da7665ba00"}}}' > $WORKDIR/metadata.json
+echo '{"clusterName":"test-cluster","aws":{"region":"us-east-1","identifier":{"openshiftClusterID":"fe953108-f64c-4166-bb8e-20da7665ba00"}}}' > $WORKDIR/metadata.json
 mkdir -p $WORKDIR/auth/
 echo "fakekubeconfig" > $WORKDIR/auth/kubeconfig
 `
diff --git a/pkg/controller/clusterdeployment/clusterdeployment_controller_test.go b/pkg/controller/clusterdeployment/clusterdeployment_controller_test.go
index 2988354cce2..3093954ee83 100644
--- a/pkg/controller/clusterdeployment/clusterdeployment_controller_test.go
+++ b/pkg/controller/clusterdeployment/clusterdeployment_controller_test.go
@@ -433,7 +433,7 @@ func testMetadataConfigMap() *corev1.ConfigMap {
 	metadataJSON := `{
 		"aws": {
 			"identifier": {
-				"tectonicClusterID": "testFooClusterUUID"
+				"openshiftClusterID": "testFooClusterUUID"
 			}
 		}
 	}`
diff --git a/pkg/install/generate.go b/pkg/install/generate.go
index 8316743c0ed..f9cfb961048 100644
--- a/pkg/install/generate.go
+++ b/pkg/install/generate.go
@@ -332,7 +332,7 @@ func GenerateUninstallerJob(
 				"debug",
 				"--cluster-name",
 				cd.Name,
-				fmt.Sprintf("tectonicClusterID=%s", cd.Spec.ClusterUUID),
+				fmt.Sprintf("openshiftClusterID=%s", cd.Spec.ClusterUUID),
 				fmt.Sprintf("kubernetes.io/cluster/%s=owned", cd.Spec.Config.ClusterID),
 			},
 		},
diff --git a/test/integration/clusterdeployment/clusterdeployment_controller_test.go b/test/integration/clusterdeployment/clusterdeployment_controller_test.go
index 209e982a758..ec0b0bdae8e 100644
--- a/test/integration/clusterdeployment/clusterdeployment_controller_test.go
+++ b/test/integration/clusterdeployment/clusterdeployment_controller_test.go
@@ -48,7 +48,7 @@ var jobKey = types.NamespacedName{Name: "foo-install", Namespace: "default"}
 const (
 	timeout             = time.Second * 10
 	fakeClusterUUID     = "fe953108-f64c-4166-bb8e-20da7665ba00"
-	fakeClusterMetadata = `{"clusterName":"foo","aws":{"region":"us-east-1","identifier":{"tectonicClusterID":"fe953108-f64c-4166-bb8e-20da7665ba00"}}}`
+	fakeClusterMetadata = `{"clusterName":"foo","aws":{"region":"us-east-1","identifier":{"openshiftClusterID":"fe953108-f64c-4166-bb8e-20da7665ba00"}}}`
 )
 
 func init() {