diff --git a/docs/data-sources/user.md b/docs/data-sources/user.md
index 4456c917..146f1e7a 100644
--- a/docs/data-sources/user.md
+++ b/docs/data-sources/user.md
@@ -26,8 +26,8 @@ data "boundary_user" "org_user" {
 }
 
 data "boundary_scope" "org" {
-  name            = "my-org"
-  parent_scope_id = data.boundary_scope.org.id
+  name     = "my-org"
+  scope_id = data.boundary_scope.org.id
 }
 ```
 
diff --git a/docs/resources/host_set.md b/docs/resources/host_set.md
index 8667edcb..c25d50a1 100644
--- a/docs/resources/host_set.md
+++ b/docs/resources/host_set.md
@@ -39,7 +39,6 @@ resource "boundary_host" "first" {
   description     = "My first host!"
   address         = "10.0.0.1"
   host_catalog_id = boundary_host_catalog.static.id
-  scope_id        = boundary_scope.project.id
 }
 
 resource "boundary_host" "second" {
@@ -48,7 +47,6 @@ resource "boundary_host" "second" {
   description     = "My second host!"
   address         = "10.0.0.2"
   host_catalog_id = boundary_host_catalog.static.id
-  scope_id        = boundary_scope.project.id
 }
 
 resource "boundary_host_set" "web" {
diff --git a/docs/resources/target.md b/docs/resources/target.md
index ef6f1d54..83853830 100644
--- a/docs/resources/target.md
+++ b/docs/resources/target.md
@@ -61,7 +61,6 @@ resource "boundary_host" "foo" {
   type            = "static"
   name            = "foo"
   host_catalog_id = boundary_host_catalog.foo.id
-  scope_id        = boundary_scope.project.id
   address         = "10.0.0.1"
 }
 
@@ -69,7 +68,6 @@ resource "boundary_host" "bar" {
   type            = "static"
   name            = "bar"
   host_catalog_id = boundary_host_catalog.foo.id
-  scope_id        = boundary_scope.project.id
   address         = "10.0.0.1"
 }
 
diff --git a/examples/data-sources/boundary_user/data-source.tf b/examples/data-sources/boundary_user/data-source.tf
index a5ef3c3c..b6685579 100644
--- a/examples/data-sources/boundary_user/data-source.tf
+++ b/examples/data-sources/boundary_user/data-source.tf
@@ -12,6 +12,6 @@ data "boundary_user" "org_user" {
 }
 
 data "boundary_scope" "org" {
-  name            = "my-org"
-  parent_scope_id = data.boundary_scope.org.id
+  name     = "my-org"
+  scope_id = data.boundary_scope.org.id
 }
diff --git a/examples/resources/boundary_host_set/resource.tf b/examples/resources/boundary_host_set/resource.tf
index 11345c31..bf695fd3 100644
--- a/examples/resources/boundary_host_set/resource.tf
+++ b/examples/resources/boundary_host_set/resource.tf
@@ -24,7 +24,6 @@ resource "boundary_host" "first" {
   description     = "My first host!"
   address         = "10.0.0.1"
   host_catalog_id = boundary_host_catalog.static.id
-  scope_id        = boundary_scope.project.id
 }
 
 resource "boundary_host" "second" {
@@ -33,7 +32,6 @@ resource "boundary_host" "second" {
   description     = "My second host!"
   address         = "10.0.0.2"
   host_catalog_id = boundary_host_catalog.static.id
-  scope_id        = boundary_scope.project.id
 }
 
 resource "boundary_host_set" "web" {
diff --git a/examples/resources/boundary_target/resource.tf b/examples/resources/boundary_target/resource.tf
index e617e7e0..f440e391 100644
--- a/examples/resources/boundary_target/resource.tf
+++ b/examples/resources/boundary_target/resource.tf
@@ -46,7 +46,6 @@ resource "boundary_host" "foo" {
   type            = "static"
   name            = "foo"
   host_catalog_id = boundary_host_catalog.foo.id
-  scope_id        = boundary_scope.project.id
   address         = "10.0.0.1"
 }
 
@@ -54,7 +53,6 @@ resource "boundary_host" "bar" {
   type            = "static"
   name            = "bar"
   host_catalog_id = boundary_host_catalog.foo.id
-  scope_id        = boundary_scope.project.id
   address         = "10.0.0.1"
 }