diff --git a/pkg/config/defaults.go b/pkg/config/defaults.go
index 89a8fd72..dbddbe92 100644
--- a/pkg/config/defaults.go
+++ b/pkg/config/defaults.go
@@ -20,9 +20,8 @@ import (
 	"strings"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"github.com/iancoleman/strcase"
 
-	typeName "github.com/crossplane-contrib/terrajet/pkg/types/name"
+	tjname "github.com/crossplane-contrib/terrajet/pkg/types/name"
 )
 
 // Commonly used resource configurations.
@@ -87,17 +86,17 @@ func DefaultResource(name string, terraformSchema *schema.Resource, opts ...Reso
 	// - aws_rds_cluster => Cluster
 	// - aws_rds_cluster_parameter_group => ClusterParameterGroup
 	// - kafka_topic => Topic
-	kind := strcase.ToCamel(strings.Join(words[2:], "_"))
+	kind := tjname.NewFromSnake(strings.Join(words[2:], "_")).Camel
 	if len(words) < 3 {
 		group = words[0]
-		kind = strcase.ToCamel(words[1])
+		kind = tjname.NewFromSnake(words[1]).Camel
 	}
 
 	r := &Resource{
 		Name:              name,
 		TerraformResource: terraformSchema,
 		ShortGroup:        group,
-		Kind:              typeName.NewFromCamel(kind).Camel,
+		Kind:              kind,
 		Version:           "v1alpha1",
 		ExternalName:      NameAsIdentifier,
 		References:        map[string]Reference{},
diff --git a/pkg/types/name/name.go b/pkg/types/name/name.go
index 0d839057..73fdb0c3 100644
--- a/pkg/types/name/name.go
+++ b/pkg/types/name/name.go
@@ -109,19 +109,40 @@ func init() {
 	// Taken from golangci-lint staticcheck
 	// https://github.com/dominikh/go-tools/blob/4049766cbbeee505b10996f03cd3f504aa238734/config/example.conf#L2
 	AddAcronym("acl", "ACL")
+	AddAcronym("adm", "ADM")
 	AddAcronym("ai", "AI")
+	AddAcronym("alb", "ALB")
+	AddAcronym("ami", "AMI")
 	AddAcronym("api", "API")
+	AddAcronym("apns", "APNS")
 	AddAcronym("ascii", "ASCII")
+	AddAcronym("bgp", "BGP")
 	AddAcronym("ca", "CA")
+	AddAcronym("cloudformation", "CloudFormation")
 	AddAcronym("cpu", "CPU")
 	AddAcronym("css", "CSS")
+	AddAcronym("dhcp", "DHCP")
 	AddAcronym("dicom", "DICOM")
+	AddAcronym("dkim", "DKIM")
 	AddAcronym("dns", "DNS")
+	AddAcronym("dnssec", "DNSSEC")
+	AddAcronym("ebs", "EBS")
+	AddAcronym("ec2", "EC2")
+	AddAcronym("efs", "EFS")
+	AddAcronym("eip", "EIP")
+	AddAcronym("elb", "ELB")
 	AddAcronym("eof", "EOF")
 	AddAcronym("fhir", "FHIR")
+	AddAcronym("fsx", "FSX")
 	AddAcronym("gcp", "GCP")
+	AddAcronym("gcm", "GCM")
+	AddAcronym("graphql", "GraphQL")
 	AddAcronym("grpc", "GRPC")
 	AddAcronym("guid", "GUID")
+	AddAcronym("haproxy", "HAProxy")
+	AddAcronym("hsm", "HSM")
+	AddAcronym("ipset", "IPSet")
+	AddAcronym("iscsi", "ISCSI")
 	AddAcronym("hl7", "HL7")
 	AddAcronym("html", "HTML")
 	AddAcronym("http", "HTTP")
@@ -131,13 +152,24 @@ func init() {
 	AddAcronym("id", "ID")
 	AddAcronym("ip", "IP")
 	AddAcronym("json", "JSON")
-	AddAcronym("qps", "QPS")
+	AddAcronym("kms", "KMS")
+	AddAcronym("lb", "LB")
+	AddAcronym("ml", "ML")
+	AddAcronym("mysql", "MySQL")
 	AddAcronym("nat", "NAT")
+	AddAcronym("nfs", "NFS")
+	AddAcronym("nodejs", "NodeJS")
+	AddAcronym("openid", "OpenID")
+	AddAcronym("php", "PHP")
+	AddAcronym("qps", "QPS")
 	AddAcronym("ram", "RAM")
+	AddAcronym("rds", "RDS")
 	AddAcronym("rpc", "RPC")
 	AddAcronym("saml", "SAML")
 	AddAcronym("sla", "SLA")
 	AddAcronym("slo", "SLO")
+	AddAcronym("smb", "SMB")
+	AddAcronym("sms", "SMS")
 	AddAcronym("smtp", "SMTP")
 	AddAcronym("sql", "SQL")
 	AddAcronym("ssh", "SSH")
@@ -154,6 +186,7 @@ func init() {
 	AddAcronym("url", "URL")
 	AddAcronym("utf8", "UTF8")
 	AddAcronym("vm", "VM")
+	AddAcronym("voip", "VoIP")
 	AddAcronym("vpc", "VPC")
 	AddAcronym("vpn", "VPN")
 	AddAcronym("xml", "XML")