diff --git a/aws/data_source_aws_ami_ids_test.go b/aws/data_source_aws_ami_ids_test.go
index e2c6ba4689a..f887a908e11 100644
--- a/aws/data_source_aws_ami_ids_test.go
+++ b/aws/data_source_aws_ami_ids_test.go
@@ -7,7 +7,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 )
 
-func TestAccDataSourceAwsAmiIds_basic(t *testing.T) {
+func TestAccEC2AMIIDsDataSource_basic(t *testing.T) {
 	resource.ParallelTest(t, resource.TestCase{
 		PreCheck:  func() { testAccPreCheck(t) },
 		Providers: testAccProviders,
@@ -22,7 +22,7 @@ func TestAccDataSourceAwsAmiIds_basic(t *testing.T) {
 	})
 }
 
-func TestAccDataSourceAwsAmiIds_sorted(t *testing.T) {
+func TestAccEC2AMIIDsDataSource_sorted(t *testing.T) {
 	resource.ParallelTest(t, resource.TestCase{
 		PreCheck:  func() { testAccPreCheck(t) },
 		Providers: testAccProviders,
diff --git a/aws/data_source_aws_ami_test.go b/aws/data_source_aws_ami_test.go
index e78b351d0bd..a4b82131c69 100644
--- a/aws/data_source_aws_ami_test.go
+++ b/aws/data_source_aws_ami_test.go
@@ -10,7 +10,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
 )
 
-func TestAccAWSAmiDataSource_natInstance(t *testing.T) {
+func TestAccEC2AMIDataSource_natInstance(t *testing.T) {
 	resourceName := "data.aws_ami.nat_ami"
 	resource.ParallelTest(t, resource.TestCase{
 		PreCheck:  func() { testAccPreCheck(t) },
@@ -60,7 +60,7 @@ func TestAccAWSAmiDataSource_natInstance(t *testing.T) {
 	})
 }
 
-func TestAccAWSAmiDataSource_windowsInstance(t *testing.T) {
+func TestAccEC2AMIDataSource_windowsInstance(t *testing.T) {
 	resourceName := "data.aws_ami.windows_ami"
 	resource.ParallelTest(t, resource.TestCase{
 		PreCheck:  func() { testAccPreCheck(t) },
@@ -103,7 +103,7 @@ func TestAccAWSAmiDataSource_windowsInstance(t *testing.T) {
 	})
 }
 
-func TestAccAWSAmiDataSource_instanceStore(t *testing.T) {
+func TestAccEC2AMIDataSource_instanceStore(t *testing.T) {
 	resourceName := "data.aws_ami.amzn-ami-minimal-hvm-instance-store"
 	resource.ParallelTest(t, resource.TestCase{
 		PreCheck:  func() { testAccPreCheck(t) },
@@ -142,7 +142,7 @@ func TestAccAWSAmiDataSource_instanceStore(t *testing.T) {
 	})
 }
 
-func TestAccAWSAmiDataSource_localNameFilter(t *testing.T) {
+func TestAccEC2AMIDataSource_localNameFilter(t *testing.T) {
 	resource.ParallelTest(t, resource.TestCase{
 		PreCheck:  func() { testAccPreCheck(t) },
 		Providers: testAccProviders,
@@ -158,7 +158,7 @@ func TestAccAWSAmiDataSource_localNameFilter(t *testing.T) {
 	})
 }
 
-func TestAccAWSAmiDataSource_Gp3BlockDevice(t *testing.T) {
+func TestAccEC2AMIDataSource_gp3BlockDevice(t *testing.T) {
 	resourceName := "aws_ami.test"
 	datasourceName := "data.aws_ami.test"
 	rName := acctest.RandomWithPrefix("tf-acc-test")
diff --git a/aws/resource_aws_ami_copy_test.go b/aws/resource_aws_ami_copy_test.go
index c24807304ed..60be53c653f 100644
--- a/aws/resource_aws_ami_copy_test.go
+++ b/aws/resource_aws_ami_copy_test.go
@@ -12,7 +12,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
 )
 
-func TestAccAWSAMICopy_basic(t *testing.T) {
+func TestAccEC2AMICopy_basic(t *testing.T) {
 	var image ec2.Image
 	rName := acctest.RandomWithPrefix("tf-acc-test")
 	resourceName := "aws_ami_copy.test"
@@ -39,7 +39,7 @@ func TestAccAWSAMICopy_basic(t *testing.T) {
 	})
 }
 
-func TestAccAWSAMICopy_Description(t *testing.T) {
+func TestAccEC2AMICopy_description(t *testing.T) {
 	var image ec2.Image
 	rName := acctest.RandomWithPrefix("tf-acc-test")
 	resourceName := "aws_ami_copy.test"
@@ -67,7 +67,7 @@ func TestAccAWSAMICopy_Description(t *testing.T) {
 	})
 }
 
-func TestAccAWSAMICopy_EnaSupport(t *testing.T) {
+func TestAccEC2AMICopy_enaSupport(t *testing.T) {
 	var image ec2.Image
 	rName := acctest.RandomWithPrefix("tf-acc-test")
 	resourceName := "aws_ami_copy.test"
@@ -88,7 +88,7 @@ func TestAccAWSAMICopy_EnaSupport(t *testing.T) {
 	})
 }
 
-func TestAccAWSAMICopy_tags(t *testing.T) {
+func TestAccEC2AMICopy_tags(t *testing.T) {
 	var ami ec2.Image
 	resourceName := "aws_ami_copy.test"
 	rName := acctest.RandomWithPrefix("tf-acc-test")
diff --git a/aws/resource_aws_ami_from_instance_test.go b/aws/resource_aws_ami_from_instance_test.go
index d2e7ef44391..5226d0848b1 100644
--- a/aws/resource_aws_ami_from_instance_test.go
+++ b/aws/resource_aws_ami_from_instance_test.go
@@ -12,7 +12,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
 )
 
-func TestAccAWSAMIFromInstance_basic(t *testing.T) {
+func TestAccEC2AMIFromInstance_basic(t *testing.T) {
 	var image ec2.Image
 	rName := acctest.RandomWithPrefix("tf-acc-test")
 	resourceName := "aws_ami_from_instance.test"
@@ -39,7 +39,7 @@ func TestAccAWSAMIFromInstance_basic(t *testing.T) {
 	})
 }
 
-func TestAccAWSAMIFromInstance_tags(t *testing.T) {
+func TestAccEC2AMIFromInstance_tags(t *testing.T) {
 	var image ec2.Image
 	rName := acctest.RandomWithPrefix("tf-acc-test")
 	resourceName := "aws_ami_from_instance.test"
diff --git a/aws/resource_aws_ami_launch_permission_test.go b/aws/resource_aws_ami_launch_permission_test.go
index 417ba85c2cf..d88668313cd 100644
--- a/aws/resource_aws_ami_launch_permission_test.go
+++ b/aws/resource_aws_ami_launch_permission_test.go
@@ -11,7 +11,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
 )
 
-func TestAccAWSAMILaunchPermission_basic(t *testing.T) {
+func TestAccEC2AMILaunchPermission_basic(t *testing.T) {
 	resourceName := "aws_ami_launch_permission.test"
 	rName := acctest.RandomWithPrefix("tf-acc-test")
 
@@ -36,7 +36,7 @@ func TestAccAWSAMILaunchPermission_basic(t *testing.T) {
 	})
 }
 
-func TestAccAWSAMILaunchPermission_Disappears_LaunchPermission(t *testing.T) {
+func TestAccEC2AMILaunchPermission_disappears_launchPermission(t *testing.T) {
 	resourceName := "aws_ami_launch_permission.test"
 	rName := acctest.RandomWithPrefix("tf-acc-test")
 
@@ -59,7 +59,7 @@ func TestAccAWSAMILaunchPermission_Disappears_LaunchPermission(t *testing.T) {
 
 // Bug reference: https://github.com/hashicorp/terraform-provider-aws/issues/6222
 // Images with <group>all</group> will not have <userId> and can cause a panic
-func TestAccAWSAMILaunchPermission_Disappears_LaunchPermission_Public(t *testing.T) {
+func TestAccEC2AMILaunchPermission_disappears_launchPermission_public(t *testing.T) {
 	resourceName := "aws_ami_launch_permission.test"
 	rName := acctest.RandomWithPrefix("tf-acc-test")
 
@@ -81,7 +81,7 @@ func TestAccAWSAMILaunchPermission_Disappears_LaunchPermission_Public(t *testing
 	})
 }
 
-func TestAccAWSAMILaunchPermission_Disappears_AMI(t *testing.T) {
+func TestAccEC2AMILaunchPermission_disappears_ami(t *testing.T) {
 	imageID := ""
 	resourceName := "aws_ami_launch_permission.test"
 	rName := acctest.RandomWithPrefix("tf-acc-test")
diff --git a/aws/resource_aws_ami_test.go b/aws/resource_aws_ami_test.go
index fc6511b800a..95dc3974c81 100644
--- a/aws/resource_aws_ami_test.go
+++ b/aws/resource_aws_ami_test.go
@@ -14,7 +14,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
 )
 
-func TestAccAWSAMI_basic(t *testing.T) {
+func TestAccEC2AMI_basic(t *testing.T) {
 	var ami ec2.Image
 	resourceName := "aws_ami.test"
 	snapshotResourceName := "aws_ebs_snapshot.test"
@@ -72,7 +72,7 @@ func TestAccAWSAMI_basic(t *testing.T) {
 	})
 }
 
-func TestAccAWSAMI_description(t *testing.T) {
+func TestAccEC2AMI_description(t *testing.T) {
 	var ami ec2.Image
 	resourceName := "aws_ami.test"
 	snapshotResourceName := "aws_ebs_snapshot.test"
@@ -157,7 +157,7 @@ func TestAccAWSAMI_description(t *testing.T) {
 	})
 }
 
-func TestAccAWSAMI_disappears(t *testing.T) {
+func TestAccEC2AMI_disappears(t *testing.T) {
 	var ami ec2.Image
 	resourceName := "aws_ami.test"
 	rName := acctest.RandomWithPrefix("tf-acc-test")
@@ -179,7 +179,7 @@ func TestAccAWSAMI_disappears(t *testing.T) {
 	})
 }
 
-func TestAccAWSAMI_EphemeralBlockDevices(t *testing.T) {
+func TestAccEC2AMI_ephemeralBlockDevices(t *testing.T) {
 	var ami ec2.Image
 	resourceName := "aws_ami.test"
 	snapshotResourceName := "aws_ebs_snapshot.test"
@@ -239,7 +239,7 @@ func TestAccAWSAMI_EphemeralBlockDevices(t *testing.T) {
 	})
 }
 
-func TestAccAWSAMI_Gp3BlockDevice(t *testing.T) {
+func TestAccEC2AMI_gp3BlockDevice(t *testing.T) {
 	var ami ec2.Image
 	resourceName := "aws_ami.test"
 	snapshotResourceName := "aws_ebs_snapshot.test"
@@ -301,7 +301,7 @@ func TestAccAWSAMI_Gp3BlockDevice(t *testing.T) {
 	})
 }
 
-func TestAccAWSAMI_tags(t *testing.T) {
+func TestAccEC2AMI_tags(t *testing.T) {
 	var ami ec2.Image
 	resourceName := "aws_ami.test"
 	rName := acctest.RandomWithPrefix("tf-acc-test")