diff --git a/nlp-sentiment-analysis/README.md b/nlp-sentiment-analysis/README.md
index b18596f..bd88160 100644
--- a/nlp-sentiment-analysis/README.md
+++ b/nlp-sentiment-analysis/README.md
@@ -42,7 +42,7 @@ Pricing Estimates - We have created a sample estimate based on some usage we see
 
 1. Click on Open in Google Cloud Shell button below.
 
-<a href="https://ssh.cloud.google.com/cloudshell/editor?shellonly=true&cloudshell_git_repo=https://github.com/GoogleCloudPlatform/click-to-deploy-solutions&cloudshell_workspace=nlp-sentiment-analysis&cloudshell_open_in_editor=terraform/terraform.tfvars" target="_new">
+<a href="https://ssh.cloud.google.com/cloudshell/editor?shellonly=true&cloudshell_git_repo=https://github.com/GoogleCloudPlatform/click-to-deploy-solutions&cloudshell_workspace=nlp-sentiment-analysis&cloudshell_open_in_editor=infra/terraform.tfvars" target="_new">
     <img alt="Open in Cloud Shell" src="https://gstatic.com/cloudssh/images/open-btn.svg">
 </a>
 
@@ -53,7 +53,7 @@ sh prereq.sh
 
 3. Run the Cloud Build Job
 ```
-gcloud builds submit . --config cloudbuild.yaml
+gcloud builds submit . --config build/cloudbuild.yaml
 ```
 
 ## Testing the architecture
diff --git a/nlp-sentiment-analysis/infra/gcs.tf b/nlp-sentiment-analysis/infra/gcs.tf
index 637ca2f..4bc3afe 100644
--- a/nlp-sentiment-analysis/infra/gcs.tf
+++ b/nlp-sentiment-analysis/infra/gcs.tf
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 resource "google_storage_bucket" "doc_input" {
-  name                        = "${var.project_id}-sentiment-analysis"
+  name                        = "${var.project_id}-sentiment-analysis-input"
   location                    = var.region
   uniform_bucket_level_access = true
   force_destroy               = true
@@ -21,7 +21,7 @@ resource "google_storage_bucket" "doc_input" {
 }
 
 resource "google_storage_bucket" "doc_output" {
-  name                        = "${var.project_id}-sentiment-analysis"
+  name                        = "${var.project_id}-sentiment-analysis-output"
   location                    = var.region
   uniform_bucket_level_access = true
   force_destroy               = true