diff --git a/config/acm/config.go b/config/acm/config.go
index 16eea95765..c9571655e0 100644
--- a/config/acm/config.go
+++ b/config/acm/config.go
@@ -8,7 +8,7 @@ import (
 	"github.com/upbound/upjet/pkg/config"
 )
 
-// Configure adds configurations for acm group.
+// Configure adds configurations for the acm group.
 func Configure(p *config.Provider) {
 	p.AddResourceConfigurator("aws_acm_certificate_validation", func(r *config.Resource) {
 		r.References = map[string]config.Reference{
diff --git a/config/acmpca/config.go b/config/acmpca/config.go
index 62e870cb00..368ab725bd 100644
--- a/config/acmpca/config.go
+++ b/config/acmpca/config.go
@@ -8,7 +8,7 @@ import (
 	"github.com/upbound/upjet/pkg/config"
 )
 
-// Configure adds configurations for acm group.
+// Configure adds configurations for the acmpca group.
 func Configure(p *config.Provider) {
 	p.AddResourceConfigurator("aws_acmpca_certificate_authority", func(r *config.Resource) {
 		// NOTE(muvaf): It causes circular dependency. See https://github.com/crossplane/crossplane-runtime/issues/313
diff --git a/config/apigateway/config.go b/config/apigateway/config.go
index 7ebe790a9d..375cd0f9ae 100644
--- a/config/apigateway/config.go
+++ b/config/apigateway/config.go
@@ -6,7 +6,7 @@ import (
 	"github.com/upbound/provider-aws/config/common"
 )
 
-// Configure adds configurations for acm group.
+// Configure adds configurations for the apigateway group.
 func Configure(p *config.Provider) {
 	p.AddResourceConfigurator("aws_api_gateway_rest_api", func(r *config.Resource) {
 		config.MoveToStatus(r.TerraformResource, "policy")
diff --git a/config/apigatewayv2/config.go b/config/apigatewayv2/config.go
index 0759519289..4267583982 100644
--- a/config/apigatewayv2/config.go
+++ b/config/apigatewayv2/config.go
@@ -10,7 +10,7 @@ import (
 	"github.com/upbound/provider-aws/config/common"
 )
 
-// Configure adds configurations for autoscaling group.
+// Configure adds configurations for the apigatewayv2 group.
 func Configure(p *config.Provider) {
 	p.AddResourceConfigurator("aws_apigatewayv2_api_mapping", func(r *config.Resource) {
 		r.References["api_id"] = config.Reference{
diff --git a/config/apprunner/config.go b/config/apprunner/config.go
index c8aad34ad7..d0b1ddb9d4 100644
--- a/config/apprunner/config.go
+++ b/config/apprunner/config.go
@@ -8,7 +8,7 @@ import (
 	"github.com/upbound/upjet/pkg/config"
 )
 
-// Configure adds configurations for apprunner group.
+// Configure adds configurations for the apprunner group.
 func Configure(p *config.Provider) {
 	p.AddResourceConfigurator("aws_apprunner_vpc_connector", func(r *config.Resource) {
 		r.References["subnets"] = config.Reference{
diff --git a/config/appstream/config.go b/config/appstream/config.go
index 73d3bc740d..9835c95b57 100644
--- a/config/appstream/config.go
+++ b/config/appstream/config.go
@@ -8,8 +8,8 @@ import (
 	"github.com/upbound/upjet/pkg/config"
 )
 
-// Configure adds configurations for appstream group.
-func Configure(p *config.Provider) { // nolint:gocyclo
+// Configure adds configurations for the appstream group.
+func Configure(p *config.Provider) {
 	p.AddResourceConfigurator("aws_appstream_fleet", func(r *config.Resource) {
 		r.References["vpc_config.subnet_ids"] = config.Reference{
 			Type:              "github.com/upbound/provider-aws/apis/ec2/v1beta1.Subnet",
diff --git a/config/athena/config.go b/config/athena/config.go
index aed657f87d..9da237c73c 100644
--- a/config/athena/config.go
+++ b/config/athena/config.go
@@ -6,7 +6,7 @@ import (
 	"github.com/upbound/provider-aws/config/common"
 )
 
-// Configure adds configurations for athena group.
+// Configure adds configurations for the athena group.
 func Configure(p *config.Provider) {
 	p.AddResourceConfigurator("aws_athena_workgroup", func(r *config.Resource) {
 		r.References["configuration.result_configuration.encryption_configuration.kms_key_arn"] = config.Reference{
diff --git a/config/autoscaling/config.go b/config/autoscaling/config.go
index 6cb8f16dfb..d22a3b5bb1 100644
--- a/config/autoscaling/config.go
+++ b/config/autoscaling/config.go
@@ -10,7 +10,7 @@ import (
 	"github.com/upbound/provider-aws/config/common"
 )
 
-// Configure adds configurations for autoscaling group.
+// Configure adds configurations for the autoscaling group.
 func Configure(p *config.Provider) {
 	p.AddResourceConfigurator("aws_autoscaling_group", func(r *config.Resource) {
 		// These are mutually exclusive with aws_autoscaling_attachment.
diff --git a/config/backup/config.go b/config/backup/config.go
index f24c3a8669..b7ef87804c 100644
--- a/config/backup/config.go
+++ b/config/backup/config.go
@@ -6,7 +6,7 @@ import (
 	"github.com/upbound/provider-aws/config/common"
 )
 
-// Configure adds configurations for backup group.
+// Configure adds configurations for the backup group.
 func Configure(p *config.Provider) {
 	p.AddResourceConfigurator("aws_backup_vault", func(r *config.Resource) {
 		r.References["kms_key_arn"] = config.Reference{
diff --git a/config/budgets/config.go b/config/budgets/config.go
index fcbf3b103e..e227fac83f 100644
--- a/config/budgets/config.go
+++ b/config/budgets/config.go
@@ -4,7 +4,7 @@ import (
 	"github.com/upbound/upjet/pkg/config"
 )
 
-// Configure adds configurations for budgets group.
+// Configure adds configurations for the budgets group.
 func Configure(p *config.Provider) {
 	p.AddResourceConfigurator("aws_budgets_budget_action", func(r *config.Resource) {
 		r.References["definition.iam_action_definition.aws_iam_role.example.name"] = config.Reference{
diff --git a/config/cloudfront/config.go b/config/cloudfront/config.go
index 70494936af..2f7eb38e4a 100644
--- a/config/cloudfront/config.go
+++ b/config/cloudfront/config.go
@@ -6,7 +6,7 @@ import (
 	"github.com/upbound/provider-aws/config/common"
 )
 
-// Configure adds configurations for ebs group.
+// Configure adds configurations for the cloudfront group.
 func Configure(p *config.Provider) {
 	p.AddResourceConfigurator("aws_cloudfront_distribution", func(r *config.Resource) {
 		r.UseAsync = true
diff --git a/config/cloudsearch/config.go b/config/cloudsearch/config.go
index da82f909f1..6dffa43fd1 100644
--- a/config/cloudsearch/config.go
+++ b/config/cloudsearch/config.go
@@ -4,7 +4,7 @@ import (
 	"github.com/upbound/upjet/pkg/config"
 )
 
-// Configure adds configurations for ebs group.
+// Configure adds configurations for the cloudsearch group.
 func Configure(p *config.Provider) {
 	p.AddResourceConfigurator("aws_cloudsearch_domain", func(r *config.Resource) {
 		r.UseAsync = true
diff --git a/config/cloudwatch/config.go b/config/cloudwatch/config.go
index 70a24c4bb8..05f0098f4b 100644
--- a/config/cloudwatch/config.go
+++ b/config/cloudwatch/config.go
@@ -6,7 +6,7 @@ import (
 	"github.com/upbound/provider-aws/config/common"
 )
 
-// Configure adds configurations for cloudwatch group.
+// Configure adds configurations for the cloudwatch group.
 func Configure(p *config.Provider) {
 	p.AddResourceConfigurator("aws_cloudwatch_metric_stream", func(r *config.Resource) {
 		config.MarkAsRequired(r.TerraformResource, "name")
diff --git a/config/cloudwatchevents/config.go b/config/cloudwatchevents/config.go
index e8e5be05dd..74e5c6d5da 100644
--- a/config/cloudwatchevents/config.go
+++ b/config/cloudwatchevents/config.go
@@ -18,7 +18,7 @@ import (
 	"github.com/upbound/upjet/pkg/config"
 )
 
-// Configure adds configurations for cloudwatchevents group.
+// Configure adds configurations for the cloudwatchevents group.
 func Configure(p *config.Provider) {
 	p.AddResourceConfigurator("aws_cloudwatch_event_permission", func(r *config.Resource) {
 		r.References["event_bus_name"] = config.Reference{
diff --git a/config/cloudwatchlogs/config.go b/config/cloudwatchlogs/config.go
index 76aa2837b1..67702e38c9 100644
--- a/config/cloudwatchlogs/config.go
+++ b/config/cloudwatchlogs/config.go
@@ -20,7 +20,7 @@ import (
 	"github.com/upbound/provider-aws/config/common"
 )
 
-// Configure adds configurations for cloudwatchlogs group.
+// Configure adds configurations for the cloudwatchlogs group.
 func Configure(p *config.Provider) {
 	p.AddResourceConfigurator("aws_cloudwatch_log_destination", func(r *config.Resource) {
 		// the target_arn field is generated together with the associated
diff --git a/config/cognitoidentity/config.go b/config/cognitoidentity/config.go
index 8e60adb509..323176db2a 100644
--- a/config/cognitoidentity/config.go
+++ b/config/cognitoidentity/config.go
@@ -10,7 +10,7 @@ import (
 	"github.com/upbound/provider-aws/config/common"
 )
 
-// Configure adds configurations for acm group.
+// Configure adds configurations for the cognitoidentity group.
 func Configure(p *config.Provider) {
 	p.AddResourceConfigurator("aws_cognito_identity_pool", func(r *config.Resource) {
 		r.References["saml_provider_arns"] = config.Reference{
diff --git a/config/cognitoidp/config.go b/config/cognitoidp/config.go
index 17f0a32195..60698f1d14 100644
--- a/config/cognitoidp/config.go
+++ b/config/cognitoidp/config.go
@@ -8,7 +8,7 @@ import (
 	"github.com/upbound/upjet/pkg/config"
 )
 
-// Configure adds configurations for acm group.
+// Configure adds configurations for the cognitoidp group.
 func Configure(p *config.Provider) {
 	p.AddResourceConfigurator("aws_cognito_user_pool_client", func(r *config.Resource) {
 		r.References["user_pool_id"] = config.Reference{
diff --git a/config/connect/config.go b/config/connect/config.go
index 2939bb2850..908fe9f135 100644
--- a/config/connect/config.go
+++ b/config/connect/config.go
@@ -8,7 +8,7 @@ import (
 	"github.com/upbound/upjet/pkg/config"
 )
 
-// Configure adds configurations for connect group.
+// Configure adds configurations for the connect group.
 func Configure(p *config.Provider) {
 	p.AddResourceConfigurator("aws_connect_contact_flow", func(r *config.Resource) {
 		r.References["instance_id"] = config.Reference{
diff --git a/config/cur/config.go b/config/cur/config.go
index 2168bd5004..458360effa 100644
--- a/config/cur/config.go
+++ b/config/cur/config.go
@@ -8,7 +8,7 @@ import (
 	"github.com/upbound/upjet/pkg/config"
 )
 
-// Configure adds configurations for cur group.
+// Configure adds configurations for the cur group.
 func Configure(p *config.Provider) {
 	p.AddResourceConfigurator("aws_cur_report_definition", func(r *config.Resource) {
 		r.References["s3_bucket"] = config.Reference{
diff --git a/config/datasync/config.go b/config/datasync/config.go
index 3a5b2fa25f..8a94044d6a 100644
--- a/config/datasync/config.go
+++ b/config/datasync/config.go
@@ -20,7 +20,7 @@ import (
 	"github.com/upbound/provider-aws/config/common"
 )
 
-// Configure adds configurations for datasync group.
+// Configure adds configurations for the datasync group.
 func Configure(p *config.Provider) {
 	p.AddResourceConfigurator("aws_datasync_task", func(r *config.Resource) {
 		r.References["destination_location_arn"] = config.Reference{
diff --git a/config/dax/config.go b/config/dax/config.go
index 5eb7d13976..8f6da2db34 100644
--- a/config/dax/config.go
+++ b/config/dax/config.go
@@ -2,7 +2,7 @@ package dax
 
 import "github.com/upbound/upjet/pkg/config"
 
-// Configure adds configurations for dax group.
+// Configure adds configurations for the dax group.
 func Configure(p *config.Provider) {
 	p.AddResourceConfigurator("aws_dax_cluster", func(r *config.Resource) {
 		r.UseAsync = true
diff --git a/config/devicefarm/config.go b/config/devicefarm/config.go
index 3339cd24ed..fac15cda50 100644
--- a/config/devicefarm/config.go
+++ b/config/devicefarm/config.go
@@ -8,8 +8,8 @@ import (
 	"github.com/upbound/upjet/pkg/config"
 )
 
-// Configure adds configurations for devicefarm group.
-func Configure(p *config.Provider) { // nolint:gocyclo
+// Configure adds configurations for the devicefarm group.
+func Configure(p *config.Provider) {
 	p.AddResourceConfigurator("aws_devicefarm_test_grid_project", func(r *config.Resource) {
 		r.References["vpc_config.subnet_ids"] = config.Reference{
 			Type:              "github.com/upbound/provider-aws/apis/ec2/v1beta1.Subnet",
diff --git a/config/directconnect/config.go b/config/directconnect/config.go
index 6903ffe2d4..98a0b97045 100644
--- a/config/directconnect/config.go
+++ b/config/directconnect/config.go
@@ -20,8 +20,8 @@ import (
 	"github.com/upbound/provider-aws/config/common"
 )
 
-// Configure adds configurations for directconnect group.
-func Configure(p *config.Provider) { // nolint:gocyclo
+// Configure adds configurations for the directconnect group.
+func Configure(p *config.Provider) {
 	p.AddResourceConfigurator("aws_dx_public_virtual_interface", func(r *config.Resource) {
 		r.References["connection_id"] = config.Reference{
 			Type: "Connection",
diff --git a/config/dms/config.go b/config/dms/config.go
index 86c2c0ffaa..a0240cce5b 100644
--- a/config/dms/config.go
+++ b/config/dms/config.go
@@ -10,7 +10,7 @@ import (
 	"github.com/upbound/provider-aws/config/common"
 )
 
-// Configure adds configurations for dms group.
+// Configure adds configurations for the dms group.
 func Configure(p *config.Provider) {
 	p.AddResourceConfigurator("aws_dms_endpoint", func(r *config.Resource) {
 		r.References = config.References{
diff --git a/config/docdb/config.go b/config/docdb/config.go
index a459f44459..72bec56dc5 100644
--- a/config/docdb/config.go
+++ b/config/docdb/config.go
@@ -2,7 +2,7 @@ package docdb
 
 import "github.com/upbound/upjet/pkg/config"
 
-// Configure adds configurations for docdb group.
+// Configure adds configurations for the docdb group.
 func Configure(p *config.Provider) {
 	p.AddResourceConfigurator("aws_docdb_cluster", func(r *config.Resource) {
 		config.MoveToStatus(r.TerraformResource, "cluster_members")
diff --git a/config/ds/config.go b/config/ds/config.go
index 3e80518578..e68b44e0ba 100644
--- a/config/ds/config.go
+++ b/config/ds/config.go
@@ -2,7 +2,7 @@ package ds
 
 import "github.com/upbound/upjet/pkg/config"
 
-// Configure adds configurations for ds group.
+// Configure adds configurations for the ds group.
 func Configure(p *config.Provider) {
 	p.AddResourceConfigurator("aws_directory_service_directory", func(r *config.Resource) {
 		r.References["vpc_settings.subnet_ids"] = config.Reference{
diff --git a/config/ebs/config.go b/config/ebs/config.go
index caaa4c1ec0..c24169dd0b 100644
--- a/config/ebs/config.go
+++ b/config/ebs/config.go
@@ -8,7 +8,7 @@ import (
 	"github.com/upbound/upjet/pkg/config"
 )
 
-// Configure adds configurations for ebs group.
+// Configure adds configurations for the ebs group.
 func Configure(p *config.Provider) {
 	p.AddResourceConfigurator("aws_ebs_volume", func(r *config.Resource) {
 		r.References = map[string]config.Reference{
diff --git a/config/ec2/config.go b/config/ec2/config.go
index 15c32a7f54..658d3c02dc 100644
--- a/config/ec2/config.go
+++ b/config/ec2/config.go
@@ -10,7 +10,7 @@ import (
 	"github.com/upbound/provider-aws/config/common"
 )
 
-// Configure adds configurations for ec2 group.
+// Configure adds configurations for the ec2 group.
 func Configure(p *config.Provider) {
 	p.AddResourceConfigurator("aws_instance", func(r *config.Resource) {
 		r.UseAsync = true
diff --git a/config/ecr/config.go b/config/ecr/config.go
index be2378b46f..286612128e 100644
--- a/config/ecr/config.go
+++ b/config/ecr/config.go
@@ -10,7 +10,7 @@ import (
 	"github.com/upbound/provider-aws/config/common"
 )
 
-// Configure adds configurations for ecrs group.
+// Configure adds configurations for the ecr group.
 func Configure(p *config.Provider) {
 	p.AddResourceConfigurator("aws_ecr_repository", func(r *config.Resource) {
 		r.References = map[string]config.Reference{
diff --git a/config/ecrpublic/config.go b/config/ecrpublic/config.go
index 147ea18f3e..0e8c178649 100644
--- a/config/ecrpublic/config.go
+++ b/config/ecrpublic/config.go
@@ -8,7 +8,7 @@ import (
 	"github.com/upbound/upjet/pkg/config"
 )
 
-// Configure adds configurations for ecrpublic group.
+// Configure adds configurations for the ecrpublic group.
 func Configure(p *config.Provider) {
 	p.AddResourceConfigurator("aws_ecrpublic_repository", func(r *config.Resource) {
 		// Deletion takes a while.
diff --git a/config/ecs/config.go b/config/ecs/config.go
index 9c82f3c680..fe63d61160 100644
--- a/config/ecs/config.go
+++ b/config/ecs/config.go
@@ -16,7 +16,7 @@ import (
 	"github.com/upbound/provider-aws/config/common"
 )
 
-// Configure adds configurations for ecs group.
+// Configure adds configurations for the ecs group.
 func Configure(p *config.Provider) {
 	p.AddResourceConfigurator("aws_ecs_cluster", func(r *config.Resource) {
 		r.ExternalName.GetExternalNameFn = func(tfstate map[string]interface{}) (string, error) {
diff --git a/config/efs/config.go b/config/efs/config.go
index d866c8d066..8c4b3cb0bd 100644
--- a/config/efs/config.go
+++ b/config/efs/config.go
@@ -6,7 +6,7 @@ import (
 	"github.com/upbound/provider-aws/config/common"
 )
 
-// Configure adds configurations for efs group.
+// Configure adds configurations for the efs group.
 func Configure(p *config.Provider) {
 	p.AddResourceConfigurator("aws_efs_mount_target", func(r *config.Resource) {
 		r.UseAsync = true
diff --git a/config/eks/config.go b/config/eks/config.go
index 6f8b1c2b3d..7290e288c3 100644
--- a/config/eks/config.go
+++ b/config/eks/config.go
@@ -12,8 +12,8 @@ import (
 	"github.com/upbound/provider-aws/config/common"
 )
 
-// Configure adds configurations for eks group.
-func Configure(p *config.Provider) { // nolint:gocyclo
+// Configure adds configurations for the eks group.
+func Configure(p *config.Provider) {
 	p.AddResourceConfigurator("aws_eks_cluster", func(r *config.Resource) {
 		r.References = config.References{
 			"role_arn": {
diff --git a/config/elasticache/config.go b/config/elasticache/config.go
index a13ce5f4b6..db88f03f99 100644
--- a/config/elasticache/config.go
+++ b/config/elasticache/config.go
@@ -8,7 +8,7 @@ import (
 	"github.com/upbound/upjet/pkg/config"
 )
 
-// Configure adds configurations for elasticache group.
+// Configure adds configurations for the elasticache group.
 func Configure(p *config.Provider) {
 	p.AddResourceConfigurator("aws_elasticache_cluster", func(r *config.Resource) {
 		r.References["parameter_group_name"] = config.Reference{
diff --git a/config/elb/config.go b/config/elb/config.go
index 404fd1c48a..8af67d6a99 100644
--- a/config/elb/config.go
+++ b/config/elb/config.go
@@ -2,7 +2,7 @@ package elb
 
 import "github.com/upbound/upjet/pkg/config"
 
-// Configure adds configurations for elb group.
+// Configure adds configurations for the elb group.
 func Configure(p *config.Provider) {
 	p.AddResourceConfigurator("aws_elb", func(r *config.Resource) {
 		r.References["instances"] = config.Reference{
diff --git a/config/elbv2/config.go b/config/elbv2/config.go
index b40f3f635c..5d895fb0ad 100644
--- a/config/elbv2/config.go
+++ b/config/elbv2/config.go
@@ -2,7 +2,7 @@ package elbv2
 
 import "github.com/upbound/upjet/pkg/config"
 
-// Configure adds configurations for acm group.
+// Configure adds configurations for the elbv2 group.
 func Configure(p *config.Provider) {
 	p.AddResourceConfigurator("aws_lb", func(r *config.Resource) {
 		r.ExternalName.OmittedFields = append(r.ExternalName.OmittedFields, "name_prefix")
diff --git a/config/firehose/config.go b/config/firehose/config.go
index 51079d8f2e..c3eed64e36 100644
--- a/config/firehose/config.go
+++ b/config/firehose/config.go
@@ -7,7 +7,7 @@ import (
 	"github.com/upbound/provider-aws/config/common"
 )
 
-// Configure adds configurations for firehose group.
+// Configure adds configurations for the firehose group.
 func Configure(p *config.Provider) {
 	p.AddResourceConfigurator("aws_kinesis_firehose_delivery_stream", func(r *config.Resource) {
 		r.TerraformResource.Schema["splunk_configuration"].Elem.(*schema.Resource).Schema["hec_token"].Sensitive = true
diff --git a/config/fsx/config.go b/config/fsx/config.go
index 087f7b3271..978924e056 100644
--- a/config/fsx/config.go
+++ b/config/fsx/config.go
@@ -10,7 +10,7 @@ import (
 	"github.com/upbound/provider-aws/config/common"
 )
 
-// Configure adds configurations for fsx group.
+// Configure adds configurations for the fsx group.
 func Configure(p *config.Provider) {
 	p.AddResourceConfigurator("aws_fsx_windows_file_system", func(r *config.Resource) {
 		r.References["kms_key_id"] = config.Reference{
diff --git a/config/gamelift/config.go b/config/gamelift/config.go
index ae8114525b..64b7749d2e 100644
--- a/config/gamelift/config.go
+++ b/config/gamelift/config.go
@@ -6,7 +6,7 @@ import (
 	"github.com/upbound/provider-aws/config/common"
 )
 
-// Configure adds configurations for gamelift group.
+// Configure adds configurations for the gamelift group.
 func Configure(p *config.Provider) {
 	p.AddResourceConfigurator("aws_gamelift_build", func(r *config.Resource) {
 		r.References["storage_location.role_arn"] = config.Reference{
diff --git a/config/globalaccelerator/config.go b/config/globalaccelerator/config.go
index 9842d3d35c..f8a40cfbbe 100644
--- a/config/globalaccelerator/config.go
+++ b/config/globalaccelerator/config.go
@@ -20,7 +20,7 @@ import (
 	"github.com/upbound/upjet/pkg/config"
 )
 
-// Configure adds configurations for ebs group.
+// Configure adds configurations for the globalaccelerator group.
 func Configure(p *config.Provider) {
 	p.AddResourceConfigurator("aws_globalaccelerator_endpoint_group", func(r *config.Resource) {
 		r.References = config.References{
diff --git a/config/glue/config.go b/config/glue/config.go
index 3228c43207..8faf49af55 100644
--- a/config/glue/config.go
+++ b/config/glue/config.go
@@ -6,7 +6,7 @@ import (
 	"github.com/upbound/provider-aws/config/common"
 )
 
-// Configure glue resources.
+// Configure adds configurations for the glue group.
 func Configure(p *config.Provider) {
 	p.AddResourceConfigurator("aws_glue_catalog_database", func(r *config.Resource) {
 		// Required in ID but optional in schema since TF defaults to Account ID.
diff --git a/config/grafana/config.go b/config/grafana/config.go
index 535847f372..e248a4f4c3 100644
--- a/config/grafana/config.go
+++ b/config/grafana/config.go
@@ -6,7 +6,7 @@ import (
 	"github.com/upbound/provider-aws/config/common"
 )
 
-// Configure adds configurations for grafana group.
+// Configure adds configurations for the grafana group.
 func Configure(p *config.Provider) {
 	p.AddResourceConfigurator("aws_grafana_workspace", func(r *config.Resource) {
 		r.References["role_arn"] = config.Reference{
diff --git a/config/iam/config.go b/config/iam/config.go
index e9a7b09d90..2271af098c 100644
--- a/config/iam/config.go
+++ b/config/iam/config.go
@@ -10,7 +10,7 @@ import (
 	"github.com/upbound/provider-aws/config/common"
 )
 
-// Configure adds configurations for iam group.
+// Configure adds configurations for the iam group.
 func Configure(p *config.Provider) {
 	p.AddResourceConfigurator("aws_iam_access_key", func(r *config.Resource) {
 		r.References = config.References{
diff --git a/config/kafka/config.go b/config/kafka/config.go
index 4528f945a8..2320dd21c5 100644
--- a/config/kafka/config.go
+++ b/config/kafka/config.go
@@ -6,7 +6,7 @@ import (
 	"github.com/upbound/provider-aws/config/common"
 )
 
-// Configure adds configurations for kafka group.
+// Configure adds configurations for the kafka group.
 func Configure(p *config.Provider) {
 	p.AddResourceConfigurator("aws_msk_cluster", func(r *config.Resource) {
 		r.References["encryption_info.encryption_at_rest_kms_key_arn"] = config.Reference{
diff --git a/config/kendra/config.go b/config/kendra/config.go
index fd9f66ea0f..10b2ca15b0 100644
--- a/config/kendra/config.go
+++ b/config/kendra/config.go
@@ -18,7 +18,7 @@ import (
 	"github.com/upbound/upjet/pkg/config"
 )
 
-// Configure adds configurations for kendra group.
+// Configure adds configurations for the kendra group.
 func Configure(p *config.Provider) {
 	p.AddResourceConfigurator("aws_kendra_thesaurus", func(r *config.Resource) {
 		r.Path = "thesaurus"
diff --git a/config/kinesis/config.go b/config/kinesis/config.go
index e76ae76513..1efe3b6c8c 100644
--- a/config/kinesis/config.go
+++ b/config/kinesis/config.go
@@ -6,7 +6,7 @@ import (
 	"github.com/upbound/provider-aws/config/common"
 )
 
-// Configure adds configurations for kinesis group.
+// Configure adds configurations for the kinesis group.
 func Configure(p *config.Provider) {
 	p.AddResourceConfigurator("aws_kinesis_stream_consumer", func(r *config.Resource) {
 		r.References["stream_arn"] = config.Reference{
diff --git a/config/kinesisanalytics/config.go b/config/kinesisanalytics/config.go
index 2dbb03602b..562cc19225 100644
--- a/config/kinesisanalytics/config.go
+++ b/config/kinesisanalytics/config.go
@@ -6,7 +6,7 @@ import (
 	"github.com/upbound/provider-aws/config/common"
 )
 
-// Configure adds configurations for kinesisanalytics group.
+// Configure adds configurations for the kinesisanalytics group.
 func Configure(p *config.Provider) {
 	p.AddResourceConfigurator("aws_kinesis_analytics_application", func(r *config.Resource) {
 		r.References["inputs.kinesis_stream.resource_arn"] = config.Reference{
diff --git a/config/kinesisanalyticsv2/config.go b/config/kinesisanalyticsv2/config.go
index c572a65ab1..171c76959e 100644
--- a/config/kinesisanalyticsv2/config.go
+++ b/config/kinesisanalyticsv2/config.go
@@ -6,7 +6,7 @@ import (
 	"github.com/upbound/provider-aws/config/common"
 )
 
-// Configure adds configurations for kinesisanalytics2 group.
+// Configure adds configurations for the kinesisanalytics2 group.
 func Configure(p *config.Provider) {
 	p.AddResourceConfigurator("aws_kinesisanalyticsv2_application", func(r *config.Resource) {
 		r.References["application_configuration.application_code_configuration.code_content.s3_content_location.bucket_arn"] = config.Reference{
diff --git a/config/kms/config.go b/config/kms/config.go
index 60ce0e88af..6ebf7d57ab 100644
--- a/config/kms/config.go
+++ b/config/kms/config.go
@@ -10,7 +10,7 @@ import (
 	"github.com/upbound/provider-aws/config/common"
 )
 
-// Configure adds configurations for kms group.
+// Configure adds configurations for the kms group.
 func Configure(p *config.Provider) {
 	p.AddResourceConfigurator("aws_kms_alias", func(r *config.Resource) {
 		r.References["target_key_id"] = config.Reference{
diff --git a/config/lakeformation/config.go b/config/lakeformation/config.go
index 4e4769b0a5..48a48ce3bd 100644
--- a/config/lakeformation/config.go
+++ b/config/lakeformation/config.go
@@ -4,7 +4,7 @@ import (
 	"github.com/upbound/upjet/pkg/config"
 )
 
-// Configure adds configurations for lakeformation group.
+// Configure adds configurations for the lakeformation group.
 func Configure(p *config.Provider) {
 	p.AddResourceConfigurator("aws_lakeformation_data_lake_settings", func(r *config.Resource) {
 		delete(r.References, "create_database_default_permissions.principal")
diff --git a/config/lambda/config.go b/config/lambda/config.go
index 527ce930ba..c18fa13aa4 100644
--- a/config/lambda/config.go
+++ b/config/lambda/config.go
@@ -6,7 +6,7 @@ import (
 	"github.com/upbound/provider-aws/config/common"
 )
 
-// Configure adds configurations for lambda group.
+// Configure adds configurations for the lambda group.
 func Configure(p *config.Provider) {
 	p.AddResourceConfigurator("aws_lambda_alias", func(r *config.Resource) {
 		r.References["function_name"] = config.Reference{
diff --git a/config/licensemanager/config.go b/config/licensemanager/config.go
index be80763164..c26a89fda6 100644
--- a/config/licensemanager/config.go
+++ b/config/licensemanager/config.go
@@ -6,7 +6,7 @@ import (
 	"github.com/upbound/provider-aws/config/common"
 )
 
-// Configure adds configurations for licensemanager group.
+// Configure adds configurations for the licensemanager group.
 func Configure(p *config.Provider) {
 	p.AddResourceConfigurator("aws_licensemanager_association", func(r *config.Resource) {
 		r.References["license_configuration_arn"] = config.Reference{
diff --git a/config/medialive/config.go b/config/medialive/config.go
index 4c666adf9f..ff0840ea4b 100644
--- a/config/medialive/config.go
+++ b/config/medialive/config.go
@@ -18,7 +18,7 @@ import (
 	"github.com/upbound/upjet/pkg/config"
 )
 
-// Configure adds configurations for medialive group.
+// Configure adds configurations for the medialive group.
 func Configure(p *config.Provider) {
 	p.AddResourceConfigurator("aws_medialive_multiplex", func(r *config.Resource) {
 		r.Path = "multiplices"
diff --git a/config/memorydb/config.go b/config/memorydb/config.go
index 7c88cd4df6..1cdb01ea79 100644
--- a/config/memorydb/config.go
+++ b/config/memorydb/config.go
@@ -10,7 +10,7 @@ import (
 	"github.com/upbound/upjet/pkg/config"
 )
 
-// Configure adds configurations for memorydb group.
+// Configure adds configurations for the memorydb group.
 func Configure(p *config.Provider) { // nolint:gocyclo
 	p.AddResourceConfigurator("aws_memorydb_cluster", func(r *config.Resource) {
 		r.UseAsync = true
diff --git a/config/mq/config.go b/config/mq/config.go
index a7b8f40f6e..3b96797f30 100644
--- a/config/mq/config.go
+++ b/config/mq/config.go
@@ -10,7 +10,7 @@ import (
 	"github.com/upbound/upjet/pkg/config"
 )
 
-// Configure adds configurations for rds group.
+// Configure adds configurations for the mq group.
 func Configure(p *config.Provider) {
 	p.AddResourceConfigurator("aws_mq_broker", func(r *config.Resource) {
 		r.References["security_groups"] = config.Reference{
diff --git a/config/neptune/config.go b/config/neptune/config.go
index 8fb7e08ad1..b4a48e7b02 100644
--- a/config/neptune/config.go
+++ b/config/neptune/config.go
@@ -8,7 +8,7 @@ import (
 	"github.com/upbound/upjet/pkg/config"
 )
 
-// Configure adds configurations for neptune group
+// Configure adds configurations for the neptune group
 func Configure(p *config.Provider) {
 	p.AddResourceConfigurator("aws_neptune_cluster", func(r *config.Resource) {
 		r.UseAsync = true
diff --git a/config/networkfirewall/config.go b/config/networkfirewall/config.go
index 2b960f52f4..ba5e046fe7 100644
--- a/config/networkfirewall/config.go
+++ b/config/networkfirewall/config.go
@@ -10,7 +10,7 @@ import (
 	"github.com/upbound/provider-aws/config/common"
 )
 
-// Configure adds configurations for networkfirewall group.
+// Configure adds configurations for the networkfirewall group.
 func Configure(p *config.Provider) {
 	p.AddResourceConfigurator("aws_networkfirewall_firewall_policy", func(r *config.Resource) {
 		r.References = config.References{
diff --git a/config/networkmanager/config.go b/config/networkmanager/config.go
index 4c621a9329..85ac990820 100644
--- a/config/networkmanager/config.go
+++ b/config/networkmanager/config.go
@@ -10,7 +10,7 @@ import (
 	"github.com/upbound/provider-aws/config/common"
 )
 
-// Configure adds configurations for networkmanager group
+// Configure adds configurations for the networkmanager group
 func Configure(p *config.Provider) {
 	p.AddResourceConfigurator("aws_networkmanager_link", func(r *config.Resource) {
 		r.References["site_id"] = config.Reference{
diff --git a/config/opensearch/config.go b/config/opensearch/config.go
index 0f068c54ad..5e09657d23 100644
--- a/config/opensearch/config.go
+++ b/config/opensearch/config.go
@@ -2,7 +2,7 @@ package opensearch
 
 import "github.com/upbound/upjet/pkg/config"
 
-// Configure adds configurations for opensearch group.
+// Configure adds configurations for the opensearch group.
 func Configure(p *config.Provider) {
 	p.AddResourceConfigurator("aws_opensearch_domain", func(r *config.Resource) {
 		config.MoveToStatus(r.TerraformResource, "access_policies")
diff --git a/config/opsworks/config.go b/config/opsworks/config.go
index be7cc6111a..05f8eec064 100644
--- a/config/opsworks/config.go
+++ b/config/opsworks/config.go
@@ -2,7 +2,7 @@ package opsworks
 
 import "github.com/upbound/upjet/pkg/config"
 
-// Configure adds configurations for opsworks group.
+// Configure adds configurations for the opsworks group.
 func Configure(p *config.Provider) {
 	p.AddResourceConfigurator("aws_opsworks_stack", func(r *config.Resource) {
 		r.References["default_subnet_id"] = config.Reference{
diff --git a/config/organization/config.go b/config/organization/config.go
index 33475d7130..b26918fa32 100644
--- a/config/organization/config.go
+++ b/config/organization/config.go
@@ -16,7 +16,7 @@ package organization
 
 import "github.com/upbound/upjet/pkg/config"
 
-// Configure adds configurations for organization group.
+// Configure adds configurations for the organization group.
 func Configure(p *config.Provider) {
 	// please see: https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/organizations_account
 	// If `role_name` is used, it's stated that Terraform will always
diff --git a/config/qldb/config.go b/config/qldb/config.go
index d5b86145d1..d03bc2bbb7 100644
--- a/config/qldb/config.go
+++ b/config/qldb/config.go
@@ -6,7 +6,7 @@ import (
 	"github.com/upbound/provider-aws/config/common"
 )
 
-// Configure adds configurations for qldb group.
+// Configure adds configurations for the qldb group.
 func Configure(p *config.Provider) {
 	p.AddResourceConfigurator("aws_qldb_stream", func(r *config.Resource) {
 		r.References["kinesis_configuration.stream_arn"] = config.Reference{
diff --git a/config/ram/config.go b/config/ram/config.go
index 3f2ff81e46..d6b6ec583d 100644
--- a/config/ram/config.go
+++ b/config/ram/config.go
@@ -8,7 +8,7 @@ import (
 	"github.com/upbound/upjet/pkg/config"
 )
 
-// Configure adds configurations for ram group.
+// Configure adds configurations for the ram group.
 func Configure(p *config.Provider) {
 	p.AddResourceConfigurator("aws_ram_resource_association", func(r *config.Resource) {
 		delete(r.References, "resource_arn")
diff --git a/config/rds/config.go b/config/rds/config.go
index 14e91ab3e9..14a6f2dbd7 100644
--- a/config/rds/config.go
+++ b/config/rds/config.go
@@ -30,7 +30,7 @@ const (
 	errGetPasswordSecret = "cannot get password secret"
 )
 
-// Configure adds configurations for rds group.
+// Configure adds configurations for the rds group.
 func Configure(p *config.Provider) {
 	p.AddResourceConfigurator("aws_rds_cluster", func(r *config.Resource) {
 		// Mutually exclusive with aws_rds_cluster_role_association
diff --git a/config/redshift/config.go b/config/redshift/config.go
index 95019576c4..adf2492aea 100644
--- a/config/redshift/config.go
+++ b/config/redshift/config.go
@@ -2,7 +2,7 @@ package redshift
 
 import "github.com/upbound/upjet/pkg/config"
 
-// Configure adds configurations for redshift group.
+// Configure adds configurations for the redshift group.
 func Configure(p *config.Provider) {
 	p.AddResourceConfigurator("aws_redshift_cluster", func(r *config.Resource) {
 		r.UseAsync = true
diff --git a/config/rolesanywhere/config.go b/config/rolesanywhere/config.go
index 5163dd4ffb..b35a0ae999 100644
--- a/config/rolesanywhere/config.go
+++ b/config/rolesanywhere/config.go
@@ -6,7 +6,7 @@ import (
 	"github.com/upbound/provider-aws/config/common"
 )
 
-// Configure adds configurations for rolesanywhere group.
+// Configure adds configurations for the rolesanywhere group.
 func Configure(p *config.Provider) {
 	p.AddResourceConfigurator("aws_rolesanywhere_profile", func(r *config.Resource) {
 		r.References["role_arns"] = config.Reference{
diff --git a/config/route53/config.go b/config/route53/config.go
index 28ec6cb3d4..e028265274 100644
--- a/config/route53/config.go
+++ b/config/route53/config.go
@@ -8,7 +8,7 @@ import (
 	"github.com/upbound/upjet/pkg/config"
 )
 
-// Configure route53 resources.
+// Configure adds configurations for the route53 group.
 func Configure(p *config.Provider) {
 	p.AddResourceConfigurator("aws_route53_traffic_policy_instance", func(r *config.Resource) {
 		r.References["hosted_zone_id"] = config.Reference{
diff --git a/config/route53recoverycontrolconfig/config.go b/config/route53recoverycontrolconfig/config.go
index b5fa929da6..4bbc532033 100644
--- a/config/route53recoverycontrolconfig/config.go
+++ b/config/route53recoverycontrolconfig/config.go
@@ -10,7 +10,7 @@ import (
 	"github.com/upbound/provider-aws/config/common"
 )
 
-// Configure adds configurations for route53recoverycontrolconfig group.
+// Configure adds configurations for the route53recoverycontrolconfig group.
 func Configure(p *config.Provider) {
 	p.AddResourceConfigurator("aws_route53recoverycontrolconfig_control_panel", func(r *config.Resource) {
 		r.References["cluster_arn"] = config.Reference{
diff --git a/config/route53resolver/config.go b/config/route53resolver/config.go
index 97f62ee36b..adfdcf5ddb 100644
--- a/config/route53resolver/config.go
+++ b/config/route53resolver/config.go
@@ -8,7 +8,7 @@ import (
 	"github.com/upbound/upjet/pkg/config"
 )
 
-// Configure route53resolver resources.
+// Configure adds configurations for the route53resolver group.
 func Configure(p *config.Provider) {
 	p.AddResourceConfigurator("aws_route53_resolver_query_log_config", func(r *config.Resource) {
 		delete(r.References, "destination_arn")
diff --git a/config/s3/config.go b/config/s3/config.go
index 9eb58ff51b..a1d3c0c3a4 100644
--- a/config/s3/config.go
+++ b/config/s3/config.go
@@ -9,7 +9,7 @@ import (
 	"github.com/upbound/upjet/pkg/registry"
 )
 
-// Configure adds configurations for s3 group.
+// Configure adds configurations for the s3 group.
 func Configure(p *config.Provider) {
 	p.AddResourceConfigurator("aws_s3_bucket", func(r *config.Resource) {
 		// Mutually exclusive with:
diff --git a/config/sagemaker/config.go b/config/sagemaker/config.go
index e28078665f..fc42767b8c 100644
--- a/config/sagemaker/config.go
+++ b/config/sagemaker/config.go
@@ -4,7 +4,7 @@ import (
 	"github.com/upbound/upjet/pkg/config"
 )
 
-// Configure adds configurations for sagemaker group.
+// Configure adds configurations for the sagemaker group.
 func Configure(p *config.Provider) {
 	p.AddResourceConfigurator("aws_sagemaker_workforce", func(r *config.Resource) {
 		r.LateInitializer = config.LateInitializer{
diff --git a/config/secretsmanager/config.go b/config/secretsmanager/config.go
index 2d9090140d..bf05937d9f 100644
--- a/config/secretsmanager/config.go
+++ b/config/secretsmanager/config.go
@@ -2,7 +2,7 @@ package secretsmanager
 
 import "github.com/upbound/upjet/pkg/config"
 
-// Configure adds configurations for lambda group.
+// Configure adds configurations for the secretsmanager group.
 func Configure(p *config.Provider) {
 	p.AddResourceConfigurator("aws_secretsmanager_secret", func(r *config.Resource) {
 		// Use aws_secretsmanager_secret_rotation.
diff --git a/config/servicecatalog/config.go b/config/servicecatalog/config.go
index b250c3b48f..f044f517a2 100644
--- a/config/servicecatalog/config.go
+++ b/config/servicecatalog/config.go
@@ -20,7 +20,7 @@ import (
 	"github.com/upbound/provider-aws/config/common"
 )
 
-// Configure adds configurations for servicecatalog group.
+// Configure adds configurations for the servicecatalog group.
 func Configure(p *config.Provider) {
 	// done for proper normalization as the defaulting is done by Terraform
 	// please refer to this resource's external-name configuration for details.
diff --git a/config/servicediscovery/config.go b/config/servicediscovery/config.go
index 57f64c979d..ceb40ae5e3 100644
--- a/config/servicediscovery/config.go
+++ b/config/servicediscovery/config.go
@@ -2,7 +2,7 @@ package servicediscovery
 
 import "github.com/upbound/upjet/pkg/config"
 
-// Configure adds configurations for servicediscovery group.
+// Configure adds configurations for the servicediscovery group.
 func Configure(p *config.Provider) {
 	p.AddResourceConfigurator("aws_service_discovery_private_dns_namespace", func(r *config.Resource) {
 		r.References["vpc"] = config.Reference{
diff --git a/config/sfn/config.go b/config/sfn/config.go
index 003a684e9b..742488e61f 100644
--- a/config/sfn/config.go
+++ b/config/sfn/config.go
@@ -6,7 +6,7 @@ import (
 	"github.com/upbound/provider-aws/config/common"
 )
 
-// Configure adds configurations for sfn group.
+// Configure adds configurations for the sfn group.
 func Configure(p *config.Provider) {
 	p.AddResourceConfigurator("aws_sfn_state_machine", func(r *config.Resource) {
 		r.References["role_arn"] = config.Reference{
diff --git a/config/sns/config.go b/config/sns/config.go
index 265e0cbcf4..93ea91c268 100644
--- a/config/sns/config.go
+++ b/config/sns/config.go
@@ -6,7 +6,7 @@ import (
 	"github.com/upbound/provider-aws/config/common"
 )
 
-// Configure adds configurations for sns group.
+// Configure adds configurations for the sns group.
 func Configure(p *config.Provider) {
 	p.AddResourceConfigurator("aws_sns_topic_subscription", func(r *config.Resource) {
 		r.References["endpoint"] = config.Reference{
diff --git a/config/sqs/config.go b/config/sqs/config.go
index 06da1c00aa..174ca1f1ce 100644
--- a/config/sqs/config.go
+++ b/config/sqs/config.go
@@ -6,7 +6,7 @@ import (
 	"github.com/upbound/provider-aws/config/common"
 )
 
-// Configure adds configurations for sns group.
+// Configure adds configurations for the sqs group.
 func Configure(p *config.Provider) {
 	p.AddResourceConfigurator("aws_sqs_queue_policy", func(r *config.Resource) {
 		r.References["queue_url"] = config.Reference{
diff --git a/config/transfer/config.go b/config/transfer/config.go
index 1aaa0cebcf..1d20b80615 100644
--- a/config/transfer/config.go
+++ b/config/transfer/config.go
@@ -6,7 +6,7 @@ import (
 	"github.com/upbound/provider-aws/config/common"
 )
 
-// Configure adds configurations for transfer group.
+// Configure adds configurations for the transfer group.
 func Configure(p *config.Provider) {
 	p.AddResourceConfigurator("aws_transfer_user", func(r *config.Resource) {
 		r.References["server_id"] = config.Reference{