diff --git a/test/integration/targets/inventory_limit/aliases b/test/integration/targets/limit_inventory/aliases
similarity index 100%
rename from test/integration/targets/inventory_limit/aliases
rename to test/integration/targets/limit_inventory/aliases
diff --git a/test/integration/targets/inventory_limit/hosts.yml b/test/integration/targets/limit_inventory/hosts.yml
similarity index 100%
rename from test/integration/targets/inventory_limit/hosts.yml
rename to test/integration/targets/limit_inventory/hosts.yml
diff --git a/test/integration/targets/inventory_limit/runme.sh b/test/integration/targets/limit_inventory/runme.sh
similarity index 100%
rename from test/integration/targets/inventory_limit/runme.sh
rename to test/integration/targets/limit_inventory/runme.sh
diff --git a/test/integration/targets/inventory_path_with_comma/aliases b/test/integration/targets/path_with_comma_in_inventory/aliases
similarity index 100%
rename from test/integration/targets/inventory_path_with_comma/aliases
rename to test/integration/targets/path_with_comma_in_inventory/aliases
diff --git a/test/integration/targets/inventory_path_with_comma/playbook.yml b/test/integration/targets/path_with_comma_in_inventory/playbook.yml
similarity index 100%
rename from test/integration/targets/inventory_path_with_comma/playbook.yml
rename to test/integration/targets/path_with_comma_in_inventory/playbook.yml
diff --git a/test/integration/targets/inventory_path_with_comma/runme.sh b/test/integration/targets/path_with_comma_in_inventory/runme.sh
similarity index 100%
rename from test/integration/targets/inventory_path_with_comma/runme.sh
rename to test/integration/targets/path_with_comma_in_inventory/runme.sh
diff --git a/test/integration/targets/inventory_path_with_comma/this,path,has,commas/group_vars/all.yml b/test/integration/targets/path_with_comma_in_inventory/this,path,has,commas/group_vars/all.yml
similarity index 100%
rename from test/integration/targets/inventory_path_with_comma/this,path,has,commas/group_vars/all.yml
rename to test/integration/targets/path_with_comma_in_inventory/this,path,has,commas/group_vars/all.yml
diff --git a/test/integration/targets/inventory_path_with_comma/this,path,has,commas/hosts b/test/integration/targets/path_with_comma_in_inventory/this,path,has,commas/hosts
similarity index 100%
rename from test/integration/targets/inventory_path_with_comma/this,path,has,commas/hosts
rename to test/integration/targets/path_with_comma_in_inventory/this,path,has,commas/hosts
diff --git a/test/integration/targets/inventory_plugin_config/aliases b/test/integration/targets/plugin_config_for_inventory/aliases
similarity index 100%
rename from test/integration/targets/inventory_plugin_config/aliases
rename to test/integration/targets/plugin_config_for_inventory/aliases
diff --git a/test/integration/targets/inventory_plugin_config/config_with_parameter.yml b/test/integration/targets/plugin_config_for_inventory/config_with_parameter.yml
similarity index 100%
rename from test/integration/targets/inventory_plugin_config/config_with_parameter.yml
rename to test/integration/targets/plugin_config_for_inventory/config_with_parameter.yml
diff --git a/test/integration/targets/inventory_plugin_config/config_without_parameter.yml b/test/integration/targets/plugin_config_for_inventory/config_without_parameter.yml
similarity index 100%
rename from test/integration/targets/inventory_plugin_config/config_without_parameter.yml
rename to test/integration/targets/plugin_config_for_inventory/config_without_parameter.yml
diff --git a/test/integration/targets/inventory_plugin_config/runme.sh b/test/integration/targets/plugin_config_for_inventory/runme.sh
similarity index 100%
rename from test/integration/targets/inventory_plugin_config/runme.sh
rename to test/integration/targets/plugin_config_for_inventory/runme.sh
diff --git a/test/integration/targets/inventory_plugin_config/test_inventory.py b/test/integration/targets/plugin_config_for_inventory/test_inventory.py
similarity index 100%
rename from test/integration/targets/inventory_plugin_config/test_inventory.py
rename to test/integration/targets/plugin_config_for_inventory/test_inventory.py
diff --git a/test/integration/targets/inventory_aws_conformance/aliases b/test/integration/targets/script_inventory_ec2/aliases
similarity index 100%
rename from test/integration/targets/inventory_aws_conformance/aliases
rename to test/integration/targets/script_inventory_ec2/aliases
diff --git a/test/integration/targets/inventory_aws_conformance/ec2.sh b/test/integration/targets/script_inventory_ec2/ec2.sh
similarity index 100%
rename from test/integration/targets/inventory_aws_conformance/ec2.sh
rename to test/integration/targets/script_inventory_ec2/ec2.sh
diff --git a/test/integration/targets/inventory_aws_conformance/inventory_diff.py b/test/integration/targets/script_inventory_ec2/inventory_diff.py
similarity index 100%
rename from test/integration/targets/inventory_aws_conformance/inventory_diff.py
rename to test/integration/targets/script_inventory_ec2/inventory_diff.py
diff --git a/test/integration/targets/inventory_aws_conformance/lib/__init__.py b/test/integration/targets/script_inventory_ec2/lib/__init__.py
similarity index 100%
rename from test/integration/targets/inventory_aws_conformance/lib/__init__.py
rename to test/integration/targets/script_inventory_ec2/lib/__init__.py
diff --git a/test/integration/targets/inventory_aws_conformance/lib/boto/__init__.py b/test/integration/targets/script_inventory_ec2/lib/boto/__init__.py
similarity index 100%
rename from test/integration/targets/inventory_aws_conformance/lib/boto/__init__.py
rename to test/integration/targets/script_inventory_ec2/lib/boto/__init__.py
diff --git a/test/integration/targets/inventory_aws_conformance/lib/boto/ec2/__init__.py b/test/integration/targets/script_inventory_ec2/lib/boto/ec2/__init__.py
similarity index 100%
rename from test/integration/targets/inventory_aws_conformance/lib/boto/ec2/__init__.py
rename to test/integration/targets/script_inventory_ec2/lib/boto/ec2/__init__.py
diff --git a/test/integration/targets/inventory_aws_conformance/lib/boto/elasticache/__init__.py b/test/integration/targets/script_inventory_ec2/lib/boto/elasticache/__init__.py
similarity index 100%
rename from test/integration/targets/inventory_aws_conformance/lib/boto/elasticache/__init__.py
rename to test/integration/targets/script_inventory_ec2/lib/boto/elasticache/__init__.py
diff --git a/test/integration/targets/inventory_aws_conformance/lib/boto/exception.py b/test/integration/targets/script_inventory_ec2/lib/boto/exception.py
similarity index 100%
rename from test/integration/targets/inventory_aws_conformance/lib/boto/exception.py
rename to test/integration/targets/script_inventory_ec2/lib/boto/exception.py
diff --git a/test/integration/targets/inventory_aws_conformance/lib/boto/exceptions.py b/test/integration/targets/script_inventory_ec2/lib/boto/exceptions.py
similarity index 100%
rename from test/integration/targets/inventory_aws_conformance/lib/boto/exceptions.py
rename to test/integration/targets/script_inventory_ec2/lib/boto/exceptions.py
diff --git a/test/integration/targets/inventory_aws_conformance/lib/boto/mocks/__init__.py b/test/integration/targets/script_inventory_ec2/lib/boto/mocks/__init__.py
similarity index 100%
rename from test/integration/targets/inventory_aws_conformance/lib/boto/mocks/__init__.py
rename to test/integration/targets/script_inventory_ec2/lib/boto/mocks/__init__.py
diff --git a/test/integration/targets/inventory_aws_conformance/lib/boto/mocks/instances.py b/test/integration/targets/script_inventory_ec2/lib/boto/mocks/instances.py
similarity index 100%
rename from test/integration/targets/inventory_aws_conformance/lib/boto/mocks/instances.py
rename to test/integration/targets/script_inventory_ec2/lib/boto/mocks/instances.py
diff --git a/test/integration/targets/inventory_aws_conformance/lib/boto/rds.py b/test/integration/targets/script_inventory_ec2/lib/boto/rds.py
similarity index 100%
rename from test/integration/targets/inventory_aws_conformance/lib/boto/rds.py
rename to test/integration/targets/script_inventory_ec2/lib/boto/rds.py
diff --git a/test/integration/targets/inventory_aws_conformance/lib/boto/route53.py b/test/integration/targets/script_inventory_ec2/lib/boto/route53.py
similarity index 100%
rename from test/integration/targets/inventory_aws_conformance/lib/boto/route53.py
rename to test/integration/targets/script_inventory_ec2/lib/boto/route53.py
diff --git a/test/integration/targets/inventory_aws_conformance/lib/boto/session.py b/test/integration/targets/script_inventory_ec2/lib/boto/session.py
similarity index 100%
rename from test/integration/targets/inventory_aws_conformance/lib/boto/session.py
rename to test/integration/targets/script_inventory_ec2/lib/boto/session.py
diff --git a/test/integration/targets/inventory_aws_conformance/lib/boto/sts.py b/test/integration/targets/script_inventory_ec2/lib/boto/sts.py
similarity index 100%
rename from test/integration/targets/inventory_aws_conformance/lib/boto/sts.py
rename to test/integration/targets/script_inventory_ec2/lib/boto/sts.py
diff --git a/test/integration/targets/inventory_aws_conformance/runme.sh b/test/integration/targets/script_inventory_ec2/runme.sh
similarity index 100%
rename from test/integration/targets/inventory_aws_conformance/runme.sh
rename to test/integration/targets/script_inventory_ec2/runme.sh
diff --git a/test/integration/targets/inventory_foreman_script/aliases b/test/integration/targets/script_inventory_foreman/aliases
similarity index 100%
rename from test/integration/targets/inventory_foreman_script/aliases
rename to test/integration/targets/script_inventory_foreman/aliases
diff --git a/test/integration/targets/inventory_foreman_script/foreman.sh b/test/integration/targets/script_inventory_foreman/foreman.sh
similarity index 100%
rename from test/integration/targets/inventory_foreman_script/foreman.sh
rename to test/integration/targets/script_inventory_foreman/foreman.sh
diff --git a/test/integration/targets/inventory_foreman_script/runme.sh b/test/integration/targets/script_inventory_foreman/runme.sh
similarity index 100%
rename from test/integration/targets/inventory_foreman_script/runme.sh
rename to test/integration/targets/script_inventory_foreman/runme.sh
diff --git a/test/integration/targets/inventory_foreman_script/test_foreman_inventory.yml b/test/integration/targets/script_inventory_foreman/test_foreman_inventory.yml
similarity index 100%
rename from test/integration/targets/inventory_foreman_script/test_foreman_inventory.yml
rename to test/integration/targets/script_inventory_foreman/test_foreman_inventory.yml
diff --git a/test/integration/targets/vmware_inventory/aliases b/test/integration/targets/script_inventory_vmware_inventory/aliases
similarity index 100%
rename from test/integration/targets/vmware_inventory/aliases
rename to test/integration/targets/script_inventory_vmware_inventory/aliases
diff --git a/test/integration/targets/vmware_inventory/runme.sh b/test/integration/targets/script_inventory_vmware_inventory/runme.sh
similarity index 100%
rename from test/integration/targets/vmware_inventory/runme.sh
rename to test/integration/targets/script_inventory_vmware_inventory/runme.sh
diff --git a/test/integration/targets/vmware_inventory/test_vmware_inventory.yml b/test/integration/targets/script_inventory_vmware_inventory/test_vmware_inventory.yml
similarity index 100%
rename from test/integration/targets/vmware_inventory/test_vmware_inventory.yml
rename to test/integration/targets/script_inventory_vmware_inventory/test_vmware_inventory.yml
diff --git a/test/integration/targets/vmware_inventory/vmware_inventory.sh b/test/integration/targets/script_inventory_vmware_inventory/vmware_inventory.sh
similarity index 100%
rename from test/integration/targets/vmware_inventory/vmware_inventory.sh
rename to test/integration/targets/script_inventory_vmware_inventory/vmware_inventory.sh