diff --git a/builtin/credential/aws/backend.go b/builtin/credential/aws-ec2/backend.go
similarity index 100%
rename from builtin/credential/aws/backend.go
rename to builtin/credential/aws-ec2/backend.go
diff --git a/builtin/credential/aws/backend_test.go b/builtin/credential/aws-ec2/backend_test.go
similarity index 100%
rename from builtin/credential/aws/backend_test.go
rename to builtin/credential/aws-ec2/backend_test.go
diff --git a/builtin/credential/aws/client.go b/builtin/credential/aws-ec2/client.go
similarity index 100%
rename from builtin/credential/aws/client.go
rename to builtin/credential/aws-ec2/client.go
diff --git a/builtin/credential/aws/path_config_certificate.go b/builtin/credential/aws-ec2/path_config_certificate.go
similarity index 100%
rename from builtin/credential/aws/path_config_certificate.go
rename to builtin/credential/aws-ec2/path_config_certificate.go
diff --git a/builtin/credential/aws/path_config_client.go b/builtin/credential/aws-ec2/path_config_client.go
similarity index 100%
rename from builtin/credential/aws/path_config_client.go
rename to builtin/credential/aws-ec2/path_config_client.go
diff --git a/builtin/credential/aws/path_config_tidy_identity_whitelist.go b/builtin/credential/aws-ec2/path_config_tidy_identity_whitelist.go
similarity index 100%
rename from builtin/credential/aws/path_config_tidy_identity_whitelist.go
rename to builtin/credential/aws-ec2/path_config_tidy_identity_whitelist.go
diff --git a/builtin/credential/aws/path_config_tidy_roletag_blacklist.go b/builtin/credential/aws-ec2/path_config_tidy_roletag_blacklist.go
similarity index 100%
rename from builtin/credential/aws/path_config_tidy_roletag_blacklist.go
rename to builtin/credential/aws-ec2/path_config_tidy_roletag_blacklist.go
diff --git a/builtin/credential/aws/path_identity_whitelist.go b/builtin/credential/aws-ec2/path_identity_whitelist.go
similarity index 100%
rename from builtin/credential/aws/path_identity_whitelist.go
rename to builtin/credential/aws-ec2/path_identity_whitelist.go
diff --git a/builtin/credential/aws/path_login.go b/builtin/credential/aws-ec2/path_login.go
similarity index 100%
rename from builtin/credential/aws/path_login.go
rename to builtin/credential/aws-ec2/path_login.go
diff --git a/builtin/credential/aws/path_role.go b/builtin/credential/aws-ec2/path_role.go
similarity index 100%
rename from builtin/credential/aws/path_role.go
rename to builtin/credential/aws-ec2/path_role.go
diff --git a/builtin/credential/aws/path_role_tag.go b/builtin/credential/aws-ec2/path_role_tag.go
similarity index 100%
rename from builtin/credential/aws/path_role_tag.go
rename to builtin/credential/aws-ec2/path_role_tag.go
diff --git a/builtin/credential/aws/path_roletag_blacklist.go b/builtin/credential/aws-ec2/path_roletag_blacklist.go
similarity index 100%
rename from builtin/credential/aws/path_roletag_blacklist.go
rename to builtin/credential/aws-ec2/path_roletag_blacklist.go
diff --git a/builtin/credential/aws/path_tidy_identity_whitelist.go b/builtin/credential/aws-ec2/path_tidy_identity_whitelist.go
similarity index 100%
rename from builtin/credential/aws/path_tidy_identity_whitelist.go
rename to builtin/credential/aws-ec2/path_tidy_identity_whitelist.go
diff --git a/builtin/credential/aws/path_tidy_roletag_blacklist.go b/builtin/credential/aws-ec2/path_tidy_roletag_blacklist.go
similarity index 100%
rename from builtin/credential/aws/path_tidy_roletag_blacklist.go
rename to builtin/credential/aws-ec2/path_tidy_roletag_blacklist.go