diff --git a/test/integration/targets/ec2_facts/aliases b/test/integration/targets/ec2_metadata_facts/aliases
similarity index 100%
rename from test/integration/targets/ec2_facts/aliases
rename to test/integration/targets/ec2_metadata_facts/aliases
diff --git a/test/integration/targets/ec2_facts/defaults/main.yml b/test/integration/targets/ec2_metadata_facts/defaults/main.yml
similarity index 100%
rename from test/integration/targets/ec2_facts/defaults/main.yml
rename to test/integration/targets/ec2_metadata_facts/defaults/main.yml
diff --git a/test/integration/targets/ec2_elb_lb/meta/main.yml b/test/integration/targets/ec2_metadata_facts/meta/main.yml
similarity index 100%
rename from test/integration/targets/ec2_elb_lb/meta/main.yml
rename to test/integration/targets/ec2_metadata_facts/meta/main.yml
diff --git a/test/integration/targets/ec2_facts/tasks/main.yml b/test/integration/targets/ec2_metadata_facts/tasks/main.yml
similarity index 100%
rename from test/integration/targets/ec2_facts/tasks/main.yml
rename to test/integration/targets/ec2_metadata_facts/tasks/main.yml
diff --git a/test/integration/targets/ec2_facts/vars/main.yml b/test/integration/targets/ec2_metadata_facts/vars/main.yml
similarity index 100%
rename from test/integration/targets/ec2_facts/vars/main.yml
rename to test/integration/targets/ec2_metadata_facts/vars/main.yml
diff --git a/test/integration/targets/aws_lambda_policy/aliases b/test/integration/targets/elb_classic_lb/aliases
similarity index 100%
rename from test/integration/targets/aws_lambda_policy/aliases
rename to test/integration/targets/elb_classic_lb/aliases
diff --git a/test/integration/targets/ec2_elb_lb/defaults/main.yml b/test/integration/targets/elb_classic_lb/defaults/main.yml
similarity index 100%
rename from test/integration/targets/ec2_elb_lb/defaults/main.yml
rename to test/integration/targets/elb_classic_lb/defaults/main.yml
diff --git a/test/integration/targets/ec2_facts/meta/main.yml b/test/integration/targets/elb_classic_lb/meta/main.yml
similarity index 100%
rename from test/integration/targets/ec2_facts/meta/main.yml
rename to test/integration/targets/elb_classic_lb/meta/main.yml
diff --git a/test/integration/targets/ec2_elb_lb/tasks/main.yml b/test/integration/targets/elb_classic_lb/tasks/main.yml
similarity index 100%
rename from test/integration/targets/ec2_elb_lb/tasks/main.yml
rename to test/integration/targets/elb_classic_lb/tasks/main.yml
diff --git a/test/integration/targets/ec2_elb_lb/vars/main.yml b/test/integration/targets/elb_classic_lb/vars/main.yml
similarity index 100%
rename from test/integration/targets/ec2_elb_lb/vars/main.yml
rename to test/integration/targets/elb_classic_lb/vars/main.yml
diff --git a/test/integration/targets/ec2_elb_lb/aliases b/test/integration/targets/lambda_policy/aliases
similarity index 100%
rename from test/integration/targets/ec2_elb_lb/aliases
rename to test/integration/targets/lambda_policy/aliases
diff --git a/test/integration/targets/aws_lambda_policy/defaults/main.yml b/test/integration/targets/lambda_policy/defaults/main.yml
similarity index 100%
rename from test/integration/targets/aws_lambda_policy/defaults/main.yml
rename to test/integration/targets/lambda_policy/defaults/main.yml
diff --git a/test/integration/targets/aws_lambda_policy/files/mini_http_lambda.py b/test/integration/targets/lambda_policy/files/mini_http_lambda.py
similarity index 100%
rename from test/integration/targets/aws_lambda_policy/files/mini_http_lambda.py
rename to test/integration/targets/lambda_policy/files/mini_http_lambda.py
diff --git a/test/integration/targets/aws_lambda_policy/tasks/main.yml b/test/integration/targets/lambda_policy/tasks/main.yml
similarity index 100%
rename from test/integration/targets/aws_lambda_policy/tasks/main.yml
rename to test/integration/targets/lambda_policy/tasks/main.yml
diff --git a/test/integration/targets/aws_lambda_policy/templates/endpoint-test-swagger-api.yml.j2 b/test/integration/targets/lambda_policy/templates/endpoint-test-swagger-api.yml.j2
similarity index 100%
rename from test/integration/targets/aws_lambda_policy/templates/endpoint-test-swagger-api.yml.j2
rename to test/integration/targets/lambda_policy/templates/endpoint-test-swagger-api.yml.j2