diff --git a/.ansible-lint b/.ansible-lint index f6af7c0..4b03f62 100644 --- a/.ansible-lint +++ b/.ansible-lint @@ -5,19 +5,19 @@ exclude_paths: - .git/ - .github/ - changelogs/ - - tests/integration/targets/hcloud_certificate - - tests/integration/targets/hcloud_firewall - - tests/integration/targets/hcloud_floating_ip - - tests/integration/targets/hcloud_load_balancer_network - - tests/integration/targets/hcloud_load_balancer_service - - tests/integration/targets/hcloud_load_balancer_target - - tests/integration/targets/hcloud_network - - tests/integration/targets/hcloud_placement_group - - tests/integration/targets/hcloud_primary_ip - - tests/integration/targets/hcloud_route - - tests/integration/targets/hcloud_server - - tests/integration/targets/hcloud_server_network - - tests/integration/targets/hcloud_ssh_key - - tests/integration/targets/hcloud_volume + - tests/integration/targets/certificate + - tests/integration/targets/firewall + - tests/integration/targets/floating_ip + - tests/integration/targets/load_balancer_network + - tests/integration/targets/load_balancer_service + - tests/integration/targets/load_balancer_target + - tests/integration/targets/network + - tests/integration/targets/placement_group + - tests/integration/targets/primary_ip + - tests/integration/targets/route + - tests/integration/targets/server + - tests/integration/targets/server_network + - tests/integration/targets/ssh_key + - tests/integration/targets/volume - tests/integration/targets/setup_selfsigned_certificate - tests/integration/targets/setup_ssh_keypair diff --git a/changelogs/fragments/remove-hcloud-prefix-from-modules-names.yml b/changelogs/fragments/remove-hcloud-prefix-from-modules-names.yml new file mode 100644 index 0000000..01d10e7 --- /dev/null +++ b/changelogs/fragments/remove-hcloud-prefix-from-modules-names.yml @@ -0,0 +1,3 @@ +minor_changes: + - Removed the `hcloud_` prefix from all modules names, e.g. `hetzner.hcloud.hcloud_firewall` + was renamed to `hetzner.hcloud.firewall`. Old module names will continue working. diff --git a/meta/runtime.yml b/meta/runtime.yml index 237954c..94ea738 100644 --- a/meta/runtime.yml +++ b/meta/runtime.yml @@ -1 +1,66 @@ requires_ansible: ">=2.13.0" + +plugin_routing: + modules: + hcloud_certificate_info: + redirect: hetzner.hcloud.certificate_info + hcloud_certificate: + redirect: hetzner.hcloud.certificate + hcloud_datacenter_info: + redirect: hetzner.hcloud.datacenter_info + hcloud_firewall: + redirect: hetzner.hcloud.firewall + hcloud_floating_ip_info: + redirect: hetzner.hcloud.floating_ip_info + hcloud_floating_ip: + redirect: hetzner.hcloud.floating_ip + hcloud_image_info: + redirect: hetzner.hcloud.image_info + hcloud_iso_info: + redirect: hetzner.hcloud.iso_info + hcloud_load_balancer_info: + redirect: hetzner.hcloud.load_balancer_info + hcloud_load_balancer_network: + redirect: hetzner.hcloud.load_balancer_network + hcloud_load_balancer_service: + redirect: hetzner.hcloud.load_balancer_service + hcloud_load_balancer_target: + redirect: hetzner.hcloud.load_balancer_target + hcloud_load_balancer_type_info: + redirect: hetzner.hcloud.load_balancer_type_info + hcloud_load_balancer: + redirect: hetzner.hcloud.load_balancer + hcloud_location_info: + redirect: hetzner.hcloud.location_info + hcloud_network_info: + redirect: hetzner.hcloud.network_info + hcloud_network: + redirect: hetzner.hcloud.network + hcloud_placement_group: + redirect: hetzner.hcloud.placement_group + hcloud_primary_ip_info: + redirect: hetzner.hcloud.primary_ip_info + hcloud_primary_ip: + redirect: hetzner.hcloud.primary_ip + hcloud_rdns: + redirect: hetzner.hcloud.rdns + hcloud_route: + redirect: hetzner.hcloud.route + hcloud_server_info: + redirect: hetzner.hcloud.server_info + hcloud_server_network: + redirect: hetzner.hcloud.server_network + hcloud_server_type_info: + redirect: hetzner.hcloud.server_type_info + hcloud_server: + redirect: hetzner.hcloud.server + hcloud_ssh_key_info: + redirect: hetzner.hcloud.ssh_key_info + hcloud_ssh_key: + redirect: hetzner.hcloud.ssh_key + hcloud_subnetwork: + redirect: hetzner.hcloud.subnetwork + hcloud_volume_info: + redirect: hetzner.hcloud.volume_info + hcloud_volume: + redirect: hetzner.hcloud.volume diff --git a/plugins/modules/hcloud_certificate.py b/plugins/modules/certificate.py similarity index 99% rename from plugins/modules/hcloud_certificate.py rename to plugins/modules/certificate.py index 685b429..0e776a7 100644 --- a/plugins/modules/hcloud_certificate.py +++ b/plugins/modules/certificate.py @@ -6,7 +6,7 @@ DOCUMENTATION = """ --- -module: hcloud_certificate +module: certificate short_description: Create and manage certificates on the Hetzner Cloud. diff --git a/plugins/modules/hcloud_certificate_info.py b/plugins/modules/certificate_info.py similarity index 99% rename from plugins/modules/hcloud_certificate_info.py rename to plugins/modules/certificate_info.py index 6df3db1..a26ae22 100644 --- a/plugins/modules/hcloud_certificate_info.py +++ b/plugins/modules/certificate_info.py @@ -6,7 +6,7 @@ DOCUMENTATION = """ --- -module: hcloud_certificate_info +module: certificate_info short_description: Gather infos about your Hetzner Cloud certificates. description: - Gather facts about your Hetzner Cloud certificates. diff --git a/plugins/modules/hcloud_datacenter_info.py b/plugins/modules/datacenter_info.py similarity index 99% rename from plugins/modules/hcloud_datacenter_info.py rename to plugins/modules/datacenter_info.py index 1cfb6e7..3a13754 100644 --- a/plugins/modules/hcloud_datacenter_info.py +++ b/plugins/modules/datacenter_info.py @@ -6,7 +6,7 @@ DOCUMENTATION = """ --- -module: hcloud_datacenter_info +module: datacenter_info short_description: Gather info about the Hetzner Cloud datacenters. diff --git a/plugins/modules/hcloud_firewall.py b/plugins/modules/firewall.py similarity index 99% rename from plugins/modules/hcloud_firewall.py rename to plugins/modules/firewall.py index ebc22f5..6f4e83b 100644 --- a/plugins/modules/hcloud_firewall.py +++ b/plugins/modules/firewall.py @@ -6,7 +6,7 @@ DOCUMENTATION = """ --- -module: hcloud_firewall +module: firewall short_description: Create and manage firewalls on the Hetzner Cloud. diff --git a/plugins/modules/hcloud_floating_ip.py b/plugins/modules/floating_ip.py similarity index 99% rename from plugins/modules/hcloud_floating_ip.py rename to plugins/modules/floating_ip.py index 0e5d8bb..d8fdb23 100644 --- a/plugins/modules/hcloud_floating_ip.py +++ b/plugins/modules/floating_ip.py @@ -6,7 +6,7 @@ DOCUMENTATION = """ --- -module: hcloud_floating_ip +module: floating_ip short_description: Create and manage cloud Floating IPs on the Hetzner Cloud. diff --git a/plugins/modules/hcloud_floating_ip_info.py b/plugins/modules/floating_ip_info.py similarity index 99% rename from plugins/modules/hcloud_floating_ip_info.py rename to plugins/modules/floating_ip_info.py index 9c85190..e6f06d7 100644 --- a/plugins/modules/hcloud_floating_ip_info.py +++ b/plugins/modules/floating_ip_info.py @@ -6,7 +6,7 @@ DOCUMENTATION = """ --- -module: hcloud_floating_ip_info +module: floating_ip_info short_description: Gather infos about the Hetzner Cloud Floating IPs. diff --git a/plugins/modules/hcloud_image_info.py b/plugins/modules/image_info.py similarity index 99% rename from plugins/modules/hcloud_image_info.py rename to plugins/modules/image_info.py index 33aaecf..90fb928 100644 --- a/plugins/modules/hcloud_image_info.py +++ b/plugins/modules/image_info.py @@ -6,7 +6,7 @@ DOCUMENTATION = """ --- -module: hcloud_image_info +module: image_info short_description: Gather infos about your Hetzner Cloud images. diff --git a/plugins/modules/hcloud_iso_info.py b/plugins/modules/iso_info.py similarity index 99% rename from plugins/modules/hcloud_iso_info.py rename to plugins/modules/iso_info.py index 63faccb..4740daf 100644 --- a/plugins/modules/hcloud_iso_info.py +++ b/plugins/modules/iso_info.py @@ -7,7 +7,7 @@ DOCUMENTATION = """ --- -module: hcloud_iso_info +module: iso_info short_description: Gather infos about the Hetzner Cloud ISO list. diff --git a/plugins/modules/hcloud_load_balancer.py b/plugins/modules/load_balancer.py similarity index 99% rename from plugins/modules/hcloud_load_balancer.py rename to plugins/modules/load_balancer.py index 456cf1e..53f19dd 100644 --- a/plugins/modules/hcloud_load_balancer.py +++ b/plugins/modules/load_balancer.py @@ -6,7 +6,7 @@ DOCUMENTATION = """ --- -module: hcloud_load_balancer +module: load_balancer short_description: Create and manage cloud Load Balancers on the Hetzner Cloud. diff --git a/plugins/modules/hcloud_load_balancer_info.py b/plugins/modules/load_balancer_info.py similarity index 99% rename from plugins/modules/hcloud_load_balancer_info.py rename to plugins/modules/load_balancer_info.py index 5fd9719..75bb751 100644 --- a/plugins/modules/hcloud_load_balancer_info.py +++ b/plugins/modules/load_balancer_info.py @@ -6,7 +6,7 @@ DOCUMENTATION = """ --- -module: hcloud_load_balancer_info +module: load_balancer_info short_description: Gather infos about your Hetzner Cloud Load Balancers. diff --git a/plugins/modules/hcloud_load_balancer_network.py b/plugins/modules/load_balancer_network.py similarity index 99% rename from plugins/modules/hcloud_load_balancer_network.py rename to plugins/modules/load_balancer_network.py index b48a0be..450ff5a 100644 --- a/plugins/modules/hcloud_load_balancer_network.py +++ b/plugins/modules/load_balancer_network.py @@ -6,7 +6,7 @@ DOCUMENTATION = """ --- -module: hcloud_load_balancer_network +module: load_balancer_network short_description: Manage the relationship between Hetzner Cloud Networks and Load Balancers diff --git a/plugins/modules/hcloud_load_balancer_service.py b/plugins/modules/load_balancer_service.py similarity index 99% rename from plugins/modules/hcloud_load_balancer_service.py rename to plugins/modules/load_balancer_service.py index 563dc35..384a825 100644 --- a/plugins/modules/hcloud_load_balancer_service.py +++ b/plugins/modules/load_balancer_service.py @@ -6,7 +6,7 @@ DOCUMENTATION = """ --- -module: hcloud_load_balancer_service +module: load_balancer_service short_description: Create and manage the services of cloud Load Balancers on the Hetzner Cloud. diff --git a/plugins/modules/hcloud_load_balancer_target.py b/plugins/modules/load_balancer_target.py similarity index 99% rename from plugins/modules/hcloud_load_balancer_target.py rename to plugins/modules/load_balancer_target.py index 3112512..0ee4d2c 100644 --- a/plugins/modules/hcloud_load_balancer_target.py +++ b/plugins/modules/load_balancer_target.py @@ -6,7 +6,7 @@ DOCUMENTATION = """ --- -module: hcloud_load_balancer_target +module: load_balancer_target short_description: Manage Hetzner Cloud Load Balancer targets diff --git a/plugins/modules/hcloud_load_balancer_type_info.py b/plugins/modules/load_balancer_type_info.py similarity index 99% rename from plugins/modules/hcloud_load_balancer_type_info.py rename to plugins/modules/load_balancer_type_info.py index 5a48b21..066f2cb 100644 --- a/plugins/modules/hcloud_load_balancer_type_info.py +++ b/plugins/modules/load_balancer_type_info.py @@ -6,7 +6,7 @@ DOCUMENTATION = """ --- -module: hcloud_load_balancer_type_info +module: load_balancer_type_info short_description: Gather infos about the Hetzner Cloud Load Balancer types. diff --git a/plugins/modules/hcloud_location_info.py b/plugins/modules/location_info.py similarity index 99% rename from plugins/modules/hcloud_location_info.py rename to plugins/modules/location_info.py index de35a8f..496d0bd 100644 --- a/plugins/modules/hcloud_location_info.py +++ b/plugins/modules/location_info.py @@ -6,7 +6,7 @@ DOCUMENTATION = """ --- -module: hcloud_location_info +module: location_info short_description: Gather infos about your Hetzner Cloud locations. diff --git a/plugins/modules/hcloud_network.py b/plugins/modules/network.py similarity index 99% rename from plugins/modules/hcloud_network.py rename to plugins/modules/network.py index 1c090dc..1cf36e1 100644 --- a/plugins/modules/hcloud_network.py +++ b/plugins/modules/network.py @@ -6,7 +6,7 @@ DOCUMENTATION = """ --- -module: hcloud_network +module: network short_description: Create and manage cloud Networks on the Hetzner Cloud. diff --git a/plugins/modules/hcloud_network_info.py b/plugins/modules/network_info.py similarity index 99% rename from plugins/modules/hcloud_network_info.py rename to plugins/modules/network_info.py index f07ed9c..2ca8937 100644 --- a/plugins/modules/hcloud_network_info.py +++ b/plugins/modules/network_info.py @@ -6,7 +6,7 @@ DOCUMENTATION = """ --- -module: hcloud_network_info +module: network_info short_description: Gather info about your Hetzner Cloud networks. diff --git a/plugins/modules/hcloud_placement_group.py b/plugins/modules/placement_group.py similarity index 99% rename from plugins/modules/hcloud_placement_group.py rename to plugins/modules/placement_group.py index 352785c..455769e 100644 --- a/plugins/modules/hcloud_placement_group.py +++ b/plugins/modules/placement_group.py @@ -6,7 +6,7 @@ DOCUMENTATION = """ --- -module: hcloud_placement_group +module: placement_group short_description: Create and manage placement groups on the Hetzner Cloud. diff --git a/plugins/modules/hcloud_primary_ip.py b/plugins/modules/primary_ip.py similarity index 99% rename from plugins/modules/hcloud_primary_ip.py rename to plugins/modules/primary_ip.py index bab0e2a..84f9df9 100644 --- a/plugins/modules/hcloud_primary_ip.py +++ b/plugins/modules/primary_ip.py @@ -6,7 +6,7 @@ DOCUMENTATION = """ --- -module: hcloud_primary_ip +module: primary_ip short_description: Create and manage cloud Primary IPs on the Hetzner Cloud. diff --git a/plugins/modules/hcloud_primary_ip_info.py b/plugins/modules/primary_ip_info.py similarity index 99% rename from plugins/modules/hcloud_primary_ip_info.py rename to plugins/modules/primary_ip_info.py index ae4234c..aba65b0 100644 --- a/plugins/modules/hcloud_primary_ip_info.py +++ b/plugins/modules/primary_ip_info.py @@ -6,7 +6,7 @@ DOCUMENTATION = """ --- -module: hcloud_primary_ip_info +module: primary_ip_info short_description: Gather infos about the Hetzner Cloud Primary IPs. diff --git a/plugins/modules/hcloud_rdns.py b/plugins/modules/rdns.py similarity index 99% rename from plugins/modules/hcloud_rdns.py rename to plugins/modules/rdns.py index 254d4c1..4be2cde 100644 --- a/plugins/modules/hcloud_rdns.py +++ b/plugins/modules/rdns.py @@ -6,7 +6,7 @@ DOCUMENTATION = """ --- -module: hcloud_rdns +module: rdns short_description: Create and manage reverse DNS entries on the Hetzner Cloud. diff --git a/plugins/modules/hcloud_route.py b/plugins/modules/route.py similarity index 99% rename from plugins/modules/hcloud_route.py rename to plugins/modules/route.py index 282ae33..78cc8ed 100644 --- a/plugins/modules/hcloud_route.py +++ b/plugins/modules/route.py @@ -6,7 +6,7 @@ DOCUMENTATION = """ --- -module: hcloud_route +module: route short_description: Create and delete cloud routes on the Hetzner Cloud. diff --git a/plugins/modules/hcloud_server.py b/plugins/modules/server.py similarity index 99% rename from plugins/modules/hcloud_server.py rename to plugins/modules/server.py index 4fb5631..c55da81 100644 --- a/plugins/modules/hcloud_server.py +++ b/plugins/modules/server.py @@ -6,7 +6,7 @@ DOCUMENTATION = """ --- -module: hcloud_server +module: server short_description: Create and manage cloud servers on the Hetzner Cloud. diff --git a/plugins/modules/hcloud_server_info.py b/plugins/modules/server_info.py similarity index 99% rename from plugins/modules/hcloud_server_info.py rename to plugins/modules/server_info.py index 0c58bdc..2fb4e7f 100644 --- a/plugins/modules/hcloud_server_info.py +++ b/plugins/modules/server_info.py @@ -6,7 +6,7 @@ DOCUMENTATION = """ --- -module: hcloud_server_info +module: server_info short_description: Gather infos about your Hetzner Cloud servers. diff --git a/plugins/modules/hcloud_server_network.py b/plugins/modules/server_network.py similarity index 99% rename from plugins/modules/hcloud_server_network.py rename to plugins/modules/server_network.py index 45311bb..dfd2979 100644 --- a/plugins/modules/hcloud_server_network.py +++ b/plugins/modules/server_network.py @@ -6,7 +6,7 @@ DOCUMENTATION = """ --- -module: hcloud_server_network +module: server_network short_description: Manage the relationship between Hetzner Cloud Networks and servers diff --git a/plugins/modules/hcloud_server_type_info.py b/plugins/modules/server_type_info.py similarity index 99% rename from plugins/modules/hcloud_server_type_info.py rename to plugins/modules/server_type_info.py index ab76061..aa08280 100644 --- a/plugins/modules/hcloud_server_type_info.py +++ b/plugins/modules/server_type_info.py @@ -6,7 +6,7 @@ DOCUMENTATION = """ --- -module: hcloud_server_type_info +module: server_type_info short_description: Gather infos about the Hetzner Cloud server types. diff --git a/plugins/modules/hcloud_ssh_key.py b/plugins/modules/ssh_key.py similarity index 99% rename from plugins/modules/hcloud_ssh_key.py rename to plugins/modules/ssh_key.py index fa7effd..b0b94a5 100644 --- a/plugins/modules/hcloud_ssh_key.py +++ b/plugins/modules/ssh_key.py @@ -6,7 +6,7 @@ DOCUMENTATION = """ --- -module: hcloud_ssh_key +module: ssh_key short_description: Create and manage ssh keys on the Hetzner Cloud. diff --git a/plugins/modules/hcloud_ssh_key_info.py b/plugins/modules/ssh_key_info.py similarity index 99% rename from plugins/modules/hcloud_ssh_key_info.py rename to plugins/modules/ssh_key_info.py index 035a3d5..f0788ef 100644 --- a/plugins/modules/hcloud_ssh_key_info.py +++ b/plugins/modules/ssh_key_info.py @@ -6,7 +6,7 @@ DOCUMENTATION = """ --- -module: hcloud_ssh_key_info +module: ssh_key_info short_description: Gather infos about your Hetzner Cloud ssh_keys. description: - Gather facts about your Hetzner Cloud ssh_keys. diff --git a/plugins/modules/hcloud_subnetwork.py b/plugins/modules/subnetwork.py similarity index 99% rename from plugins/modules/hcloud_subnetwork.py rename to plugins/modules/subnetwork.py index 07fc9c7..4afe00c 100644 --- a/plugins/modules/hcloud_subnetwork.py +++ b/plugins/modules/subnetwork.py @@ -6,7 +6,7 @@ DOCUMENTATION = """ --- -module: hcloud_subnetwork +module: subnetwork short_description: Manage cloud subnetworks on the Hetzner Cloud. diff --git a/plugins/modules/hcloud_volume.py b/plugins/modules/volume.py similarity index 99% rename from plugins/modules/hcloud_volume.py rename to plugins/modules/volume.py index c66f3e9..d443e39 100644 --- a/plugins/modules/hcloud_volume.py +++ b/plugins/modules/volume.py @@ -6,7 +6,7 @@ DOCUMENTATION = """ --- -module: hcloud_volume +module: volume short_description: Create and manage block Volume on the Hetzner Cloud. diff --git a/plugins/modules/hcloud_volume_info.py b/plugins/modules/volume_info.py similarity index 99% rename from plugins/modules/hcloud_volume_info.py rename to plugins/modules/volume_info.py index 945df52..22db416 100644 --- a/plugins/modules/hcloud_volume_info.py +++ b/plugins/modules/volume_info.py @@ -6,7 +6,7 @@ DOCUMENTATION = """ --- -module: hcloud_volume_info +module: volume_info short_description: Gather infos about your Hetzner Cloud Volumes. diff --git a/scripts/integration-test-files.sh b/scripts/integration-test-files.sh index 611560b..fbae089 100755 --- a/scripts/integration-test-files.sh +++ b/scripts/integration-test-files.sh @@ -2,7 +2,7 @@ # Sync the integration test files from the template to all the integrations targets. -integration_targets="tests/integration/targets/hcloud_" +integration_targets="tests/integration/targets/" integration_common="tests/integration/common" # banner @@ -20,6 +20,9 @@ copy_file() { } for target in "$integration_targets"*; do + if [[ "$(basename "$target")" = setup_* ]]; then + continue + fi copy_file "$integration_common"/defaults/main/common.yml "$target"/defaults/main/common.yml copy_file "$integration_common"/tasks/main.yml "$target"/tasks/main.yml done diff --git a/tests/integration/targets/hcloud_certificate/aliases b/tests/integration/targets/certificate/aliases similarity index 100% rename from tests/integration/targets/hcloud_certificate/aliases rename to tests/integration/targets/certificate/aliases diff --git a/tests/integration/targets/hcloud_certificate/defaults/main/common.yml b/tests/integration/targets/certificate/defaults/main/common.yml similarity index 100% rename from tests/integration/targets/hcloud_certificate/defaults/main/common.yml rename to tests/integration/targets/certificate/defaults/main/common.yml diff --git a/tests/integration/targets/hcloud_certificate/defaults/main/main.yml b/tests/integration/targets/certificate/defaults/main/main.yml similarity index 100% rename from tests/integration/targets/hcloud_certificate/defaults/main/main.yml rename to tests/integration/targets/certificate/defaults/main/main.yml diff --git a/tests/integration/targets/hcloud_certificate/meta/main.yml b/tests/integration/targets/certificate/meta/main.yml similarity index 100% rename from tests/integration/targets/hcloud_certificate/meta/main.yml rename to tests/integration/targets/certificate/meta/main.yml diff --git a/tests/integration/targets/hcloud_certificate/tasks/cleanup.yml b/tests/integration/targets/certificate/tasks/cleanup.yml similarity index 100% rename from tests/integration/targets/hcloud_certificate/tasks/cleanup.yml rename to tests/integration/targets/certificate/tasks/cleanup.yml diff --git a/tests/integration/targets/hcloud_certificate/tasks/main.yml b/tests/integration/targets/certificate/tasks/main.yml similarity index 100% rename from tests/integration/targets/hcloud_certificate/tasks/main.yml rename to tests/integration/targets/certificate/tasks/main.yml diff --git a/tests/integration/targets/hcloud_certificate/tasks/test.yml b/tests/integration/targets/certificate/tasks/test.yml similarity index 100% rename from tests/integration/targets/hcloud_certificate/tasks/test.yml rename to tests/integration/targets/certificate/tasks/test.yml diff --git a/tests/integration/targets/hcloud_certificate_info/aliases b/tests/integration/targets/certificate_info/aliases similarity index 100% rename from tests/integration/targets/hcloud_certificate_info/aliases rename to tests/integration/targets/certificate_info/aliases diff --git a/tests/integration/targets/hcloud_certificate_info/defaults/main/common.yml b/tests/integration/targets/certificate_info/defaults/main/common.yml similarity index 100% rename from tests/integration/targets/hcloud_certificate_info/defaults/main/common.yml rename to tests/integration/targets/certificate_info/defaults/main/common.yml diff --git a/tests/integration/targets/hcloud_certificate_info/defaults/main/main.yml b/tests/integration/targets/certificate_info/defaults/main/main.yml similarity index 100% rename from tests/integration/targets/hcloud_certificate_info/defaults/main/main.yml rename to tests/integration/targets/certificate_info/defaults/main/main.yml diff --git a/tests/integration/targets/hcloud_certificate_info/meta/main.yml b/tests/integration/targets/certificate_info/meta/main.yml similarity index 100% rename from tests/integration/targets/hcloud_certificate_info/meta/main.yml rename to tests/integration/targets/certificate_info/meta/main.yml diff --git a/tests/integration/targets/hcloud_certificate_info/tasks/cleanup.yml b/tests/integration/targets/certificate_info/tasks/cleanup.yml similarity index 100% rename from tests/integration/targets/hcloud_certificate_info/tasks/cleanup.yml rename to tests/integration/targets/certificate_info/tasks/cleanup.yml diff --git a/tests/integration/targets/hcloud_certificate_info/tasks/main.yml b/tests/integration/targets/certificate_info/tasks/main.yml similarity index 100% rename from tests/integration/targets/hcloud_certificate_info/tasks/main.yml rename to tests/integration/targets/certificate_info/tasks/main.yml diff --git a/tests/integration/targets/hcloud_certificate_info/tasks/prepare.yml b/tests/integration/targets/certificate_info/tasks/prepare.yml similarity index 100% rename from tests/integration/targets/hcloud_certificate_info/tasks/prepare.yml rename to tests/integration/targets/certificate_info/tasks/prepare.yml diff --git a/tests/integration/targets/hcloud_certificate_info/tasks/test.yml b/tests/integration/targets/certificate_info/tasks/test.yml similarity index 100% rename from tests/integration/targets/hcloud_certificate_info/tasks/test.yml rename to tests/integration/targets/certificate_info/tasks/test.yml diff --git a/tests/integration/targets/hcloud_datacenter_info/aliases b/tests/integration/targets/datacenter_info/aliases similarity index 100% rename from tests/integration/targets/hcloud_datacenter_info/aliases rename to tests/integration/targets/datacenter_info/aliases diff --git a/tests/integration/targets/hcloud_datacenter_info/defaults/main/common.yml b/tests/integration/targets/datacenter_info/defaults/main/common.yml similarity index 100% rename from tests/integration/targets/hcloud_datacenter_info/defaults/main/common.yml rename to tests/integration/targets/datacenter_info/defaults/main/common.yml diff --git a/tests/integration/targets/hcloud_datacenter_info/defaults/main/main.yml b/tests/integration/targets/datacenter_info/defaults/main/main.yml similarity index 100% rename from tests/integration/targets/hcloud_datacenter_info/defaults/main/main.yml rename to tests/integration/targets/datacenter_info/defaults/main/main.yml diff --git a/tests/integration/targets/hcloud_datacenter_info/tasks/main.yml b/tests/integration/targets/datacenter_info/tasks/main.yml similarity index 100% rename from tests/integration/targets/hcloud_datacenter_info/tasks/main.yml rename to tests/integration/targets/datacenter_info/tasks/main.yml diff --git a/tests/integration/targets/hcloud_datacenter_info/tasks/test.yml b/tests/integration/targets/datacenter_info/tasks/test.yml similarity index 100% rename from tests/integration/targets/hcloud_datacenter_info/tasks/test.yml rename to tests/integration/targets/datacenter_info/tasks/test.yml diff --git a/tests/integration/targets/hcloud_firewall/aliases b/tests/integration/targets/firewall/aliases similarity index 100% rename from tests/integration/targets/hcloud_firewall/aliases rename to tests/integration/targets/firewall/aliases diff --git a/tests/integration/targets/hcloud_firewall/defaults/main/common.yml b/tests/integration/targets/firewall/defaults/main/common.yml similarity index 100% rename from tests/integration/targets/hcloud_firewall/defaults/main/common.yml rename to tests/integration/targets/firewall/defaults/main/common.yml diff --git a/tests/integration/targets/hcloud_firewall/defaults/main/main.yml b/tests/integration/targets/firewall/defaults/main/main.yml similarity index 100% rename from tests/integration/targets/hcloud_firewall/defaults/main/main.yml rename to tests/integration/targets/firewall/defaults/main/main.yml diff --git a/tests/integration/targets/hcloud_firewall/tasks/main.yml b/tests/integration/targets/firewall/tasks/main.yml similarity index 100% rename from tests/integration/targets/hcloud_firewall/tasks/main.yml rename to tests/integration/targets/firewall/tasks/main.yml diff --git a/tests/integration/targets/hcloud_firewall/tasks/test.yml b/tests/integration/targets/firewall/tasks/test.yml similarity index 100% rename from tests/integration/targets/hcloud_firewall/tasks/test.yml rename to tests/integration/targets/firewall/tasks/test.yml diff --git a/tests/integration/targets/hcloud_floating_ip/aliases b/tests/integration/targets/floating_ip/aliases similarity index 100% rename from tests/integration/targets/hcloud_floating_ip/aliases rename to tests/integration/targets/floating_ip/aliases diff --git a/tests/integration/targets/hcloud_floating_ip/defaults/main/common.yml b/tests/integration/targets/floating_ip/defaults/main/common.yml similarity index 100% rename from tests/integration/targets/hcloud_floating_ip/defaults/main/common.yml rename to tests/integration/targets/floating_ip/defaults/main/common.yml diff --git a/tests/integration/targets/hcloud_floating_ip/defaults/main/main.yml b/tests/integration/targets/floating_ip/defaults/main/main.yml similarity index 100% rename from tests/integration/targets/hcloud_floating_ip/defaults/main/main.yml rename to tests/integration/targets/floating_ip/defaults/main/main.yml diff --git a/tests/integration/targets/hcloud_floating_ip/tasks/main.yml b/tests/integration/targets/floating_ip/tasks/main.yml similarity index 100% rename from tests/integration/targets/hcloud_floating_ip/tasks/main.yml rename to tests/integration/targets/floating_ip/tasks/main.yml diff --git a/tests/integration/targets/hcloud_floating_ip/tasks/test.yml b/tests/integration/targets/floating_ip/tasks/test.yml similarity index 100% rename from tests/integration/targets/hcloud_floating_ip/tasks/test.yml rename to tests/integration/targets/floating_ip/tasks/test.yml diff --git a/tests/integration/targets/hcloud_floating_ip_info/aliases b/tests/integration/targets/floating_ip_info/aliases similarity index 100% rename from tests/integration/targets/hcloud_floating_ip_info/aliases rename to tests/integration/targets/floating_ip_info/aliases diff --git a/tests/integration/targets/hcloud_floating_ip_info/defaults/main/common.yml b/tests/integration/targets/floating_ip_info/defaults/main/common.yml similarity index 100% rename from tests/integration/targets/hcloud_floating_ip_info/defaults/main/common.yml rename to tests/integration/targets/floating_ip_info/defaults/main/common.yml diff --git a/tests/integration/targets/hcloud_floating_ip_info/defaults/main/main.yml b/tests/integration/targets/floating_ip_info/defaults/main/main.yml similarity index 100% rename from tests/integration/targets/hcloud_floating_ip_info/defaults/main/main.yml rename to tests/integration/targets/floating_ip_info/defaults/main/main.yml diff --git a/tests/integration/targets/hcloud_floating_ip_info/tasks/cleanup.yml b/tests/integration/targets/floating_ip_info/tasks/cleanup.yml similarity index 100% rename from tests/integration/targets/hcloud_floating_ip_info/tasks/cleanup.yml rename to tests/integration/targets/floating_ip_info/tasks/cleanup.yml diff --git a/tests/integration/targets/hcloud_floating_ip_info/tasks/main.yml b/tests/integration/targets/floating_ip_info/tasks/main.yml similarity index 100% rename from tests/integration/targets/hcloud_floating_ip_info/tasks/main.yml rename to tests/integration/targets/floating_ip_info/tasks/main.yml diff --git a/tests/integration/targets/hcloud_floating_ip_info/tasks/prepare.yml b/tests/integration/targets/floating_ip_info/tasks/prepare.yml similarity index 100% rename from tests/integration/targets/hcloud_floating_ip_info/tasks/prepare.yml rename to tests/integration/targets/floating_ip_info/tasks/prepare.yml diff --git a/tests/integration/targets/hcloud_floating_ip_info/tasks/test.yml b/tests/integration/targets/floating_ip_info/tasks/test.yml similarity index 100% rename from tests/integration/targets/hcloud_floating_ip_info/tasks/test.yml rename to tests/integration/targets/floating_ip_info/tasks/test.yml diff --git a/tests/integration/targets/hcloud_image_info/aliases b/tests/integration/targets/image_info/aliases similarity index 100% rename from tests/integration/targets/hcloud_image_info/aliases rename to tests/integration/targets/image_info/aliases diff --git a/tests/integration/targets/hcloud_image_info/defaults/main/common.yml b/tests/integration/targets/image_info/defaults/main/common.yml similarity index 100% rename from tests/integration/targets/hcloud_image_info/defaults/main/common.yml rename to tests/integration/targets/image_info/defaults/main/common.yml diff --git a/tests/integration/targets/hcloud_image_info/defaults/main/main.yml b/tests/integration/targets/image_info/defaults/main/main.yml similarity index 100% rename from tests/integration/targets/hcloud_image_info/defaults/main/main.yml rename to tests/integration/targets/image_info/defaults/main/main.yml diff --git a/tests/integration/targets/hcloud_image_info/meta/main.yml b/tests/integration/targets/image_info/meta/main.yml similarity index 100% rename from tests/integration/targets/hcloud_image_info/meta/main.yml rename to tests/integration/targets/image_info/meta/main.yml diff --git a/tests/integration/targets/hcloud_image_info/tasks/cleanup.yml b/tests/integration/targets/image_info/tasks/cleanup.yml similarity index 100% rename from tests/integration/targets/hcloud_image_info/tasks/cleanup.yml rename to tests/integration/targets/image_info/tasks/cleanup.yml diff --git a/tests/integration/targets/hcloud_image_info/tasks/main.yml b/tests/integration/targets/image_info/tasks/main.yml similarity index 100% rename from tests/integration/targets/hcloud_image_info/tasks/main.yml rename to tests/integration/targets/image_info/tasks/main.yml diff --git a/tests/integration/targets/hcloud_image_info/tasks/prepare.yml b/tests/integration/targets/image_info/tasks/prepare.yml similarity index 100% rename from tests/integration/targets/hcloud_image_info/tasks/prepare.yml rename to tests/integration/targets/image_info/tasks/prepare.yml diff --git a/tests/integration/targets/hcloud_image_info/tasks/test.yml b/tests/integration/targets/image_info/tasks/test.yml similarity index 100% rename from tests/integration/targets/hcloud_image_info/tasks/test.yml rename to tests/integration/targets/image_info/tasks/test.yml diff --git a/tests/integration/targets/hcloud_iso_info/aliases b/tests/integration/targets/iso_info/aliases similarity index 100% rename from tests/integration/targets/hcloud_iso_info/aliases rename to tests/integration/targets/iso_info/aliases diff --git a/tests/integration/targets/hcloud_iso_info/defaults/main/common.yml b/tests/integration/targets/iso_info/defaults/main/common.yml similarity index 100% rename from tests/integration/targets/hcloud_iso_info/defaults/main/common.yml rename to tests/integration/targets/iso_info/defaults/main/common.yml diff --git a/tests/integration/targets/hcloud_iso_info/defaults/main/main.yml b/tests/integration/targets/iso_info/defaults/main/main.yml similarity index 100% rename from tests/integration/targets/hcloud_iso_info/defaults/main/main.yml rename to tests/integration/targets/iso_info/defaults/main/main.yml diff --git a/tests/integration/targets/hcloud_iso_info/tasks/main.yml b/tests/integration/targets/iso_info/tasks/main.yml similarity index 100% rename from tests/integration/targets/hcloud_iso_info/tasks/main.yml rename to tests/integration/targets/iso_info/tasks/main.yml diff --git a/tests/integration/targets/hcloud_iso_info/tasks/test.yml b/tests/integration/targets/iso_info/tasks/test.yml similarity index 100% rename from tests/integration/targets/hcloud_iso_info/tasks/test.yml rename to tests/integration/targets/iso_info/tasks/test.yml diff --git a/tests/integration/targets/hcloud_load_balancer/aliases b/tests/integration/targets/load_balancer/aliases similarity index 100% rename from tests/integration/targets/hcloud_load_balancer/aliases rename to tests/integration/targets/load_balancer/aliases diff --git a/tests/integration/targets/hcloud_load_balancer/defaults/main/common.yml b/tests/integration/targets/load_balancer/defaults/main/common.yml similarity index 100% rename from tests/integration/targets/hcloud_load_balancer/defaults/main/common.yml rename to tests/integration/targets/load_balancer/defaults/main/common.yml diff --git a/tests/integration/targets/hcloud_load_balancer/defaults/main/main.yml b/tests/integration/targets/load_balancer/defaults/main/main.yml similarity index 100% rename from tests/integration/targets/hcloud_load_balancer/defaults/main/main.yml rename to tests/integration/targets/load_balancer/defaults/main/main.yml diff --git a/tests/integration/targets/hcloud_load_balancer/tasks/cleanup.yml b/tests/integration/targets/load_balancer/tasks/cleanup.yml similarity index 100% rename from tests/integration/targets/hcloud_load_balancer/tasks/cleanup.yml rename to tests/integration/targets/load_balancer/tasks/cleanup.yml diff --git a/tests/integration/targets/hcloud_load_balancer/tasks/main.yml b/tests/integration/targets/load_balancer/tasks/main.yml similarity index 100% rename from tests/integration/targets/hcloud_load_balancer/tasks/main.yml rename to tests/integration/targets/load_balancer/tasks/main.yml diff --git a/tests/integration/targets/hcloud_load_balancer/tasks/test.yml b/tests/integration/targets/load_balancer/tasks/test.yml similarity index 100% rename from tests/integration/targets/hcloud_load_balancer/tasks/test.yml rename to tests/integration/targets/load_balancer/tasks/test.yml diff --git a/tests/integration/targets/hcloud_load_balancer_info/aliases b/tests/integration/targets/load_balancer_info/aliases similarity index 100% rename from tests/integration/targets/hcloud_load_balancer_info/aliases rename to tests/integration/targets/load_balancer_info/aliases diff --git a/tests/integration/targets/hcloud_load_balancer_info/defaults/main/common.yml b/tests/integration/targets/load_balancer_info/defaults/main/common.yml similarity index 100% rename from tests/integration/targets/hcloud_load_balancer_info/defaults/main/common.yml rename to tests/integration/targets/load_balancer_info/defaults/main/common.yml diff --git a/tests/integration/targets/hcloud_load_balancer_info/defaults/main/main.yml b/tests/integration/targets/load_balancer_info/defaults/main/main.yml similarity index 100% rename from tests/integration/targets/hcloud_load_balancer_info/defaults/main/main.yml rename to tests/integration/targets/load_balancer_info/defaults/main/main.yml diff --git a/tests/integration/targets/hcloud_load_balancer_info/meta/main.yml b/tests/integration/targets/load_balancer_info/meta/main.yml similarity index 100% rename from tests/integration/targets/hcloud_load_balancer_info/meta/main.yml rename to tests/integration/targets/load_balancer_info/meta/main.yml diff --git a/tests/integration/targets/hcloud_load_balancer_info/tasks/cleanup.yml b/tests/integration/targets/load_balancer_info/tasks/cleanup.yml similarity index 100% rename from tests/integration/targets/hcloud_load_balancer_info/tasks/cleanup.yml rename to tests/integration/targets/load_balancer_info/tasks/cleanup.yml diff --git a/tests/integration/targets/hcloud_load_balancer_info/tasks/main.yml b/tests/integration/targets/load_balancer_info/tasks/main.yml similarity index 100% rename from tests/integration/targets/hcloud_load_balancer_info/tasks/main.yml rename to tests/integration/targets/load_balancer_info/tasks/main.yml diff --git a/tests/integration/targets/hcloud_load_balancer_info/tasks/prepare.yml b/tests/integration/targets/load_balancer_info/tasks/prepare.yml similarity index 100% rename from tests/integration/targets/hcloud_load_balancer_info/tasks/prepare.yml rename to tests/integration/targets/load_balancer_info/tasks/prepare.yml diff --git a/tests/integration/targets/hcloud_load_balancer_info/tasks/test.yml b/tests/integration/targets/load_balancer_info/tasks/test.yml similarity index 100% rename from tests/integration/targets/hcloud_load_balancer_info/tasks/test.yml rename to tests/integration/targets/load_balancer_info/tasks/test.yml diff --git a/tests/integration/targets/hcloud_load_balancer_network/aliases b/tests/integration/targets/load_balancer_network/aliases similarity index 100% rename from tests/integration/targets/hcloud_load_balancer_network/aliases rename to tests/integration/targets/load_balancer_network/aliases diff --git a/tests/integration/targets/hcloud_load_balancer_network/defaults/main/common.yml b/tests/integration/targets/load_balancer_network/defaults/main/common.yml similarity index 100% rename from tests/integration/targets/hcloud_load_balancer_network/defaults/main/common.yml rename to tests/integration/targets/load_balancer_network/defaults/main/common.yml diff --git a/tests/integration/targets/hcloud_load_balancer_network/defaults/main/main.yml b/tests/integration/targets/load_balancer_network/defaults/main/main.yml similarity index 100% rename from tests/integration/targets/hcloud_load_balancer_network/defaults/main/main.yml rename to tests/integration/targets/load_balancer_network/defaults/main/main.yml diff --git a/tests/integration/targets/hcloud_load_balancer_network/tasks/main.yml b/tests/integration/targets/load_balancer_network/tasks/main.yml similarity index 100% rename from tests/integration/targets/hcloud_load_balancer_network/tasks/main.yml rename to tests/integration/targets/load_balancer_network/tasks/main.yml diff --git a/tests/integration/targets/hcloud_load_balancer_network/tasks/test.yml b/tests/integration/targets/load_balancer_network/tasks/test.yml similarity index 100% rename from tests/integration/targets/hcloud_load_balancer_network/tasks/test.yml rename to tests/integration/targets/load_balancer_network/tasks/test.yml diff --git a/tests/integration/targets/hcloud_load_balancer_service/aliases b/tests/integration/targets/load_balancer_service/aliases similarity index 100% rename from tests/integration/targets/hcloud_load_balancer_service/aliases rename to tests/integration/targets/load_balancer_service/aliases diff --git a/tests/integration/targets/hcloud_load_balancer_service/defaults/main/common.yml b/tests/integration/targets/load_balancer_service/defaults/main/common.yml similarity index 100% rename from tests/integration/targets/hcloud_load_balancer_service/defaults/main/common.yml rename to tests/integration/targets/load_balancer_service/defaults/main/common.yml diff --git a/tests/integration/targets/hcloud_load_balancer_service/defaults/main/main.yml b/tests/integration/targets/load_balancer_service/defaults/main/main.yml similarity index 100% rename from tests/integration/targets/hcloud_load_balancer_service/defaults/main/main.yml rename to tests/integration/targets/load_balancer_service/defaults/main/main.yml diff --git a/tests/integration/targets/hcloud_load_balancer_service/tasks/main.yml b/tests/integration/targets/load_balancer_service/tasks/main.yml similarity index 100% rename from tests/integration/targets/hcloud_load_balancer_service/tasks/main.yml rename to tests/integration/targets/load_balancer_service/tasks/main.yml diff --git a/tests/integration/targets/hcloud_load_balancer_service/tasks/test.yml b/tests/integration/targets/load_balancer_service/tasks/test.yml similarity index 100% rename from tests/integration/targets/hcloud_load_balancer_service/tasks/test.yml rename to tests/integration/targets/load_balancer_service/tasks/test.yml diff --git a/tests/integration/targets/hcloud_load_balancer_target/aliases b/tests/integration/targets/load_balancer_target/aliases similarity index 100% rename from tests/integration/targets/hcloud_load_balancer_target/aliases rename to tests/integration/targets/load_balancer_target/aliases diff --git a/tests/integration/targets/hcloud_load_balancer_target/defaults/main/common.yml b/tests/integration/targets/load_balancer_target/defaults/main/common.yml similarity index 100% rename from tests/integration/targets/hcloud_load_balancer_target/defaults/main/common.yml rename to tests/integration/targets/load_balancer_target/defaults/main/common.yml diff --git a/tests/integration/targets/hcloud_load_balancer_target/defaults/main/main.yml b/tests/integration/targets/load_balancer_target/defaults/main/main.yml similarity index 100% rename from tests/integration/targets/hcloud_load_balancer_target/defaults/main/main.yml rename to tests/integration/targets/load_balancer_target/defaults/main/main.yml diff --git a/tests/integration/targets/hcloud_load_balancer_target/tasks/main.yml b/tests/integration/targets/load_balancer_target/tasks/main.yml similarity index 100% rename from tests/integration/targets/hcloud_load_balancer_target/tasks/main.yml rename to tests/integration/targets/load_balancer_target/tasks/main.yml diff --git a/tests/integration/targets/hcloud_load_balancer_target/tasks/test.yml b/tests/integration/targets/load_balancer_target/tasks/test.yml similarity index 100% rename from tests/integration/targets/hcloud_load_balancer_target/tasks/test.yml rename to tests/integration/targets/load_balancer_target/tasks/test.yml diff --git a/tests/integration/targets/hcloud_load_balancer_type_info/aliases b/tests/integration/targets/load_balancer_type_info/aliases similarity index 100% rename from tests/integration/targets/hcloud_load_balancer_type_info/aliases rename to tests/integration/targets/load_balancer_type_info/aliases diff --git a/tests/integration/targets/hcloud_load_balancer_type_info/defaults/main/common.yml b/tests/integration/targets/load_balancer_type_info/defaults/main/common.yml similarity index 100% rename from tests/integration/targets/hcloud_load_balancer_type_info/defaults/main/common.yml rename to tests/integration/targets/load_balancer_type_info/defaults/main/common.yml diff --git a/tests/integration/targets/hcloud_load_balancer_type_info/defaults/main/main.yml b/tests/integration/targets/load_balancer_type_info/defaults/main/main.yml similarity index 100% rename from tests/integration/targets/hcloud_load_balancer_type_info/defaults/main/main.yml rename to tests/integration/targets/load_balancer_type_info/defaults/main/main.yml diff --git a/tests/integration/targets/hcloud_load_balancer_type_info/tasks/main.yml b/tests/integration/targets/load_balancer_type_info/tasks/main.yml similarity index 100% rename from tests/integration/targets/hcloud_load_balancer_type_info/tasks/main.yml rename to tests/integration/targets/load_balancer_type_info/tasks/main.yml diff --git a/tests/integration/targets/hcloud_load_balancer_type_info/tasks/test.yml b/tests/integration/targets/load_balancer_type_info/tasks/test.yml similarity index 100% rename from tests/integration/targets/hcloud_load_balancer_type_info/tasks/test.yml rename to tests/integration/targets/load_balancer_type_info/tasks/test.yml diff --git a/tests/integration/targets/hcloud_location_info/aliases b/tests/integration/targets/location_info/aliases similarity index 100% rename from tests/integration/targets/hcloud_location_info/aliases rename to tests/integration/targets/location_info/aliases diff --git a/tests/integration/targets/hcloud_location_info/defaults/main/common.yml b/tests/integration/targets/location_info/defaults/main/common.yml similarity index 100% rename from tests/integration/targets/hcloud_location_info/defaults/main/common.yml rename to tests/integration/targets/location_info/defaults/main/common.yml diff --git a/tests/integration/targets/hcloud_location_info/defaults/main/main.yml b/tests/integration/targets/location_info/defaults/main/main.yml similarity index 100% rename from tests/integration/targets/hcloud_location_info/defaults/main/main.yml rename to tests/integration/targets/location_info/defaults/main/main.yml diff --git a/tests/integration/targets/hcloud_location_info/tasks/main.yml b/tests/integration/targets/location_info/tasks/main.yml similarity index 100% rename from tests/integration/targets/hcloud_location_info/tasks/main.yml rename to tests/integration/targets/location_info/tasks/main.yml diff --git a/tests/integration/targets/hcloud_location_info/tasks/test.yml b/tests/integration/targets/location_info/tasks/test.yml similarity index 100% rename from tests/integration/targets/hcloud_location_info/tasks/test.yml rename to tests/integration/targets/location_info/tasks/test.yml diff --git a/tests/integration/targets/hcloud_network/aliases b/tests/integration/targets/network/aliases similarity index 100% rename from tests/integration/targets/hcloud_network/aliases rename to tests/integration/targets/network/aliases diff --git a/tests/integration/targets/hcloud_network/defaults/main/common.yml b/tests/integration/targets/network/defaults/main/common.yml similarity index 100% rename from tests/integration/targets/hcloud_network/defaults/main/common.yml rename to tests/integration/targets/network/defaults/main/common.yml diff --git a/tests/integration/targets/hcloud_network/defaults/main/main.yml b/tests/integration/targets/network/defaults/main/main.yml similarity index 100% rename from tests/integration/targets/hcloud_network/defaults/main/main.yml rename to tests/integration/targets/network/defaults/main/main.yml diff --git a/tests/integration/targets/hcloud_network/tasks/main.yml b/tests/integration/targets/network/tasks/main.yml similarity index 100% rename from tests/integration/targets/hcloud_network/tasks/main.yml rename to tests/integration/targets/network/tasks/main.yml diff --git a/tests/integration/targets/hcloud_network/tasks/test.yml b/tests/integration/targets/network/tasks/test.yml similarity index 100% rename from tests/integration/targets/hcloud_network/tasks/test.yml rename to tests/integration/targets/network/tasks/test.yml diff --git a/tests/integration/targets/hcloud_network_info/aliases b/tests/integration/targets/network_info/aliases similarity index 100% rename from tests/integration/targets/hcloud_network_info/aliases rename to tests/integration/targets/network_info/aliases diff --git a/tests/integration/targets/hcloud_network_info/defaults/main/common.yml b/tests/integration/targets/network_info/defaults/main/common.yml similarity index 100% rename from tests/integration/targets/hcloud_network_info/defaults/main/common.yml rename to tests/integration/targets/network_info/defaults/main/common.yml diff --git a/tests/integration/targets/hcloud_network_info/defaults/main/main.yml b/tests/integration/targets/network_info/defaults/main/main.yml similarity index 100% rename from tests/integration/targets/hcloud_network_info/defaults/main/main.yml rename to tests/integration/targets/network_info/defaults/main/main.yml diff --git a/tests/integration/targets/hcloud_network_info/tasks/cleanup.yml b/tests/integration/targets/network_info/tasks/cleanup.yml similarity index 100% rename from tests/integration/targets/hcloud_network_info/tasks/cleanup.yml rename to tests/integration/targets/network_info/tasks/cleanup.yml diff --git a/tests/integration/targets/hcloud_network_info/tasks/main.yml b/tests/integration/targets/network_info/tasks/main.yml similarity index 100% rename from tests/integration/targets/hcloud_network_info/tasks/main.yml rename to tests/integration/targets/network_info/tasks/main.yml diff --git a/tests/integration/targets/hcloud_network_info/tasks/prepare.yml b/tests/integration/targets/network_info/tasks/prepare.yml similarity index 100% rename from tests/integration/targets/hcloud_network_info/tasks/prepare.yml rename to tests/integration/targets/network_info/tasks/prepare.yml diff --git a/tests/integration/targets/hcloud_network_info/tasks/test.yml b/tests/integration/targets/network_info/tasks/test.yml similarity index 100% rename from tests/integration/targets/hcloud_network_info/tasks/test.yml rename to tests/integration/targets/network_info/tasks/test.yml diff --git a/tests/integration/targets/hcloud_placement_group/aliases b/tests/integration/targets/placement_group/aliases similarity index 100% rename from tests/integration/targets/hcloud_placement_group/aliases rename to tests/integration/targets/placement_group/aliases diff --git a/tests/integration/targets/hcloud_placement_group/defaults/main/common.yml b/tests/integration/targets/placement_group/defaults/main/common.yml similarity index 100% rename from tests/integration/targets/hcloud_placement_group/defaults/main/common.yml rename to tests/integration/targets/placement_group/defaults/main/common.yml diff --git a/tests/integration/targets/hcloud_placement_group/defaults/main/main.yml b/tests/integration/targets/placement_group/defaults/main/main.yml similarity index 100% rename from tests/integration/targets/hcloud_placement_group/defaults/main/main.yml rename to tests/integration/targets/placement_group/defaults/main/main.yml diff --git a/tests/integration/targets/hcloud_placement_group/meta/main.yml b/tests/integration/targets/placement_group/meta/main.yml similarity index 100% rename from tests/integration/targets/hcloud_placement_group/meta/main.yml rename to tests/integration/targets/placement_group/meta/main.yml diff --git a/tests/integration/targets/hcloud_placement_group/tasks/cleanup.yml b/tests/integration/targets/placement_group/tasks/cleanup.yml similarity index 100% rename from tests/integration/targets/hcloud_placement_group/tasks/cleanup.yml rename to tests/integration/targets/placement_group/tasks/cleanup.yml diff --git a/tests/integration/targets/hcloud_placement_group/tasks/main.yml b/tests/integration/targets/placement_group/tasks/main.yml similarity index 100% rename from tests/integration/targets/hcloud_placement_group/tasks/main.yml rename to tests/integration/targets/placement_group/tasks/main.yml diff --git a/tests/integration/targets/hcloud_placement_group/tasks/prepare.yml b/tests/integration/targets/placement_group/tasks/prepare.yml similarity index 100% rename from tests/integration/targets/hcloud_placement_group/tasks/prepare.yml rename to tests/integration/targets/placement_group/tasks/prepare.yml diff --git a/tests/integration/targets/hcloud_placement_group/tasks/test.yml b/tests/integration/targets/placement_group/tasks/test.yml similarity index 100% rename from tests/integration/targets/hcloud_placement_group/tasks/test.yml rename to tests/integration/targets/placement_group/tasks/test.yml diff --git a/tests/integration/targets/hcloud_primary_ip/aliases b/tests/integration/targets/primary_ip/aliases similarity index 100% rename from tests/integration/targets/hcloud_primary_ip/aliases rename to tests/integration/targets/primary_ip/aliases diff --git a/tests/integration/targets/hcloud_primary_ip/defaults/main/common.yml b/tests/integration/targets/primary_ip/defaults/main/common.yml similarity index 100% rename from tests/integration/targets/hcloud_primary_ip/defaults/main/common.yml rename to tests/integration/targets/primary_ip/defaults/main/common.yml diff --git a/tests/integration/targets/hcloud_primary_ip/defaults/main/main.yml b/tests/integration/targets/primary_ip/defaults/main/main.yml similarity index 100% rename from tests/integration/targets/hcloud_primary_ip/defaults/main/main.yml rename to tests/integration/targets/primary_ip/defaults/main/main.yml diff --git a/tests/integration/targets/hcloud_primary_ip/tasks/main.yml b/tests/integration/targets/primary_ip/tasks/main.yml similarity index 100% rename from tests/integration/targets/hcloud_primary_ip/tasks/main.yml rename to tests/integration/targets/primary_ip/tasks/main.yml diff --git a/tests/integration/targets/hcloud_primary_ip/tasks/test.yml b/tests/integration/targets/primary_ip/tasks/test.yml similarity index 100% rename from tests/integration/targets/hcloud_primary_ip/tasks/test.yml rename to tests/integration/targets/primary_ip/tasks/test.yml diff --git a/tests/integration/targets/hcloud_primary_ip_info/aliases b/tests/integration/targets/primary_ip_info/aliases similarity index 100% rename from tests/integration/targets/hcloud_primary_ip_info/aliases rename to tests/integration/targets/primary_ip_info/aliases diff --git a/tests/integration/targets/hcloud_primary_ip_info/defaults/main/common.yml b/tests/integration/targets/primary_ip_info/defaults/main/common.yml similarity index 100% rename from tests/integration/targets/hcloud_primary_ip_info/defaults/main/common.yml rename to tests/integration/targets/primary_ip_info/defaults/main/common.yml diff --git a/tests/integration/targets/hcloud_primary_ip_info/defaults/main/main.yml b/tests/integration/targets/primary_ip_info/defaults/main/main.yml similarity index 100% rename from tests/integration/targets/hcloud_primary_ip_info/defaults/main/main.yml rename to tests/integration/targets/primary_ip_info/defaults/main/main.yml diff --git a/tests/integration/targets/hcloud_primary_ip_info/tasks/cleanup.yml b/tests/integration/targets/primary_ip_info/tasks/cleanup.yml similarity index 100% rename from tests/integration/targets/hcloud_primary_ip_info/tasks/cleanup.yml rename to tests/integration/targets/primary_ip_info/tasks/cleanup.yml diff --git a/tests/integration/targets/hcloud_primary_ip_info/tasks/main.yml b/tests/integration/targets/primary_ip_info/tasks/main.yml similarity index 100% rename from tests/integration/targets/hcloud_primary_ip_info/tasks/main.yml rename to tests/integration/targets/primary_ip_info/tasks/main.yml diff --git a/tests/integration/targets/hcloud_primary_ip_info/tasks/prepare.yml b/tests/integration/targets/primary_ip_info/tasks/prepare.yml similarity index 100% rename from tests/integration/targets/hcloud_primary_ip_info/tasks/prepare.yml rename to tests/integration/targets/primary_ip_info/tasks/prepare.yml diff --git a/tests/integration/targets/hcloud_primary_ip_info/tasks/test.yml b/tests/integration/targets/primary_ip_info/tasks/test.yml similarity index 100% rename from tests/integration/targets/hcloud_primary_ip_info/tasks/test.yml rename to tests/integration/targets/primary_ip_info/tasks/test.yml diff --git a/tests/integration/targets/hcloud_rdns/aliases b/tests/integration/targets/rdns/aliases similarity index 100% rename from tests/integration/targets/hcloud_rdns/aliases rename to tests/integration/targets/rdns/aliases diff --git a/tests/integration/targets/hcloud_rdns/defaults/main/common.yml b/tests/integration/targets/rdns/defaults/main/common.yml similarity index 100% rename from tests/integration/targets/hcloud_rdns/defaults/main/common.yml rename to tests/integration/targets/rdns/defaults/main/common.yml diff --git a/tests/integration/targets/hcloud_rdns/defaults/main/main.yml b/tests/integration/targets/rdns/defaults/main/main.yml similarity index 100% rename from tests/integration/targets/hcloud_rdns/defaults/main/main.yml rename to tests/integration/targets/rdns/defaults/main/main.yml diff --git a/tests/integration/targets/hcloud_rdns/tasks/cleanup.yml b/tests/integration/targets/rdns/tasks/cleanup.yml similarity index 100% rename from tests/integration/targets/hcloud_rdns/tasks/cleanup.yml rename to tests/integration/targets/rdns/tasks/cleanup.yml diff --git a/tests/integration/targets/hcloud_rdns/tasks/main.yml b/tests/integration/targets/rdns/tasks/main.yml similarity index 100% rename from tests/integration/targets/hcloud_rdns/tasks/main.yml rename to tests/integration/targets/rdns/tasks/main.yml diff --git a/tests/integration/targets/hcloud_rdns/tasks/prepare.yml b/tests/integration/targets/rdns/tasks/prepare.yml similarity index 100% rename from tests/integration/targets/hcloud_rdns/tasks/prepare.yml rename to tests/integration/targets/rdns/tasks/prepare.yml diff --git a/tests/integration/targets/hcloud_rdns/tasks/test.yml b/tests/integration/targets/rdns/tasks/test.yml similarity index 100% rename from tests/integration/targets/hcloud_rdns/tasks/test.yml rename to tests/integration/targets/rdns/tasks/test.yml diff --git a/tests/integration/targets/hcloud_route/aliases b/tests/integration/targets/route/aliases similarity index 100% rename from tests/integration/targets/hcloud_route/aliases rename to tests/integration/targets/route/aliases diff --git a/tests/integration/targets/hcloud_route/defaults/main/common.yml b/tests/integration/targets/route/defaults/main/common.yml similarity index 100% rename from tests/integration/targets/hcloud_route/defaults/main/common.yml rename to tests/integration/targets/route/defaults/main/common.yml diff --git a/tests/integration/targets/hcloud_route/defaults/main/main.yml b/tests/integration/targets/route/defaults/main/main.yml similarity index 100% rename from tests/integration/targets/hcloud_route/defaults/main/main.yml rename to tests/integration/targets/route/defaults/main/main.yml diff --git a/tests/integration/targets/hcloud_route/tasks/main.yml b/tests/integration/targets/route/tasks/main.yml similarity index 100% rename from tests/integration/targets/hcloud_route/tasks/main.yml rename to tests/integration/targets/route/tasks/main.yml diff --git a/tests/integration/targets/hcloud_route/tasks/test.yml b/tests/integration/targets/route/tasks/test.yml similarity index 100% rename from tests/integration/targets/hcloud_route/tasks/test.yml rename to tests/integration/targets/route/tasks/test.yml diff --git a/tests/integration/targets/hcloud_server/aliases b/tests/integration/targets/server/aliases similarity index 100% rename from tests/integration/targets/hcloud_server/aliases rename to tests/integration/targets/server/aliases diff --git a/tests/integration/targets/hcloud_server/defaults/main/common.yml b/tests/integration/targets/server/defaults/main/common.yml similarity index 100% rename from tests/integration/targets/hcloud_server/defaults/main/common.yml rename to tests/integration/targets/server/defaults/main/common.yml diff --git a/tests/integration/targets/hcloud_server/defaults/main/main.yml b/tests/integration/targets/server/defaults/main/main.yml similarity index 100% rename from tests/integration/targets/hcloud_server/defaults/main/main.yml rename to tests/integration/targets/server/defaults/main/main.yml diff --git a/tests/integration/targets/hcloud_server/meta/main.yml b/tests/integration/targets/server/meta/main.yml similarity index 100% rename from tests/integration/targets/hcloud_server/meta/main.yml rename to tests/integration/targets/server/meta/main.yml diff --git a/tests/integration/targets/hcloud_server/tasks/cleanup.yml b/tests/integration/targets/server/tasks/cleanup.yml similarity index 100% rename from tests/integration/targets/hcloud_server/tasks/cleanup.yml rename to tests/integration/targets/server/tasks/cleanup.yml diff --git a/tests/integration/targets/hcloud_server/tasks/main.yml b/tests/integration/targets/server/tasks/main.yml similarity index 100% rename from tests/integration/targets/hcloud_server/tasks/main.yml rename to tests/integration/targets/server/tasks/main.yml diff --git a/tests/integration/targets/hcloud_server/tasks/prepare.yml b/tests/integration/targets/server/tasks/prepare.yml similarity index 100% rename from tests/integration/targets/hcloud_server/tasks/prepare.yml rename to tests/integration/targets/server/tasks/prepare.yml diff --git a/tests/integration/targets/hcloud_server/tasks/test.yml b/tests/integration/targets/server/tasks/test.yml similarity index 100% rename from tests/integration/targets/hcloud_server/tasks/test.yml rename to tests/integration/targets/server/tasks/test.yml diff --git a/tests/integration/targets/hcloud_server/tasks/test_basic.yml b/tests/integration/targets/server/tasks/test_basic.yml similarity index 100% rename from tests/integration/targets/hcloud_server/tasks/test_basic.yml rename to tests/integration/targets/server/tasks/test_basic.yml diff --git a/tests/integration/targets/hcloud_server/tasks/test_firewalls.yml b/tests/integration/targets/server/tasks/test_firewalls.yml similarity index 100% rename from tests/integration/targets/hcloud_server/tasks/test_firewalls.yml rename to tests/integration/targets/server/tasks/test_firewalls.yml diff --git a/tests/integration/targets/hcloud_server/tasks/test_primary_ips.yml b/tests/integration/targets/server/tasks/test_primary_ips.yml similarity index 100% rename from tests/integration/targets/hcloud_server/tasks/test_primary_ips.yml rename to tests/integration/targets/server/tasks/test_primary_ips.yml diff --git a/tests/integration/targets/hcloud_server/tasks/test_private_network_only.yml b/tests/integration/targets/server/tasks/test_private_network_only.yml similarity index 100% rename from tests/integration/targets/hcloud_server/tasks/test_private_network_only.yml rename to tests/integration/targets/server/tasks/test_private_network_only.yml diff --git a/tests/integration/targets/hcloud_server/tasks/test_validation.yml b/tests/integration/targets/server/tasks/test_validation.yml similarity index 100% rename from tests/integration/targets/hcloud_server/tasks/test_validation.yml rename to tests/integration/targets/server/tasks/test_validation.yml diff --git a/tests/integration/targets/hcloud_server_info/aliases b/tests/integration/targets/server_info/aliases similarity index 100% rename from tests/integration/targets/hcloud_server_info/aliases rename to tests/integration/targets/server_info/aliases diff --git a/tests/integration/targets/hcloud_server_info/defaults/main/common.yml b/tests/integration/targets/server_info/defaults/main/common.yml similarity index 100% rename from tests/integration/targets/hcloud_server_info/defaults/main/common.yml rename to tests/integration/targets/server_info/defaults/main/common.yml diff --git a/tests/integration/targets/hcloud_server_info/defaults/main/main.yml b/tests/integration/targets/server_info/defaults/main/main.yml similarity index 100% rename from tests/integration/targets/hcloud_server_info/defaults/main/main.yml rename to tests/integration/targets/server_info/defaults/main/main.yml diff --git a/tests/integration/targets/hcloud_server_info/tasks/cleanup.yml b/tests/integration/targets/server_info/tasks/cleanup.yml similarity index 100% rename from tests/integration/targets/hcloud_server_info/tasks/cleanup.yml rename to tests/integration/targets/server_info/tasks/cleanup.yml diff --git a/tests/integration/targets/hcloud_server_info/tasks/main.yml b/tests/integration/targets/server_info/tasks/main.yml similarity index 100% rename from tests/integration/targets/hcloud_server_info/tasks/main.yml rename to tests/integration/targets/server_info/tasks/main.yml diff --git a/tests/integration/targets/hcloud_server_info/tasks/prepare.yml b/tests/integration/targets/server_info/tasks/prepare.yml similarity index 100% rename from tests/integration/targets/hcloud_server_info/tasks/prepare.yml rename to tests/integration/targets/server_info/tasks/prepare.yml diff --git a/tests/integration/targets/hcloud_server_info/tasks/test.yml b/tests/integration/targets/server_info/tasks/test.yml similarity index 100% rename from tests/integration/targets/hcloud_server_info/tasks/test.yml rename to tests/integration/targets/server_info/tasks/test.yml diff --git a/tests/integration/targets/hcloud_server_network/aliases b/tests/integration/targets/server_network/aliases similarity index 100% rename from tests/integration/targets/hcloud_server_network/aliases rename to tests/integration/targets/server_network/aliases diff --git a/tests/integration/targets/hcloud_server_network/defaults/main/common.yml b/tests/integration/targets/server_network/defaults/main/common.yml similarity index 100% rename from tests/integration/targets/hcloud_server_network/defaults/main/common.yml rename to tests/integration/targets/server_network/defaults/main/common.yml diff --git a/tests/integration/targets/hcloud_server_network/defaults/main/main.yml b/tests/integration/targets/server_network/defaults/main/main.yml similarity index 100% rename from tests/integration/targets/hcloud_server_network/defaults/main/main.yml rename to tests/integration/targets/server_network/defaults/main/main.yml diff --git a/tests/integration/targets/hcloud_server_network/tasks/main.yml b/tests/integration/targets/server_network/tasks/main.yml similarity index 100% rename from tests/integration/targets/hcloud_server_network/tasks/main.yml rename to tests/integration/targets/server_network/tasks/main.yml diff --git a/tests/integration/targets/hcloud_server_network/tasks/test.yml b/tests/integration/targets/server_network/tasks/test.yml similarity index 100% rename from tests/integration/targets/hcloud_server_network/tasks/test.yml rename to tests/integration/targets/server_network/tasks/test.yml diff --git a/tests/integration/targets/hcloud_server_type_info/aliases b/tests/integration/targets/server_type_info/aliases similarity index 100% rename from tests/integration/targets/hcloud_server_type_info/aliases rename to tests/integration/targets/server_type_info/aliases diff --git a/tests/integration/targets/hcloud_server_type_info/defaults/main/common.yml b/tests/integration/targets/server_type_info/defaults/main/common.yml similarity index 100% rename from tests/integration/targets/hcloud_server_type_info/defaults/main/common.yml rename to tests/integration/targets/server_type_info/defaults/main/common.yml diff --git a/tests/integration/targets/hcloud_server_type_info/defaults/main/main.yml b/tests/integration/targets/server_type_info/defaults/main/main.yml similarity index 100% rename from tests/integration/targets/hcloud_server_type_info/defaults/main/main.yml rename to tests/integration/targets/server_type_info/defaults/main/main.yml diff --git a/tests/integration/targets/hcloud_server_type_info/tasks/main.yml b/tests/integration/targets/server_type_info/tasks/main.yml similarity index 100% rename from tests/integration/targets/hcloud_server_type_info/tasks/main.yml rename to tests/integration/targets/server_type_info/tasks/main.yml diff --git a/tests/integration/targets/hcloud_server_type_info/tasks/test.yml b/tests/integration/targets/server_type_info/tasks/test.yml similarity index 100% rename from tests/integration/targets/hcloud_server_type_info/tasks/test.yml rename to tests/integration/targets/server_type_info/tasks/test.yml diff --git a/tests/integration/targets/hcloud_ssh_key/aliases b/tests/integration/targets/ssh_key/aliases similarity index 100% rename from tests/integration/targets/hcloud_ssh_key/aliases rename to tests/integration/targets/ssh_key/aliases diff --git a/tests/integration/targets/hcloud_ssh_key/defaults/main/common.yml b/tests/integration/targets/ssh_key/defaults/main/common.yml similarity index 100% rename from tests/integration/targets/hcloud_ssh_key/defaults/main/common.yml rename to tests/integration/targets/ssh_key/defaults/main/common.yml diff --git a/tests/integration/targets/hcloud_ssh_key/defaults/main/main.yml b/tests/integration/targets/ssh_key/defaults/main/main.yml similarity index 100% rename from tests/integration/targets/hcloud_ssh_key/defaults/main/main.yml rename to tests/integration/targets/ssh_key/defaults/main/main.yml diff --git a/tests/integration/targets/hcloud_ssh_key/meta/main.yml b/tests/integration/targets/ssh_key/meta/main.yml similarity index 100% rename from tests/integration/targets/hcloud_ssh_key/meta/main.yml rename to tests/integration/targets/ssh_key/meta/main.yml diff --git a/tests/integration/targets/hcloud_ssh_key/tasks/cleanup.yml b/tests/integration/targets/ssh_key/tasks/cleanup.yml similarity index 100% rename from tests/integration/targets/hcloud_ssh_key/tasks/cleanup.yml rename to tests/integration/targets/ssh_key/tasks/cleanup.yml diff --git a/tests/integration/targets/hcloud_ssh_key/tasks/main.yml b/tests/integration/targets/ssh_key/tasks/main.yml similarity index 100% rename from tests/integration/targets/hcloud_ssh_key/tasks/main.yml rename to tests/integration/targets/ssh_key/tasks/main.yml diff --git a/tests/integration/targets/hcloud_ssh_key/tasks/test.yml b/tests/integration/targets/ssh_key/tasks/test.yml similarity index 100% rename from tests/integration/targets/hcloud_ssh_key/tasks/test.yml rename to tests/integration/targets/ssh_key/tasks/test.yml diff --git a/tests/integration/targets/hcloud_ssh_key_info/aliases b/tests/integration/targets/ssh_key_info/aliases similarity index 100% rename from tests/integration/targets/hcloud_ssh_key_info/aliases rename to tests/integration/targets/ssh_key_info/aliases diff --git a/tests/integration/targets/hcloud_ssh_key_info/defaults/main/common.yml b/tests/integration/targets/ssh_key_info/defaults/main/common.yml similarity index 100% rename from tests/integration/targets/hcloud_ssh_key_info/defaults/main/common.yml rename to tests/integration/targets/ssh_key_info/defaults/main/common.yml diff --git a/tests/integration/targets/hcloud_ssh_key_info/defaults/main/main.yml b/tests/integration/targets/ssh_key_info/defaults/main/main.yml similarity index 100% rename from tests/integration/targets/hcloud_ssh_key_info/defaults/main/main.yml rename to tests/integration/targets/ssh_key_info/defaults/main/main.yml diff --git a/tests/integration/targets/hcloud_ssh_key_info/meta/main.yml b/tests/integration/targets/ssh_key_info/meta/main.yml similarity index 100% rename from tests/integration/targets/hcloud_ssh_key_info/meta/main.yml rename to tests/integration/targets/ssh_key_info/meta/main.yml diff --git a/tests/integration/targets/hcloud_ssh_key_info/tasks/cleanup.yml b/tests/integration/targets/ssh_key_info/tasks/cleanup.yml similarity index 100% rename from tests/integration/targets/hcloud_ssh_key_info/tasks/cleanup.yml rename to tests/integration/targets/ssh_key_info/tasks/cleanup.yml diff --git a/tests/integration/targets/hcloud_ssh_key_info/tasks/main.yml b/tests/integration/targets/ssh_key_info/tasks/main.yml similarity index 100% rename from tests/integration/targets/hcloud_ssh_key_info/tasks/main.yml rename to tests/integration/targets/ssh_key_info/tasks/main.yml diff --git a/tests/integration/targets/hcloud_ssh_key_info/tasks/prepare.yml b/tests/integration/targets/ssh_key_info/tasks/prepare.yml similarity index 100% rename from tests/integration/targets/hcloud_ssh_key_info/tasks/prepare.yml rename to tests/integration/targets/ssh_key_info/tasks/prepare.yml diff --git a/tests/integration/targets/hcloud_ssh_key_info/tasks/test.yml b/tests/integration/targets/ssh_key_info/tasks/test.yml similarity index 100% rename from tests/integration/targets/hcloud_ssh_key_info/tasks/test.yml rename to tests/integration/targets/ssh_key_info/tasks/test.yml diff --git a/tests/integration/targets/hcloud_subnetwork/aliases b/tests/integration/targets/subnetwork/aliases similarity index 100% rename from tests/integration/targets/hcloud_subnetwork/aliases rename to tests/integration/targets/subnetwork/aliases diff --git a/tests/integration/targets/hcloud_subnetwork/defaults/main/common.yml b/tests/integration/targets/subnetwork/defaults/main/common.yml similarity index 100% rename from tests/integration/targets/hcloud_subnetwork/defaults/main/common.yml rename to tests/integration/targets/subnetwork/defaults/main/common.yml diff --git a/tests/integration/targets/hcloud_subnetwork/defaults/main/main.yml b/tests/integration/targets/subnetwork/defaults/main/main.yml similarity index 100% rename from tests/integration/targets/hcloud_subnetwork/defaults/main/main.yml rename to tests/integration/targets/subnetwork/defaults/main/main.yml diff --git a/tests/integration/targets/hcloud_subnetwork/tasks/cleanup.yml b/tests/integration/targets/subnetwork/tasks/cleanup.yml similarity index 100% rename from tests/integration/targets/hcloud_subnetwork/tasks/cleanup.yml rename to tests/integration/targets/subnetwork/tasks/cleanup.yml diff --git a/tests/integration/targets/hcloud_subnetwork/tasks/main.yml b/tests/integration/targets/subnetwork/tasks/main.yml similarity index 100% rename from tests/integration/targets/hcloud_subnetwork/tasks/main.yml rename to tests/integration/targets/subnetwork/tasks/main.yml diff --git a/tests/integration/targets/hcloud_subnetwork/tasks/prepare.yml b/tests/integration/targets/subnetwork/tasks/prepare.yml similarity index 100% rename from tests/integration/targets/hcloud_subnetwork/tasks/prepare.yml rename to tests/integration/targets/subnetwork/tasks/prepare.yml diff --git a/tests/integration/targets/hcloud_subnetwork/tasks/test.yml b/tests/integration/targets/subnetwork/tasks/test.yml similarity index 100% rename from tests/integration/targets/hcloud_subnetwork/tasks/test.yml rename to tests/integration/targets/subnetwork/tasks/test.yml diff --git a/tests/integration/targets/hcloud_volume/aliases b/tests/integration/targets/volume/aliases similarity index 100% rename from tests/integration/targets/hcloud_volume/aliases rename to tests/integration/targets/volume/aliases diff --git a/tests/integration/targets/hcloud_volume/defaults/main/common.yml b/tests/integration/targets/volume/defaults/main/common.yml similarity index 100% rename from tests/integration/targets/hcloud_volume/defaults/main/common.yml rename to tests/integration/targets/volume/defaults/main/common.yml diff --git a/tests/integration/targets/hcloud_volume/defaults/main/main.yml b/tests/integration/targets/volume/defaults/main/main.yml similarity index 100% rename from tests/integration/targets/hcloud_volume/defaults/main/main.yml rename to tests/integration/targets/volume/defaults/main/main.yml diff --git a/tests/integration/targets/hcloud_volume/tasks/main.yml b/tests/integration/targets/volume/tasks/main.yml similarity index 100% rename from tests/integration/targets/hcloud_volume/tasks/main.yml rename to tests/integration/targets/volume/tasks/main.yml diff --git a/tests/integration/targets/hcloud_volume/tasks/test.yml b/tests/integration/targets/volume/tasks/test.yml similarity index 100% rename from tests/integration/targets/hcloud_volume/tasks/test.yml rename to tests/integration/targets/volume/tasks/test.yml diff --git a/tests/integration/targets/hcloud_volume_info/aliases b/tests/integration/targets/volume_info/aliases similarity index 100% rename from tests/integration/targets/hcloud_volume_info/aliases rename to tests/integration/targets/volume_info/aliases diff --git a/tests/integration/targets/hcloud_volume_info/defaults/main/common.yml b/tests/integration/targets/volume_info/defaults/main/common.yml similarity index 100% rename from tests/integration/targets/hcloud_volume_info/defaults/main/common.yml rename to tests/integration/targets/volume_info/defaults/main/common.yml diff --git a/tests/integration/targets/hcloud_volume_info/defaults/main/main.yml b/tests/integration/targets/volume_info/defaults/main/main.yml similarity index 100% rename from tests/integration/targets/hcloud_volume_info/defaults/main/main.yml rename to tests/integration/targets/volume_info/defaults/main/main.yml diff --git a/tests/integration/targets/hcloud_volume_info/tasks/cleanup.yml b/tests/integration/targets/volume_info/tasks/cleanup.yml similarity index 100% rename from tests/integration/targets/hcloud_volume_info/tasks/cleanup.yml rename to tests/integration/targets/volume_info/tasks/cleanup.yml diff --git a/tests/integration/targets/hcloud_volume_info/tasks/main.yml b/tests/integration/targets/volume_info/tasks/main.yml similarity index 100% rename from tests/integration/targets/hcloud_volume_info/tasks/main.yml rename to tests/integration/targets/volume_info/tasks/main.yml diff --git a/tests/integration/targets/hcloud_volume_info/tasks/prepare.yml b/tests/integration/targets/volume_info/tasks/prepare.yml similarity index 100% rename from tests/integration/targets/hcloud_volume_info/tasks/prepare.yml rename to tests/integration/targets/volume_info/tasks/prepare.yml diff --git a/tests/integration/targets/hcloud_volume_info/tasks/test.yml b/tests/integration/targets/volume_info/tasks/test.yml similarity index 100% rename from tests/integration/targets/hcloud_volume_info/tasks/test.yml rename to tests/integration/targets/volume_info/tasks/test.yml