diff --git a/build/terraform b/build/terraform
index bc7726aae5c6..c6da2ed4ec15 160000
--- a/build/terraform
+++ b/build/terraform
@@ -1 +1 @@
-Subproject commit bc7726aae5c699ed0f432ccd65440b38a26b927e
+Subproject commit c6da2ed4ec15554538a2edc010e0516ad8a94975
diff --git a/build/terraform-beta b/build/terraform-beta
index aaaf7650a691..e75ad9a1afda 160000
--- a/build/terraform-beta
+++ b/build/terraform-beta
@@ -1 +1 @@
-Subproject commit aaaf7650a691171203040501aee2f09073fbc3bc
+Subproject commit e75ad9a1afda66437e5febb5181b2b3ec172bd35
diff --git a/templates/terraform/examples/pubsub_subscription_different_project.tf.erb b/templates/terraform/examples/pubsub_subscription_different_project.tf.erb
index d3ca9295f54f..eeebc111ace3 100644
--- a/templates/terraform/examples/pubsub_subscription_different_project.tf.erb
+++ b/templates/terraform/examples/pubsub_subscription_different_project.tf.erb
@@ -6,5 +6,5 @@ resource "google_pubsub_topic" "<%= ctx[:primary_resource_id] %>" {
 resource "google_pubsub_subscription" "<%= ctx[:primary_resource_id] %>" {
   project = "<%= ctx[:vars]['subscription_project'] %>"
   name    = "<%= ctx[:vars]['subscription_name'] %>"
-  topic   = "${google_pubsub_topic.<%= ctx[:primary_resource_id] %>.id}"
+  topic   = "${google_pubsub_topic.<%= ctx[:primary_resource_id] %>.name}"
 }
diff --git a/third_party/terraform/website/docs/d/google_kms_secret.html.markdown b/third_party/terraform/website/docs/d/google_kms_secret.html.markdown
index 6ad424e519b3..24ab5a3ca1a4 100644
--- a/third_party/terraform/website/docs/d/google_kms_secret.html.markdown
+++ b/third_party/terraform/website/docs/d/google_kms_secret.html.markdown
@@ -32,7 +32,7 @@ resource "google_kms_key_ring" "my_key_ring" {
 
 resource "google_kms_crypto_key" "my_crypto_key" {
   name     = "my-crypto-key"
-  key_ring = "${google_kms_key_ring.my_key_ring.id}"
+  key_ring = "${google_kms_key_ring.my_key_ring.self_link}"
 }
 ```
 
@@ -55,7 +55,7 @@ Finally, reference the encrypted ciphertext in your resource definitions:
 
 ```hcl
 data "google_kms_secret" "sql_user_password" {
-  crypto_key = "${google_kms_crypto_key.my_crypto_key.id}"
+  crypto_key = "${google_kms_crypto_key.my_crypto_key.self_link}"
   ciphertext = "CiQAqD+xX4SXOSziF4a8JYvq4spfAuWhhYSNul33H85HnVtNQW4SOgDu2UZ46dQCRFl5MF6ekabviN8xq+F+2035ZJ85B+xTYXqNf4mZs0RJitnWWuXlYQh6axnnJYu3kDU="
 }
 
diff --git a/third_party/terraform/website/docs/d/google_kms_secret_ciphertext.html.markdown b/third_party/terraform/website/docs/d/google_kms_secret_ciphertext.html.markdown
index 686112285ee2..6e91f12b9b4d 100644
--- a/third_party/terraform/website/docs/d/google_kms_secret_ciphertext.html.markdown
+++ b/third_party/terraform/website/docs/d/google_kms_secret_ciphertext.html.markdown
@@ -32,7 +32,7 @@ resource "google_kms_key_ring" "my_key_ring" {
 
 resource "google_kms_crypto_key" "my_crypto_key" {
   name     = "my-crypto-key"
-  key_ring = "${google_kms_key_ring.my_key_ring.id}"
+  key_ring = "${google_kms_key_ring.my_key_ring.self_link}"
 }
 ```
 
@@ -40,7 +40,7 @@ Next, encrypt some sensitive information and use the encrypted data in your reso
 
 ```hcl
 data "google_kms_secret_ciphertext" "my_password" {
-  crypto_key = "${google_kms_crypto_key.my_crypto_key.id}"
+  crypto_key = "${google_kms_crypto_key.my_crypto_key.self_link}"
   plaintext = "my-secret-password"
 }