diff --git a/providers/gcp/resources/gcp.lr b/providers/gcp/resources/gcp.lr
index a2f696054c..abbb524da0 100644
--- a/providers/gcp/resources/gcp.lr
+++ b/providers/gcp/resources/gcp.lr
@@ -20,7 +20,7 @@ alias gcp.dns = gcp.project.dnsService
 alias gcp.bigquery = gcp.project.bigqueryService
 alias gcp.storage = gcp.project.storageService
 
-// GCP cloud organization
+// Google Cloud (GCP) organization
 gcp.organization @defaults("name") {
   // Organization ID
   id string
@@ -40,7 +40,7 @@ gcp.organization @defaults("name") {
   projects() gcp.projects
 }
 
-// GCP folders
+// Google Cloud (GCP) folders
 private gcp.folders {
   []gcp.folder
   // Parent ID
@@ -49,7 +49,7 @@ private gcp.folders {
   children() []gcp.folder
 }
 
-// GCP folder
+// Google Cloud (GCP) folder
 private gcp.folder @defaults("name") {
   // Folder ID
   id string
@@ -69,7 +69,7 @@ private gcp.folder @defaults("name") {
   projects() gcp.projects
 }
 
-// GCP projects
+// Google Cloud (GCP) projects
 private gcp.projects {
   []gcp.project
   // Parent ID
@@ -78,7 +78,7 @@ private gcp.projects {
   children() []gcp.project
 }
 
-// Google Cloud Platform project
+// Google Cloud (GCP) project
 gcp.project @defaults("name") {
   // Unique, user-assigned ID of the project
   id string
@@ -140,7 +140,7 @@ gcp.project @defaults("name") {
   monitoring() gcp.project.monitoringService
 }
 
-// GCP service
+// Google Cloud (GCP) service
 gcp.service @defaults("name") {
   // Project ID
   projectId string
@@ -156,7 +156,7 @@ gcp.service @defaults("name") {
   enabled() bool
 }
 
-// GCP recommendation and suggested action
+// Google Cloud (GCP) recommendation and suggested action
 gcp.recommendation {
   // ID of recommendation
   id string
@@ -184,7 +184,7 @@ gcp.recommendation {
   state dict
 }
 
-// GCP Resource Manager binding
+// Google Cloud (GCP) Resource Manager binding
 private gcp.resourcemanager.binding {
   // Internal ID
   id string
@@ -194,7 +194,7 @@ private gcp.resourcemanager.binding {
   role string
 }
 
-// GCP Compute Engine
+// Google Cloud (GCP) Compute Engine
 private gcp.project.computeService {
   // Project ID
   projectId string
@@ -228,7 +228,7 @@ private gcp.project.computeService {
   forwardingRules() []gcp.project.computeService.forwardingRule
 }
 
-// GCP Compute address
+// Google Cloud (GCP) Compute address
 private gcp.project.computeService.address @defaults("name address addressType") {
   // Unique identifier
   id string
@@ -268,7 +268,7 @@ private gcp.project.computeService.address @defaults("name address addressType")
   resourceUrls []string
 }
 
-// GCP Compute forwarding rules
+// Google Cloud (GCP) Compute forwarding rules
 private gcp.project.computeService.forwardingRule {
   // Unique identifier
   id string
@@ -326,7 +326,7 @@ private gcp.project.computeService.forwardingRule {
   targetUrl string
 }
 
-// GCP Compute region
+// Google Cloud (GCP) Compute region
 private gcp.project.computeService.region @defaults("name") {
   // Unique identifier
   id string
@@ -344,7 +344,7 @@ private gcp.project.computeService.region @defaults("name") {
   deprecated dict
 }
 
-// GCP Compute zone
+// Google Cloud (GCP) Compute zone
 private gcp.project.computeService.zone @defaults("name") {
   // Unique identifier
   id string
@@ -358,7 +358,7 @@ private gcp.project.computeService.zone @defaults("name") {
   created time
 }
 
-// GCP machine type
+// Google Cloud (GCP) machine type
 private gcp.project.computeService.machineType @defaults("name") {
   // Unique identifier
   id string
@@ -384,7 +384,7 @@ private gcp.project.computeService.machineType @defaults("name") {
   zone gcp.project.computeService.zone
 }
 
-// GCP Compute instances
+// Google Cloud (GCP) Compute instances
 private gcp.project.computeService.instance @defaults("name") {
   // Unique identifier for the instance
   id string
@@ -466,7 +466,7 @@ private gcp.project.computeService.instance @defaults("name") {
   zone gcp.project.computeService.zone
 }
 
-// GCP Compute service account
+// Google Cloud (GCP) Compute service account
 private gcp.project.computeService.serviceaccount @defaults("email") {
   // Service account email address
   email string
@@ -474,7 +474,7 @@ private gcp.project.computeService.serviceaccount @defaults("email") {
   scopes []string
 }
 
-// GCP Compute persistent disk
+// Google Cloud (GCP) Compute persistent disk
 private gcp.project.computeService.disk @defaults("name") {
   // Unique identifier for the resource
   id string
@@ -512,7 +512,7 @@ private gcp.project.computeService.disk @defaults("name") {
   diskEncryptionKey dict
 }
 
-// GCP Compute attached disk
+// Google Cloud (GCP) Compute attached disk
 private gcp.project.computeService.attachedDisk {
   // Attached Disk ID
   id string
@@ -546,7 +546,7 @@ private gcp.project.computeService.attachedDisk {
   type string
 }
 
-// GCP Compute persistent disk snapshot
+// Google Cloud (GCP) Compute persistent disk snapshot
 private gcp.project.computeService.snapshot @defaults("name") {
   // Unique identifier
   id string
@@ -582,7 +582,7 @@ private gcp.project.computeService.snapshot @defaults("name") {
   status string
 }
 
-// GCP Compute
+// Google Cloud (GCP) Compute
 private gcp.project.computeService.image @defaults("id name") {
   // Unique identifier
   id string
@@ -610,7 +610,7 @@ private gcp.project.computeService.image @defaults("id name") {
   status string
 }
 
-// GCP Compute firewall
+// Google Cloud (GCP) Compute firewall
 private gcp.project.computeService.firewall @defaults("name") {
   // Unique identifier
   id string
@@ -644,7 +644,7 @@ private gcp.project.computeService.firewall @defaults("name") {
   denied []dict
 }
 
-// GCP Compute VPC network resource
+// Google Cloud (GCP) Compute VPC network resource
 private gcp.project.computeService.network @defaults("name") {
   // Unique identifier
   id string
@@ -678,7 +678,7 @@ private gcp.project.computeService.network @defaults("name") {
   subnetworks() []gcp.project.computeService.subnetwork
 }
 
-// GCP Compute VPC network partitioning
+// Google Cloud (GCP) Compute VPC network partitioning
 private gcp.project.computeService.subnetwork @defaults("name") {
   // Unique identifier
   id string
@@ -726,7 +726,7 @@ private gcp.project.computeService.subnetwork @defaults("name") {
   created time
 }
 
-// GCP Compute VPC network partitioning log configuration
+// Google Cloud (GCP) Compute VPC network partitioning log configuration
 private gcp.project.computeService.subnetwork.logConfig @defaults("enable") {
   // Internal ID
   id string
@@ -744,7 +744,7 @@ private gcp.project.computeService.subnetwork.logConfig @defaults("enable") {
   metadataFields []string
 }
 
-// GCP Compute cloud router
+// Google Cloud (GCP) Compute cloud router
 private gcp.project.computeService.router @defaults("name")  {
   // Unique identifier
   id string
@@ -764,7 +764,7 @@ private gcp.project.computeService.router @defaults("name")  {
   created time
 }
 
-// GCP Compute backend service
+// Google Cloud (GCP) Compute backend service
 private gcp.project.computeService.backendService @defaults("name") {
   // Unique identifier
   id string
@@ -834,7 +834,7 @@ private gcp.project.computeService.backendService @defaults("name") {
   timeoutSec int
 }
 
-// GCP Compute backend service backend
+// Google Cloud (GCP) Compute backend service backend
 private gcp.project.computeService.backendService.backend @defaults("description") {
   // Internal ID
   id string
@@ -864,7 +864,7 @@ private gcp.project.computeService.backendService.backend @defaults("description
   maxUtilization float
 }
 
-// GCP Compute backend service CDN policy
+// Google Cloud (GCP) Compute backend service CDN policy
 private gcp.project.computeService.backendService.cdnPolicy {
   // Internal ID
   id string
@@ -894,7 +894,7 @@ private gcp.project.computeService.backendService.cdnPolicy {
   signedUrlKeyNames []string
 }
 
-// GCP Cloud Storage
+// Google Cloud (GCP) Storage
 private gcp.project.storageService {
   // Project ID
   projectId string
@@ -902,7 +902,7 @@ private gcp.project.storageService {
   buckets() []gcp.project.storageService.bucket
 }
 
-// GCP Cloud Storage bucket
+// Google Cloud (GCP) Storage bucket
 private gcp.project.storageService.bucket @defaults("id") {
   // Bucket ID
   id string
@@ -932,7 +932,7 @@ private gcp.project.storageService.bucket @defaults("id") {
   retentionPolicy dict
 }
 
-// GCP Cloud SQL resources
+// Google Cloud (GCP) SQL resources
 private gcp.project.sqlService {
   // Project ID
   projectId string
@@ -940,7 +940,7 @@ private gcp.project.sqlService {
   instances() []gcp.project.sqlService.instance
 }
 
-// GCP Cloud SQL instance
+// Google Cloud (GCP) SQL instance
 private gcp.project.sqlService.instance @defaults("name") {
   // Project ID
   projectId string
@@ -994,7 +994,7 @@ private gcp.project.sqlService.instance @defaults("name") {
   databases() []gcp.project.sqlService.instance.database
 }
 
-// GCP Cloud SQL instance database
+// Google Cloud (GCP) SQL instance database
 private gcp.project.sqlService.instance.database @defaults("name") {
   // Project ID
   projectId string
@@ -1010,7 +1010,7 @@ private gcp.project.sqlService.instance.database @defaults("name") {
   sqlserverDatabaseDetails dict
 }
 
-// GCP Cloud SQL instance IP mapping
+// Google Cloud (GCP) SQL instance IP mapping
 private gcp.project.sqlService.instance.ipMapping @defaults("ipAddress") {
   // Internal ID
   id string
@@ -1022,7 +1022,7 @@ private gcp.project.sqlService.instance.ipMapping @defaults("ipAddress") {
   type string
 }
 
-// GCP Cloud SQL instance settings
+// Google Cloud (GCP) SQL instance settings
 private gcp.project.sqlService.instance.settings {
   // Project ID
   projectId string
@@ -1084,7 +1084,7 @@ private gcp.project.sqlService.instance.settings {
   userLabels map[string]string
 }
 
-// GCP Cloud SQL instance settings backup configuration
+// Google Cloud (GCP) SQL instance settings backup configuration
 private gcp.project.sqlService.instance.settings.backupconfiguration {
   // Internal ID
   id string
@@ -1104,7 +1104,7 @@ private gcp.project.sqlService.instance.settings.backupconfiguration {
   transactionLogRetentionDays int
 }
 
-// GCP Cloud SQL instance settings deny maintenance period
+// Google Cloud (GCP) SQL instance settings deny maintenance period
 private gcp.project.sqlService.instance.settings.denyMaintenancePeriod @defaults("startDate endDate") {
   // Internal ID
   id string
@@ -1116,7 +1116,7 @@ private gcp.project.sqlService.instance.settings.denyMaintenancePeriod @defaults
   time string
 }
 
-// GCP Cloud SQL instance settings IP configuration
+// Google Cloud (GCP) SQL instance settings IP configuration
 private gcp.project.sqlService.instance.settings.ipConfiguration {
   // Internal ID
   id string
@@ -1132,7 +1132,7 @@ private gcp.project.sqlService.instance.settings.ipConfiguration {
   requireSsl bool
 }
 
-// GCP Cloud SQL instance settings maintenance window
+// Google Cloud (GCP) SQL instance settings maintenance window
 private gcp.project.sqlService.instance.settings.maintenanceWindow @defaults("day hour") {
   // Internal ID
   id string
@@ -1144,7 +1144,7 @@ private gcp.project.sqlService.instance.settings.maintenanceWindow @defaults("da
   updateTrack string
 }
 
-// GCP Cloud SQL instance settings password validation policy
+// Google Cloud (GCP) SQL instance settings password validation policy
 private gcp.project.sqlService.instance.settings.passwordValidationPolicy @defaults("enabledPasswordPolicy") {
   // Internal ID
   id string
@@ -1162,7 +1162,7 @@ private gcp.project.sqlService.instance.settings.passwordValidationPolicy @defau
   reuseInterval int
 }
 
-// GCP BigQuery resources
+// Google Cloud (GCP) BigQuery resources
 private gcp.project.bigqueryService @defaults("projectId") {
   // Project ID
   projectId string
@@ -1170,7 +1170,7 @@ private gcp.project.bigqueryService @defaults("projectId") {
   datasets() []gcp.project.bigqueryService.dataset
 }
 
-// GCP BigQuery dataset
+// Google Cloud (GCP) BigQuery dataset
 private gcp.project.bigqueryService.dataset @defaults("id name") {
   // Dataset ID
   id string
@@ -1202,7 +1202,7 @@ private gcp.project.bigqueryService.dataset @defaults("id name") {
   routines() []gcp.project.bigqueryService.routine
 }
 
-// GCP BigQuery dataset access entry
+// Google Cloud (GCP) BigQuery dataset access entry
 private gcp.project.bigqueryService.dataset.accessEntry @defaults("role entity entityType") {
   // Internal ID
   id string
@@ -1222,7 +1222,7 @@ private gcp.project.bigqueryService.dataset.accessEntry @defaults("role entity e
   datasetRef dict
 }
 
-// GCP BigQuery table
+// Google Cloud (GCP) BigQuery table
 private gcp.project.bigqueryService.table @defaults("id") {
   // Table ID
   id string
@@ -1276,7 +1276,7 @@ private gcp.project.bigqueryService.table @defaults("id") {
   schema []dict
 }
 
-// GCP BigQuery ML model
+// Google Cloud (GCP) BigQuery ML model
 private gcp.project.bigqueryService.model @defaults("id") {
   // Model ID
   id string
@@ -1304,7 +1304,7 @@ private gcp.project.bigqueryService.model @defaults("id") {
   kmsName string
 }
 
-// GCP BigQuery routine
+// Google Cloud (GCP) BigQuery routine
 private gcp.project.bigqueryService.routine @defaults("id") {
   // Routine ID
   id string
@@ -1324,7 +1324,7 @@ private gcp.project.bigqueryService.routine @defaults("id") {
   type string
 }
 
-// GCP Cloud DNS
+// Google Cloud (GCP) DNS
 private gcp.project.dnsService {
   // Project ID
   projectId string
@@ -1334,7 +1334,7 @@ private gcp.project.dnsService {
   policies() []gcp.project.dnsService.policy
 }
 
-// Cloud DNS managed zone (a resource that represents a DNS zone hosted by the Cloud DNS service)
+// Google Cloud (GCP) DNS managed zone (a resource that represents a DNS zone hosted by the Cloud DNS service)
 private gcp.project.dnsService.managedzone @defaults("name") {
   // Managed zone ID
   id string
@@ -1360,7 +1360,7 @@ private gcp.project.dnsService.managedzone @defaults("name") {
   recordSets() []gcp.project.dnsService.recordset
 }
 
-// Cloud DNS record set
+// Google Cloud (GCP) DNS record set
 private gcp.project.dnsService.recordset @defaults("name") {
   // Project ID
   projectId string
@@ -1376,7 +1376,7 @@ private gcp.project.dnsService.recordset @defaults("name") {
   type string
 }
 
-// Cloud DNS rules applied to one or more Virtual Private Cloud resources
+// Google Cloud (GCP) DNS rules applied to one or more Virtual Private Cloud resources
 private gcp.project.dnsService.policy @defaults("name") {
   // Project ID
   projectId string
@@ -1396,7 +1396,7 @@ private gcp.project.dnsService.policy @defaults("name") {
   networks() []gcp.project.computeService.network
 }
 
-// GCP GKE
+// Google Kubernetes Engine (GKE)
 private gcp.project.gkeService {
   // Project ID
   projectId string
@@ -1404,7 +1404,7 @@ private gcp.project.gkeService {
   clusters() []gcp.project.gkeService.cluster
 }
 
-// GCP GKE cluster
+// Google Kubernetes Engine (GKE) cluster
 private gcp.project.gkeService.cluster @defaults("name") {
   // Project ID
   projectId string
@@ -1472,7 +1472,7 @@ private gcp.project.gkeService.cluster @defaults("name") {
   databaseEncryption dict
 }
 
-// GKE cluster addons config
+// Google Kubernetes Engine (GKE) cluster addons config
 private gcp.project.gkeService.cluster.addonsConfig {
   // Internal ID
   id string
@@ -1498,7 +1498,7 @@ private gcp.project.gkeService.cluster.addonsConfig {
   gkeBackupAgentConfig dict
 }
 
-// GKE cluster IP allocation policy
+// Google Kubernetes Engine (GKE) cluster IP allocation policy
 private gcp.project.gkeService.cluster.ipAllocationPolicy {
   // Internal ID
   id string
@@ -1528,7 +1528,7 @@ private gcp.project.gkeService.cluster.ipAllocationPolicy {
   ipv6AccessType string
 }
 
-// GKE cluster network config
+// Google Kubernetes Engine (GKE) cluster network config
 private gcp.project.gkeService.cluster.networkConfig @defaults("networkPath") {
   // Internal ID
   id string
@@ -1556,7 +1556,7 @@ private gcp.project.gkeService.cluster.networkConfig @defaults("networkPath") {
   serviceExternalIpsConfig dict
 }
 
-// GKE cluster node pool
+// Google Kubernetes Engine (GKE) cluster node pool
 private gcp.project.gkeService.cluster.nodepool @defaults("name") {
   // Internal ID
   id string
@@ -1580,7 +1580,7 @@ private gcp.project.gkeService.cluster.nodepool @defaults("name") {
   management dict
 }
 
-// GCP GKE node pool-Level network configuration
+// Google Kubernetes Engine (GKE) node pool-Level network configuration
 private gcp.project.gkeService.cluster.nodepool.networkConfig @defaults("podRange podIpv4CidrBlock") {
   // Internal ID
   id string
@@ -1592,7 +1592,7 @@ private gcp.project.gkeService.cluster.nodepool.networkConfig @defaults("podRang
   performanceConfig gcp.project.gkeService.cluster.nodepool.networkConfig.performanceConfig
 }
 
-// GCP GKE node pool network performance configuration
+// Google Kubernetes Engine (GKE) node pool network performance configuration
 private gcp.project.gkeService.cluster.nodepool.networkConfig.performanceConfig @defaults("totalEgressBandwidthTier") {
   // Internal ID
   id string
@@ -1600,7 +1600,7 @@ private gcp.project.gkeService.cluster.nodepool.networkConfig.performanceConfig
   totalEgressBandwidthTier string
 }
 
-// GCP GKE node pool configuration
+// Google Kubernetes Engine (GKE) node pool configuration
 private gcp.project.gkeService.cluster.nodepool.config @defaults("machineType diskSizeGb") {
   // Internal ID
   id string
@@ -1660,7 +1660,7 @@ private gcp.project.gkeService.cluster.nodepool.config @defaults("machineType di
   confidentialNodes gcp.project.gkeService.cluster.nodepool.config.confidentialNodes
 }
 
-// GCP GKE node pool hardware accelerators configuration
+// Google Kubernetes Engine (GKE) node pool hardware accelerators configuration
 private gcp.project.gkeService.cluster.nodepool.config.accelerator @defaults("type count") {
   // Internal ID
   id string
@@ -1674,7 +1674,7 @@ private gcp.project.gkeService.cluster.nodepool.config.accelerator @defaults("ty
   gpuSharingConfig gcp.project.gkeService.cluster.nodepool.config.accelerator.gpuSharingConfig
 }
 
-// GPU sharing configuration
+// Google Kubernetes Engine (GKE) GPU sharing configuration
 private gcp.project.gkeService.cluster.nodepool.config.accelerator.gpuSharingConfig @defaults("strategy") {
   // Internal ID
   id string
@@ -1684,7 +1684,7 @@ private gcp.project.gkeService.cluster.nodepool.config.accelerator.gpuSharingCon
   strategy string
 }
 
-// GCP GKE Kubernetes node taint
+// Google Kubernetes Engine (GKE) Kubernetes node taint
 private gcp.project.gkeService.cluster.nodepool.config.nodeTaint @defaults("key value effect") {
   // Internal ID
   id string
@@ -1696,7 +1696,7 @@ private gcp.project.gkeService.cluster.nodepool.config.nodeTaint @defaults("key
   effect string
 }
 
-// GCP GKE node pool sandbox configuration
+// Google Kubernetes Engine (GKE) node pool sandbox configuration
 private gcp.project.gkeService.cluster.nodepool.config.sandboxConfig @defaults("type") {
   // Internal ID
   id string
@@ -1704,7 +1704,7 @@ private gcp.project.gkeService.cluster.nodepool.config.sandboxConfig @defaults("
   type string
 }
 
-// GCP GKE node pool shielded instance configuration
+// Google Kubernetes Engine (GKE) node pool shielded instance configuration
 private gcp.project.gkeService.cluster.nodepool.config.shieldedInstanceConfig @defaults("enableSecureBoot enableIntegrityMonitoring") {
   // Internal ID
   id string
@@ -1714,7 +1714,7 @@ private gcp.project.gkeService.cluster.nodepool.config.shieldedInstanceConfig @d
   enableIntegrityMonitoring bool
 }
 
-// GCP GKE node pool parameters that can be configured on Linux nodes
+// Google Kubernetes Engine (GKE) node pool parameters that can be configured on Linux nodes
 private gcp.project.gkeService.cluster.nodepool.config.linuxNodeConfig @defaults("sysctls") {
   // Internal ID
   id string
@@ -1722,7 +1722,7 @@ private gcp.project.gkeService.cluster.nodepool.config.linuxNodeConfig @defaults
   sysctls map[string]string
 }
 
-// GCP GKE Node Pool kubelet configuration
+// Google Kubernetes Engine (GKE) Node Pool kubelet configuration
 private gcp.project.gkeService.cluster.nodepool.config.kubeletConfig @defaults("cpuManagerPolicy podPidsLimit") {
   // Internal ID
   id string
@@ -1734,7 +1734,7 @@ private gcp.project.gkeService.cluster.nodepool.config.kubeletConfig @defaults("
   podPidsLimit int
 }
 
-// GCP GKE node pool GCFS configuration
+// Google Kubernetes Engine (GKE) node pool GCFS configuration
 private gcp.project.gkeService.cluster.nodepool.config.gcfsConfig @defaults("enabled") {
   // Internal ID
   id string
@@ -1742,7 +1742,7 @@ private gcp.project.gkeService.cluster.nodepool.config.gcfsConfig @defaults("ena
   enabled bool
 }
 
-// GCP GKE node pool advanced machine features configuration
+// Google Kubernetes Engine (GKE) node pool advanced machine features configuration
 private gcp.project.gkeService.cluster.nodepool.config.advancedMachineFeatures @defaults("threadsPerCore") {
   // Internal ID
   id string
@@ -1750,7 +1750,7 @@ private gcp.project.gkeService.cluster.nodepool.config.advancedMachineFeatures @
   threadsPerCore int
 }
 
-// GCP GKE node pool gVNIC configuration
+// Google Kubernetes Engine (GKE) node pool gVNIC configuration
 private gcp.project.gkeService.cluster.nodepool.config.gvnicConfig @defaults("enabled") {
   // Internal ID
   id string
@@ -1758,7 +1758,7 @@ private gcp.project.gkeService.cluster.nodepool.config.gvnicConfig @defaults("en
   enabled bool
 }
 
-// GCP GKE node pool confidential nodes configuration
+// Google Kubernetes Engine (GKE) node pool confidential nodes configuration
 private gcp.project.gkeService.cluster.nodepool.config.confidentialNodes @defaults("enabled") {
   // Internal ID
   id string
@@ -1766,7 +1766,7 @@ private gcp.project.gkeService.cluster.nodepool.config.confidentialNodes @defaul
   enabled bool
 }
 
-// GCP Pub/Sub resources
+// Google Cloud (GCP) Pub/Sub resources
 private gcp.project.pubsubService {
   // Project ID
   projectId string
@@ -1778,7 +1778,7 @@ private gcp.project.pubsubService {
   snapshots() []gcp.project.pubsubService.snapshot
 }
 
-// GCP Pub/Sub topic
+// Google Cloud (GCP) Pub/Sub topic
 private gcp.project.pubsubService.topic @defaults("name") {
   // Project ID
   projectId string
@@ -1788,7 +1788,7 @@ private gcp.project.pubsubService.topic @defaults("name") {
   config() gcp.project.pubsubService.topic.config
 }
 
-// GCP Pub/Sub topic configuration
+// Google Cloud (GCP) Pub/Sub topic configuration
 private gcp.project.pubsubService.topic.config @defaults("kmsKeyName messageStoragePolicy") {
   // Project ID
   projectId string
@@ -1802,7 +1802,7 @@ private gcp.project.pubsubService.topic.config @defaults("kmsKeyName messageStor
   messageStoragePolicy gcp.project.pubsubService.topic.config.messagestoragepolicy
 }
 
-// GCP Pub/Sub topic message storage policy
+// Google Cloud (GCP) Pub/Sub topic message storage policy
 private gcp.project.pubsubService.topic.config.messagestoragepolicy @defaults("allowedPersistenceRegions"){
   // Parent configuration ID
   configId string
@@ -1810,7 +1810,7 @@ private gcp.project.pubsubService.topic.config.messagestoragepolicy @defaults("a
   allowedPersistenceRegions []string
 }
 
-// GCP Pub/Sub subscription
+// Google Cloud (GCP) Pub/Sub subscription
 private gcp.project.pubsubService.subscription @defaults("name") {
   // Project ID
   projectId string
@@ -1820,7 +1820,7 @@ private gcp.project.pubsubService.subscription @defaults("name") {
   config() gcp.project.pubsubService.subscription.config
 }
 
-// GCP Pub/Sub subscription configuration
+// Google Cloud (GCP) Pub/Sub subscription configuration
 private gcp.project.pubsubService.subscription.config @defaults("topic.name ackDeadline expirationPolicy") {
   // Project ID
   projectId string
@@ -1852,7 +1852,7 @@ private gcp.project.pubsubService.subscription.config.pushconfig @defaults("attr
   attributes map[string]string
 }
 
-// GCP Pub/Sub snapshot
+// Google Cloud (GCP) Pub/Sub snapshot
 private gcp.project.pubsubService.snapshot @defaults("name") {
   // Project ID
   projectId string
@@ -1873,7 +1873,7 @@ private gcp.project.kmsService {
   keyrings() []gcp.project.kmsService.keyring
 }
 
-// GCP KMS keyring
+// Google Cloud (GCP) KMS keyring
 private gcp.project.kmsService.keyring @defaults("name") {
   // Project ID
   projectId string
@@ -1889,7 +1889,7 @@ private gcp.project.kmsService.keyring @defaults("name") {
   cryptokeys() []gcp.project.kmsService.keyring.cryptokey
 }
 
-// GCP KMS crypto key
+// Google Cloud (GCP) KMS crypto key
 private gcp.project.kmsService.keyring.cryptokey @defaults("name purpose") {
   // Full resource path
   resourcePath string
@@ -1921,7 +1921,7 @@ private gcp.project.kmsService.keyring.cryptokey @defaults("name purpose") {
   iamPolicy() []gcp.resourcemanager.binding
 }
 
-// GCP KMS crypto key version
+// Google Cloud (GCP) KMS crypto key version
 private gcp.project.kmsService.keyring.cryptokey.version @defaults("name state") {
   // Full resource path
   resourcePath string
@@ -1965,7 +1965,7 @@ private gcp.project.kmsService.keyring.cryptokey.version.attestation {
   certificateChains gcp.project.kmsService.keyring.cryptokey.version.attestation.certificatechains
 }
 
-// GCP KMS crypto key version attestation certificate chains
+// Google Cloud (GCP) KMS crypto key version attestation certificate chains
 private gcp.project.kmsService.keyring.cryptokey.version.attestation.certificatechains {
   // Crypto key version name
   cryptoKeyVersionName string
@@ -1977,7 +1977,7 @@ private gcp.project.kmsService.keyring.cryptokey.version.attestation.certificate
   googlePartitionCerts []string
 }
 
-// GCP KMS crypto key version external protection level options
+// Google Cloud (GCP) KMS crypto key version external protection level options
 private gcp.project.kmsService.keyring.cryptokey.version.externalProtectionLevelOptions {
   // Crypto key version name
   cryptoKeyVersionName string
@@ -1987,7 +1987,7 @@ private gcp.project.kmsService.keyring.cryptokey.version.externalProtectionLevel
   ekmConnectionKeyPath string
 }
 
-// GCP contact
+// Google Cloud (GCP) contact
 private gcp.essentialContact @defaults("email notificationCategories") {
   // Full resource path
   resourcePath string
@@ -2003,7 +2003,7 @@ private gcp.essentialContact @defaults("email notificationCategories") {
   validationState string
 }
 
-// GCP project API key
+// Google Cloud (GCP) project API key
 private gcp.project.apiKey @defaults("name") {
   // The ID of the key
   id string
@@ -2027,7 +2027,7 @@ private gcp.project.apiKey @defaults("name") {
   updated time
 }
 
-// GCP project API key restrictions
+// Google Cloud (GCP) project API key restrictions
 private gcp.project.apiKey.restrictions {
   // Parent resource path
   parentResourcePath string
@@ -2043,7 +2043,7 @@ private gcp.project.apiKey.restrictions {
   serverKeyRestrictions dict
 }
 
-// GCP Logging resources
+// Google Cloud (GCP) Logging resources
 private gcp.project.loggingservice {
   // Project ID
   projectId string
@@ -2055,7 +2055,7 @@ private gcp.project.loggingservice {
   sinks() []gcp.project.loggingservice.sink
 }
 
-// GCP Logging bucket
+// Google Cloud (GCP) Logging bucket
 private gcp.project.loggingservice.bucket @defaults("name") {
   // Project ID
   projectId string
@@ -2081,7 +2081,7 @@ private gcp.project.loggingservice.bucket @defaults("name") {
   updated time
 }
 
-// GCP Logging bucket index config
+// Google Cloud (GCP) Logging bucket index config
 private gcp.project.loggingservice.bucket.indexConfig @defaults("id") {
   // Internal ID
   id string
@@ -2093,7 +2093,7 @@ private gcp.project.loggingservice.bucket.indexConfig @defaults("id") {
   type string
 }
 
-// GCP Logging metric
+// Google Cloud (GCP) Logging metric
 private gcp.project.loggingservice.metric @defaults("description filter") {
   // Metric ID
   id string
@@ -2125,7 +2125,7 @@ private gcp.project.loggingservice.sink @defaults("destination") {
   includeChildren bool
 }
 
-// GCP IAM resources
+// Google Cloud (GCP) IAM resources
 private gcp.project.iamService {
   // Project ID
   projectId string
@@ -2133,7 +2133,7 @@ private gcp.project.iamService {
   serviceAccounts() []gcp.project.iamService.serviceAccount
 }
 
-// GCP service account
+// Google Cloud (GCP) service account
 private gcp.project.iamService.serviceAccount @defaults("displayName name") {
   // Project ID
   projectId string
@@ -2155,7 +2155,7 @@ private gcp.project.iamService.serviceAccount @defaults("displayName name") {
   keys() []gcp.project.iamService.serviceAccount.key
 }
 
-// GCP service account keys
+// Google Cloud (GCP) service account keys
 private gcp.project.iamService.serviceAccount.key @defaults("name") {
   // Service account key name
   name string
@@ -2241,7 +2241,7 @@ private gcp.project.cloudFunction @defaults("name") {
   // Docker registry to use for this deployment
   dockerRegistry string
 }
-// GCP Dataproc resources
+// Google Cloud (GCP) Dataproc resources
 private gcp.project.dataprocService {
   // Project ID
   projectId string
@@ -2253,7 +2253,7 @@ private gcp.project.dataprocService {
   clusters() []gcp.project.dataprocService.cluster
 }
 
-// GCP Dataproc cluster
+// Google Cloud (GCP) Dataproc cluster
 private gcp.project.dataprocService.cluster @defaults("name") {
   // Project ID
   projectId string
@@ -2275,7 +2275,7 @@ private gcp.project.dataprocService.cluster @defaults("name") {
   virtualClusterConfig gcp.project.dataprocService.cluster.virtualClusterConfig
 }
 
-// GCP Dataproc cluster config
+// Google Cloud (GCP) Dataproc cluster config
 private gcp.project.dataprocService.cluster.config {
   // Parent resource path
   parentResourcePath string
@@ -2313,7 +2313,7 @@ private gcp.project.dataprocService.cluster.config {
   worker gcp.project.dataprocService.cluster.config.instance
 }
 
-// GCP Dataproc cluster endpoint config
+// Google Cloud (GCP) Dataproc cluster endpoint config
 private gcp.project.dataprocService.cluster.config.gceCluster {
   // Internal ID
   id string
@@ -2349,7 +2349,7 @@ private gcp.project.dataprocService.cluster.config.gceCluster {
   zoneUri string
 }
 
-// GCP Dataproc cluster GCE cluster reservation affinity config
+// Google Cloud (GCP) Dataproc cluster GCE cluster reservation affinity config
 private gcp.project.dataprocService.cluster.config.gceCluster.reservationAffinity {
   // Internal ID
   id string
@@ -2361,7 +2361,7 @@ private gcp.project.dataprocService.cluster.config.gceCluster.reservationAffinit
   values []string
 }
 
-// GCP Dataproc cluster GCE cluster shielded instance config
+// Google Cloud (GCP) Dataproc cluster GCE cluster shielded instance config
 private gcp.project.dataprocService.cluster.config.gceCluster.shieldedInstanceConfig {
   // Internal ID
   id string
@@ -2373,7 +2373,7 @@ private gcp.project.dataprocService.cluster.config.gceCluster.shieldedInstanceCo
   enableVtpm bool
 }
 
-// GCP Dataproc cluster GKE cluster config
+// Google Cloud (GCP) Dataproc cluster GKE cluster config
 private gcp.project.dataprocService.cluster.config.gkeCluster {
   // Internal ID
   id string
@@ -2383,7 +2383,7 @@ private gcp.project.dataprocService.cluster.config.gkeCluster {
   nodePoolTarget []dict
 }
 
-// GCP Dataproc cluster lifecycle config
+// Google Cloud (GCP) Dataproc cluster lifecycle config
 private gcp.project.dataprocService.cluster.config.lifecycle {
   // Internal ID
   id string
@@ -2397,7 +2397,7 @@ private gcp.project.dataprocService.cluster.config.lifecycle {
   idleStartTime string
 }
 
-// GCP Dataproc cluster instance config
+// Google Cloud (GCP) Dataproc cluster instance config
 private gcp.project.dataprocService.cluster.config.instance {
   // Internal ID
   id string
@@ -2425,7 +2425,7 @@ private gcp.project.dataprocService.cluster.config.instance {
   preemptibility string
 }
 
-// GCP Dataproc cluster instance disk config
+// Google Cloud (GCP) Dataproc cluster instance disk config
 private gcp.project.dataprocService.cluster.config.instance.diskConfig {
   // Internal ID
   id string
@@ -2439,7 +2439,7 @@ private gcp.project.dataprocService.cluster.config.instance.diskConfig {
   numLocalSsds int
 }
 
-// GCP Dataproc cluster status
+// Google Cloud (GCP) Dataproc cluster status
 private gcp.project.dataprocService.cluster.status @defaults("state") {
   // Internal ID
   id string
@@ -2453,7 +2453,7 @@ private gcp.project.dataprocService.cluster.status @defaults("state") {
   substate string
 }
 
-// GCP Dataproc cluster virtual cluster config
+// Google Cloud (GCP) Dataproc cluster virtual cluster config
 private gcp.project.dataprocService.cluster.virtualClusterConfig {
   // Parent resource path
   parentResourcePath string
@@ -2464,7 +2464,7 @@ private gcp.project.dataprocService.cluster.virtualClusterConfig {
   // Cloud Storage bucket used to stage job dependencies, config files, and job driver console output
   stagingBucket string
 }
-// GCP Cloud Run resources
+// Google Cloud (GCP) Run resources
 private gcp.project.cloudRunService {
   // Project ID
   projectId string
@@ -2478,7 +2478,7 @@ private gcp.project.cloudRunService {
   jobs() []gcp.project.cloudRunService.job
 }
 
-// GCP Cloud Run operation
+// Google Cloud (GCP) Run operation
 private gcp.project.cloudRunService.operation @defaults("name") {
   // Project ID
   projectId string
@@ -2488,7 +2488,7 @@ private gcp.project.cloudRunService.operation @defaults("name") {
   done bool
 }
 
-// GCP Cloud Run service
+// Google Cloud (GCP) Run service
 private gcp.project.cloudRunService.service @defaults("name") {
   // Service identifier
   id string
@@ -2544,7 +2544,7 @@ private gcp.project.cloudRunService.service @defaults("name") {
   reconciling bool
 }
 
-// GCP Cloud Run service revision template
+// Google Cloud (GCP) Run service revision template
 private gcp.project.cloudRunService.service.revisionTemplate @defaults("name") {
   // Internal ID
   id string
@@ -2578,7 +2578,7 @@ private gcp.project.cloudRunService.service.revisionTemplate @defaults("name") {
   maxInstanceRequestConcurrency int
 }
 
-// GCP Cloud Run service revision template container
+// Google Cloud (GCP) Run service revision template container
 private gcp.project.cloudRunService.container @defaults("name image") {
   // Internal ID
   id string
@@ -2606,7 +2606,7 @@ private gcp.project.cloudRunService.container @defaults("name image") {
   startupProbe gcp.project.cloudRunService.container.probe
 }
 
-// GCP Cloud Run service revision template container probe
+// Google Cloud (GCP) Run service revision template container probe
 private gcp.project.cloudRunService.container.probe {
   // Internal ID
   id string
@@ -2624,7 +2624,7 @@ private gcp.project.cloudRunService.container.probe {
   tcpSocket dict
 }
 
-// GCP Cloud Run condition
+// Google Cloud (GCP) Run condition
 private gcp.project.cloudRunService.condition @defaults("type state message") {
   // Internal ID
   id string
@@ -2640,7 +2640,7 @@ private gcp.project.cloudRunService.condition @defaults("type state message") {
   severity string
 }
 
-// GCP Cloud Run job
+// Google Cloud (GCP) Run job
 private gcp.project.cloudRunService.job {
   // Job identifier
   id string
@@ -2688,7 +2688,7 @@ private gcp.project.cloudRunService.job {
   reconciling bool
 }
 
-// GCP Cloud Run job execution template
+// Google Cloud (GCP) Run job execution template
 private gcp.project.cloudRunService.job.executionTemplate {
   // Internal ID
   id string
@@ -2704,7 +2704,7 @@ private gcp.project.cloudRunService.job.executionTemplate {
   template gcp.project.cloudRunService.job.executionTemplate.taskTemplate
 }
 
-// GCP Cloud Run job execution template task template
+// Google Cloud (GCP) Run job execution template task template
 private gcp.project.cloudRunService.job.executionTemplate.taskTemplate {
   // Internal ID
   id string
@@ -2730,7 +2730,7 @@ private gcp.project.cloudRunService.job.executionTemplate.taskTemplate {
   maxRetries int
 }
 
-// GCP access approval settings
+// Google Cloud (GCP) access approval settings
 private gcp.accessApprovalSettings {
   // Resource path
   resourcePath string
@@ -2748,7 +2748,7 @@ private gcp.accessApprovalSettings {
   invalidKeyVersion bool
 }
 
-// GCP monitoring resources
+// Google Cloud (GCP) monitoring resources
 private gcp.project.monitoringService {
   // Project ID
   projectId string
@@ -2756,7 +2756,7 @@ private gcp.project.monitoringService {
   alertPolicies() []gcp.project.monitoringService.alertPolicy
 }
 
-// GCP monitoring alert policy
+// Google Cloud (GCP) monitoring alert policy
 private gcp.project.monitoringService.alertPolicy {
   // Project ID
   projectId string