diff --git a/README.md b/README.md
index 26efe4d40..6c2375998 100644
--- a/README.md
+++ b/README.md
@@ -33,7 +33,7 @@ Currently available modules:
 - **process factories** - [project factory](./modules/project-factory/README.md)
 - **networking** - [DNS](./modules/dns), [DNS Response Policy](./modules/dns-response-policy/), [Cloud Endpoints](./modules/endpoints), [address reservation](./modules/net-address), [NAT](./modules/net-cloudnat), [VLAN Attachment](./modules/net-vlan-attachment/), [External Application LB](./modules/net-lb-app-ext/), [External Passthrough Network LB](./modules/net-lb-ext), [External Regional Application Load Balancer](./modules/net-lb-app-ext-regional/), [Firewall policy](./modules/net-firewall-policy), [Internal Application LB](./modules/net-lb-app-int), [Cross-region Internal Application LB](./modules/net-lb-app-int-cross-region), [Internal Passthrough Network LB](./modules/net-lb-int), [Internal Proxy Network LB](./modules/net-lb-proxy-int), [IPSec over Interconnect](./modules/net-ipsec-over-interconnect), [VPC](./modules/net-vpc), [VPC factory](./modules/net-vpc-factory/README.md), [VPC firewall](./modules/net-vpc-firewall), [VPC peering](./modules/net-vpc-peering), [VPN dynamic](./modules/net-vpn-dynamic), [HA VPN](./modules/net-vpn-ha), [VPN static](./modules/net-vpn-static), [Service Directory](./modules/service-directory), [Secure Web Proxy](./modules/net-swp)
 - **compute** - [VM/VM group](./modules/compute-vm), [MIG](./modules/compute-mig), [COS container](./modules/cloud-config-container/cos-generic-metadata/) (coredns, mysql, onprem, squid), [GKE cluster](./modules/gke-cluster-standard), [GKE hub](./modules/gke-hub), [GKE nodepool](./modules/gke-nodepool), [GCVE private cloud](./modules/gcve-private-cloud)
-- **data** - [AlloyDB instance](./modules/alloydb), [Analytics Hub](./modules/analytics-hub), [BigQuery dataset](./modules/bigquery-dataset), [Biglake Catalog](./modules/biglake-catalog), [Bigtable instance](./modules/bigtable-instance), [Dataplex](./modules/dataplex), [Dataplex Aspect Types](./modules/dataplex-aspects/), [Dataplex DataScan](./modules/dataplex-datascan), [Cloud SQL instance](./modules/cloudsql-instance), [Spanner instance](./modules/spanner-instance), [Firestore](./modules/firestore), [Data Catalog Policy Tag](./modules/data-catalog-policy-tag), [Data Catalog Tag](./modules/data-catalog-tag), [Data Catalog Tag Template](./modules/data-catalog-tag-template), [Datafusion](./modules/datafusion), [Dataproc](./modules/dataproc), [GCS](./modules/gcs), [Pub/Sub](./modules/pubsub), [Dataform Repository](./modules/dataform-repository/), [Looker Core](./modules/looker-core)
+- **data** - [AlloyDB instance](./modules/alloydb), [Analytics Hub](./modules/analytics-hub), [BigQuery dataset](./modules/bigquery-dataset), [Biglake Catalog](./modules/biglake-catalog), [Bigtable instance](./modules/bigtable-instance), [Dataplex](./modules/dataplex), [Dataplex Aspect Types](./modules/dataplex-aspect-types/), [Dataplex DataScan](./modules/dataplex-datascan), [Cloud SQL instance](./modules/cloudsql-instance), [Spanner instance](./modules/spanner-instance), [Firestore](./modules/firestore), [Data Catalog Policy Tag](./modules/data-catalog-policy-tag), [Data Catalog Tag](./modules/data-catalog-tag), [Data Catalog Tag Template](./modules/data-catalog-tag-template), [Datafusion](./modules/datafusion), [Dataproc](./modules/dataproc), [GCS](./modules/gcs), [Pub/Sub](./modules/pubsub), [Dataform Repository](./modules/dataform-repository/), [Looker Core](./modules/looker-core)
 - **development** - [API Gateway](./modules/api-gateway), [Apigee](./modules/apigee), [Artifact Registry](./modules/artifact-registry), [Container Registry](./modules/container-registry), [Cloud Source Repository](./modules/source-repository), [Secure Source Manager instance](./modules/secure-source-manager-instance), [Workstation cluster](./modules/workstation-cluster)
 - **security** - [Binauthz](./modules/binauthz/), [Certificate Authority Service (CAS)](./modules/certificate-authority-service), [KMS](./modules/kms), [SecretManager](./modules/secret-manager), [VPC Service Control](./modules/vpc-sc), [Certificate Manager](./modules/certificate-manager/)
 - **serverless** - [Cloud Function v1](./modules/cloud-function-v1), [Cloud Function v2](./modules/cloud-function-v2), [Cloud Run](./modules/cloud-run), [Cloud Run v2](./modules/cloud-run-v2)
diff --git a/modules/README.md b/modules/README.md
index dfc2ecb3c..6851500f0 100644
--- a/modules/README.md
+++ b/modules/README.md
@@ -92,7 +92,7 @@ These modules are used in the examples included in this repository. If you are u
 - [Dataform Repository](./dataform-repository/)
 - [Datafusion](./datafusion)
 - [Dataplex](./dataplex)
-- [Dataplex Aspect Types](./dataplex-aspects/)
+- [Dataplex Aspect Types](./dataplex-aspect-types/)
 - [Dataplex DataScan](./dataplex-datascan/)
 - [Dataproc](./dataproc)
 - [Firestore](./firestore)
diff --git a/modules/dataplex-aspects/README.md b/modules/dataplex-aspect-types/README.md
similarity index 98%
rename from modules/dataplex-aspects/README.md
rename to modules/dataplex-aspect-types/README.md
index 7991da33d..9dba8ba63 100644
--- a/modules/dataplex-aspects/README.md
+++ b/modules/dataplex-aspect-types/README.md
@@ -17,7 +17,7 @@ This example mirrors the one in the [`google_dataplex_aspect_type`](https://regi
 
 ```hcl
 module "aspect-types" {
-  source     = "./fabric/modules/dataplex-aspects"
+  source     = "./fabric/modules/dataplex-aspect-types"
   project_id = "test-project"
   # var.location defaults to "global"
   # location   = "global"
@@ -71,7 +71,7 @@ Aspect types can also be defined via a resource factory, where the file name wil
 
 ```hcl
 module "aspect-types" {
-  source     = "./fabric/modules/dataplex-aspects"
+  source     = "./fabric/modules/dataplex-aspect-types"
   project_id = "test-project"
   factories_config = {
     aspect_types = "data/aspect-types"
diff --git a/modules/dataplex-aspects/iam.tf b/modules/dataplex-aspect-types/iam.tf
similarity index 100%
rename from modules/dataplex-aspects/iam.tf
rename to modules/dataplex-aspect-types/iam.tf
diff --git a/modules/dataplex-aspects/main.tf b/modules/dataplex-aspect-types/main.tf
similarity index 100%
rename from modules/dataplex-aspects/main.tf
rename to modules/dataplex-aspect-types/main.tf
diff --git a/modules/dataplex-aspects/outputs.tf b/modules/dataplex-aspect-types/outputs.tf
similarity index 100%
rename from modules/dataplex-aspects/outputs.tf
rename to modules/dataplex-aspect-types/outputs.tf
diff --git a/modules/dataplex-aspects/schemas/aspect-type.schema.json b/modules/dataplex-aspect-types/schemas/aspect-type.schema.json
similarity index 100%
rename from modules/dataplex-aspects/schemas/aspect-type.schema.json
rename to modules/dataplex-aspect-types/schemas/aspect-type.schema.json
diff --git a/modules/dataplex-aspects/variables.tf b/modules/dataplex-aspect-types/variables.tf
similarity index 100%
rename from modules/dataplex-aspects/variables.tf
rename to modules/dataplex-aspect-types/variables.tf