diff --git a/README.md b/README.md
index 348eff0..274c908 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@ The `main` branch is used for the development of the latest versions of the coll
 
 The documentation for all modules are available through `ansible-doc`.
 
-Sample: `ansible-doc hetzner.hcloud.hcloud_server` shows the documentation for the `hcloud_server` module.
+Sample: `ansible-doc hetzner.hcloud.server` shows the documentation for the `server` module.
 
 For all modules that were part of Ansible directly (before Ansible 2.11) we also have the documentation published in the
 Ansible documentation: https://docs.ansible.com/ansible/latest/collections/hetzner/hcloud/
@@ -56,7 +56,7 @@ After this you should be able to use `ansible-test integration` to perform the i
 Sample:
 
 ```
-ansible-test integration --color --local  -vvv hcloud_server // Executed all integration tests for hcloud_server module
+ansible-test integration --color --local  -vvv hetzner.hcloud.server // Executed all integration tests for server module
 ```
 
 ## Releasing a new version
diff --git a/plugins/modules/certificate.py b/plugins/modules/certificate.py
index 0e776a7..a1cd4a1 100644
--- a/plugins/modules/certificate.py
+++ b/plugins/modules/certificate.py
@@ -68,14 +68,14 @@ extends_documentation_fragment:
 
 EXAMPLES = """
 - name: Create a basic certificate
-  hetzner.hcloud.hcloud_certificate:
+  hetzner.hcloud.certificate:
     name: my-certificate
     certificate: -----BEGIN CERTIFICATE-----...
     private_key: -----BEGIN PRIVATE KEY-----...
     state: present
 
 - name: Create a certificate with labels
-  hetzner.hcloud.hcloud_certificate:
+  hetzner.hcloud.certificate:
     name: my-certificate
     certificate: -----BEGIN CERTIFICATE-----...
     private_key: -----BEGIN PRIVATE KEY-----...
@@ -85,7 +85,7 @@ EXAMPLES = """
     state: present
 
 - name: Create a managed certificate
-  hetzner.hcloud.hcloud_certificate:
+  hetzner.hcloud.certificate:
     name: my-certificate
     type: managed
     domain_names:
@@ -94,7 +94,7 @@ EXAMPLES = """
     state: present
 
 - name: Ensure the certificate is absent (remove if needed)
-  hetzner.hcloud.hcloud_certificate:
+  hetzner.hcloud.certificate:
     name: my-certificate
     state: absent
 """
diff --git a/plugins/modules/certificate_info.py b/plugins/modules/certificate_info.py
index a26ae22..0116d5e 100644
--- a/plugins/modules/certificate_info.py
+++ b/plugins/modules/certificate_info.py
@@ -33,7 +33,7 @@ extends_documentation_fragment:
 
 EXAMPLES = """
 - name: Gather hcloud certificate infos
-  hetzner.hcloud.hcloud_certificate_info:
+  hetzner.hcloud.certificate_info:
   register: output
 - name: Print the gathered infos
   debug:
diff --git a/plugins/modules/datacenter_info.py b/plugins/modules/datacenter_info.py
index 3a13754..83c5fdc 100644
--- a/plugins/modules/datacenter_info.py
+++ b/plugins/modules/datacenter_info.py
@@ -33,7 +33,7 @@ extends_documentation_fragment:
 
 EXAMPLES = """
 - name: Gather hcloud datacenter info
-  hetzner.hcloud.hcloud_datacenter_info:
+  hetzner.hcloud.datacenter_info:
   register: output
 
 - name: Print the gathered info
@@ -43,12 +43,12 @@ EXAMPLES = """
 - name: List available server_types in a datacenter
   block:
     - name: Gather a hcloud datacenter
-      hetzner.hcloud.hcloud_datacenter_info:
+      hetzner.hcloud.datacenter_info:
         name: fsn1-dc14
       register: output
 
     - name: Gather a hcloud datacenter available server_types
-      hetzner.hcloud.hcloud_server_type_info:
+      hetzner.hcloud.server_type_info:
         id: "{{ item }}"
       loop: "{{ output.hcloud_datacenter_info[0].server_types.available }}"
       register: available_server_types
diff --git a/plugins/modules/firewall.py b/plugins/modules/firewall.py
index 6f4e83b..4760b4b 100644
--- a/plugins/modules/firewall.py
+++ b/plugins/modules/firewall.py
@@ -80,12 +80,12 @@ extends_documentation_fragment:
 
 EXAMPLES = """
 - name: Create a basic firewall
-  hetzner.hcloud.hcloud_firewall:
+  hetzner.hcloud.firewall:
     name: my-firewall
     state: present
 
 - name: Create a firewall with rules
-  hetzner.hcloud.hcloud_firewall:
+  hetzner.hcloud.firewall:
     name: my-firewall
     rules:
       - direction: in
@@ -97,7 +97,7 @@ EXAMPLES = """
     state: present
 
 - name: Create a firewall with labels
-  hetzner.hcloud.hcloud_firewall:
+  hetzner.hcloud.firewall:
     name: my-firewall
     labels:
       key: value
@@ -105,7 +105,7 @@ EXAMPLES = """
     state: present
 
 - name: Ensure the firewall is absent (remove if needed)
-  hetzner.hcloud.hcloud_firewall:
+  hetzner.hcloud.firewall:
     name: my-firewall
     state: absent
 """
diff --git a/plugins/modules/floating_ip.py b/plugins/modules/floating_ip.py
index d8fdb23..96c55b8 100644
--- a/plugins/modules/floating_ip.py
+++ b/plugins/modules/floating_ip.py
@@ -73,30 +73,30 @@ extends_documentation_fragment:
 
 EXAMPLES = """
 - name: Create a basic IPv4 Floating IP
-  hetzner.hcloud.hcloud_floating_ip:
+  hetzner.hcloud.floating_ip:
     name: my-floating-ip
     home_location: fsn1
     type: ipv4
     state: present
 - name: Create a basic IPv6 Floating IP
-  hetzner.hcloud.hcloud_floating_ip:
+  hetzner.hcloud.floating_ip:
     name: my-floating-ip
     home_location: fsn1
     type: ipv6
     state: present
 - name: Assign a Floating IP to a server
-  hetzner.hcloud.hcloud_floating_ip:
+  hetzner.hcloud.floating_ip:
     name: my-floating-ip
     server: 1234
     state: present
 - name: Assign a Floating IP to another server
-  hetzner.hcloud.hcloud_floating_ip:
+  hetzner.hcloud.floating_ip:
     name: my-floating-ip
     server: 1234
     force: true
     state: present
 - name: Floating IP should be absent
-  hetzner.hcloud.hcloud_floating_ip:
+  hetzner.hcloud.floating_ip:
     name: my-floating-ip
     state: absent
 """
diff --git a/plugins/modules/floating_ip_info.py b/plugins/modules/floating_ip_info.py
index e6f06d7..0576b8e 100644
--- a/plugins/modules/floating_ip_info.py
+++ b/plugins/modules/floating_ip_info.py
@@ -37,7 +37,7 @@ extends_documentation_fragment:
 
 EXAMPLES = """
 - name: Gather hcloud Floating ip infos
-  hetzner.hcloud.hcloud_floating_ip_info:
+  hetzner.hcloud.floating_ip_info:
   register: output
 - name: Print the gathered infos
   debug:
diff --git a/plugins/modules/image_info.py b/plugins/modules/image_info.py
index 90fb928..1f39322 100644
--- a/plugins/modules/image_info.py
+++ b/plugins/modules/image_info.py
@@ -49,7 +49,7 @@ extends_documentation_fragment:
 
 EXAMPLES = """
 - name: Gather hcloud image infos
-  hetzner.hcloud.hcloud_image_info:
+  hetzner.hcloud.image_info:
   register: output
 
 - name: Print the gathered infos
diff --git a/plugins/modules/iso_info.py b/plugins/modules/iso_info.py
index 4740daf..d49f188 100644
--- a/plugins/modules/iso_info.py
+++ b/plugins/modules/iso_info.py
@@ -45,7 +45,7 @@ extends_documentation_fragment:
 
 EXAMPLES = """
 - name: Gather hcloud ISO type infos
-  hetzner.hcloud.hcloud_iso_info:
+  hetzner.hcloud.iso_info:
   register: output
 
 - name: Print the gathered infos
diff --git a/plugins/modules/load_balancer.py b/plugins/modules/load_balancer.py
index 53f19dd..55db368 100644
--- a/plugins/modules/load_balancer.py
+++ b/plugins/modules/load_balancer.py
@@ -73,7 +73,7 @@ extends_documentation_fragment:
 
 EXAMPLES = """
 - name: Create a basic Load Balancer
-  hetzner.hcloud.hcloud_load_balancer:
+  hetzner.hcloud.load_balancer:
     name: my-Load Balancer
     load_balancer_type: lb11
     algorithm: round_robin
@@ -81,7 +81,7 @@ EXAMPLES = """
     state: present
 
 - name: Ensure the Load Balancer is absent (remove if needed)
-  hetzner.hcloud.hcloud_load_balancer:
+  hetzner.hcloud.load_balancer:
     name: my-Load Balancer
     state: absent
 """
diff --git a/plugins/modules/load_balancer_info.py b/plugins/modules/load_balancer_info.py
index 75bb751..18a086c 100644
--- a/plugins/modules/load_balancer_info.py
+++ b/plugins/modules/load_balancer_info.py
@@ -38,7 +38,7 @@ extends_documentation_fragment:
 
 EXAMPLES = """
 - name: Gather hcloud load_balancer infos
-  hetzner.hcloud.hcloud_load_balancer_info:
+  hetzner.hcloud.load_balancer_info:
   register: output
 
 - name: Print the gathered infos
@@ -134,7 +134,7 @@ hcloud_load_balancer_info:
                 use_private_ip:
                     description:
                         - Route the traffic over the private IP of the Load Balancer through a Hetzner Cloud Network.
-                        - Load Balancer needs to be attached to a network. See M(hetzner.hcloud.hcloud_load_balancer_network)
+                        - Load Balancer needs to be attached to a network. See M(hetzner.hcloud.load_balancer_network)
                     type: bool
                     sample: true
                     returned: always
diff --git a/plugins/modules/load_balancer_network.py b/plugins/modules/load_balancer_network.py
index 450ff5a..ec3abd7 100644
--- a/plugins/modules/load_balancer_network.py
+++ b/plugins/modules/load_balancer_network.py
@@ -45,20 +45,20 @@ extends_documentation_fragment:
 
 EXAMPLES = """
 - name: Create a basic Load Balancer network
-  hetzner.hcloud.hcloud_load_balancer_network:
+  hetzner.hcloud.load_balancer_network:
     network: my-network
     load_balancer: my-LoadBalancer
     state: present
 
 - name: Create a Load Balancer network and specify the ip address
-  hetzner.hcloud.hcloud_load_balancer_network:
+  hetzner.hcloud.load_balancer_network:
     network: my-network
     load_balancer: my-LoadBalancer
     ip: 10.0.0.1
     state: present
 
 - name: Ensure the Load Balancer network is absent (remove if needed)
-  hetzner.hcloud.hcloud_load_balancer_network:
+  hetzner.hcloud.load_balancer_network:
     network: my-network
     load_balancer: my-LoadBalancer
     state: absent
diff --git a/plugins/modules/load_balancer_service.py b/plugins/modules/load_balancer_service.py
index 384a825..070909d 100644
--- a/plugins/modules/load_balancer_service.py
+++ b/plugins/modules/load_balancer_service.py
@@ -137,14 +137,14 @@ extends_documentation_fragment:
 
 EXAMPLES = """
 - name: Create a basic Load Balancer service with Port 80
-  hetzner.hcloud.hcloud_load_balancer_service:
+  hetzner.hcloud.load_balancer_service:
     load_balancer: my-load-balancer
     protocol: http
     listen_port: 80
     state: present
 
 - name: Ensure the Load Balancer is absent (remove if needed)
-  hetzner.hcloud.hcloud_load_balancer_service:
+  hetzner.hcloud.load_balancer_service:
     load_balancer: my-Load Balancer
     protocol: http
     listen_port: 80
diff --git a/plugins/modules/load_balancer_target.py b/plugins/modules/load_balancer_target.py
index 0ee4d2c..d2fa083 100644
--- a/plugins/modules/load_balancer_target.py
+++ b/plugins/modules/load_balancer_target.py
@@ -47,7 +47,7 @@ options:
     use_private_ip:
         description:
             - Route the traffic over the private IP of the Load Balancer through a Hetzner Cloud Network.
-            - Load Balancer needs to be attached to a network. See M(hetzner.hcloud.hcloud_load_balancer_network)
+            - Load Balancer needs to be attached to a network. See M(hetzner.hcloud.load_balancer_network)
         type: bool
         default: False
     state:
@@ -63,28 +63,28 @@ extends_documentation_fragment:
 
 EXAMPLES = """
 - name: Create a server Load Balancer target
-  hetzner.hcloud.hcloud_load_balancer_target:
+  hetzner.hcloud.load_balancer_target:
     type: server
     load_balancer: my-LoadBalancer
     server: my-server
     state: present
 
 - name: Create a label_selector Load Balancer target
-  hetzner.hcloud.hcloud_load_balancer_target:
+  hetzner.hcloud.load_balancer_target:
     type: label_selector
     load_balancer: my-LoadBalancer
     label_selector: application=backend
     state: present
 
 - name: Create an IP Load Balancer target
-  hetzner.hcloud.hcloud_load_balancer_target:
+  hetzner.hcloud.load_balancer_target:
     type: ip
     load_balancer: my-LoadBalancer
     ip: 127.0.0.1
     state: present
 
 - name: Ensure the Load Balancer target is absent (remove if needed)
-  hetzner.hcloud.hcloud_load_balancer_target:
+  hetzner.hcloud.load_balancer_target:
     type: server
     load_balancer: my-LoadBalancer
     server: my-server
@@ -125,7 +125,7 @@ hcloud_load_balancer_target:
         use_private_ip:
             description:
                 - Route the traffic over the private IP of the Load Balancer through a Hetzner Cloud Network.
-                - Load Balancer needs to be attached to a network. See M(hetzner.hcloud.hcloud_load_balancer_network)
+                - Load Balancer needs to be attached to a network. See M(hetzner.hcloud.load_balancer_network)
             type: bool
             sample: true
             returned: always
diff --git a/plugins/modules/load_balancer_type_info.py b/plugins/modules/load_balancer_type_info.py
index 066f2cb..e1bf617 100644
--- a/plugins/modules/load_balancer_type_info.py
+++ b/plugins/modules/load_balancer_type_info.py
@@ -34,7 +34,7 @@ extends_documentation_fragment:
 
 EXAMPLES = """
 - name: Gather hcloud Load Balancer type infos
-  hetzner.hcloud.hcloud_load_balancer_type_info:
+  hetzner.hcloud.load_balancer_type_info:
   register: output
 
 - name: Print the gathered infos
diff --git a/plugins/modules/location_info.py b/plugins/modules/location_info.py
index 496d0bd..a23a9d7 100644
--- a/plugins/modules/location_info.py
+++ b/plugins/modules/location_info.py
@@ -34,7 +34,7 @@ extends_documentation_fragment:
 
 EXAMPLES = """
 - name: Gather hcloud location infos
-  hetzner.hcloud.hcloud_location_info:
+  hetzner.hcloud.location_info:
   register: output
 
 - name: Print the gathered infos
diff --git a/plugins/modules/network.py b/plugins/modules/network.py
index 1cf36e1..3dd4006 100644
--- a/plugins/modules/network.py
+++ b/plugins/modules/network.py
@@ -60,13 +60,13 @@ extends_documentation_fragment:
 
 EXAMPLES = """
 - name: Create a basic network
-  hetzner.hcloud.hcloud_network:
+  hetzner.hcloud.network:
     name: my-network
     ip_range: 10.0.0.0/8
     state: present
 
 - name: Ensure the Network is absent (remove if needed)
-  hetzner.hcloud.hcloud_network:
+  hetzner.hcloud.network:
     name: my-network
     state: absent
 """
diff --git a/plugins/modules/placement_group.py b/plugins/modules/placement_group.py
index 455769e..dfc8d97 100644
--- a/plugins/modules/placement_group.py
+++ b/plugins/modules/placement_group.py
@@ -49,13 +49,13 @@ extends_documentation_fragment:
 
 EXAMPLES = """
 - name: Create a basic placement group
-  hetzner.hcloud.hcloud_placement_group:
+  hetzner.hcloud.placement_group:
     name: my-placement-group
     state: present
     type: spread
 
 - name: Create a placement group with labels
-  hetzner.hcloud.hcloud_placement_group:
+  hetzner.hcloud.placement_group:
     name: my-placement-group
     type: spread
     labels:
@@ -64,7 +64,7 @@ EXAMPLES = """
     state: present
 
 - name: Ensure the placement group is absent (remove if needed)
-  hetzner.hcloud.hcloud_placement_group:
+  hetzner.hcloud.placement_group:
     name: my-placement-group
     state: absent
 """
diff --git a/plugins/modules/primary_ip.py b/plugins/modules/primary_ip.py
index 84f9df9..f48793d 100644
--- a/plugins/modules/primary_ip.py
+++ b/plugins/modules/primary_ip.py
@@ -65,19 +65,19 @@ extends_documentation_fragment:
 
 EXAMPLES = """
 - name: Create a basic IPv4 Primary IP
-  hetzner.hcloud.hcloud_primary_ip:
+  hetzner.hcloud.primary_ip:
     name: my-primary-ip
     datacenter: fsn1-dc14
     type: ipv4
     state: present
 - name: Create a basic IPv6 Primary IP
-  hetzner.hcloud.hcloud_primary_ip:
+  hetzner.hcloud.primary_ip:
     name: my-primary-ip
     datacenter: fsn1-dc14
     type: ipv6
     state: present
 - name: Primary IP should be absent
-  hetzner.hcloud.hcloud_primary_ip:
+  hetzner.hcloud.primary_ip:
     name: my-primary-ip
     state: absent
 """
diff --git a/plugins/modules/primary_ip_info.py b/plugins/modules/primary_ip_info.py
index aba65b0..3fc6c57 100644
--- a/plugins/modules/primary_ip_info.py
+++ b/plugins/modules/primary_ip_info.py
@@ -38,21 +38,21 @@ extends_documentation_fragment:
 
 EXAMPLES = """
 - name: Gather hcloud Primary IP infos
-  hetzner.hcloud.hcloud_primary_ip_info:
+  hetzner.hcloud.primary_ip_info:
   register: output
 
 - name: Gather hcloud Primary IP infos by id
-  hetzner.hcloud.hcloud_primary_ip_info:
+  hetzner.hcloud.primary_ip_info:
     id: 673954
   register: output
 
 - name: Gather hcloud Primary IP infos by name
-  hetzner.hcloud.hcloud_primary_ip_info:
+  hetzner.hcloud.primary_ip_info:
     name: srv1-v4
   register: output
 
 - name: Gather hcloud Primary IP infos by label
-  hetzner.hcloud.hcloud_primary_ip_info:
+  hetzner.hcloud.primary_ip_info:
     label_selector: srv03-ips
   register: output
 
diff --git a/plugins/modules/rdns.py b/plugins/modules/rdns.py
index 4be2cde..cde124a 100644
--- a/plugins/modules/rdns.py
+++ b/plugins/modules/rdns.py
@@ -57,35 +57,35 @@ extends_documentation_fragment:
 
 EXAMPLES = """
 - name: Create a reverse DNS entry for a server
-  hetzner.hcloud.hcloud_rdns:
+  hetzner.hcloud.rdns:
     server: my-server
     ip_address: 123.123.123.123
     dns_ptr: example.com
     state: present
 
 - name: Create a reverse DNS entry for a Floating IP
-  hetzner.hcloud.hcloud_rdns:
+  hetzner.hcloud.rdns:
     floating_ip: my-floating-ip
     ip_address: 123.123.123.123
     dns_ptr: example.com
     state: present
 
 - name: Create a reverse DNS entry for a Primary IP
-  hetzner.hcloud.hcloud_rdns:
+  hetzner.hcloud.rdns:
     primary_ip: my-primary-ip
     ip_address: 123.123.123.123
     dns_ptr: example.com
     state: present
 
 - name: Create a reverse DNS entry for a Load Balancer
-  hetzner.hcloud.hcloud_rdns:
+  hetzner.hcloud.rdns:
     load_balancer: my-load-balancer
     ip_address: 123.123.123.123
     dns_ptr: example.com
     state: present
 
 - name: Ensure the reverse DNS entry is absent (remove if needed)
-  hetzner.hcloud.hcloud_rdns:
+  hetzner.hcloud.rdns:
     server: my-server
     ip_address: 123.123.123.123
     dns_ptr: example.com
diff --git a/plugins/modules/route.py b/plugins/modules/route.py
index 78cc8ed..7099a52 100644
--- a/plugins/modules/route.py
+++ b/plugins/modules/route.py
@@ -46,14 +46,14 @@ extends_documentation_fragment:
 
 EXAMPLES = """
 - name: Create a basic route
-  hetzner.hcloud.hcloud_route:
+  hetzner.hcloud.route:
     network: my-network
     destination: 10.100.1.0/24
     gateway: 10.0.1.1
     state: present
 
 - name: Ensure the route is absent
-  hetzner.hcloud.hcloud_route:
+  hetzner.hcloud.route:
     network: my-network
     destination: 10.100.1.0/24
     gateway: 10.0.1.1
diff --git a/plugins/modules/server.py b/plugins/modules/server.py
index c55da81..62f2e7b 100644
--- a/plugins/modules/server.py
+++ b/plugins/modules/server.py
@@ -157,14 +157,14 @@ extends_documentation_fragment:
 
 EXAMPLES = """
 - name: Create a basic server
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: my-server
     server_type: cx11
     image: ubuntu-22.04
     state: present
 
 - name: Create a basic server with ssh key
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: my-server
     server_type: cx11
     image: ubuntu-22.04
@@ -174,59 +174,59 @@ EXAMPLES = """
     state: present
 
 - name: Resize an existing server
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: my-server
     server_type: cx21
     upgrade_disk: true
     state: present
 
 - name: Ensure the server is absent (remove if needed)
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: my-server
     state: absent
 
 - name: Ensure the server is started
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: my-server
     state: started
 
 - name: Ensure the server is stopped
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: my-server
     state: stopped
 
 - name: Ensure the server is restarted
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: my-server
     state: restarted
 
 - name: Ensure the server is will be booted in rescue mode and therefore restarted
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: my-server
     rescue_mode: linux64
     state: restarted
 
 - name: Ensure the server is rebuild
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: my-server
     image: ubuntu-22.04
     state: rebuild
 
 - name: Add server to placement group
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: my-server
     placement_group: my-placement-group
     force: true
     state: present
 
 - name: Remove server from placement group
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: my-server
     placement_group:
     state: present
 
 - name: Add server with private network only
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: my-server
     enable_ipv4: false
     enable_ipv6: false
@@ -553,7 +553,7 @@ class AnsibleHCloudServer(AnsibleHCloud):
                 "no longer be ordered. Existing servers of that plan will continue to "
                 "work as before and no action is required on your part. "
                 "It is possible to migrate this server to another server plan by setting "
-                "the server_type parameter on the hetzner.hcloud.hcloud_server module."
+                "the server_type parameter on the hetzner.hcloud.server module."
             )
         else:
             server_type_unavailable_date = server_type.deprecation.unavailable_after.strftime("%Y-%m-%d")
@@ -563,7 +563,7 @@ class AnsibleHCloudServer(AnsibleHCloud):
                 "Existing servers of that plan will continue to work as before and no "
                 "action is required on your part. "
                 "It is possible to migrate this server to another server plan by setting "
-                "the server_type parameter on the hetzner.hcloud.hcloud_server module."
+                "the server_type parameter on the hetzner.hcloud.server module."
             )
 
     def _get_placement_group(self):
diff --git a/plugins/modules/server_info.py b/plugins/modules/server_info.py
index 2fb4e7f..e6b6fda 100644
--- a/plugins/modules/server_info.py
+++ b/plugins/modules/server_info.py
@@ -38,7 +38,7 @@ extends_documentation_fragment:
 
 EXAMPLES = """
 - name: Gather hcloud server infos
-  hetzner.hcloud.hcloud_server_info:
+  hetzner.hcloud.server_info:
   register: output
 
 - name: Print the gathered infos
diff --git a/plugins/modules/server_network.py b/plugins/modules/server_network.py
index dfd2979..96d80be 100644
--- a/plugins/modules/server_network.py
+++ b/plugins/modules/server_network.py
@@ -50,20 +50,20 @@ extends_documentation_fragment:
 
 EXAMPLES = """
 - name: Create a basic server network
-  hetzner.hcloud.hcloud_server_network:
+  hetzner.hcloud.server_network:
     network: my-network
     server: my-server
     state: present
 
 - name: Create a server network and specify the ip address
-  hetzner.hcloud.hcloud_server_network:
+  hetzner.hcloud.server_network:
     network: my-network
     server: my-server
     ip: 10.0.0.1
     state: present
 
 - name: Create a server network and add alias ips
-  hetzner.hcloud.hcloud_server_network:
+  hetzner.hcloud.server_network:
     network: my-network
     server: my-server
     ip: 10.0.0.1
@@ -73,7 +73,7 @@ EXAMPLES = """
     state: present
 
 - name: Ensure the server network is absent (remove if needed)
-  hetzner.hcloud.hcloud_server_network:
+  hetzner.hcloud.server_network:
     network: my-network
     server: my-server
     state: absent
diff --git a/plugins/modules/server_type_info.py b/plugins/modules/server_type_info.py
index aa08280..1f00e14 100644
--- a/plugins/modules/server_type_info.py
+++ b/plugins/modules/server_type_info.py
@@ -34,7 +34,7 @@ extends_documentation_fragment:
 
 EXAMPLES = """
 - name: Gather hcloud server type infos
-  hetzner.hcloud.hcloud_server_type_info:
+  hetzner.hcloud.server_type_info:
   register: output
 
 - name: Print the gathered infos
diff --git a/plugins/modules/ssh_key.py b/plugins/modules/ssh_key.py
index b0b94a5..4d2ec96 100644
--- a/plugins/modules/ssh_key.py
+++ b/plugins/modules/ssh_key.py
@@ -55,13 +55,13 @@ extends_documentation_fragment:
 
 EXAMPLES = """
 - name: Create a basic ssh_key
-  hetzner.hcloud.hcloud_ssh_key:
+  hetzner.hcloud.ssh_key:
     name: my-ssh_key
     public_key: ssh-rsa AAAjjk76kgf...Xt
     state: present
 
 - name: Create a ssh_key with labels
-  hetzner.hcloud.hcloud_ssh_key:
+  hetzner.hcloud.ssh_key:
     name: my-ssh_key
     public_key: ssh-rsa AAAjjk76kgf...Xt
     labels:
@@ -70,7 +70,7 @@ EXAMPLES = """
     state: present
 
 - name: Ensure the ssh_key is absent (remove if needed)
-  hetzner.hcloud.hcloud_ssh_key:
+  hetzner.hcloud.ssh_key:
     name: my-ssh_key
     state: absent
 """
diff --git a/plugins/modules/ssh_key_info.py b/plugins/modules/ssh_key_info.py
index f0788ef..5cf5259 100644
--- a/plugins/modules/ssh_key_info.py
+++ b/plugins/modules/ssh_key_info.py
@@ -37,7 +37,7 @@ extends_documentation_fragment:
 
 EXAMPLES = """
 - name: Gather hcloud sshkey infos
-  hetzner.hcloud.hcloud_ssh_key_info:
+  hetzner.hcloud.ssh_key_info:
   register: output
 - name: Print the gathered infos
   debug:
diff --git a/plugins/modules/subnetwork.py b/plugins/modules/subnetwork.py
index 4afe00c..bfcaedd 100644
--- a/plugins/modules/subnetwork.py
+++ b/plugins/modules/subnetwork.py
@@ -57,7 +57,7 @@ extends_documentation_fragment:
 
 EXAMPLES = """
 - name: Create a basic subnetwork
-  hetzner.hcloud.hcloud_subnetwork:
+  hetzner.hcloud.subnetwork:
     network: my-network
     ip_range: 10.0.0.0/16
     network_zone: eu-central
@@ -65,7 +65,7 @@ EXAMPLES = """
     state: present
 
 - name: Create a basic subnetwork
-  hetzner.hcloud.hcloud_subnetwork:
+  hetzner.hcloud.subnetwork:
     network: my-vswitch-network
     ip_range: 10.0.0.0/24
     network_zone: eu-central
@@ -74,7 +74,7 @@ EXAMPLES = """
     state: present
 
 - name: Ensure the subnetwork is absent (remove if needed)
-  hetzner.hcloud.hcloud_subnetwork:
+  hetzner.hcloud.subnetwork:
     network: my-network
     ip_range: 10.0.0.0/8
     network_zone: eu-central
diff --git a/plugins/modules/volume.py b/plugins/modules/volume.py
index d443e39..36b7e8b 100644
--- a/plugins/modules/volume.py
+++ b/plugins/modules/volume.py
@@ -75,32 +75,32 @@ extends_documentation_fragment:
 
 EXAMPLES = """
 - name: Create a Volume
-  hetzner.hcloud.hcloud_volume:
+  hetzner.hcloud.volume:
     name: my-volume
     location: fsn1
     size: 100
     state: present
 - name: Create a Volume and format it with ext4
-  hetzner.hcloud.hcloud_volume:
+  hetzner.hcloud.volume:
     name: my-volume
     location: fsn
     format: ext4
     size: 100
     state: present
 - name: Mount a existing Volume and automount
-  hetzner.hcloud.hcloud_volume:
+  hetzner.hcloud.volume:
     name: my-volume
     server: my-server
     automount: true
     state: present
 - name: Mount a existing Volume and automount
-  hetzner.hcloud.hcloud_volume:
+  hetzner.hcloud.volume:
     name: my-volume
     server: my-server
     automount: true
     state: present
 - name: Ensure the Volume is absent (remove if needed)
-  hetzner.hcloud.hcloud_volume:
+  hetzner.hcloud.volume:
     name: my-volume
     state: absent
 """
diff --git a/plugins/modules/volume_info.py b/plugins/modules/volume_info.py
index 22db416..1729700 100644
--- a/plugins/modules/volume_info.py
+++ b/plugins/modules/volume_info.py
@@ -37,7 +37,7 @@ extends_documentation_fragment:
 
 EXAMPLES = """
 - name: Gather hcloud Volume infos
-  hetzner.hcloud.hcloud_volume_info:
+  hetzner.hcloud.volume_info:
   register: output
 - name: Print the gathered infos
   debug:
diff --git a/tests/integration/targets/certificate/tasks/cleanup.yml b/tests/integration/targets/certificate/tasks/cleanup.yml
index d6479d8..2513909 100644
--- a/tests/integration/targets/certificate/tasks/cleanup.yml
+++ b/tests/integration/targets/certificate/tasks/cleanup.yml
@@ -1,5 +1,5 @@
 ---
 - name: cleanup test certificate
-  hetzner.hcloud.hcloud_certificate:
+  hetzner.hcloud.certificate:
     name: "{{ hcloud_certificate_name }}"
     state: absent
diff --git a/tests/integration/targets/certificate/tasks/test.yml b/tests/integration/targets/certificate/tasks/test.yml
index f0d7719..d9d4bb7 100644
--- a/tests/integration/targets/certificate/tasks/test.yml
+++ b/tests/integration/targets/certificate/tasks/test.yml
@@ -2,7 +2,7 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 ---
 - name: test missing required parameters on create certificate
-  hetzner.hcloud.hcloud_certificate:
+  hetzner.hcloud.certificate:
     name: "{{ hcloud_certificate_name }}"
   register: result
   ignore_errors: true
@@ -13,7 +13,7 @@
       - 'result.msg == "missing required arguments: certificate, private_key"'
 
 - name: test create certificate with check mode
-  hetzner.hcloud.hcloud_certificate:
+  hetzner.hcloud.certificate:
     name: "{{ hcloud_certificate_name }}"
     certificate: "{{ test_certificate_content }}"
     private_key: "{{ test_certificate_privatekey_content }}"
@@ -25,7 +25,7 @@
       - result is changed
 
 - name: test create certificate
-  hetzner.hcloud.hcloud_certificate:
+  hetzner.hcloud.certificate:
     name: "{{ hcloud_certificate_name }}"
     certificate: "{{ test_certificate_content }}"
     private_key: "{{ test_certificate_privatekey_content }}"
@@ -42,7 +42,7 @@
       - certificate.hcloud_certificate.labels.key == "value"
 
 - name: test create certificate idempotence
-  hetzner.hcloud.hcloud_certificate:
+  hetzner.hcloud.certificate:
     name: "{{ hcloud_certificate_name }}"
     certificate: "{{ test_certificate_content }}"
     private_key: "{{ test_certificate_privatekey_content }}"
@@ -53,7 +53,7 @@
       - result is not changed
 
 - name: test update certificate with check mode
-  hetzner.hcloud.hcloud_certificate:
+  hetzner.hcloud.certificate:
     id: "{{ certificate.hcloud_certificate.id }}"
     name: "changed-{{ hcloud_certificate_name }}"
   register: result
@@ -64,7 +64,7 @@
       - result is changed
 
 - name: test update certificate
-  hetzner.hcloud.hcloud_certificate:
+  hetzner.hcloud.certificate:
     id: "{{ certificate.hcloud_certificate.id }}"
     name: "changed-{{ hcloud_certificate_name }}"
     labels:
@@ -77,7 +77,7 @@
       - result.hcloud_certificate.name == "changed-{{ hcloud_certificate_name }}"
 
 - name: test update certificate with same labels
-  hetzner.hcloud.hcloud_certificate:
+  hetzner.hcloud.certificate:
     id: "{{ certificate.hcloud_certificate.id }}"
     name: "changed-{{ hcloud_certificate_name }}"
     labels:
@@ -89,7 +89,7 @@
       - result is not changed
 
 - name: test update certificate with other labels
-  hetzner.hcloud.hcloud_certificate:
+  hetzner.hcloud.certificate:
     id: "{{ certificate.hcloud_certificate.id }}"
     name: "changed-{{ hcloud_certificate_name }}"
     labels:
@@ -102,7 +102,7 @@
       - result is changed
 
 - name: test rename certificate
-  hetzner.hcloud.hcloud_certificate:
+  hetzner.hcloud.certificate:
     id: "{{ certificate.hcloud_certificate.id }}"
     name: "{{ hcloud_certificate_name }}"
   register: result
@@ -113,7 +113,7 @@
       - result.hcloud_certificate.name == "{{ hcloud_certificate_name }}"
 
 - name: absent certificate
-  hetzner.hcloud.hcloud_certificate:
+  hetzner.hcloud.certificate:
     id: "{{ certificate.hcloud_certificate.id }}"
     state: absent
   register: result
@@ -129,7 +129,7 @@
     hcloud_dns_test_domain: "{{ hcloud_dns_test_domain }}"
 
 - name: test create managed certificate
-  hetzner.hcloud.hcloud_certificate:
+  hetzner.hcloud.certificate:
     name: "{{ hcloud_certificate_name }}"
     domain_names:
       - "{{ hcloud_dns_test_domain }}"
@@ -145,7 +145,7 @@
       - result.hcloud_certificate.domain_names[0] == "{{ hcloud_dns_test_domain }}"
 
 - name: test delete certificate
-  hetzner.hcloud.hcloud_certificate:
+  hetzner.hcloud.certificate:
     id: "{{ result.hcloud_certificate.id }}"
     state: absent
   register: result
diff --git a/tests/integration/targets/certificate_info/tasks/cleanup.yml b/tests/integration/targets/certificate_info/tasks/cleanup.yml
index e4475cd..59a50c8 100644
--- a/tests/integration/targets/certificate_info/tasks/cleanup.yml
+++ b/tests/integration/targets/certificate_info/tasks/cleanup.yml
@@ -1,5 +1,5 @@
 ---
 - name: Cleanup test_certificate
-  hetzner.hcloud.hcloud_certificate:
+  hetzner.hcloud.certificate:
     name: "{{ hcloud_certificate_name }}"
     state: absent
diff --git a/tests/integration/targets/certificate_info/tasks/prepare.yml b/tests/integration/targets/certificate_info/tasks/prepare.yml
index fa7ba87..bb1dacd 100644
--- a/tests/integration/targets/certificate_info/tasks/prepare.yml
+++ b/tests/integration/targets/certificate_info/tasks/prepare.yml
@@ -1,6 +1,6 @@
 ---
 - name: Create test_certificate
-  hetzner.hcloud.hcloud_certificate:
+  hetzner.hcloud.certificate:
     name: "{{ hcloud_certificate_name }}"
     certificate: "{{ test_certificate_content }}"
     private_key: "{{ test_certificate_privatekey_content }}"
diff --git a/tests/integration/targets/certificate_info/tasks/test.yml b/tests/integration/targets/certificate_info/tasks/test.yml
index 30f06ce..ffbb48f 100644
--- a/tests/integration/targets/certificate_info/tasks/test.yml
+++ b/tests/integration/targets/certificate_info/tasks/test.yml
@@ -2,7 +2,7 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 ---
 - name: Gather hcloud_certificate_info
-  hetzner.hcloud.hcloud_certificate_info:
+  hetzner.hcloud.certificate_info:
   register: result
 - name: Verify hcloud_certificate_info
   ansible.builtin.assert:
@@ -10,7 +10,7 @@
       - result.hcloud_certificate_info | list | count >= 1
 
 - name: Gather hcloud_certificate_info in check mode
-  hetzner.hcloud.hcloud_certificate_info:
+  hetzner.hcloud.certificate_info:
   check_mode: true
   register: result
 - name: Verify hcloud_certificate_info in check mode
@@ -19,7 +19,7 @@
       - result.hcloud_certificate_info | list | count >= 1
 
 - name: Gather hcloud_certificate_info with correct id
-  hetzner.hcloud.hcloud_certificate_info:
+  hetzner.hcloud.certificate_info:
     id: "{{ test_certificate.hcloud_certificate.id }}"
   register: result
 - name: Verify hcloud_certificate_info with correct id
@@ -28,7 +28,7 @@
       - result.hcloud_certificate_info | list | count == 1
 
 - name: Gather hcloud_certificate_info with wrong id
-  hetzner.hcloud.hcloud_certificate_info:
+  hetzner.hcloud.certificate_info:
     id: "{{ test_certificate.hcloud_certificate.id }}4321"
   ignore_errors: true
   register: result
@@ -38,7 +38,7 @@
       - result is failed
 
 - name: Gather hcloud_certificate_info with correct name
-  hetzner.hcloud.hcloud_certificate_info:
+  hetzner.hcloud.certificate_info:
     name: "{{ hcloud_certificate_name }}"
   register: result
 - name: Verify hcloud_certificate_info with correct name
@@ -47,7 +47,7 @@
       - result.hcloud_certificate_info | list | count == 1
 
 - name: Gather hcloud_certificate_info with wrong name
-  hetzner.hcloud.hcloud_certificate_info:
+  hetzner.hcloud.certificate_info:
     name: "{{ hcloud_certificate_name }}-invalid"
   register: result
 - name: Verify hcloud_certificate_info with wrong name
@@ -56,7 +56,7 @@
       - result.hcloud_certificate_info | list | count == 0
 
 - name: Gather hcloud_certificate_info with correct label selector
-  hetzner.hcloud.hcloud_certificate_info:
+  hetzner.hcloud.certificate_info:
     label_selector: "key=value"
   register: result
 - name: Verify hcloud_certificate_info with correct label selector
@@ -68,7 +68,7 @@
         | list | count == 1
 
 - name: Gather hcloud_certificate_info with wrong label selector
-  hetzner.hcloud.hcloud_certificate_info:
+  hetzner.hcloud.certificate_info:
     label_selector: "key!=value"
   register: result
 - name: Verify hcloud_certificate_info with wrong label selector
diff --git a/tests/integration/targets/datacenter_info/tasks/test.yml b/tests/integration/targets/datacenter_info/tasks/test.yml
index 9efe9cf..530b4dd 100644
--- a/tests/integration/targets/datacenter_info/tasks/test.yml
+++ b/tests/integration/targets/datacenter_info/tasks/test.yml
@@ -2,7 +2,7 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 ---
 - name: Gather hcloud_datacenter_info
-  hetzner.hcloud.hcloud_datacenter_info:
+  hetzner.hcloud.datacenter_info:
   register: result
 - name: Verify hcloud_datacenter_info
   ansible.builtin.assert:
@@ -10,7 +10,7 @@
       - result.hcloud_datacenter_info | list | count >= 5
 
 - name: Gather hcloud_datacenter_info in check mode
-  hetzner.hcloud.hcloud_datacenter_info:
+  hetzner.hcloud.datacenter_info:
   check_mode: true
   register: result
 - name: Verify hcloud_datacenter_info in check mode
@@ -19,7 +19,7 @@
       - result.hcloud_datacenter_info | list | count >= 5
 
 - name: Gather hcloud_datacenter_info with correct id
-  hetzner.hcloud.hcloud_datacenter_info:
+  hetzner.hcloud.datacenter_info:
     id: "{{ hcloud_datacenter_id }}"
   register: result
 - name: Verify hcloud_datacenter_info with correct id
@@ -30,7 +30,7 @@
       - result.hcloud_datacenter_info[0].location == hcloud_location_name
 
 - name: Gather hcloud_datacenter_info with wrong id
-  hetzner.hcloud.hcloud_datacenter_info:
+  hetzner.hcloud.datacenter_info:
     id: "{{ hcloud_datacenter_id }}4321"
   ignore_errors: true
   register: result
@@ -40,7 +40,7 @@
       - result is failed
 
 - name: Gather hcloud_datacenter_info with correct name
-  hetzner.hcloud.hcloud_datacenter_info:
+  hetzner.hcloud.datacenter_info:
     name: "{{ hcloud_datacenter_name }}"
   register: result
 - name: Verify hcloud_datacenter_info with correct name
@@ -49,7 +49,7 @@
       - result.hcloud_datacenter_info | list | count == 1
 
 - name: Gather hcloud_datacenter_info with wrong name
-  hetzner.hcloud.hcloud_datacenter_info:
+  hetzner.hcloud.datacenter_info:
     name: "{{ hcloud_datacenter_name }}-invalid"
   register: result
 - name: Verify hcloud_datacenter_info with wrong name
diff --git a/tests/integration/targets/firewall/tasks/test.yml b/tests/integration/targets/firewall/tasks/test.yml
index e2c3b89..85ff32f 100644
--- a/tests/integration/targets/firewall/tasks/test.yml
+++ b/tests/integration/targets/firewall/tasks/test.yml
@@ -2,12 +2,12 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 ---
 - name: setup firewall to be absent
-  hetzner.hcloud.hcloud_firewall:
+  hetzner.hcloud.firewall:
     name: "{{ hcloud_firewall_name }}"
     state: absent
 
 - name: test missing required parameters on create firewall
-  hetzner.hcloud.hcloud_firewall:
+  hetzner.hcloud.firewall:
   register: result
   ignore_errors: true
 - name: verify fail test missing required parameters on create firewall
@@ -17,7 +17,7 @@
       - 'result.msg == "one of the following is required: id, name"'
 
 - name: test create firewall with check mode
-  hetzner.hcloud.hcloud_firewall:
+  hetzner.hcloud.firewall:
     name: "{{ hcloud_firewall_name }}"
   register: result
   check_mode: true
@@ -27,7 +27,7 @@
       - result is changed
 
 - name: test create firewall
-  hetzner.hcloud.hcloud_firewall:
+  hetzner.hcloud.firewall:
     name: "{{ hcloud_firewall_name }}"
     rules:
       - direction: in
@@ -51,7 +51,7 @@
       - firewall.hcloud_firewall.rules | selectattr('description', 'equalto', 'allow icmp in') | list | count == 1
 
 - name: test create firewall idempotence
-  hetzner.hcloud.hcloud_firewall:
+  hetzner.hcloud.firewall:
     name: "{{ hcloud_firewall_name }}"
     rules:
       - direction: in
@@ -70,7 +70,7 @@
       - result is not changed
 
 - name: test update firewall rules
-  hetzner.hcloud.hcloud_firewall:
+  hetzner.hcloud.firewall:
     name: "{{ hcloud_firewall_name }}"
     rules:
       - direction: in
@@ -109,7 +109,7 @@
       - firewall.hcloud_firewall.rules | selectattr('description', 'equalto', 'allow tcp out') | list | count == 1
 
 - name: test update firewall rules idempotence
-  hetzner.hcloud.hcloud_firewall:
+  hetzner.hcloud.firewall:
     name: "{{ hcloud_firewall_name }}"
     rules:
       - direction: in
@@ -140,7 +140,7 @@
       - result is not changed
 
 - name: test update firewall with check mode
-  hetzner.hcloud.hcloud_firewall:
+  hetzner.hcloud.firewall:
     id: "{{ firewall.hcloud_firewall.id }}"
     name: "changed-{{ hcloud_firewall_name }}"
   register: result
@@ -151,7 +151,7 @@
       - result is changed
 
 - name: test update firewall
-  hetzner.hcloud.hcloud_firewall:
+  hetzner.hcloud.firewall:
     id: "{{ firewall.hcloud_firewall.id }}"
     name: "changed-{{ hcloud_firewall_name }}"
     labels:
@@ -164,7 +164,7 @@
       - result.hcloud_firewall.name == "changed-{{ hcloud_firewall_name }}"
 
 - name: test update firewall with same labels
-  hetzner.hcloud.hcloud_firewall:
+  hetzner.hcloud.firewall:
     id: "{{ firewall.hcloud_firewall.id }}"
     name: "changed-{{ hcloud_firewall_name }}"
     labels:
@@ -176,7 +176,7 @@
       - result is not changed
 
 - name: test update firewall with other labels
-  hetzner.hcloud.hcloud_firewall:
+  hetzner.hcloud.firewall:
     id: "{{ firewall.hcloud_firewall.id }}"
     name: "changed-{{ hcloud_firewall_name }}"
     labels:
@@ -189,7 +189,7 @@
       - result is changed
 
 - name: test rename firewall
-  hetzner.hcloud.hcloud_firewall:
+  hetzner.hcloud.firewall:
     id: "{{ firewall.hcloud_firewall.id }}"
     name: "{{ hcloud_firewall_name }}"
   register: result
@@ -200,7 +200,7 @@
       - result.hcloud_firewall.name == "{{ hcloud_firewall_name }}"
 
 - name: absent firewall
-  hetzner.hcloud.hcloud_firewall:
+  hetzner.hcloud.firewall:
     id: "{{ firewall.hcloud_firewall.id }}"
     state: absent
   register: result
diff --git a/tests/integration/targets/floating_ip/tasks/test.yml b/tests/integration/targets/floating_ip/tasks/test.yml
index 44b173d..5395344 100644
--- a/tests/integration/targets/floating_ip/tasks/test.yml
+++ b/tests/integration/targets/floating_ip/tasks/test.yml
@@ -2,22 +2,22 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 ---
 - name: setup ensure server is absent
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: "{{ hcloud_server_name }}"
     state: absent
 
 - name: setup ensure another server is absent
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: "{{ hcloud_server_name }}2"
     state: absent
 
 - name: setup ensure floating ip is absent
-  hetzner.hcloud.hcloud_floating_ip:
+  hetzner.hcloud.floating_ip:
     name: "{{ hcloud_floating_ip_name }}"
     state: absent
 
 - name: setup server
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: "{{ hcloud_server_name }}"
     server_type: cx11
     image: ubuntu-22.04
@@ -30,7 +30,7 @@
       - main_server is changed
 
 - name: setup another server
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: "{{ hcloud_server_name }}2"
     server_type: cx11
     image: ubuntu-22.04
@@ -42,7 +42,7 @@
       - main_server2 is changed
 
 - name: test missing type parameter on create Floating IP
-  hetzner.hcloud.hcloud_floating_ip:
+  hetzner.hcloud.floating_ip:
     name: "{{ hcloud_floating_ip_name }}"
   register: result
   ignore_errors: true
@@ -53,7 +53,7 @@
       - 'result.msg == "missing required arguments: type"'
 
 - name: test missing required parameters on create Floating IP
-  hetzner.hcloud.hcloud_floating_ip:
+  hetzner.hcloud.floating_ip:
     name: "{{ hcloud_floating_ip_name }}"
     type: ipv4
   register: result
@@ -65,7 +65,7 @@
       - 'result.msg == "one of the following is required: home_location, server"'
 
 - name: test missing type parameter on delete Floating IP
-  hetzner.hcloud.hcloud_floating_ip:
+  hetzner.hcloud.floating_ip:
     type: ipv4
     home_location: "fsn1"
     state: "absent"
@@ -78,7 +78,7 @@
       - 'result.msg == "one of the following is required: id, name"'
 
 - name: test invalid type
-  hetzner.hcloud.hcloud_floating_ip:
+  hetzner.hcloud.floating_ip:
     name: "{{ hcloud_floating_ip_name }}"
     type: ipv5
     home_location: "fsn1"
@@ -91,7 +91,7 @@
       - 'result.msg == "value of type must be one of: ipv4, ipv6, got: ipv5"'
 
 - name: test invalid location
-  hetzner.hcloud.hcloud_floating_ip:
+  hetzner.hcloud.floating_ip:
     name: "{{ hcloud_floating_ip_name }}"
     type: ipv4
     home_location: "abc"
@@ -104,7 +104,7 @@
       - result.msg == "invalid input in fields 'server', 'home_location'"
 
 - name: test create Floating IP with check mode
-  hetzner.hcloud.hcloud_floating_ip:
+  hetzner.hcloud.floating_ip:
     name: "{{ hcloud_floating_ip_name }}"
     description: "Web Server"
     type: ipv4
@@ -117,7 +117,7 @@
       - floatingIP is changed
 
 - name: test create Floating IP
-  hetzner.hcloud.hcloud_floating_ip:
+  hetzner.hcloud.floating_ip:
     name: "{{ hcloud_floating_ip_name }}"
     description: "Web Server"
     type: ipv4
@@ -132,7 +132,7 @@
       - floatingIP.hcloud_floating_ip.home_location == "fsn1"
 
 - name: test create Floating IP idempotency
-  hetzner.hcloud.hcloud_floating_ip:
+  hetzner.hcloud.floating_ip:
     name: "{{ hcloud_floating_ip_name }}"
     description: "Web Server"
     type: ipv4
@@ -144,7 +144,7 @@
       - floatingIP is not changed
 
 - name: test update Floating IP with check mode
-  hetzner.hcloud.hcloud_floating_ip:
+  hetzner.hcloud.floating_ip:
     name: "{{ hcloud_floating_ip_name }}"
     description: "changed-description"
     type: ipv4
@@ -158,7 +158,7 @@
       - floatingIP.hcloud_floating_ip.description == "Web Server"
 
 - name: test update Floating IP
-  hetzner.hcloud.hcloud_floating_ip:
+  hetzner.hcloud.floating_ip:
     name: "{{ hcloud_floating_ip_name }}"
     description: "changed-description"
     type: ipv4
@@ -173,7 +173,7 @@
       - floatingIP.hcloud_floating_ip.description == "changed-description"
 
 - name: test update Floating IP idempotency
-  hetzner.hcloud.hcloud_floating_ip:
+  hetzner.hcloud.floating_ip:
     name: "{{ hcloud_floating_ip_name }}"
     description: "changed-description"
     type: ipv4
@@ -187,7 +187,7 @@
       - floatingIP is not changed
 
 - name: test update Floating IP with same labels
-  hetzner.hcloud.hcloud_floating_ip:
+  hetzner.hcloud.floating_ip:
     name: "{{ hcloud_floating_ip_name }}"
     type: ipv4
     home_location: "fsn1"
@@ -200,7 +200,7 @@
       - floatingIP is not changed
 
 - name: test update Floating IP with other labels
-  hetzner.hcloud.hcloud_floating_ip:
+  hetzner.hcloud.floating_ip:
     name: "{{ hcloud_floating_ip_name }}"
     type: ipv4
     home_location: "fsn1"
@@ -214,7 +214,7 @@
       - floatingIP is changed
 
 - name: test update Floating IP with other labels in different order
-  hetzner.hcloud.hcloud_floating_ip:
+  hetzner.hcloud.floating_ip:
     name: "{{ hcloud_floating_ip_name }}"
     type: ipv4
     home_location: "fsn1"
@@ -228,7 +228,7 @@
       - floatingIP is not changed
 
 - name: test assign Floating IP with checkmode
-  hetzner.hcloud.hcloud_floating_ip:
+  hetzner.hcloud.floating_ip:
     name: "{{ hcloud_floating_ip_name }}"
     description: "changed-description"
     type: ipv4
@@ -242,7 +242,7 @@
       - floatingIP.hcloud_floating_ip.server != "{{ main_server.hcloud_server.name }}"
 
 - name: test assign Floating IP
-  hetzner.hcloud.hcloud_floating_ip:
+  hetzner.hcloud.floating_ip:
     name: "{{ hcloud_floating_ip_name }}"
     description: "changed-description"
     type: ipv4
@@ -255,7 +255,7 @@
       - floatingIP.hcloud_floating_ip.server == "{{ main_server.hcloud_server.name }}"
 
 - name: test assign Floating IP idempotency
-  hetzner.hcloud.hcloud_floating_ip:
+  hetzner.hcloud.floating_ip:
     name: "{{ hcloud_floating_ip_name }}"
     description: "changed-description"
     type: ipv4
@@ -267,7 +267,7 @@
       - floatingIP is not changed
 
 - name: test unassign Floating IP
-  hetzner.hcloud.hcloud_floating_ip:
+  hetzner.hcloud.floating_ip:
     name: "{{ hcloud_floating_ip_name }}"
     type: ipv4
     home_location: "fsn1"
@@ -279,7 +279,7 @@
       - floatingIP.hcloud_floating_ip.server != "{{ main_server.hcloud_server.name }}"
 
 - name: test unassign Floating IP idempotency
-  hetzner.hcloud.hcloud_floating_ip:
+  hetzner.hcloud.floating_ip:
     name: "{{ hcloud_floating_ip_name }}"
     type: ipv4
     home_location: "fsn1"
@@ -290,7 +290,7 @@
       - floatingIP is not changed
 
 - name: test assign Floating IP again
-  hetzner.hcloud.hcloud_floating_ip:
+  hetzner.hcloud.floating_ip:
     name: "{{ hcloud_floating_ip_name }}"
     type: ipv4
     server: "{{ main_server.hcloud_server.name }}"
@@ -302,7 +302,7 @@
       - floatingIP.hcloud_floating_ip.server == "{{ main_server.hcloud_server.name }}"
 
 - name: test already assigned Floating IP assign without force
-  hetzner.hcloud.hcloud_floating_ip:
+  hetzner.hcloud.floating_ip:
     name: "{{ hcloud_floating_ip_name }}"
     type: ipv4
     server: "{{ main_server2.hcloud_server.name }}"
@@ -314,7 +314,7 @@
       - floatingIP.hcloud_floating_ip.server == "{{ main_server.hcloud_server.name }}"
 
 - name: test already assigned Floating IP assign with force
-  hetzner.hcloud.hcloud_floating_ip:
+  hetzner.hcloud.floating_ip:
     name: "{{ hcloud_floating_ip_name }}"
     type: ipv4
     force: true
@@ -327,7 +327,7 @@
       - floatingIP.hcloud_floating_ip.server == "{{ main_server2.hcloud_server.name }}"
 
 - name: test update Floating IP delete protection
-  hetzner.hcloud.hcloud_floating_ip:
+  hetzner.hcloud.floating_ip:
     name: "{{ hcloud_floating_ip_name }}"
     type: ipv4
     delete_protection: true
@@ -339,7 +339,7 @@
       - floatingIP.hcloud_floating_ip.delete_protection is sameas true
 
 - name: test update Floating IP delete protection idempotency
-  hetzner.hcloud.hcloud_floating_ip:
+  hetzner.hcloud.floating_ip:
     name: "{{ hcloud_floating_ip_name }}"
     type: ipv4
     delete_protection: true
@@ -351,7 +351,7 @@
       - floatingIP.hcloud_floating_ip.delete_protection is sameas true
 
 - name: test Floating IP without delete protection set to be idempotent
-  hetzner.hcloud.hcloud_floating_ip:
+  hetzner.hcloud.floating_ip:
     name: "{{ hcloud_floating_ip_name }}"
     type: ipv4
   register: floatingIP
@@ -362,7 +362,7 @@
       - floatingIP.hcloud_floating_ip.delete_protection is sameas true
 
 - name: test delete Floating IP fails if it is protected
-  hetzner.hcloud.hcloud_floating_ip:
+  hetzner.hcloud.floating_ip:
     name: "{{ hcloud_floating_ip_name }}"
     state: "absent"
   register: result
@@ -374,7 +374,7 @@
       - 'result.msg == "Floating IP deletion is protected"'
 
 - name: test update Floating IP delete protection
-  hetzner.hcloud.hcloud_floating_ip:
+  hetzner.hcloud.floating_ip:
     name: "{{ hcloud_floating_ip_name }}"
     type: ipv4
     delete_protection: false
@@ -386,7 +386,7 @@
       - floatingIP.hcloud_floating_ip.delete_protection is sameas false
 
 - name: test delete floating ip
-  hetzner.hcloud.hcloud_floating_ip:
+  hetzner.hcloud.floating_ip:
     name: "{{ hcloud_floating_ip_name }}"
     state: "absent"
   register: result
@@ -396,7 +396,7 @@
       - result is changed
 
 - name: test create ipv6 floating ip
-  hetzner.hcloud.hcloud_floating_ip:
+  hetzner.hcloud.floating_ip:
     name: "{{ hcloud_floating_ip_name }}"
     type: ipv6
     home_location: "fsn1"
@@ -408,7 +408,7 @@
       - result is changed
 
 - name: test delete ipv6 floating ip
-  hetzner.hcloud.hcloud_floating_ip:
+  hetzner.hcloud.floating_ip:
     name: "{{ hcloud_floating_ip_name }}"
     state: "absent"
   register: result
@@ -418,7 +418,7 @@
       - result is changed
 
 - name: cleanup
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: "{{ hcloud_server_name }}"
     state: absent
   register: result
@@ -427,7 +427,7 @@
     that:
       - result is changed
 - name: cleanup another server
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: "{{ main_server2.hcloud_server.name }}"
     state: absent
   register: result
@@ -437,7 +437,7 @@
       - result is changed
 
 - name: test create Floating IP with delete protection
-  hetzner.hcloud.hcloud_floating_ip:
+  hetzner.hcloud.floating_ip:
     name: "{{ hcloud_floating_ip_name }}"
     type: ipv4
     home_location: fsn1
@@ -450,7 +450,7 @@
       - floatingIP.hcloud_floating_ip.delete_protection is sameas true
 
 - name: test delete Floating IP fails if it is protected
-  hetzner.hcloud.hcloud_floating_ip:
+  hetzner.hcloud.floating_ip:
     name: "{{ hcloud_floating_ip_name }}"
     state: "absent"
   register: result
@@ -462,7 +462,7 @@
       - 'result.msg == "Floating IP deletion is protected"'
 
 - name: test update Floating IP delete protection
-  hetzner.hcloud.hcloud_floating_ip:
+  hetzner.hcloud.floating_ip:
     name: "{{ hcloud_floating_ip_name }}"
     type: ipv4
     delete_protection: false
@@ -474,7 +474,7 @@
       - floatingIP.hcloud_floating_ip.delete_protection is sameas false
 
 - name: test delete floating ip
-  hetzner.hcloud.hcloud_floating_ip:
+  hetzner.hcloud.floating_ip:
     name: "{{ hcloud_floating_ip_name }}"
     state: "absent"
   register: result
diff --git a/tests/integration/targets/floating_ip_info/tasks/cleanup.yml b/tests/integration/targets/floating_ip_info/tasks/cleanup.yml
index 3bae2ec..611d8e0 100644
--- a/tests/integration/targets/floating_ip_info/tasks/cleanup.yml
+++ b/tests/integration/targets/floating_ip_info/tasks/cleanup.yml
@@ -1,5 +1,5 @@
 ---
 - name: Cleanup test_floating_ip
-  hetzner.hcloud.hcloud_floating_ip:
+  hetzner.hcloud.floating_ip:
     name: "{{ hcloud_floating_ip_name }}"
     state: absent
diff --git a/tests/integration/targets/floating_ip_info/tasks/prepare.yml b/tests/integration/targets/floating_ip_info/tasks/prepare.yml
index 6ab9ec9..26230ad 100644
--- a/tests/integration/targets/floating_ip_info/tasks/prepare.yml
+++ b/tests/integration/targets/floating_ip_info/tasks/prepare.yml
@@ -1,6 +1,6 @@
 ---
 - name: Create test_floating_ip
-  hetzner.hcloud.hcloud_floating_ip:
+  hetzner.hcloud.floating_ip:
     name: "{{ hcloud_floating_ip_name }}"
     home_location: fsn1
     type: ipv4
diff --git a/tests/integration/targets/floating_ip_info/tasks/test.yml b/tests/integration/targets/floating_ip_info/tasks/test.yml
index 3f31d6d..b0d78d0 100644
--- a/tests/integration/targets/floating_ip_info/tasks/test.yml
+++ b/tests/integration/targets/floating_ip_info/tasks/test.yml
@@ -2,7 +2,7 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 ---
 - name: Gather hcloud_floating_ip_info
-  hetzner.hcloud.hcloud_floating_ip_info:
+  hetzner.hcloud.floating_ip_info:
   register: result
 - name: Verify hcloud_floating_ip_info
   ansible.builtin.assert:
@@ -10,7 +10,7 @@
       - result.hcloud_floating_ip_info | list | count >= 1
 
 - name: Gather hcloud_floating_ip_info in check mode
-  hetzner.hcloud.hcloud_floating_ip_info:
+  hetzner.hcloud.floating_ip_info:
   check_mode: true
   register: result
 - name: Verify hcloud_floating_ip_info in check mode
@@ -19,7 +19,7 @@
       - result.hcloud_floating_ip_info | list | count >= 1
 
 - name: Gather hcloud_floating_ip_info with correct id
-  hetzner.hcloud.hcloud_floating_ip_info:
+  hetzner.hcloud.floating_ip_info:
     id: "{{ test_floating_ip.hcloud_floating_ip.id }}"
   register: result
 - name: Verify hcloud_floating_ip_info with correct id
@@ -28,7 +28,7 @@
       - result.hcloud_floating_ip_info | list | count == 1
 
 - name: Gather hcloud_floating_ip_info with wrong id
-  hetzner.hcloud.hcloud_floating_ip_info:
+  hetzner.hcloud.floating_ip_info:
     id: "{{ test_floating_ip.hcloud_floating_ip.id }}4321"
   ignore_errors: true
   register: result
@@ -38,7 +38,7 @@
       - result is failed
 
 - name: Gather hcloud_floating_ip_info with correct name
-  hetzner.hcloud.hcloud_floating_ip_info:
+  hetzner.hcloud.floating_ip_info:
     name: "{{ hcloud_floating_ip_name }}"
   register: result
 - name: Verify hcloud_floating_ip_info with correct name
@@ -47,7 +47,7 @@
       - result.hcloud_floating_ip_info | list | count == 1
 
 - name: Gather hcloud_floating_ip_info with wrong name
-  hetzner.hcloud.hcloud_floating_ip_info:
+  hetzner.hcloud.floating_ip_info:
     name: "{{ hcloud_floating_ip_name }}-invalid"
   register: result
 - name: Verify hcloud_floating_ip_info with wrong name
@@ -56,7 +56,7 @@
       - result.hcloud_floating_ip_info | list | count == 0
 
 - name: Gather hcloud_floating_ip_info with correct label selector
-  hetzner.hcloud.hcloud_floating_ip_info:
+  hetzner.hcloud.floating_ip_info:
     label_selector: "key=value"
   register: result
 - name: Verify hcloud_floating_ip_info with correct label selector
@@ -68,7 +68,7 @@
         | list | count == 1
 
 - name: Gather hcloud_floating_ip_info with wrong label selector
-  hetzner.hcloud.hcloud_floating_ip_info:
+  hetzner.hcloud.floating_ip_info:
     label_selector: "key!=value"
   register: result
 - name: Verify hcloud_floating_ip_info with wrong label selector
diff --git a/tests/integration/targets/image_info/tasks/cleanup.yml b/tests/integration/targets/image_info/tasks/cleanup.yml
index 751366b..a99c365 100644
--- a/tests/integration/targets/image_info/tasks/cleanup.yml
+++ b/tests/integration/targets/image_info/tasks/cleanup.yml
@@ -1,5 +1,5 @@
 ---
 - name: Cleanup test_server
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: "{{ hcloud_server_name }}"
     state: absent
diff --git a/tests/integration/targets/image_info/tasks/prepare.yml b/tests/integration/targets/image_info/tasks/prepare.yml
index 190e432..9c65ae8 100644
--- a/tests/integration/targets/image_info/tasks/prepare.yml
+++ b/tests/integration/targets/image_info/tasks/prepare.yml
@@ -1,6 +1,6 @@
 ---
 - name: Create test_server
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: "{{ hcloud_server_name }}"
     server_type: cx11
     image: ubuntu-22.04
diff --git a/tests/integration/targets/image_info/tasks/test.yml b/tests/integration/targets/image_info/tasks/test.yml
index 4360b89..7a8d128 100644
--- a/tests/integration/targets/image_info/tasks/test.yml
+++ b/tests/integration/targets/image_info/tasks/test.yml
@@ -2,7 +2,7 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 ---
 - name: Gather hcloud_image_info
-  hetzner.hcloud.hcloud_image_info:
+  hetzner.hcloud.image_info:
   register: result
 - name: Verify hcloud_image_info
   ansible.builtin.assert:
@@ -10,7 +10,7 @@
       - result.hcloud_image_info | list | count >= 3
 
 - name: Gather hcloud_image_info with architecture
-  hetzner.hcloud.hcloud_image_info:
+  hetzner.hcloud.image_info:
     architecture: arm
   register: result
 - name: Verify hcloud_image_info with architecture
@@ -20,7 +20,7 @@
       - result.hcloud_image_info | selectattr('architecture', 'equalto', 'arm') | list | count  > 2
 
 - name: Gather hcloud_image_info in check mode
-  hetzner.hcloud.hcloud_image_info:
+  hetzner.hcloud.image_info:
   check_mode: true
   register: result
 - name: Verify hcloud_image_info in check mode
@@ -29,7 +29,7 @@
       - result.hcloud_image_info | list | count >= 3
 
 - name: Gather hcloud_image_info with correct id
-  hetzner.hcloud.hcloud_image_info:
+  hetzner.hcloud.image_info:
     id: "{{ test_snapshot_id }}"
     type: snapshot
   register: result
@@ -39,7 +39,7 @@
       - result.hcloud_image_info | list | count == 1
 
 - name: Gather hcloud_image_info with wrong id
-  hetzner.hcloud.hcloud_image_info:
+  hetzner.hcloud.image_info:
     id: "{{ test_snapshot_id }}4321"
     type: snapshot
   ignore_errors: true
@@ -50,7 +50,7 @@
       - result is failed
 
 - name: Gather hcloud_image_info with correct name
-  hetzner.hcloud.hcloud_image_info:
+  hetzner.hcloud.image_info:
     name: "{{ hcloud_image_name }}"
   register: result
 - name: Verify hcloud_image_info with correct name
@@ -60,7 +60,7 @@
       - result.hcloud_image_info[0].architecture == "x86"
 
 - name: Gather hcloud_image_info with wrong name
-  hetzner.hcloud.hcloud_image_info:
+  hetzner.hcloud.image_info:
     name: "{{ hcloud_image_name }}-invalid"
   register: result
 - name: Verify hcloud_image_info with wrong name
@@ -69,7 +69,7 @@
       - result.hcloud_image_info | list | count == 0
 
 - name: Gather hcloud_image_info with correct name and architecture
-  hetzner.hcloud.hcloud_image_info:
+  hetzner.hcloud.image_info:
     name: "{{ hcloud_image_name }}"
     architecture: arm
   register: result
@@ -80,7 +80,7 @@
       - result.hcloud_image_info[0].architecture == "arm"
 
 - name: Gather hcloud_image_info with correct label selector
-  hetzner.hcloud.hcloud_image_info:
+  hetzner.hcloud.image_info:
     label_selector: "key=value"
     type: snapshot
   register: result
@@ -94,7 +94,7 @@
         | list | count == 1
 
 - name: Gather hcloud_image_info with wrong label selector
-  hetzner.hcloud.hcloud_image_info:
+  hetzner.hcloud.image_info:
     label_selector: "key!=value"
     type: snapshot
   register: result
diff --git a/tests/integration/targets/iso_info/tasks/test.yml b/tests/integration/targets/iso_info/tasks/test.yml
index a1d4242..52a4204 100644
--- a/tests/integration/targets/iso_info/tasks/test.yml
+++ b/tests/integration/targets/iso_info/tasks/test.yml
@@ -2,7 +2,7 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 ---
 - name: Gather hcloud_iso_info
-  hetzner.hcloud.hcloud_iso_info:
+  hetzner.hcloud.iso_info:
   register: result
 - name: Verify hcloud_iso_info
   ansible.builtin.assert:
@@ -10,7 +10,7 @@
       - result.hcloud_iso_info | list | count >= 1
 
 - name: Gather hcloud_iso_info in check mode
-  hetzner.hcloud.hcloud_iso_info:
+  hetzner.hcloud.iso_info:
   check_mode: true
   register: result
 - name: Verify hcloud_iso_info in check mode
@@ -19,7 +19,7 @@
       - result.hcloud_iso_info | list | count >= 1
 
 - name: Gather hcloud_iso_info with correct id
-  hetzner.hcloud.hcloud_iso_info:
+  hetzner.hcloud.iso_info:
     id: "{{ hcloud_iso_id }}"
   register: result
 - name: Verify hcloud_iso_info with correct id
@@ -34,7 +34,7 @@
       - result.hcloud_iso_info[0].deprecation is none
 
 - name: Gather hcloud_iso_info with wrong id
-  hetzner.hcloud.hcloud_iso_info:
+  hetzner.hcloud.iso_info:
     id: "{{ hcloud_iso_id }}4321"
   ignore_errors: true
   register: result
@@ -44,7 +44,7 @@
       - result is failed
 
 - name: Gather hcloud_iso_info with correct name
-  hetzner.hcloud.hcloud_iso_info:
+  hetzner.hcloud.iso_info:
     name: "{{ hcloud_iso_name }}"
   register: result
 - name: Verify hcloud_iso_info with correct name
@@ -53,7 +53,7 @@
       - result.hcloud_iso_info | list | count == 1
 
 - name: Gather hcloud_iso_info with wrong name
-  hetzner.hcloud.hcloud_iso_info:
+  hetzner.hcloud.iso_info:
     name: "{{ hcloud_iso_name }}-invalid"
   register: result
 - name: Verify hcloud_iso_info with wrong name
@@ -62,7 +62,7 @@
       - result.hcloud_iso_info | list | count == 0
 
 - name: Gather hcloud_iso_info with architecture
-  hetzner.hcloud.hcloud_iso_info:
+  hetzner.hcloud.iso_info:
     architecture: arm
   register: result
 - name: Verify hcloud_iso_info with architecture
diff --git a/tests/integration/targets/load_balancer/tasks/cleanup.yml b/tests/integration/targets/load_balancer/tasks/cleanup.yml
index 2110adf..b9ad6d2 100644
--- a/tests/integration/targets/load_balancer/tasks/cleanup.yml
+++ b/tests/integration/targets/load_balancer/tasks/cleanup.yml
@@ -1,5 +1,5 @@
 ---
 - name: Cleanup test_load_balancer
-  hetzner.hcloud.hcloud_load_balancer:
+  hetzner.hcloud.load_balancer:
     name: "{{ hcloud_load_balancer_name }}"
     state: absent
diff --git a/tests/integration/targets/load_balancer/tasks/test.yml b/tests/integration/targets/load_balancer/tasks/test.yml
index 9ec10bb..64cb50b 100644
--- a/tests/integration/targets/load_balancer/tasks/test.yml
+++ b/tests/integration/targets/load_balancer/tasks/test.yml
@@ -2,7 +2,7 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 ---
 - name: Test missing required parameters
-  hetzner.hcloud.hcloud_load_balancer:
+  hetzner.hcloud.load_balancer:
     name: "{{ hcloud_load_balancer_name }}"
     state: present
   ignore_errors: true
@@ -14,7 +14,7 @@
       - 'result.msg == "missing required arguments: load_balancer_type"'
 
 - name: Test create with check mode
-  hetzner.hcloud.hcloud_load_balancer:
+  hetzner.hcloud.load_balancer:
     name: "{{ hcloud_load_balancer_name }}"
     load_balancer_type: lb11
     network_zone: eu-central
@@ -27,7 +27,7 @@
       - result is changed
 
 - name: Test create
-  hetzner.hcloud.hcloud_load_balancer:
+  hetzner.hcloud.load_balancer:
     name: "{{ hcloud_load_balancer_name }}"
     load_balancer_type: lb11
     network_zone: eu-central
@@ -48,7 +48,7 @@
       - result.hcloud_load_balancer.delete_protection == false
 
 - name: Test create idempotency
-  hetzner.hcloud.hcloud_load_balancer:
+  hetzner.hcloud.load_balancer:
     name: "{{ hcloud_load_balancer_name }}"
     load_balancer_type: lb11
     network_zone: eu-central
@@ -60,7 +60,7 @@
       - result is not changed
 
 - name: Test update algorithm
-  hetzner.hcloud.hcloud_load_balancer:
+  hetzner.hcloud.load_balancer:
     name: "{{ hcloud_load_balancer_name }}"
     algorithm: least_connections
     state: present
@@ -72,7 +72,7 @@
       - result.hcloud_load_balancer.algorithm == "least_connections"
 
 - name: Test update load_balancer_type
-  hetzner.hcloud.hcloud_load_balancer:
+  hetzner.hcloud.load_balancer:
     name: "{{ hcloud_load_balancer_name }}"
     load_balancer_type: lb21
     state: present
@@ -84,7 +84,7 @@
       - result.hcloud_load_balancer.load_balancer_type == "lb21"
 
 - name: Test update labels
-  hetzner.hcloud.hcloud_load_balancer:
+  hetzner.hcloud.load_balancer:
     name: "{{ hcloud_load_balancer_name }}"
     labels:
       key: changed
@@ -99,7 +99,7 @@
       - result.hcloud_load_balancer.labels.label == "changed123"
 
 - name: Test update delete_protection
-  hetzner.hcloud.hcloud_load_balancer:
+  hetzner.hcloud.load_balancer:
     name: "{{ hcloud_load_balancer_name }}"
     delete_protection: true
     state: present
@@ -111,7 +111,7 @@
       - result.hcloud_load_balancer.delete_protection == true
 
 - name: Test delete with protection
-  hetzner.hcloud.hcloud_load_balancer:
+  hetzner.hcloud.load_balancer:
     name: "{{ hcloud_load_balancer_name }}"
     state: absent
   register: result
@@ -123,7 +123,7 @@
       - 'result.msg == "load balancer deletion is protected"'
 
 - name: Test update delete_protection
-  hetzner.hcloud.hcloud_load_balancer:
+  hetzner.hcloud.load_balancer:
     name: "{{ hcloud_load_balancer_name }}"
     delete_protection: false
     state: present
@@ -135,7 +135,7 @@
       - result.hcloud_load_balancer.delete_protection == false
 
 - name: Test delete
-  hetzner.hcloud.hcloud_load_balancer:
+  hetzner.hcloud.load_balancer:
     name: "{{ hcloud_load_balancer_name }}"
     state: absent
   register: result
diff --git a/tests/integration/targets/load_balancer_info/tasks/cleanup.yml b/tests/integration/targets/load_balancer_info/tasks/cleanup.yml
index 39745ae..b99d2cd 100644
--- a/tests/integration/targets/load_balancer_info/tasks/cleanup.yml
+++ b/tests/integration/targets/load_balancer_info/tasks/cleanup.yml
@@ -1,10 +1,10 @@
 ---
 - name: Cleanup test_load_balancer
-  hetzner.hcloud.hcloud_load_balancer:
+  hetzner.hcloud.load_balancer:
     name: "{{ hcloud_load_balancer_name }}"
     state: absent
 
 - name: Cleanup test_server
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: "{{ hcloud_server_name }}"
     state: absent
diff --git a/tests/integration/targets/load_balancer_info/tasks/prepare.yml b/tests/integration/targets/load_balancer_info/tasks/prepare.yml
index e70359e..bfad755 100644
--- a/tests/integration/targets/load_balancer_info/tasks/prepare.yml
+++ b/tests/integration/targets/load_balancer_info/tasks/prepare.yml
@@ -1,6 +1,6 @@
 ---
 - name: Create test_server
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: "{{ hcloud_server_name }}"
     server_type: cx11
     image: ubuntu-22.04
@@ -8,7 +8,7 @@
   register: test_server
 
 - name: Create test_load_balancer
-  hetzner.hcloud.hcloud_load_balancer:
+  hetzner.hcloud.load_balancer:
     name: "{{ hcloud_load_balancer_name }}"
     load_balancer_type: lb11
     network_zone: eu-central
@@ -17,7 +17,7 @@
   register: test_load_balancer
 
 - name: Create test_load_balancer_target
-  hetzner.hcloud.hcloud_load_balancer_target:
+  hetzner.hcloud.load_balancer_target:
     type: "server"
     load_balancer: "{{ hcloud_load_balancer_name }}"
     server: "{{ hcloud_server_name }}"
@@ -25,7 +25,7 @@
   register: test_load_balancer_target
 
 - name: Create test_load_balancer_service
-  hetzner.hcloud.hcloud_load_balancer_service:
+  hetzner.hcloud.load_balancer_service:
     load_balancer: "{{ hcloud_load_balancer_name }}"
     protocol: "http"
     listen_port: 80
diff --git a/tests/integration/targets/load_balancer_info/tasks/test.yml b/tests/integration/targets/load_balancer_info/tasks/test.yml
index 514d02d..02b7452 100644
--- a/tests/integration/targets/load_balancer_info/tasks/test.yml
+++ b/tests/integration/targets/load_balancer_info/tasks/test.yml
@@ -2,7 +2,7 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 ---
 - name: Gather hcloud_load_balancer_info
-  hetzner.hcloud.hcloud_load_balancer_info:
+  hetzner.hcloud.load_balancer_info:
   register: result
 - name: Verify hcloud_load_balancer_info
   ansible.builtin.assert:
@@ -10,7 +10,7 @@
       - result.hcloud_load_balancer_info | list | count >= 1
 
 - name: Gather hcloud_load_balancer_info in check mode
-  hetzner.hcloud.hcloud_load_balancer_info:
+  hetzner.hcloud.load_balancer_info:
   check_mode: true
   register: result
 - name: Verify hcloud_load_balancer_info in check mode
@@ -19,7 +19,7 @@
       - result.hcloud_load_balancer_info | list | count >= 1
 
 - name: Gather hcloud_load_balancer_info with correct id
-  hetzner.hcloud.hcloud_load_balancer_info:
+  hetzner.hcloud.load_balancer_info:
     id: "{{ test_load_balancer.hcloud_load_balancer.id }}"
   register: result
 - name: Verify hcloud_load_balancer_info with correct id
@@ -37,7 +37,7 @@
       - result.hcloud_load_balancer_info[0].services | selectattr('destination_port', 'equalto', 80) | list | count == 1
 
 - name: Gather hcloud_load_balancer_info with wrong id
-  hetzner.hcloud.hcloud_load_balancer_info:
+  hetzner.hcloud.load_balancer_info:
     id: "{{ test_load_balancer.hcloud_load_balancer.id }}4321"
   ignore_errors: true
   register: result
@@ -47,7 +47,7 @@
       - result is failed
 
 - name: Gather hcloud_load_balancer_info with correct name
-  hetzner.hcloud.hcloud_load_balancer_info:
+  hetzner.hcloud.load_balancer_info:
     name: "{{ hcloud_load_balancer_name }}"
   register: result
 - name: Verify hcloud_load_balancer_info with correct name
@@ -56,7 +56,7 @@
       - result.hcloud_load_balancer_info | list | count == 1
 
 - name: Gather hcloud_load_balancer_info with wrong name
-  hetzner.hcloud.hcloud_load_balancer_info:
+  hetzner.hcloud.load_balancer_info:
     name: "{{ hcloud_load_balancer_name }}-invalid"
   register: result
 - name: Verify hcloud_load_balancer_info with wrong name
@@ -65,7 +65,7 @@
       - result.hcloud_load_balancer_info | list | count == 0
 
 - name: Gather hcloud_load_balancer_info with correct label selector
-  hetzner.hcloud.hcloud_load_balancer_info:
+  hetzner.hcloud.load_balancer_info:
     label_selector: "key=value"
   register: result
 - name: Verify hcloud_load_balancer_info with correct label selector
@@ -77,7 +77,7 @@
         | list | count == 1
 
 - name: Gather hcloud_load_balancer_info with wrong label selector
-  hetzner.hcloud.hcloud_load_balancer_info:
+  hetzner.hcloud.load_balancer_info:
     label_selector: "key!=value"
   register: result
 - name: Verify hcloud_load_balancer_info with wrong label selector
diff --git a/tests/integration/targets/load_balancer_network/tasks/test.yml b/tests/integration/targets/load_balancer_network/tasks/test.yml
index 689853d..06e4696 100644
--- a/tests/integration/targets/load_balancer_network/tasks/test.yml
+++ b/tests/integration/targets/load_balancer_network/tasks/test.yml
@@ -2,7 +2,7 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 ---
 - name: setup network
-  hetzner.hcloud.hcloud_network:
+  hetzner.hcloud.network:
     name: "{{ hcloud_network_name }}"
     ip_range: "10.0.0.0/8"
     state: present
@@ -13,7 +13,7 @@
       - network is success
 
 - name: setup subnetwork
-  hetzner.hcloud.hcloud_subnetwork:
+  hetzner.hcloud.subnetwork:
     network: "{{ hcloud_network_name }}"
     ip_range: "10.0.0.0/16"
     type: "cloud"
@@ -26,7 +26,7 @@
       - subnetwork is success
 
 - name: setup load_balancer
-  hetzner.hcloud.hcloud_load_balancer:
+  hetzner.hcloud.load_balancer:
     name: "{{hcloud_load_balancer_name}}"
     load_balancer_type: lb11
     state: present
@@ -38,7 +38,7 @@
       - load_balancer is success
 
 - name: test missing required parameters on create load_balancer network
-  hetzner.hcloud.hcloud_load_balancer_network:
+  hetzner.hcloud.load_balancer_network:
     state: present
   register: result
   ignore_errors: true
@@ -49,7 +49,7 @@
       - '"missing required arguments:" in result.msg'
 
 - name: test fail load balancer does not exist
-  hetzner.hcloud.hcloud_load_balancer_network:
+  hetzner.hcloud.load_balancer_network:
     network: "{{ hcloud_network_name }}"
     load_balancer: does-not-exist
     state: present
@@ -62,7 +62,7 @@
       - "result.msg == 'resource (load_balancer) does not exist: does-not-exist'"
 
 - name: test fail network does not exist
-  hetzner.hcloud.hcloud_load_balancer_network:
+  hetzner.hcloud.load_balancer_network:
     network: does-not-exist
     load_balancer: "{{ hcloud_load_balancer_name }}"
     state: present
@@ -75,7 +75,7 @@
       - "result.msg == 'resource (network) does not exist: does-not-exist'"
 
 - name: test create load_balancer network with checkmode
-  hetzner.hcloud.hcloud_load_balancer_network:
+  hetzner.hcloud.load_balancer_network:
     network: "{{ hcloud_network_name }}"
     load_balancer: "{{hcloud_load_balancer_name}}"
     state: present
@@ -87,7 +87,7 @@
       - result is changed
 
 - name: test create load_balancer network
-  hetzner.hcloud.hcloud_load_balancer_network:
+  hetzner.hcloud.load_balancer_network:
     network: "{{ hcloud_network_name }}"
     load_balancer: "{{hcloud_load_balancer_name}}"
     state: present
@@ -100,7 +100,7 @@
       - load_balancerNetwork.hcloud_load_balancer_network.load_balancer == hcloud_load_balancer_name
 
 - name: test create load_balancer network idempotency
-  hetzner.hcloud.hcloud_load_balancer_network:
+  hetzner.hcloud.load_balancer_network:
     network: "{{ hcloud_network_name }}"
     load_balancer: "{{hcloud_load_balancer_name}}"
     state: present
@@ -111,7 +111,7 @@
       - load_balancerNetwork is not changed
 
 - name: test absent load_balancer network
-  hetzner.hcloud.hcloud_load_balancer_network:
+  hetzner.hcloud.load_balancer_network:
     network: "{{ hcloud_network_name }}"
     load_balancer: "{{hcloud_load_balancer_name}}"
     state: absent
@@ -122,7 +122,7 @@
       - result is changed
 
 - name: test create load_balancer network with specified ip
-  hetzner.hcloud.hcloud_load_balancer_network:
+  hetzner.hcloud.load_balancer_network:
     network: "{{ hcloud_network_name }}"
     load_balancer: "{{hcloud_load_balancer_name}}"
     ip: "10.0.0.2"
@@ -137,7 +137,7 @@
       - load_balancerNetwork.hcloud_load_balancer_network.ip == "10.0.0.2"
 
 - name: cleanup create load_balancer network with specified ip
-  hetzner.hcloud.hcloud_load_balancer_network:
+  hetzner.hcloud.load_balancer_network:
     network: "{{ hcloud_network_name }}"
     load_balancer: "{{hcloud_load_balancer_name}}"
     state: absent
@@ -148,7 +148,7 @@
       - result is changed
 
 - name: cleanup load_balancer
-  hetzner.hcloud.hcloud_load_balancer:
+  hetzner.hcloud.load_balancer:
     name: "{{ hcloud_load_balancer_name }}"
     state: absent
   register: result
@@ -158,7 +158,7 @@
       - result is success
 
 - name: cleanup subnetwork
-  hetzner.hcloud.hcloud_subnetwork:
+  hetzner.hcloud.subnetwork:
     network: "{{ hcloud_network_name }}"
     ip_range: "10.0.0.0/16"
     type: "cloud"
@@ -171,7 +171,7 @@
       - result is changed
 
 - name: cleanup
-  hetzner.hcloud.hcloud_network:
+  hetzner.hcloud.network:
     name: "{{hcloud_network_name}}"
     state: absent
   register: result
diff --git a/tests/integration/targets/load_balancer_service/tasks/test.yml b/tests/integration/targets/load_balancer_service/tasks/test.yml
index e7a6a83..173709a 100644
--- a/tests/integration/targets/load_balancer_service/tasks/test.yml
+++ b/tests/integration/targets/load_balancer_service/tasks/test.yml
@@ -2,7 +2,7 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 ---
 - name: setup load_balancer
-  hetzner.hcloud.hcloud_load_balancer:
+  hetzner.hcloud.load_balancer:
     name: "{{hcloud_load_balancer_name}}"
     load_balancer_type: lb11
     state: present
@@ -14,7 +14,7 @@
       - load_balancer is success
 
 - name: test fail load balancer does not exist
-  hetzner.hcloud.hcloud_load_balancer_service:
+  hetzner.hcloud.load_balancer_service:
     load_balancer: does-not-exist
     protocol: http
     listen_port: 80
@@ -28,7 +28,7 @@
       - "result.msg == 'resource (load_balancer) does not exist: does-not-exist'"
 
 - name: test create load_balancer service with checkmode
-  hetzner.hcloud.hcloud_load_balancer_service:
+  hetzner.hcloud.load_balancer_service:
     load_balancer: "{{hcloud_load_balancer_name}}"
     protocol: "http"
     listen_port: 80
@@ -41,7 +41,7 @@
       - result is changed
 
 - name: test create load_balancer service
-  hetzner.hcloud.hcloud_load_balancer_service:
+  hetzner.hcloud.load_balancer_service:
     load_balancer: "{{hcloud_load_balancer_name}}"
     protocol: "http"
     listen_port: 80
@@ -57,7 +57,7 @@
       - load_balancer_service.hcloud_load_balancer_service.proxyprotocol is sameas false
 
 - name: test create load_balancer service idempotency
-  hetzner.hcloud.hcloud_load_balancer_service:
+  hetzner.hcloud.load_balancer_service:
     load_balancer: "{{hcloud_load_balancer_name}}"
     protocol: "http"
     listen_port: 80
@@ -69,7 +69,7 @@
       - load_balancer_service is not changed
 
 - name: test update load_balancer service
-  hetzner.hcloud.hcloud_load_balancer_service:
+  hetzner.hcloud.load_balancer_service:
     load_balancer: "{{hcloud_load_balancer_name}}"
     protocol: "tcp"
     listen_port: 80
@@ -85,7 +85,7 @@
       - load_balancer_service.hcloud_load_balancer_service.proxyprotocol is sameas false
 
 - name: test absent load_balancer service
-  hetzner.hcloud.hcloud_load_balancer_service:
+  hetzner.hcloud.load_balancer_service:
     load_balancer: "{{hcloud_load_balancer_name}}"
     protocol: "http"
     listen_port: 80
@@ -97,7 +97,7 @@
       - result is changed
 
 - name: test create load_balancer service with http
-  hetzner.hcloud.hcloud_load_balancer_service:
+  hetzner.hcloud.load_balancer_service:
     load_balancer: "{{hcloud_load_balancer_name}}"
     protocol: "http"
     listen_port: 80
@@ -116,7 +116,7 @@
       - load_balancer_service.hcloud_load_balancer_service.proxyprotocol is sameas false
 
 - name: cleanup load_balancer
-  hetzner.hcloud.hcloud_load_balancer:
+  hetzner.hcloud.load_balancer:
     name: "{{ hcloud_load_balancer_name }}"
     state: absent
   register: result
diff --git a/tests/integration/targets/load_balancer_target/tasks/test.yml b/tests/integration/targets/load_balancer_target/tasks/test.yml
index ad9ae1f..19fd0e9 100644
--- a/tests/integration/targets/load_balancer_target/tasks/test.yml
+++ b/tests/integration/targets/load_balancer_target/tasks/test.yml
@@ -2,7 +2,7 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 ---
 - name: setup server
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: "{{hcloud_server_name}}"
     server_type: cx11
     image: ubuntu-22.04
@@ -15,7 +15,7 @@
       - server is success
 
 - name: setup load_balancer
-  hetzner.hcloud.hcloud_load_balancer:
+  hetzner.hcloud.load_balancer:
     name: "{{hcloud_load_balancer_name}}"
     load_balancer_type: lb11
     state: present
@@ -27,7 +27,7 @@
       - load_balancer is success
 
 - name: test fail load balancer does not exist
-  hetzner.hcloud.hcloud_load_balancer_target:
+  hetzner.hcloud.load_balancer_target:
     type: server
     load_balancer: does-not-exist
     server: "{{ hcloud_server_name }}"
@@ -40,7 +40,7 @@
       - "result.msg == 'resource (load_balancer) does not exist: does-not-exist'"
 
 - name: test fail server does not exist
-  hetzner.hcloud.hcloud_load_balancer_target:
+  hetzner.hcloud.load_balancer_target:
     type: server
     load_balancer: "{{ hcloud_load_balancer_name }}"
     server: does-not-exist
@@ -53,7 +53,7 @@
       - "result.msg == 'resource (server) does not exist: does-not-exist'"
 
 - name: test create load_balancer target with checkmode
-  hetzner.hcloud.hcloud_load_balancer_target:
+  hetzner.hcloud.load_balancer_target:
     type: "server"
     load_balancer: "{{hcloud_load_balancer_name}}"
     server: "{{hcloud_server_name}}"
@@ -66,7 +66,7 @@
       - result is changed
 
 - name: test create load_balancer target
-  hetzner.hcloud.hcloud_load_balancer_target:
+  hetzner.hcloud.load_balancer_target:
     type: "server"
     load_balancer: "{{hcloud_load_balancer_name}}"
     server: "{{hcloud_server_name}}"
@@ -81,7 +81,7 @@
       - load_balancer_target.hcloud_load_balancer_target.load_balancer == hcloud_load_balancer_name
 
 - name: test create load_balancer target idempotency
-  hetzner.hcloud.hcloud_load_balancer_target:
+  hetzner.hcloud.load_balancer_target:
     type: "server"
     load_balancer: "{{hcloud_load_balancer_name}}"
     server: "{{hcloud_server_name}}"
@@ -93,7 +93,7 @@
       - load_balancer_target is not changed
 
 - name: test absent load_balancer target
-  hetzner.hcloud.hcloud_load_balancer_target:
+  hetzner.hcloud.load_balancer_target:
     type: "server"
     load_balancer: "{{hcloud_load_balancer_name}}"
     server: "{{hcloud_server_name}}"
@@ -105,7 +105,7 @@
       - result is changed
 
 - name: test create label_selector target
-  hetzner.hcloud.hcloud_load_balancer_target:
+  hetzner.hcloud.load_balancer_target:
     type: "label_selector"
     load_balancer: "{{hcloud_load_balancer_name}}"
     label_selector: "application=backend"
@@ -120,7 +120,7 @@
       - load_balancer_target.hcloud_load_balancer_target.load_balancer == hcloud_load_balancer_name
 
 - name: test create ip target
-  hetzner.hcloud.hcloud_load_balancer_target:
+  hetzner.hcloud.load_balancer_target:
     type: "ip"
     load_balancer: "{{ hcloud_load_balancer_name }}"
     ip: "{{ hetzner_server_ip }}"
@@ -135,7 +135,7 @@
       - load_balancer_target.hcloud_load_balancer_target.load_balancer == hcloud_load_balancer_name
 
 - name: cleanup load_balancer
-  hetzner.hcloud.hcloud_load_balancer:
+  hetzner.hcloud.load_balancer:
     name: "{{ hcloud_load_balancer_name }}"
     state: absent
   register: result
@@ -144,7 +144,7 @@
   delay: 2
 
 - name: cleanup
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: "{{hcloud_server_name}}"
     state: absent
   register: result
diff --git a/tests/integration/targets/load_balancer_type_info/tasks/test.yml b/tests/integration/targets/load_balancer_type_info/tasks/test.yml
index a8fc75c..980b8a2 100644
--- a/tests/integration/targets/load_balancer_type_info/tasks/test.yml
+++ b/tests/integration/targets/load_balancer_type_info/tasks/test.yml
@@ -2,7 +2,7 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 ---
 - name: Gather hcloud_load_balancer_type_info
-  hetzner.hcloud.hcloud_load_balancer_type_info:
+  hetzner.hcloud.load_balancer_type_info:
   register: result
 - name: Verify hcloud_load_balancer_type_info
   ansible.builtin.assert:
@@ -10,7 +10,7 @@
       - result.hcloud_load_balancer_type_info | list | count >= 1
 
 - name: Gather hcloud_load_balancer_type_info in check mode
-  hetzner.hcloud.hcloud_load_balancer_type_info:
+  hetzner.hcloud.load_balancer_type_info:
   check_mode: true
   register: result
 - name: Verify hcloud_load_balancer_type_info in check mode
@@ -19,7 +19,7 @@
       - result.hcloud_load_balancer_type_info | list | count >= 1
 
 - name: Gather hcloud_load_balancer_type_info with correct id
-  hetzner.hcloud.hcloud_load_balancer_type_info:
+  hetzner.hcloud.load_balancer_type_info:
     id: "{{ hcloud_load_balancer_type_id }}"
   register: result
 - name: Verify hcloud_load_balancer_type_info with correct id
@@ -28,7 +28,7 @@
       - result.hcloud_load_balancer_type_info | list | count == 1
 
 - name: Gather hcloud_load_balancer_type_info with wrong id
-  hetzner.hcloud.hcloud_load_balancer_type_info:
+  hetzner.hcloud.load_balancer_type_info:
     id: "{{ hcloud_load_balancer_type_id }}4321"
   ignore_errors: true
   register: result
@@ -38,7 +38,7 @@
       - result is failed
 
 - name: Gather hcloud_load_balancer_type_info with correct name
-  hetzner.hcloud.hcloud_load_balancer_type_info:
+  hetzner.hcloud.load_balancer_type_info:
     name: "{{ hcloud_load_balancer_type_name }}"
   register: result
 - name: Verify hcloud_load_balancer_type_info with correct name
@@ -47,7 +47,7 @@
       - result.hcloud_load_balancer_type_info | list | count == 1
 
 - name: Gather hcloud_load_balancer_type_info with wrong name
-  hetzner.hcloud.hcloud_load_balancer_type_info:
+  hetzner.hcloud.load_balancer_type_info:
     name: "{{ hcloud_load_balancer_type_name }}-invalid"
   register: result
 - name: Verify hcloud_load_balancer_type_info with wrong name
diff --git a/tests/integration/targets/location_info/tasks/test.yml b/tests/integration/targets/location_info/tasks/test.yml
index d500e04..12ad679 100644
--- a/tests/integration/targets/location_info/tasks/test.yml
+++ b/tests/integration/targets/location_info/tasks/test.yml
@@ -2,7 +2,7 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 ---
 - name: Gather hcloud_location_info
-  hetzner.hcloud.hcloud_location_info:
+  hetzner.hcloud.location_info:
   register: result
 - name: Verify hcloud_location_info
   ansible.builtin.assert:
@@ -10,7 +10,7 @@
       - result.hcloud_location_info | list | count >= 5
 
 - name: Gather hcloud_location_info in check mode
-  hetzner.hcloud.hcloud_location_info:
+  hetzner.hcloud.location_info:
   check_mode: true
   register: result
 - name: Verify hcloud_location_info in check mode
@@ -19,7 +19,7 @@
       - result.hcloud_location_info | list | count >= 5
 
 - name: Gather hcloud_location_info with correct id
-  hetzner.hcloud.hcloud_location_info:
+  hetzner.hcloud.location_info:
     id: "{{ hcloud_location_id }}"
   register: result
 - name: Verify hcloud_location_info with correct id
@@ -28,7 +28,7 @@
       - result.hcloud_location_info | list | count == 1
 
 - name: Gather hcloud_location_info with wrong id
-  hetzner.hcloud.hcloud_location_info:
+  hetzner.hcloud.location_info:
     id: "{{ hcloud_location_id }}4321"
   ignore_errors: true
   register: result
@@ -38,7 +38,7 @@
       - result is failed
 
 - name: Gather hcloud_location_info with correct name
-  hetzner.hcloud.hcloud_location_info:
+  hetzner.hcloud.location_info:
     name: "{{ hcloud_location_name }}"
   register: result
 - name: Verify hcloud_location_info with correct name
@@ -47,7 +47,7 @@
       - result.hcloud_location_info | list | count == 1
 
 - name: Gather hcloud_location_info with wrong name
-  hetzner.hcloud.hcloud_location_info:
+  hetzner.hcloud.location_info:
     name: "{{ hcloud_location_name }}-invalid"
   register: result
 - name: Verify hcloud_location_info with wrong name
diff --git a/tests/integration/targets/network/tasks/test.yml b/tests/integration/targets/network/tasks/test.yml
index fe380b0..42070f0 100644
--- a/tests/integration/targets/network/tasks/test.yml
+++ b/tests/integration/targets/network/tasks/test.yml
@@ -2,7 +2,7 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 ---
 - name: setup ensure network is absent
-  hetzner.hcloud.hcloud_network:
+  hetzner.hcloud.network:
     name: "{{ item }}"
     state: absent
   with_items:
@@ -10,7 +10,7 @@
     - "{{ hcloud_network_name_with_vswitch }}"
 
 - name: test missing ip_range parameter on create Network
-  hetzner.hcloud.hcloud_network:
+  hetzner.hcloud.network:
     name: "{{hcloud_network_name}}"
   register: result
   ignore_errors: true
@@ -21,7 +21,7 @@
       - 'result.msg == "missing required arguments: ip_range"'
 
 - name: test create Network with check mode
-  hetzner.hcloud.hcloud_network:
+  hetzner.hcloud.network:
     name: "{{hcloud_network_name}}"
     ip_range: "10.0.0.0/16"
   register: result
@@ -32,7 +32,7 @@
       - result is changed
 
 - name: test create Network
-  hetzner.hcloud.hcloud_network:
+  hetzner.hcloud.network:
     name: "{{hcloud_network_name}}"
     ip_range: "10.0.0.0/16"
   register: network
@@ -44,7 +44,7 @@
       - network.hcloud_network.ip_range == "10.0.0.0/16"
 
 - name: test create Network idempotence
-  hetzner.hcloud.hcloud_network:
+  hetzner.hcloud.network:
     name: "{{hcloud_network_name}}"
     ip_range: "10.0.0.0/16"
   register: network
@@ -54,7 +54,7 @@
       - network is not changed
 
 - name: test create Network with expose_routes_to_vswitch
-  hetzner.hcloud.hcloud_network:
+  hetzner.hcloud.network:
     name: "{{hcloud_network_name_with_vswitch}}"
     ip_range: "10.0.0.0/16"
     expose_routes_to_vswitch: true
@@ -68,7 +68,7 @@
       - network.hcloud_network.expose_routes_to_vswitch is true
 
 - name: test create Network with expose_routes_to_vswitch idempotence
-  hetzner.hcloud.hcloud_network:
+  hetzner.hcloud.network:
     name: "{{hcloud_network_name_with_vswitch}}"
     ip_range: "10.0.0.0/16"
     expose_routes_to_vswitch: true
@@ -79,7 +79,7 @@
       - network is not changed
 
 - name: test update Network label
-  hetzner.hcloud.hcloud_network:
+  hetzner.hcloud.network:
     name: "{{hcloud_network_name}}"
     labels:
       key: value
@@ -91,7 +91,7 @@
       - network.hcloud_network.labels.key == "value"
 
 - name: test update Network label idempotency
-  hetzner.hcloud.hcloud_network:
+  hetzner.hcloud.network:
     name: "{{hcloud_network_name}}"
     labels:
       key: value
@@ -102,7 +102,7 @@
       - network is not changed
 
 - name: test update Network ip range
-  hetzner.hcloud.hcloud_network:
+  hetzner.hcloud.network:
     name: "{{hcloud_network_name}}"
     ip_range: "10.0.0.0/8"
   register: network
@@ -113,7 +113,7 @@
       - network.hcloud_network.ip_range == "10.0.0.0/8"
 
 - name: test update Network ip range idempotency
-  hetzner.hcloud.hcloud_network:
+  hetzner.hcloud.network:
     name: "{{hcloud_network_name}}"
     ip_range: "10.0.0.0/8"
   register: network
@@ -123,7 +123,7 @@
       - network is not changed
 
 - name: test update Network expose_routes_to_vswitch
-  hetzner.hcloud.hcloud_network:
+  hetzner.hcloud.network:
     name: "{{hcloud_network_name_with_vswitch}}"
     expose_routes_to_vswitch: false
   register: network
@@ -134,7 +134,7 @@
       - network.hcloud_network.expose_routes_to_vswitch is false
 
 - name: test update Network expose_routes_to_vswitch idempotency
-  hetzner.hcloud.hcloud_network:
+  hetzner.hcloud.network:
     name: "{{hcloud_network_name_with_vswitch}}"
     expose_routes_to_vswitch: false
   register: network
@@ -144,7 +144,7 @@
       - network is not changed
 
 - name: test update Network delete protection
-  hetzner.hcloud.hcloud_network:
+  hetzner.hcloud.network:
     name: "{{hcloud_network_name}}"
     ip_range: "10.0.0.0/8"
     delete_protection: true
@@ -156,7 +156,7 @@
       - network.hcloud_network.delete_protection is sameas true
 
 - name: test update Network delete protection idempotency
-  hetzner.hcloud.hcloud_network:
+  hetzner.hcloud.network:
     name: "{{hcloud_network_name}}"
     ip_range: "10.0.0.0/8"
     delete_protection: true
@@ -168,7 +168,7 @@
       - network.hcloud_network.delete_protection is sameas true
 
 - name: test Network without delete protection set to be idempotent
-  hetzner.hcloud.hcloud_network:
+  hetzner.hcloud.network:
     name: "{{hcloud_network_name}}"
     ip_range: "10.0.0.0/8"
   register: network
@@ -179,7 +179,7 @@
       - network.hcloud_network.delete_protection is sameas true
 
 - name: test delete Network fails if it is protected
-  hetzner.hcloud.hcloud_network:
+  hetzner.hcloud.network:
     name: "{{hcloud_network_name}}"
     state: absent
   ignore_errors: true
@@ -191,7 +191,7 @@
       - 'result.msg == "network deletion is protected"'
 
 - name: test update Network delete protection
-  hetzner.hcloud.hcloud_network:
+  hetzner.hcloud.network:
     name: "{{hcloud_network_name}}"
     ip_range: "10.0.0.0/8"
     delete_protection: false
@@ -203,7 +203,7 @@
       - network.hcloud_network.delete_protection is sameas false
 
 - name: test delete Network
-  hetzner.hcloud.hcloud_network:
+  hetzner.hcloud.network:
     name: "{{hcloud_network_name}}"
     state: absent
   register: result
@@ -213,7 +213,7 @@
       - result is success
 
 - name: test create Network with delete protection
-  hetzner.hcloud.hcloud_network:
+  hetzner.hcloud.network:
     name: "{{hcloud_network_name}}"
     ip_range: "10.0.0.0/8"
     delete_protection: true
@@ -225,7 +225,7 @@
       - network.hcloud_network.delete_protection is sameas true
 
 - name: test delete Network fails if it is protected
-  hetzner.hcloud.hcloud_network:
+  hetzner.hcloud.network:
     name: "{{hcloud_network_name}}"
     state: absent
   ignore_errors: true
@@ -237,7 +237,7 @@
       - 'result.msg == "network deletion is protected"'
 
 - name: test update Network delete protection
-  hetzner.hcloud.hcloud_network:
+  hetzner.hcloud.network:
     name: "{{hcloud_network_name}}"
     delete_protection: false
   register: network
@@ -248,7 +248,7 @@
       - network.hcloud_network.delete_protection is sameas false
 
 - name: test delete Network
-  hetzner.hcloud.hcloud_network:
+  hetzner.hcloud.network:
     name: "{{hcloud_network_name}}"
     state: absent
   register: result
@@ -258,7 +258,7 @@
       - result is success
 
 - name: test delete Network with expose_routes_to_vswitch
-  hetzner.hcloud.hcloud_network:
+  hetzner.hcloud.network:
     name: "{{hcloud_network_name_with_vswitch}}"
     state: absent
   register: result
diff --git a/tests/integration/targets/network_info/tasks/cleanup.yml b/tests/integration/targets/network_info/tasks/cleanup.yml
index e61c34e..989d01b 100644
--- a/tests/integration/targets/network_info/tasks/cleanup.yml
+++ b/tests/integration/targets/network_info/tasks/cleanup.yml
@@ -1,5 +1,5 @@
 ---
 - name: Cleanup test_network
-  hetzner.hcloud.hcloud_network:
+  hetzner.hcloud.network:
     name: "{{ hcloud_network_name }}"
     state: absent
diff --git a/tests/integration/targets/network_info/tasks/prepare.yml b/tests/integration/targets/network_info/tasks/prepare.yml
index dead163..9a6e618 100644
--- a/tests/integration/targets/network_info/tasks/prepare.yml
+++ b/tests/integration/targets/network_info/tasks/prepare.yml
@@ -1,6 +1,6 @@
 ---
 - name: Create test_network
-  hetzner.hcloud.hcloud_network:
+  hetzner.hcloud.network:
     name: "{{ hcloud_network_name }}"
     ip_range: 10.0.0.0/16
     labels:
@@ -8,7 +8,7 @@
   register: test_network
 
 - name: Create test_subnetwork
-  hetzner.hcloud.hcloud_subnetwork:
+  hetzner.hcloud.subnetwork:
     network: "{{ hcloud_network_name }}"
     type: server
     network_zone: eu-central
@@ -16,7 +16,7 @@
   register: test_subnetwork
 
 - name: Create test_route
-  hetzner.hcloud.hcloud_route:
+  hetzner.hcloud.route:
     network: "{{ hcloud_network_name }}"
     destination: 10.0.3.0/24
     gateway: 10.0.2.1
diff --git a/tests/integration/targets/network_info/tasks/test.yml b/tests/integration/targets/network_info/tasks/test.yml
index d74841e..57b45d3 100644
--- a/tests/integration/targets/network_info/tasks/test.yml
+++ b/tests/integration/targets/network_info/tasks/test.yml
@@ -2,7 +2,7 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 ---
 - name: Gather hcloud_network_info
-  hetzner.hcloud.hcloud_network_info:
+  hetzner.hcloud.network_info:
   register: result
 - name: Verify hcloud_network_info
   ansible.builtin.assert:
@@ -10,7 +10,7 @@
       - result.hcloud_network_info | list | count >= 1
 
 - name: Gather hcloud_network_info in check mode
-  hetzner.hcloud.hcloud_network_info:
+  hetzner.hcloud.network_info:
   check_mode: true
   register: result
 - name: Verify hcloud_network_info in check mode
@@ -19,7 +19,7 @@
       - result.hcloud_network_info | list | count >= 1
 
 - name: Gather hcloud_network_info with correct id
-  hetzner.hcloud.hcloud_network_info:
+  hetzner.hcloud.network_info:
     id: "{{ test_network.hcloud_network.id }}"
   register: result
 - name: Verify hcloud_network_info with correct id
@@ -30,7 +30,7 @@
       - result.hcloud_network_info[0].routes | list | count >= 1
 
 - name: Gather hcloud_network_info with wrong id
-  hetzner.hcloud.hcloud_network_info:
+  hetzner.hcloud.network_info:
     id: "{{ test_network.hcloud_network.id }}4321"
   ignore_errors: true
   register: result
@@ -40,7 +40,7 @@
       - result is failed
 
 - name: Gather hcloud_network_info with correct name
-  hetzner.hcloud.hcloud_network_info:
+  hetzner.hcloud.network_info:
     name: "{{ hcloud_network_name }}"
   register: result
 - name: Verify hcloud_network_info with correct name
@@ -49,7 +49,7 @@
       - result.hcloud_network_info | list | count == 1
 
 - name: Gather hcloud_network_info with wrong name
-  hetzner.hcloud.hcloud_network_info:
+  hetzner.hcloud.network_info:
     name: "{{ hcloud_network_name }}-invalid"
   register: result
 - name: Verify hcloud_network_info with wrong name
@@ -58,7 +58,7 @@
       - result.hcloud_network_info | list | count == 0
 
 - name: Gather hcloud_network_info with correct label selector
-  hetzner.hcloud.hcloud_network_info:
+  hetzner.hcloud.network_info:
     label_selector: "key=value"
   register: result
 - name: Verify hcloud_network_info with correct label selector
@@ -70,7 +70,7 @@
         | list | count == 1
 
 - name: Gather hcloud_network_info with wrong label selector
-  hetzner.hcloud.hcloud_network_info:
+  hetzner.hcloud.network_info:
     label_selector: "key!=value"
   register: result
 - name: Verify hcloud_network_info with wrong label selector
diff --git a/tests/integration/targets/placement_group/tasks/cleanup.yml b/tests/integration/targets/placement_group/tasks/cleanup.yml
index ac31d88..8066c41 100644
--- a/tests/integration/targets/placement_group/tasks/cleanup.yml
+++ b/tests/integration/targets/placement_group/tasks/cleanup.yml
@@ -1,5 +1,5 @@
 ---
 - name: Cleanup test_ssh_key
-  hetzner.hcloud.hcloud_ssh_key:
+  hetzner.hcloud.ssh_key:
     name: "{{ hcloud_ssh_key_name }}"
     state: absent
diff --git a/tests/integration/targets/placement_group/tasks/prepare.yml b/tests/integration/targets/placement_group/tasks/prepare.yml
index b9f6a8f..4bdb959 100644
--- a/tests/integration/targets/placement_group/tasks/prepare.yml
+++ b/tests/integration/targets/placement_group/tasks/prepare.yml
@@ -1,6 +1,6 @@
 ---
 - name: Create test_ssh_key
-  hetzner.hcloud.hcloud_ssh_key:
+  hetzner.hcloud.ssh_key:
     name: "{{ hcloud_ssh_key_name }}"
     public_key: "{{ test_ssh_keypair.public_key }}"
   register: test_ssh_key
diff --git a/tests/integration/targets/placement_group/tasks/test.yml b/tests/integration/targets/placement_group/tasks/test.yml
index b503118..06ae290 100644
--- a/tests/integration/targets/placement_group/tasks/test.yml
+++ b/tests/integration/targets/placement_group/tasks/test.yml
@@ -2,17 +2,17 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 ---
 - name: setup placement group to be absent
-  hetzner.hcloud.hcloud_placement_group:
+  hetzner.hcloud.placement_group:
     name: "{{ hcloud_placement_group_name }}"
     state: absent
 
 - name: setup server to be absent
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: "{{ hcloud_server_name }}"
     state: absent
 
 - name: test missing required parameters on create placement group
-  hetzner.hcloud.hcloud_placement_group:
+  hetzner.hcloud.placement_group:
   register: result
   ignore_errors: true
 - name: verify fail test missing required parameters on create placement group
@@ -22,7 +22,7 @@
       - 'result.msg == "one of the following is required: id, name"'
 
 - name: test create placement group with check mode
-  hetzner.hcloud.hcloud_placement_group:
+  hetzner.hcloud.placement_group:
     name: "{{ hcloud_placement_group_name }}"
     type: spread
   register: result
@@ -33,7 +33,7 @@
       - result is changed
 
 - name: test create placement group
-  hetzner.hcloud.hcloud_placement_group:
+  hetzner.hcloud.placement_group:
     name: "{{ hcloud_placement_group_name }}"
     type: spread
     labels:
@@ -49,7 +49,7 @@
       - placement_group.hcloud_placement_group.servers | list | count == 0
 
 - name: test create placement group idempotence
-  hetzner.hcloud.hcloud_placement_group:
+  hetzner.hcloud.placement_group:
     name: "{{ hcloud_placement_group_name }}"
     type: spread
     labels:
@@ -62,7 +62,7 @@
       - result is not changed
 
 - name: test create server with placement group
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: "{{ hcloud_server_name }}"
     server_type: cpx11
     placement_group: "{{ hcloud_placement_group_name }}"
@@ -78,7 +78,7 @@
       - server.hcloud_server.placement_group == "{{ hcloud_placement_group_name }}"
 
 - name: test remove server from placement group
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: "{{ hcloud_server_name }}"
     placement_group: null
     state: present
@@ -90,7 +90,7 @@
       - result.hcloud_server.placement_group == None
 
 - name: test add server to placement group
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: "{{ hcloud_server_name }}"
     placement_group: "{{ hcloud_placement_group_name }}"
     force: True
@@ -104,7 +104,7 @@
       - result.hcloud_server.status == "running"
 
 - name: test add server to placement group idempotence
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: "{{ hcloud_server_name }}"
     placement_group: "{{ hcloud_placement_group_name }}"
     force: True
@@ -118,7 +118,7 @@
       - result.hcloud_server.status == "running"
 
 - name: test update placement group with check mode
-  hetzner.hcloud.hcloud_placement_group:
+  hetzner.hcloud.placement_group:
     id: "{{ placement_group.hcloud_placement_group.id }}"
     name: "changed-{{ hcloud_placement_group_name }}"
   register: result
@@ -129,7 +129,7 @@
       - result is changed
 
 - name: test update placement group
-  hetzner.hcloud.hcloud_placement_group:
+  hetzner.hcloud.placement_group:
     id: "{{ placement_group.hcloud_placement_group.id }}"
     name: "changed-{{ hcloud_placement_group_name }}"
     labels:
@@ -142,7 +142,7 @@
       - result.hcloud_placement_group.name == "changed-{{ hcloud_placement_group_name }}"
 
 - name: test update placement group idempotence
-  hetzner.hcloud.hcloud_placement_group:
+  hetzner.hcloud.placement_group:
     id: "{{ placement_group.hcloud_placement_group.id }}"
     name: "changed-{{ hcloud_placement_group_name }}"
     labels:
@@ -154,12 +154,12 @@
       - result is not changed
 
 - name: absent server
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     id: "{{ server.hcloud_server.id }}"
     state: absent
 
 - name: absent placement group
-  hetzner.hcloud.hcloud_placement_group:
+  hetzner.hcloud.placement_group:
     id: "{{ placement_group.hcloud_placement_group.id }}"
     state: absent
   register: result
diff --git a/tests/integration/targets/primary_ip/tasks/test.yml b/tests/integration/targets/primary_ip/tasks/test.yml
index 181a1fe..4c0fd2e 100644
--- a/tests/integration/targets/primary_ip/tasks/test.yml
+++ b/tests/integration/targets/primary_ip/tasks/test.yml
@@ -2,12 +2,12 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 ---
 - name: setup ensure primary ip is absent
-  hetzner.hcloud.hcloud_primary_ip:
+  hetzner.hcloud.primary_ip:
     name: "{{ hcloud_primary_ip_name }}"
     state: absent
 
 - name: test create Primary IP with check mode
-  hetzner.hcloud.hcloud_primary_ip:
+  hetzner.hcloud.primary_ip:
     name: "{{ hcloud_primary_ip_name }}"
     type: ipv4
     datacenter: "fsn1-dc14"
@@ -19,7 +19,7 @@
       - primaryIP is changed
 
 - name: test create Primary IP
-  hetzner.hcloud.hcloud_primary_ip:
+  hetzner.hcloud.primary_ip:
     name: "{{ hcloud_primary_ip_name }}"
     type: ipv4
     datacenter: "fsn1-dc14"
@@ -32,7 +32,7 @@
       - primaryIP.hcloud_primary_ip.datacenter == "fsn1-dc14"
 
 - name: test create Primary IP idempotency
-  hetzner.hcloud.hcloud_primary_ip:
+  hetzner.hcloud.primary_ip:
     name: "{{ hcloud_primary_ip_name }}"
     type: ipv4
     datacenter: "fsn1-dc14"
@@ -43,7 +43,7 @@
       - primaryIP is not changed
 
 - name: test update Primary IP
-  hetzner.hcloud.hcloud_primary_ip:
+  hetzner.hcloud.primary_ip:
     name: "{{ hcloud_primary_ip_name }}"
     type: ipv4
     datacenter: "fsn1-dc14"
@@ -56,7 +56,7 @@
       - primaryIP is changed
 
 - name: test update Primary IP idempotency
-  hetzner.hcloud.hcloud_primary_ip:
+  hetzner.hcloud.primary_ip:
     name: "{{ hcloud_primary_ip_name }}"
     type: ipv4
     datacenter: "fsn1-dc14"
@@ -69,7 +69,7 @@
       - primaryIP is not changed
 
 - name: test update Primary IP with same labels
-  hetzner.hcloud.hcloud_primary_ip:
+  hetzner.hcloud.primary_ip:
     name: "{{ hcloud_primary_ip_name }}"
     type: ipv4
     datacenter: "fsn1-dc14"
@@ -82,7 +82,7 @@
       - primaryIP is not changed
 
 - name: test update Primary IP with other labels
-  hetzner.hcloud.hcloud_primary_ip:
+  hetzner.hcloud.primary_ip:
     name: "{{ hcloud_primary_ip_name }}"
     type: ipv4
     datacenter: "fsn1-dc14"
@@ -96,7 +96,7 @@
       - primaryIP is changed
 
 - name: test update Primary IP with other labels in different order
-  hetzner.hcloud.hcloud_primary_ip:
+  hetzner.hcloud.primary_ip:
     name: "{{ hcloud_primary_ip_name }}"
     type: ipv4
     datacenter: "fsn1-dc14"
@@ -110,7 +110,7 @@
       - primaryIP is not changed
 
 - name: test update Primary IP delete protection
-  hetzner.hcloud.hcloud_primary_ip:
+  hetzner.hcloud.primary_ip:
     name: "{{ hcloud_primary_ip_name }}"
     type: ipv4
     delete_protection: true
@@ -122,7 +122,7 @@
       - primaryIP.hcloud_primary_ip.delete_protection is sameas true
 
 - name: test update Primary IP delete protection idempotency
-  hetzner.hcloud.hcloud_primary_ip:
+  hetzner.hcloud.primary_ip:
     name: "{{ hcloud_primary_ip_name }}"
     type: ipv4
     delete_protection: true
@@ -134,7 +134,7 @@
       - primaryIP.hcloud_primary_ip.delete_protection is sameas true
 
 - name: test Primary IP without delete protection set to be idempotent
-  hetzner.hcloud.hcloud_primary_ip:
+  hetzner.hcloud.primary_ip:
     name: "{{ hcloud_primary_ip_name }}"
     type: ipv4
   register: primaryIP
@@ -145,7 +145,7 @@
       - primaryIP.hcloud_primary_ip.delete_protection is sameas true
 
 - name: test delete Primary IP fails if it is protected
-  hetzner.hcloud.hcloud_primary_ip:
+  hetzner.hcloud.primary_ip:
     name: "{{ hcloud_primary_ip_name }}"
     state: "absent"
   register: result
@@ -157,7 +157,7 @@
       - 'result.msg == "Primary IP deletion is protected"'
 
 - name: test update Primary IP delete protection
-  hetzner.hcloud.hcloud_primary_ip:
+  hetzner.hcloud.primary_ip:
     name: "{{ hcloud_primary_ip_name }}"
     type: ipv4
     delete_protection: false
@@ -169,7 +169,7 @@
       - primaryIP.hcloud_primary_ip.delete_protection is sameas false
 
 - name: test delete primary ip
-  hetzner.hcloud.hcloud_primary_ip:
+  hetzner.hcloud.primary_ip:
     name: "{{ hcloud_primary_ip_name }}"
     state: "absent"
   register: result
@@ -179,7 +179,7 @@
       - result is changed
 
 - name: test create ipv6 primary ip
-  hetzner.hcloud.hcloud_primary_ip:
+  hetzner.hcloud.primary_ip:
     name: "{{ hcloud_primary_ip_name }}"
     type: ipv6
     datacenter: "fsn1-dc14"
@@ -191,7 +191,7 @@
       - result is changed
 
 - name: test delete ipv6 primary ip
-  hetzner.hcloud.hcloud_primary_ip:
+  hetzner.hcloud.primary_ip:
     name: "{{ hcloud_primary_ip_name }}"
     state: "absent"
   register: result
@@ -201,7 +201,7 @@
       - result is changed
 
 - name: test create Primary IP with delete protection
-  hetzner.hcloud.hcloud_primary_ip:
+  hetzner.hcloud.primary_ip:
     name: "{{ hcloud_primary_ip_name }}"
     type: ipv4
     datacenter: fsn1-dc14
@@ -214,7 +214,7 @@
       - primaryIP.hcloud_primary_ip.delete_protection is sameas true
 
 - name: test delete Primary IP fails if it is protected
-  hetzner.hcloud.hcloud_primary_ip:
+  hetzner.hcloud.primary_ip:
     name: "{{ hcloud_primary_ip_name }}"
     state: "absent"
   register: result
@@ -226,7 +226,7 @@
       - 'result.msg == "Primary IP deletion is protected"'
 
 - name: test update Primary IP delete protection
-  hetzner.hcloud.hcloud_primary_ip:
+  hetzner.hcloud.primary_ip:
     name: "{{ hcloud_primary_ip_name }}"
     type: ipv4
     delete_protection: false
@@ -238,7 +238,7 @@
       - primaryIP.hcloud_primary_ip.delete_protection is sameas false
 
 - name: test delete primary ip
-  hetzner.hcloud.hcloud_primary_ip:
+  hetzner.hcloud.primary_ip:
     name: "{{ hcloud_primary_ip_name }}"
     state: "absent"
   register: result
diff --git a/tests/integration/targets/primary_ip_info/tasks/cleanup.yml b/tests/integration/targets/primary_ip_info/tasks/cleanup.yml
index 05e7106..8fc4805 100644
--- a/tests/integration/targets/primary_ip_info/tasks/cleanup.yml
+++ b/tests/integration/targets/primary_ip_info/tasks/cleanup.yml
@@ -1,5 +1,5 @@
 ---
 - name: Cleanup test_primary_ip
-  hetzner.hcloud.hcloud_primary_ip:
+  hetzner.hcloud.primary_ip:
     name: "{{ hcloud_primary_ip_name }}"
     state: absent
diff --git a/tests/integration/targets/primary_ip_info/tasks/prepare.yml b/tests/integration/targets/primary_ip_info/tasks/prepare.yml
index bccf711..4c96ee8 100644
--- a/tests/integration/targets/primary_ip_info/tasks/prepare.yml
+++ b/tests/integration/targets/primary_ip_info/tasks/prepare.yml
@@ -1,6 +1,6 @@
 ---
 - name: Create test_primary_ip
-  hetzner.hcloud.hcloud_primary_ip:
+  hetzner.hcloud.primary_ip:
     name: "{{ hcloud_primary_ip_name }}"
     datacenter: fsn1-dc14
     type: ipv4
diff --git a/tests/integration/targets/primary_ip_info/tasks/test.yml b/tests/integration/targets/primary_ip_info/tasks/test.yml
index 05b4673..a4f2fd8 100644
--- a/tests/integration/targets/primary_ip_info/tasks/test.yml
+++ b/tests/integration/targets/primary_ip_info/tasks/test.yml
@@ -2,7 +2,7 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 ---
 - name: Gather hcloud_primary_ip_info
-  hetzner.hcloud.hcloud_primary_ip_info:
+  hetzner.hcloud.primary_ip_info:
   register: result
 - name: Verify hcloud_primary_ip_info
   ansible.builtin.assert:
@@ -10,7 +10,7 @@
       - result.hcloud_primary_ip_info | list | count >= 1
 
 - name: Gather hcloud_primary_ip_info in check mode
-  hetzner.hcloud.hcloud_primary_ip_info:
+  hetzner.hcloud.primary_ip_info:
   check_mode: true
   register: result
 - name: Verify hcloud_primary_ip_info in check mode
@@ -19,7 +19,7 @@
       - result.hcloud_primary_ip_info | list | count >= 1
 
 - name: Gather hcloud_primary_ip_info with correct id
-  hetzner.hcloud.hcloud_primary_ip_info:
+  hetzner.hcloud.primary_ip_info:
     id: "{{ test_primary_ip.hcloud_primary_ip.id }}"
   register: result
 - name: Verify hcloud_primary_ip_info with correct id
@@ -28,7 +28,7 @@
       - result.hcloud_primary_ip_info | list | count == 1
 
 - name: Gather hcloud_primary_ip_info with wrong id
-  hetzner.hcloud.hcloud_primary_ip_info:
+  hetzner.hcloud.primary_ip_info:
     id: "{{ test_primary_ip.hcloud_primary_ip.id }}4321"
   ignore_errors: true
   register: result
@@ -38,7 +38,7 @@
       - result is failed
 
 - name: Gather hcloud_primary_ip_info with correct name
-  hetzner.hcloud.hcloud_primary_ip_info:
+  hetzner.hcloud.primary_ip_info:
     name: "{{ hcloud_primary_ip_name }}"
   register: result
 - name: Verify hcloud_primary_ip_info with correct name
@@ -47,7 +47,7 @@
       - result.hcloud_primary_ip_info | list | count == 1
 
 - name: Gather hcloud_primary_ip_info with wrong name
-  hetzner.hcloud.hcloud_primary_ip_info:
+  hetzner.hcloud.primary_ip_info:
     name: "{{ hcloud_primary_ip_name }}-invalid"
   register: result
 - name: Verify hcloud_primary_ip_info with wrong name
@@ -56,7 +56,7 @@
       - result.hcloud_primary_ip_info | list | count == 0
 
 - name: Gather hcloud_primary_ip_info with correct label selector
-  hetzner.hcloud.hcloud_primary_ip_info:
+  hetzner.hcloud.primary_ip_info:
     label_selector: "key=value"
   register: result
 - name: Verify hcloud_primary_ip_info with correct label selector
@@ -68,7 +68,7 @@
         | list | count == 1
 
 - name: Gather hcloud_primary_ip_info with wrong label selector
-  hetzner.hcloud.hcloud_primary_ip_info:
+  hetzner.hcloud.primary_ip_info:
     label_selector: "key!=value"
   register: result
 - name: Verify hcloud_primary_ip_info with wrong label selector
diff --git a/tests/integration/targets/rdns/tasks/cleanup.yml b/tests/integration/targets/rdns/tasks/cleanup.yml
index 3ee152f..0df360a 100644
--- a/tests/integration/targets/rdns/tasks/cleanup.yml
+++ b/tests/integration/targets/rdns/tasks/cleanup.yml
@@ -1,20 +1,20 @@
 ---
 - name: Cleanup test_server
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: "{{ hcloud_server_name }}"
     state: absent
 
 - name: Cleanup test_primary_ip
-  hetzner.hcloud.hcloud_primary_ip:
+  hetzner.hcloud.primary_ip:
     name: "{{ hcloud_primary_ip_name }}"
     state: absent
 
 - name: Cleanup test_floating_ip
-  hetzner.hcloud.hcloud_floating_ip:
+  hetzner.hcloud.floating_ip:
     name: "{{ hcloud_floating_ip_name }}"
     state: absent
 
 - name: Cleanup test_load_balancer
-  hetzner.hcloud.hcloud_load_balancer:
+  hetzner.hcloud.load_balancer:
     name: "{{ hcloud_load_balancer_name }}"
     state: absent
diff --git a/tests/integration/targets/rdns/tasks/prepare.yml b/tests/integration/targets/rdns/tasks/prepare.yml
index f31b392..ea36b6d 100644
--- a/tests/integration/targets/rdns/tasks/prepare.yml
+++ b/tests/integration/targets/rdns/tasks/prepare.yml
@@ -1,6 +1,6 @@
 ---
 - name: Create test_server
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: "{{ hcloud_server_name }}"
     server_type: cx11
     image: ubuntu-22.04
@@ -8,7 +8,7 @@
   register: test_server
 
 - name: Create test_primary_ip
-  hetzner.hcloud.hcloud_primary_ip:
+  hetzner.hcloud.primary_ip:
     name: "{{ hcloud_primary_ip_name }}"
     type: ipv4
     datacenter: fsn1-dc14
@@ -16,7 +16,7 @@
   register: test_primary_ip
 
 - name: Create test_floating_ip
-  hetzner.hcloud.hcloud_floating_ip:
+  hetzner.hcloud.floating_ip:
     name: "{{ hcloud_floating_ip_name }}"
     type: ipv4
     home_location: fsn1
@@ -24,7 +24,7 @@
   register: test_floating_ip
 
 - name: Create test_load_balancer
-  hetzner.hcloud.hcloud_load_balancer:
+  hetzner.hcloud.load_balancer:
     name: "{{ hcloud_load_balancer_name }}"
     load_balancer_type: lb11
     network_zone: eu-central
diff --git a/tests/integration/targets/rdns/tasks/test.yml b/tests/integration/targets/rdns/tasks/test.yml
index 6a84aa5..ed09ccc 100644
--- a/tests/integration/targets/rdns/tasks/test.yml
+++ b/tests/integration/targets/rdns/tasks/test.yml
@@ -2,7 +2,7 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 ---
 - name: Test missing required parameters
-  hetzner.hcloud.hcloud_rdns:
+  hetzner.hcloud.rdns:
     state: present
   ignore_errors: true
   register: result
@@ -13,7 +13,7 @@
       - 'result.msg == "missing required arguments: ip_address"'
 
 - name: Test create with checkmode
-  hetzner.hcloud.hcloud_rdns:
+  hetzner.hcloud.rdns:
     server: "{{ hcloud_server_name }}"
     ip_address: "{{ test_server.hcloud_server.ipv6 | ansible.netcommon.ipaddr('next_usable') }}"
     dns_ptr: example.com
@@ -26,7 +26,7 @@
       - result is changed
 
 - name: Test create
-  hetzner.hcloud.hcloud_rdns:
+  hetzner.hcloud.rdns:
     server: "{{ hcloud_server_name }}"
     ip_address: "{{ test_server.hcloud_server.ipv6 | ansible.netcommon.ipaddr('next_usable') }}"
     dns_ptr: example.com
@@ -41,7 +41,7 @@
       - result.hcloud_rdns.dns_ptr == "example.com"
 
 - name: Test create idempotency
-  hetzner.hcloud.hcloud_rdns:
+  hetzner.hcloud.rdns:
     server: "{{ hcloud_server_name }}"
     ip_address: "{{ test_server.hcloud_server.ipv6 | ansible.netcommon.ipaddr('next_usable') }}"
     dns_ptr: example.com
@@ -53,7 +53,7 @@
       - result is not changed
 
 - name: Test create with not existing server
-  hetzner.hcloud.hcloud_rdns:
+  hetzner.hcloud.rdns:
     server: not-existing
     ip_address: "127.0.0.1"
     dns_ptr: example.com
@@ -67,7 +67,7 @@
       - 'result.msg == "resource (server) does not exist: not-existing"'
 
 - name: Test update
-  hetzner.hcloud.hcloud_rdns:
+  hetzner.hcloud.rdns:
     server: "{{ hcloud_server_name }}"
     ip_address: "{{ test_server.hcloud_server.ipv4_address }}"
     dns_ptr: example.com
@@ -80,7 +80,7 @@
       - result.hcloud_rdns.ip_address == "{{ test_server.hcloud_server.ipv4_address }}"
 
 - name: Test update reset
-  hetzner.hcloud.hcloud_rdns:
+  hetzner.hcloud.rdns:
     server: "{{ hcloud_server_name }}"
     ip_address: "{{ test_server.hcloud_server.ipv4_address }}"
     state: present
@@ -92,7 +92,7 @@
       - result.hcloud_rdns.dns_ptr != "example.com"
 
 - name: Test delete
-  hetzner.hcloud.hcloud_rdns:
+  hetzner.hcloud.rdns:
     server: "{{ hcloud_server_name }}"
     ip_address: "{{ test_server.hcloud_server.ipv6 | ansible.netcommon.ipaddr('next_usable') }}"
     state: absent
@@ -103,7 +103,7 @@
       - result is changed
 
 - name: Test create with primary ip
-  hetzner.hcloud.hcloud_rdns:
+  hetzner.hcloud.rdns:
     primary_ip: "{{ hcloud_primary_ip_name }}"
     ip_address: "{{ test_primary_ip.hcloud_primary_ip.ip }}"
     dns_ptr: example.com
@@ -118,7 +118,7 @@
       - result.hcloud_rdns.dns_ptr == "example.com"
 
 - name: Test create with floating ip
-  hetzner.hcloud.hcloud_rdns:
+  hetzner.hcloud.rdns:
     floating_ip: "{{ hcloud_floating_ip_name }}"
     ip_address: "{{ test_floating_ip.hcloud_floating_ip.ip }}"
     dns_ptr: example.com
@@ -133,7 +133,7 @@
       - result.hcloud_rdns.dns_ptr == "example.com"
 
 - name: Test create with load balancer
-  hetzner.hcloud.hcloud_rdns:
+  hetzner.hcloud.rdns:
     load_balancer: "{{ hcloud_load_balancer_name }}"
     ip_address: "{{ test_load_balancer.hcloud_load_balancer.ipv4_address }}"
     dns_ptr: example.com
diff --git a/tests/integration/targets/route/tasks/test.yml b/tests/integration/targets/route/tasks/test.yml
index 4bc6791..ff933e0 100644
--- a/tests/integration/targets/route/tasks/test.yml
+++ b/tests/integration/targets/route/tasks/test.yml
@@ -2,7 +2,7 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 ---
 - name: setup
-  hetzner.hcloud.hcloud_network:
+  hetzner.hcloud.network:
     name: "{{ hcloud_network_name }}"
     ip_range: "10.0.0.0/8"
     state: present
@@ -13,7 +13,7 @@
       - network is success
 
 - name: test missing required parameters on create route
-  hetzner.hcloud.hcloud_route:
+  hetzner.hcloud.route:
     state: present
   register: result
   ignore_errors: true
@@ -24,7 +24,7 @@
       - 'result.msg == "missing required arguments: destination, gateway, network"'
 
 - name: test create route with checkmode
-  hetzner.hcloud.hcloud_route:
+  hetzner.hcloud.route:
     network: "{{ hcloud_network_name }}"
     destination: "10.100.1.0/24"
     gateway: "10.0.1.1"
@@ -37,7 +37,7 @@
       - result is changed
 
 - name: test create route
-  hetzner.hcloud.hcloud_route:
+  hetzner.hcloud.route:
     network: "{{ hcloud_network_name }}"
     destination: "10.100.1.0/24"
     gateway: "10.0.1.1"
@@ -52,7 +52,7 @@
       - route.hcloud_route.gateway == "10.0.1.1"
 
 - name: test create route idempotency
-  hetzner.hcloud.hcloud_route:
+  hetzner.hcloud.route:
     network: "{{ hcloud_network_name }}"
     destination: "10.100.1.0/24"
     gateway: "10.0.1.1"
@@ -64,7 +64,7 @@
       - result is not changed
 
 - name: test fail create route with wrong gateway
-  hetzner.hcloud.hcloud_route:
+  hetzner.hcloud.route:
     network: "{{ hcloud_network_name }}"
     destination: "10.100.1.0/24"
     gateway: "10.0.1.2"
@@ -77,7 +77,7 @@
       - route is failed
 
 - name: test absent route
-  hetzner.hcloud.hcloud_route:
+  hetzner.hcloud.route:
     network: "{{ hcloud_network_name }}"
     destination: "10.100.1.0/24"
     gateway: "10.0.1.1"
@@ -89,7 +89,7 @@
       - result is changed
 
 - name: cleanup
-  hetzner.hcloud.hcloud_network:
+  hetzner.hcloud.network:
     name: "{{hcloud_network_name}}"
     state: absent
   register: result
diff --git a/tests/integration/targets/server/tasks/cleanup.yml b/tests/integration/targets/server/tasks/cleanup.yml
index ac31d88..8066c41 100644
--- a/tests/integration/targets/server/tasks/cleanup.yml
+++ b/tests/integration/targets/server/tasks/cleanup.yml
@@ -1,5 +1,5 @@
 ---
 - name: Cleanup test_ssh_key
-  hetzner.hcloud.hcloud_ssh_key:
+  hetzner.hcloud.ssh_key:
     name: "{{ hcloud_ssh_key_name }}"
     state: absent
diff --git a/tests/integration/targets/server/tasks/prepare.yml b/tests/integration/targets/server/tasks/prepare.yml
index b9f6a8f..4bdb959 100644
--- a/tests/integration/targets/server/tasks/prepare.yml
+++ b/tests/integration/targets/server/tasks/prepare.yml
@@ -1,6 +1,6 @@
 ---
 - name: Create test_ssh_key
-  hetzner.hcloud.hcloud_ssh_key:
+  hetzner.hcloud.ssh_key:
     name: "{{ hcloud_ssh_key_name }}"
     public_key: "{{ test_ssh_keypair.public_key }}"
   register: test_ssh_key
diff --git a/tests/integration/targets/server/tasks/test_basic.yml b/tests/integration/targets/server/tasks/test_basic.yml
index d4bff79..a9dfc61 100644
--- a/tests/integration/targets/server/tasks/test_basic.yml
+++ b/tests/integration/targets/server/tasks/test_basic.yml
@@ -1,5 +1,5 @@
 - name: test create server with check mode
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: "{{ hcloud_server_name }}"
     server_type: cx11
     image: ubuntu-22.04
@@ -12,7 +12,7 @@
       - result is changed
 
 - name: test create server
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: "{{ hcloud_server_name}}"
     server_type: cx11
     image: ubuntu-22.04
@@ -29,7 +29,7 @@
       - main_server.root_password != ""
 
 - name: test create server idempotence
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: "{{ hcloud_server_name }}"
     state: started
   register: result
@@ -39,7 +39,7 @@
       - result is not changed
 
 - name: test stop server with check mode
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: "{{ hcloud_server_name }}"
     state: stopped
   register: result
@@ -51,7 +51,7 @@
       - result.hcloud_server.status == "running"
 
 - name: test stop server
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: "{{ hcloud_server_name }}"
     state: stopped
   register: result
@@ -62,7 +62,7 @@
       - result.hcloud_server.status == "off"
 
 - name: test start server with check mode
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: "{{ hcloud_server_name }}"
     state: started
   register: result
@@ -73,7 +73,7 @@
       - result is changed
 
 - name: test start server
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: "{{ hcloud_server_name }}"
     state: started
   register: result
@@ -84,7 +84,7 @@
       - result.hcloud_server.status == "running"
 
 - name: test start server idempotence
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: "{{ hcloud_server_name }}"
     state: started
   register: result
@@ -95,7 +95,7 @@
       - result.hcloud_server.status == "running"
 
 - name: test stop server by its id
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     id: "{{ main_server.hcloud_server.id }}"
     state: stopped
   register: result
@@ -106,7 +106,7 @@
       - result.hcloud_server.status == "off"
 
 - name: test resize server running without force
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: "{{ hcloud_server_name }}"
     server_type: "cx21"
     state: present
@@ -119,7 +119,7 @@
       - result.hcloud_server.server_type == "cx11"
 
 - name: test resize server with check mode
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: "{{ hcloud_server_name }}"
     server_type: "cx21"
     state: stopped
@@ -131,7 +131,7 @@
       - result is changed
 
 - name: test resize server without disk
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: "{{ hcloud_server_name }}"
     server_type: "cx21"
     state: stopped
@@ -143,7 +143,7 @@
       - result.hcloud_server.server_type == "cx21"
 
 - name: test resize server idempotence
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: "{{ hcloud_server_name }}"
     server_type: "cx21"
     state: stopped
@@ -154,7 +154,7 @@
       - result is not changed
 
 - name: test resize server to smaller plan
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: "{{ hcloud_server_name }}"
     server_type: "cx11"
     state: stopped
@@ -166,7 +166,7 @@
       - result.hcloud_server.server_type == "cx11"
 
 - name: test resize server with disk
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: "{{ hcloud_server_name }}"
     server_type: "cx21"
     upgrade_disk: true
@@ -179,7 +179,7 @@
       - result.hcloud_server.server_type == "cx21"
 
 - name: test enable backups with check mode
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: "{{ hcloud_server_name }}"
     backups: true
     state: stopped
@@ -191,7 +191,7 @@
       - result is changed
 
 - name: test enable backups
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: "{{ hcloud_server_name }}"
     backups: true
     state: stopped
@@ -203,7 +203,7 @@
       - result.hcloud_server.backup_window != ""
 
 - name: test enable backups idempotence
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: "{{ hcloud_server_name }}"
     backups: true
     state: stopped
@@ -215,7 +215,7 @@
       - result.hcloud_server.backup_window != ""
 
 - name: test backups are not accidentally disabled
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: "{{ hcloud_server_name }}"
     # Make sure that backups are not disabled because a partial server object without "backups" was supplied somewhere
     # to update some unrelated properties.
@@ -230,7 +230,7 @@
       - result.hcloud_server.backup_window != ""
 
 - name: test rebuild server
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: "{{ hcloud_server_name }}"
     image: ubuntu-22.04
     state: rebuild
@@ -242,7 +242,7 @@
       - result.hcloud_server.id == result_after_test.hcloud_server.id
 
 - name: test rebuild server with check mode
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: "{{ hcloud_server_name }}"
     image: ubuntu-22.04
     state: rebuild
@@ -254,7 +254,7 @@
       - result_after_test is changed
 
 - name: test update server protection booth protection arguments are required
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: "{{ hcloud_server_name }}"
     delete_protection: true
     state: present
@@ -267,7 +267,7 @@
       - 'result_after_test.msg == "parameters are required together: delete_protection, rebuild_protection"'
 
 - name: test update server protection fails if they are not the same
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: "{{ hcloud_server_name }}"
     delete_protection: true
     rebuild_protection: false
@@ -280,7 +280,7 @@
       - result_after_test is failed
 
 - name: test update server protection
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: "{{ hcloud_server_name }}"
     delete_protection: true
     rebuild_protection: true
@@ -295,7 +295,7 @@
       - result_after_test.hcloud_server.rebuild_protection is sameas true
 
 - name: test server without protection set to be idempotent
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: "{{hcloud_server_name}}"
   register: result_after_test
 - name: verify test server without protection set to be idempotent
@@ -306,7 +306,7 @@
       - result_after_test.hcloud_server.rebuild_protection is sameas true
 
 - name: test delete server fails if it is protected
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: "{{hcloud_server_name}}"
     state: absent
   ignore_errors: true
@@ -318,7 +318,7 @@
       - 'result.msg == "server deletion is protected"'
 
 - name: test rebuild server fails if it is protected
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: "{{hcloud_server_name}}"
     image: ubuntu-22.04
     state: rebuild
@@ -331,7 +331,7 @@
       - 'result.msg == "server rebuild is protected"'
 
 - name: test remove server protection
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: "{{ hcloud_server_name }}"
     delete_protection: false
     rebuild_protection: false
@@ -346,7 +346,7 @@
       - result_after_test.hcloud_server.rebuild_protection is sameas false
 
 - name: absent server
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: "{{ hcloud_server_name }}"
     state: absent
   register: result
@@ -356,7 +356,7 @@
       - result is success
 
 - name: test create server with ssh key
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: "{{ hcloud_server_name}}"
     server_type: cx11
     image: "ubuntu-22.04"
@@ -374,7 +374,7 @@
       - main_server.root_password != ""
 
 - name: test activate rescue mode with check_mode
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: "{{ hcloud_server_name }}"
     rescue_mode: "linux64"
     ssh_keys:
@@ -388,7 +388,7 @@
       - main_server is changed
 
 - name: test activate rescue mode
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: "{{ hcloud_server_name }}"
     rescue_mode: "linux64"
     ssh_keys:
@@ -402,7 +402,7 @@
       - main_server.hcloud_server.rescue_enabled is sameas true
 
 - name: test disable rescue mode
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: "{{ hcloud_server_name }}"
     ssh_keys:
       - "{{ hcloud_ssh_key_name }}"
@@ -415,7 +415,7 @@
       - main_server.hcloud_server.rescue_enabled is sameas false
 
 - name: test activate rescue mode without ssh keys
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: "{{ hcloud_server_name }}"
     rescue_mode: "linux64"
     state: present
@@ -427,7 +427,7 @@
       - main_server.hcloud_server.rescue_enabled is sameas true
 
 - name: absent server
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: "{{ hcloud_server_name }}"
     state: absent
   register: result
@@ -437,7 +437,7 @@
       - result is success
 
 - name: test create server with rescue_mode
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: "{{ hcloud_server_name}}"
     server_type: cx11
     image: "ubuntu-22.04"
@@ -457,7 +457,7 @@
       - main_server.hcloud_server.rescue_enabled is sameas true
 
 - name: absent server
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: "{{ hcloud_server_name }}"
     state: absent
   register: result
@@ -466,7 +466,7 @@
     that:
       - result is success
 - name: test create server with labels
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: "{{ hcloud_server_name}}"
     server_type: cx11
     image: "ubuntu-22.04"
@@ -485,7 +485,7 @@
       - main_server.hcloud_server.labels.mylabel == "val123"
 
 - name: test update server with labels
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: "{{ hcloud_server_name}}"
     server_type: cx11
     image: "ubuntu-22.04"
@@ -504,7 +504,7 @@
       - main_server.hcloud_server.labels.mylabel == "val123"
 
 - name: test update server with labels in other order
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: "{{ hcloud_server_name}}"
     server_type: cx11
     image: "ubuntu-22.04"
@@ -521,7 +521,7 @@
       - main_server is not changed
 
 - name: cleanup with labels
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: "{{ hcloud_server_name }}"
     state: absent
   register: result
@@ -531,7 +531,7 @@
       - result is success
 
 - name: test create server with enabled backups
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: "{{ hcloud_server_name }}"
     server_type: cpx11
     backups: true
@@ -547,7 +547,7 @@
       - result.hcloud_server.backup_window != ""
 
 - name: cleanup test create server with enabled backups
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: "{{ hcloud_server_name }}"
     state: absent
   register: result
@@ -557,7 +557,7 @@
       - result is success
 
 - name: test create server with protection
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: "{{ hcloud_server_name }}"
     delete_protection: true
     rebuild_protection: true
@@ -576,7 +576,7 @@
       - result_after_test.hcloud_server.rebuild_protection is sameas true
 
 - name: test delete server fails if it is protected
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: "{{hcloud_server_name}}"
     state: absent
   ignore_errors: true
@@ -588,7 +588,7 @@
       - 'result.msg == "server deletion is protected"'
 
 - name: remove protection from server
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: "{{ hcloud_server_name }}"
     delete_protection: false
     rebuild_protection: false
@@ -603,7 +603,7 @@
       - result_after_test.hcloud_server.rebuild_protection is sameas false
 
 - name: cleanup
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: "{{ hcloud_server_name }}"
     state: absent
   register: result
diff --git a/tests/integration/targets/server/tasks/test_firewalls.yml b/tests/integration/targets/server/tasks/test_firewalls.yml
index 6898e7b..896a6c5 100644
--- a/tests/integration/targets/server/tasks/test_firewalls.yml
+++ b/tests/integration/targets/server/tasks/test_firewalls.yml
@@ -2,7 +2,7 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 ---
 - name: test add not existing firewall should fail
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: "{{ hcloud_server_name }}"
     firewalls:
       - not-existing
@@ -15,7 +15,7 @@
       - result is failed
       - 'result.msg == "firewall not-existing was not found"'
 - name: setup create firewalls
-  hetzner.hcloud.hcloud_firewall:
+  hetzner.hcloud.firewall:
     name: "{{ item }}"
     rules:
       - direction: in
@@ -28,7 +28,7 @@
     - "{{ hcloud_firewall_name }}2"
 
 - name: test create server with firewalls
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: "{{ hcloud_server_name }}"
     server_type: cpx11
     firewalls:
@@ -44,7 +44,7 @@
       - result is changed
 
 - name: test create server with firewalls idempotence
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: "{{ hcloud_server_name }}"
     server_type: cpx11
     firewalls:
@@ -60,7 +60,7 @@
       - result is not changed
 
 - name: test update server with firewalls
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: "{{ hcloud_server_name }}"
     server_type: cpx11
     firewalls:
@@ -76,7 +76,7 @@
       - result is changed
 
 - name: test update server with firewalls idempotence
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: "{{ hcloud_server_name }}"
     server_type: cpx11
     firewalls:
@@ -92,12 +92,12 @@
       - result is not changed
 
 - name: cleanup server with firewalls
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: "{{ hcloud_server_name }}"
     state: absent
 
 - name: cleanup test create firewall
-  hetzner.hcloud.hcloud_firewall:
+  hetzner.hcloud.firewall:
     name: "{{ item }}"
     state: absent
   with_items:
diff --git a/tests/integration/targets/server/tasks/test_primary_ips.yml b/tests/integration/targets/server/tasks/test_primary_ips.yml
index 92e4bf8..034da9f 100644
--- a/tests/integration/targets/server/tasks/test_primary_ips.yml
+++ b/tests/integration/targets/server/tasks/test_primary_ips.yml
@@ -2,28 +2,28 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 ---
 - name: setup create primary ipv4
-  hetzner.hcloud.hcloud_primary_ip:
+  hetzner.hcloud.primary_ip:
     name: "{{ hcloud_primary_ip_name }}v4"
     type: ipv4
     datacenter: "fsn1-dc14"
   register: primaryIPv4
 
 - name: setup create second primary ipv4
-  hetzner.hcloud.hcloud_primary_ip:
+  hetzner.hcloud.primary_ip:
     name: "{{ hcloud_primary_ip_name }}v42"
     type: ipv4
     datacenter: "fsn1-dc14"
   register: secondPrimaryIPv4
 
 - name: setup create primary ipv6
-  hetzner.hcloud.hcloud_primary_ip:
+  hetzner.hcloud.primary_ip:
     name: "{{ hcloud_primary_ip_name }}v6"
     type: ipv6
     datacenter: "fsn1-dc14"
   register: primaryIPv6
 
 - name: test create server with primary ips
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: "{{ hcloud_server_name }}"
     server_type: cpx11
     datacenter: "fsn1-dc14"
@@ -40,7 +40,7 @@
       - result is changed
 
 - name: test update server with primary ips
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: "{{ hcloud_server_name }}"
     server_type: cpx11
     datacenter: "fsn1-dc14"
@@ -58,23 +58,23 @@
       - result is changed
 
 - name: cleanup server with primary ips
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: "{{ hcloud_server_name }}"
     state: absent
 
 - name: cleanup test create primary ips
-  hetzner.hcloud.hcloud_primary_ip:
+  hetzner.hcloud.primary_ip:
     name: "{{ hcloud_server_name }}v4"
     state: absent
 - name: cleanup test create primary ips
-  hetzner.hcloud.hcloud_primary_ip:
+  hetzner.hcloud.primary_ip:
     name: "{{ hcloud_server_name }}v42"
     state: absent
   until: result is not failed
   retries: 5
   delay: 2
 - name: cleanup test create primary ips
-  hetzner.hcloud.hcloud_primary_ip:
+  hetzner.hcloud.primary_ip:
     name: "{{ hcloud_server_name }}v6"
     state: absent
   until: result is not failed
diff --git a/tests/integration/targets/server/tasks/test_private_network_only.yml b/tests/integration/targets/server/tasks/test_private_network_only.yml
index ec157d2..a4219a0 100644
--- a/tests/integration/targets/server/tasks/test_private_network_only.yml
+++ b/tests/integration/targets/server/tasks/test_private_network_only.yml
@@ -2,28 +2,28 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 ---
 - name: setup network 1 to be absent
-  hetzner.hcloud.hcloud_network:
+  hetzner.hcloud.network:
     name: "{{ hcloud_network_name }}-1"
     state: absent
 
 - name: setup network 2 to be absent
-  hetzner.hcloud.hcloud_network:
+  hetzner.hcloud.network:
     name: "{{ hcloud_network_name }}-2"
     state: absent
 
 - name: setup server to be absent
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: "{{ hcloud_server_name }}"
     state: absent
 
 - name: setup create network
-  hetzner.hcloud.hcloud_network:
+  hetzner.hcloud.network:
     name: "{{ hcloud_network_name }}-1"
     ip_range: 192.168.0.0/23
   register: primaryNetwork
 
 - name: setup create network subnet 1
-  hetzner.hcloud.hcloud_subnetwork:
+  hetzner.hcloud.subnetwork:
     network: "{{ hcloud_network_name }}-1"
     ip_range: 192.168.0.0/24
     network_zone: eu-central
@@ -31,7 +31,7 @@
     state: present
 
 - name: setup create network subnet 2
-  hetzner.hcloud.hcloud_subnetwork:
+  hetzner.hcloud.subnetwork:
     network: "{{ hcloud_network_name }}-1"
     ip_range: 192.168.1.0/24
     network_zone: eu-central
@@ -39,13 +39,13 @@
     state: present
 
 - name: setup create secondary network
-  hetzner.hcloud.hcloud_network:
+  hetzner.hcloud.network:
     name: "{{ hcloud_network_name }}-2"
     ip_range: 192.168.2.0/23
   register: secondaryNetwork
 
 - name: setup create secondary network subnet 1
-  hetzner.hcloud.hcloud_subnetwork:
+  hetzner.hcloud.subnetwork:
     network: "{{ hcloud_network_name }}-2"
     ip_range: 192.168.2.0/24
     network_zone: eu-central
@@ -53,7 +53,7 @@
     state: present
 
 - name: setup create secondary network subnet 2
-  hetzner.hcloud.hcloud_subnetwork:
+  hetzner.hcloud.subnetwork:
     network: "{{ hcloud_network_name }}-2"
     ip_range: 192.168.3.0/24
     network_zone: eu-central
@@ -61,7 +61,7 @@
     state: present
 
 - name: test create server with primary network and no internet
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: "{{ hcloud_server_name }}"
     server_type: cpx11
     datacenter: "fsn1-dc14"
@@ -80,7 +80,7 @@
       - result is changed
 
 - name: test update server by adding secondary network
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: "{{ hcloud_server_name }}"
     server_type: cpx11
     datacenter: "fsn1-dc14"
@@ -100,7 +100,7 @@
       - result is changed
 
 - name: test update server idem
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: "{{ hcloud_server_name }}"
     server_type: cpx11
     datacenter: "fsn1-dc14"
@@ -120,11 +120,11 @@
       - result is not changed
 
 - name: cleanup server
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: "{{ hcloud_server_name }}"
     state: absent
 - name: cleanup networks
-  hetzner.hcloud.hcloud_network:
+  hetzner.hcloud.network:
     name: "{{ item }}"
     state: absent
   with_items:
diff --git a/tests/integration/targets/server/tasks/test_validation.yml b/tests/integration/targets/server/tasks/test_validation.yml
index 1c500ee..d4e0ef8 100644
--- a/tests/integration/targets/server/tasks/test_validation.yml
+++ b/tests/integration/targets/server/tasks/test_validation.yml
@@ -2,7 +2,7 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 ---
 - name: setup
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: "{{ hcloud_server_name }}"
     state: absent
   register: result
@@ -12,7 +12,7 @@
       - result is success
 
 - name: test missing required parameters on create server
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: "{{ hcloud_server_name }}"
   register: result
   ignore_errors: true
@@ -23,7 +23,7 @@
       - 'result.msg == "missing required arguments: server_type, image"'
 
 - name: test create server with not existing server type
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: "{{ hcloud_server_name }}"
     server_type: not-existing-server-type
     image: ubuntu-22.04
@@ -37,7 +37,7 @@
       - 'result.msg == "server_type not-existing-server-type was not found"'
 
 - name: test create server with not existing image
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: "{{ hcloud_server_name }}"
     server_type: cx11
     image: my-not-existing-image-20.04
diff --git a/tests/integration/targets/server_info/tasks/cleanup.yml b/tests/integration/targets/server_info/tasks/cleanup.yml
index 438e2bc..0c95d2c 100644
--- a/tests/integration/targets/server_info/tasks/cleanup.yml
+++ b/tests/integration/targets/server_info/tasks/cleanup.yml
@@ -1,10 +1,10 @@
 ---
 - name: Cleanup test_server
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: "{{ hcloud_server_name }}"
     state: absent
 
 - name: Cleanup test_server2
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: "{{ hcloud_server_name }}2"
     state: absent
diff --git a/tests/integration/targets/server_info/tasks/prepare.yml b/tests/integration/targets/server_info/tasks/prepare.yml
index 2342ff9..9e8aa2c 100644
--- a/tests/integration/targets/server_info/tasks/prepare.yml
+++ b/tests/integration/targets/server_info/tasks/prepare.yml
@@ -1,6 +1,6 @@
 ---
 - name: Create test_server
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: "{{ hcloud_server_name }}"
     server_type: cx11
     image: ubuntu-22.04
@@ -10,7 +10,7 @@
   register: test_server
 
 - name: Create test_server2 (stopped + without ip)
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: "{{ hcloud_server_name }}2"
     server_type: cx11
     image: ubuntu-22.04
diff --git a/tests/integration/targets/server_info/tasks/test.yml b/tests/integration/targets/server_info/tasks/test.yml
index 8418630..25f4f16 100644
--- a/tests/integration/targets/server_info/tasks/test.yml
+++ b/tests/integration/targets/server_info/tasks/test.yml
@@ -2,7 +2,7 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 ---
 - name: Gather hcloud_server_info
-  hetzner.hcloud.hcloud_server_info:
+  hetzner.hcloud.server_info:
   register: result
 - name: Verify hcloud_server_info
   ansible.builtin.assert:
@@ -10,7 +10,7 @@
       - result.hcloud_server_info | list | count >= 2
 
 - name: Gather hcloud_server_info in check mode
-  hetzner.hcloud.hcloud_server_info:
+  hetzner.hcloud.server_info:
   check_mode: true
   register: result
 - name: Verify hcloud_server_info in check mode
@@ -19,7 +19,7 @@
       - result.hcloud_server_info | list | count >= 2
 
 - name: Gather hcloud_server_info with correct id
-  hetzner.hcloud.hcloud_server_info:
+  hetzner.hcloud.server_info:
     id: "{{ test_server.hcloud_server.id }}"
   register: result
 - name: Verify hcloud_server_info with correct id
@@ -29,7 +29,7 @@
       - result.hcloud_server_info[0].name == hcloud_server_name
 
 - name: Gather hcloud_server_info with wrong id
-  hetzner.hcloud.hcloud_server_info:
+  hetzner.hcloud.server_info:
     id: "{{ test_server.hcloud_server.id }}4321"
   ignore_errors: true
   register: result
@@ -39,7 +39,7 @@
       - result is failed
 
 - name: Gather hcloud_server_info with correct name
-  hetzner.hcloud.hcloud_server_info:
+  hetzner.hcloud.server_info:
     name: "{{ hcloud_server_name }}"
   register: result
 - name: Verify hcloud_server_info with correct name
@@ -49,7 +49,7 @@
       - result.hcloud_server_info[0].name == hcloud_server_name
 
 - name: Gather hcloud_server_info with wrong name
-  hetzner.hcloud.hcloud_server_info:
+  hetzner.hcloud.server_info:
     name: "{{ hcloud_server_name }}-invalid"
   register: result
 - name: Verify hcloud_server_info with wrong name
@@ -58,7 +58,7 @@
       - result.hcloud_server_info | list | count == 0
 
 - name: Gather hcloud_server_info with correct label selector
-  hetzner.hcloud.hcloud_server_info:
+  hetzner.hcloud.server_info:
     label_selector: "key=value"
   register: result
 - name: Verify hcloud_server_info with correct label selector
@@ -70,7 +70,7 @@
         | list | count == 1
 
 - name: Gather hcloud_server_info with wrong label selector
-  hetzner.hcloud.hcloud_server_info:
+  hetzner.hcloud.server_info:
     label_selector: "key!=value"
   register: result
 - name: Verify hcloud_server_info with wrong label selector
@@ -79,7 +79,7 @@
       - result.hcloud_server_info | list | count == 0
 
 - name: Gather hcloud_server_info (without ip)
-  hetzner.hcloud.hcloud_server_info:
+  hetzner.hcloud.server_info:
     id: "{{ test_server2.hcloud_server.id }}"
   register: result
 - name: Verify hcloud_server_info (without ip)
diff --git a/tests/integration/targets/server_network/tasks/test.yml b/tests/integration/targets/server_network/tasks/test.yml
index 612cdd9..a77f2e3 100644
--- a/tests/integration/targets/server_network/tasks/test.yml
+++ b/tests/integration/targets/server_network/tasks/test.yml
@@ -2,7 +2,7 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 ---
 - name: setup network
-  hetzner.hcloud.hcloud_network:
+  hetzner.hcloud.network:
     name: "{{ hcloud_network_name }}"
     ip_range: "10.0.0.0/8"
     state: present
@@ -13,7 +13,7 @@
       - network is success
 
 - name: setup subnetwork
-  hetzner.hcloud.hcloud_subnetwork:
+  hetzner.hcloud.subnetwork:
     network: "{{ hcloud_network_name }}"
     ip_range: "10.0.0.0/16"
     type: "server"
@@ -26,7 +26,7 @@
       - subnetwork is success
 
 - name: setup server
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: "{{hcloud_server_name}}"
     server_type: cx11
     image: ubuntu-22.04
@@ -39,7 +39,7 @@
       - server is success
 
 - name: test missing required parameters on create server network
-  hetzner.hcloud.hcloud_server_network:
+  hetzner.hcloud.server_network:
     state: present
   register: result
   ignore_errors: true
@@ -50,7 +50,7 @@
       - 'result.msg == "missing required arguments: network, server"'
 
 - name: test create server network with checkmode
-  hetzner.hcloud.hcloud_server_network:
+  hetzner.hcloud.server_network:
     network: "{{ hcloud_network_name }}"
     server: "{{hcloud_server_name}}"
     state: present
@@ -62,7 +62,7 @@
       - result is changed
 
 - name: test create server network
-  hetzner.hcloud.hcloud_server_network:
+  hetzner.hcloud.server_network:
     network: "{{ hcloud_network_name }}"
     server: "{{hcloud_server_name}}"
     state: present
@@ -75,7 +75,7 @@
       - serverNetwork.hcloud_server_network.server == hcloud_server_name
 
 - name: test create server network idempotency
-  hetzner.hcloud.hcloud_server_network:
+  hetzner.hcloud.server_network:
     network: "{{ hcloud_network_name }}"
     server: "{{hcloud_server_name}}"
     state: present
@@ -86,7 +86,7 @@
       - serverNetwork is not changed
 
 - name: test absent server network
-  hetzner.hcloud.hcloud_server_network:
+  hetzner.hcloud.server_network:
     network: "{{ hcloud_network_name }}"
     server: "{{hcloud_server_name}}"
     state: absent
@@ -97,7 +97,7 @@
       - result is changed
 
 - name: test create server network with specified ip
-  hetzner.hcloud.hcloud_server_network:
+  hetzner.hcloud.server_network:
     network: "{{ hcloud_network_name }}"
     server: "{{hcloud_server_name}}"
     ip: "10.0.0.2"
@@ -112,7 +112,7 @@
       - serverNetwork.hcloud_server_network.ip == "10.0.0.2"
 
 - name: cleanup create server network with specified ip
-  hetzner.hcloud.hcloud_server_network:
+  hetzner.hcloud.server_network:
     network: "{{ hcloud_network_name }}"
     server: "{{hcloud_server_name}}"
     state: absent
@@ -123,7 +123,7 @@
       - result is changed
 
 - name: test create server network with alias ips
-  hetzner.hcloud.hcloud_server_network:
+  hetzner.hcloud.server_network:
     network: "{{ hcloud_network_name }}"
     server: "{{hcloud_server_name}}"
     ip: "10.0.0.2"
@@ -143,7 +143,7 @@
       - 'serverNetwork.hcloud_server_network.alias_ips[1] == "10.0.1.2"'
 
 - name: test update server network with alias ips
-  hetzner.hcloud.hcloud_server_network:
+  hetzner.hcloud.server_network:
     network: "{{ hcloud_network_name }}"
     server: "{{hcloud_server_name}}"
     ip: "10.0.0.2"
@@ -163,7 +163,7 @@
       - 'serverNetwork.hcloud_server_network.alias_ips[1] == "10.0.3.1"'
 
 - name: test update server network with alias ips idempotency
-  hetzner.hcloud.hcloud_server_network:
+  hetzner.hcloud.server_network:
     network: "{{ hcloud_network_name }}"
     server: "{{hcloud_server_name}}"
     ip: "10.0.0.2"
@@ -178,7 +178,7 @@
       - serverNetwork is not changed
 
 - name: cleanup create server network with alias ips
-  hetzner.hcloud.hcloud_server_network:
+  hetzner.hcloud.server_network:
     network: "{{ hcloud_network_name }}"
     server: "{{hcloud_server_name}}"
     state: absent
@@ -189,7 +189,7 @@
       - result is changed
 
 - name: cleanup server
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: "{{ hcloud_server_name }}"
     state: absent
   register: result
@@ -199,7 +199,7 @@
       - result is success
 
 - name: cleanup subnetwork
-  hetzner.hcloud.hcloud_subnetwork:
+  hetzner.hcloud.subnetwork:
     network: "{{ hcloud_network_name }}"
     ip_range: "10.0.0.0/16"
     type: "server"
@@ -212,7 +212,7 @@
       - result is changed
 
 - name: cleanup
-  hetzner.hcloud.hcloud_network:
+  hetzner.hcloud.network:
     name: "{{hcloud_network_name}}"
     state: absent
   register: result
diff --git a/tests/integration/targets/server_type_info/tasks/test.yml b/tests/integration/targets/server_type_info/tasks/test.yml
index f0c4731..9c51e09 100644
--- a/tests/integration/targets/server_type_info/tasks/test.yml
+++ b/tests/integration/targets/server_type_info/tasks/test.yml
@@ -2,7 +2,7 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 ---
 - name: Gather hcloud_server_type_info
-  hetzner.hcloud.hcloud_server_type_info:
+  hetzner.hcloud.server_type_info:
   register: result
 - name: Verify hcloud_server_type_info
   ansible.builtin.assert:
@@ -10,7 +10,7 @@
       - result.hcloud_server_type_info | list | count >= 3
 
 - name: Gather hcloud_server_type_info in check mode
-  hetzner.hcloud.hcloud_server_type_info:
+  hetzner.hcloud.server_type_info:
   check_mode: true
   register: result
 - name: Verify hcloud_server_type_info in check mode
@@ -19,7 +19,7 @@
       - result.hcloud_server_type_info | list | count >= 3
 
 - name: Gather hcloud_server_type_info with correct id
-  hetzner.hcloud.hcloud_server_type_info:
+  hetzner.hcloud.server_type_info:
     id: "{{ hcloud_server_type_id }}"
   register: result
 - name: Verify hcloud_server_type_info with correct id
@@ -29,7 +29,7 @@
       - result.hcloud_server_type_info[0].deprecation is none # fails if cx11 is ever deprecated
 
 - name: Gather hcloud_server_type_info with wrong id
-  hetzner.hcloud.hcloud_server_type_info:
+  hetzner.hcloud.server_type_info:
     id: "{{ hcloud_server_type_id }}4321"
   ignore_errors: true
   register: result
@@ -39,7 +39,7 @@
       - result is failed
 
 - name: Gather hcloud_server_type_info with correct name
-  hetzner.hcloud.hcloud_server_type_info:
+  hetzner.hcloud.server_type_info:
     name: "{{ hcloud_server_type_name }}"
   register: result
 - name: Verify hcloud_server_type_info with correct name
@@ -48,7 +48,7 @@
       - result.hcloud_server_type_info | list | count == 1
 
 - name: Gather hcloud_server_type_info with wrong name
-  hetzner.hcloud.hcloud_server_type_info:
+  hetzner.hcloud.server_type_info:
     name: "{{ hcloud_server_type_name }}-invalid"
   register: result
 - name: Verify hcloud_server_type_info with wrong name
@@ -57,7 +57,7 @@
       - result.hcloud_server_type_info | list | count == 0
 
 - name: Gather hcloud_server_type_info with deprecated field
-  hetzner.hcloud.hcloud_server_type_info:
+  hetzner.hcloud.server_type_info:
     id: "{{ hcloud_server_type_id_deprecated }}"
   register: result
 - name: Verify hcloud_server_type_info with deprecated field
diff --git a/tests/integration/targets/ssh_key/tasks/cleanup.yml b/tests/integration/targets/ssh_key/tasks/cleanup.yml
index f55362a..fea3ff0 100644
--- a/tests/integration/targets/ssh_key/tasks/cleanup.yml
+++ b/tests/integration/targets/ssh_key/tasks/cleanup.yml
@@ -1,10 +1,10 @@
 ---
 - name: Cleanup test_ssh_key
-  hetzner.hcloud.hcloud_ssh_key:
+  hetzner.hcloud.ssh_key:
     name: "{{ hcloud_ssh_key_name }}"
     state: absent
 
 - name: Cleanup test_server
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: "{{ hcloud_server_name }}"
     state: absent
diff --git a/tests/integration/targets/ssh_key/tasks/test.yml b/tests/integration/targets/ssh_key/tasks/test.yml
index 9ed9352..53b5803 100644
--- a/tests/integration/targets/ssh_key/tasks/test.yml
+++ b/tests/integration/targets/ssh_key/tasks/test.yml
@@ -2,7 +2,7 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 ---
 - name: test missing required parameters on create ssh_key
-  hetzner.hcloud.hcloud_ssh_key:
+  hetzner.hcloud.ssh_key:
     name: "{{ hcloud_ssh_key_name }}"
   register: result
   ignore_errors: true
@@ -13,7 +13,7 @@
       - 'result.msg == "missing required arguments: public_key"'
 
 - name: test create ssh key with check mode
-  hetzner.hcloud.hcloud_ssh_key:
+  hetzner.hcloud.ssh_key:
     name: "{{ hcloud_ssh_key_name }}"
     public_key: "{{ test_ssh_keypair.public_key }}"
   register: result
@@ -24,7 +24,7 @@
       - result is changed
 
 - name: test create ssh key
-  hetzner.hcloud.hcloud_ssh_key:
+  hetzner.hcloud.ssh_key:
     name: "{{ hcloud_ssh_key_name }}"
     public_key: "{{ test_ssh_keypair.public_key }}"
     labels:
@@ -40,7 +40,7 @@
       - ssh_key.hcloud_ssh_key.labels.key == "value"
 
 - name: test create ssh key idempotence
-  hetzner.hcloud.hcloud_ssh_key:
+  hetzner.hcloud.ssh_key:
     name: "{{ hcloud_ssh_key_name }}"
     public_key: "{{ test_ssh_keypair.public_key }}"
   register: result
@@ -50,7 +50,7 @@
       - result is not changed
 
 - name: test update ssh key with check mode
-  hetzner.hcloud.hcloud_ssh_key:
+  hetzner.hcloud.ssh_key:
     id: "{{ ssh_key.hcloud_ssh_key.id }}"
     name: "changed-{{ hcloud_ssh_key_name }}"
   register: result
@@ -61,7 +61,7 @@
       - result is changed
 
 - name: test update ssh key
-  hetzner.hcloud.hcloud_ssh_key:
+  hetzner.hcloud.ssh_key:
     id: "{{ ssh_key.hcloud_ssh_key.id }}"
     name: "changed-{{ hcloud_ssh_key_name }}"
     labels:
@@ -74,7 +74,7 @@
       - result.hcloud_ssh_key.name == "changed-{{ hcloud_ssh_key_name }}"
 
 - name: test update ssh key with same labels
-  hetzner.hcloud.hcloud_ssh_key:
+  hetzner.hcloud.ssh_key:
     id: "{{ ssh_key.hcloud_ssh_key.id }}"
     name: "changed-{{ hcloud_ssh_key_name }}"
     labels:
@@ -86,7 +86,7 @@
       - result is not changed
 
 - name: test update ssh key with other labels
-  hetzner.hcloud.hcloud_ssh_key:
+  hetzner.hcloud.ssh_key:
     id: "{{ ssh_key.hcloud_ssh_key.id }}"
     name: "changed-{{ hcloud_ssh_key_name }}"
     labels:
@@ -99,7 +99,7 @@
       - result is changed
 
 - name: test rename ssh key
-  hetzner.hcloud.hcloud_ssh_key:
+  hetzner.hcloud.ssh_key:
     id: "{{ ssh_key.hcloud_ssh_key.id }}"
     name: "{{ hcloud_ssh_key_name }}"
   register: result
@@ -110,7 +110,7 @@
       - result.hcloud_ssh_key.name == "{{ hcloud_ssh_key_name }}"
 
 - name: test create server with ssh key
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: "{{ hcloud_server_name }}"
     server_type: cx11
     image: "ubuntu-22.04"
@@ -124,7 +124,7 @@
       - main_server is changed
 
 - name: test fail cleanly on double created ssh key
-  hetzner.hcloud.hcloud_ssh_key:
+  hetzner.hcloud.ssh_key:
     name: "{{ hcloud_ssh_key_name }}-other-name"
     public_key: "{{ test_ssh_keypair.public_key }}"
   register: result
@@ -136,7 +136,7 @@
       - 'result.msg == "SSH key with the same fingerprint already exists"'
 
 - name: test delete ssh key
-  hetzner.hcloud.hcloud_ssh_key:
+  hetzner.hcloud.ssh_key:
     id: "{{ ssh_key.hcloud_ssh_key.id }}"
     state: absent
   register: result
diff --git a/tests/integration/targets/ssh_key_info/tasks/cleanup.yml b/tests/integration/targets/ssh_key_info/tasks/cleanup.yml
index ac31d88..8066c41 100644
--- a/tests/integration/targets/ssh_key_info/tasks/cleanup.yml
+++ b/tests/integration/targets/ssh_key_info/tasks/cleanup.yml
@@ -1,5 +1,5 @@
 ---
 - name: Cleanup test_ssh_key
-  hetzner.hcloud.hcloud_ssh_key:
+  hetzner.hcloud.ssh_key:
     name: "{{ hcloud_ssh_key_name }}"
     state: absent
diff --git a/tests/integration/targets/ssh_key_info/tasks/prepare.yml b/tests/integration/targets/ssh_key_info/tasks/prepare.yml
index 97d765f..519bc85 100644
--- a/tests/integration/targets/ssh_key_info/tasks/prepare.yml
+++ b/tests/integration/targets/ssh_key_info/tasks/prepare.yml
@@ -1,6 +1,6 @@
 ---
 - name: Create test_ssh_key
-  hetzner.hcloud.hcloud_ssh_key:
+  hetzner.hcloud.ssh_key:
     name: "{{ hcloud_ssh_key_name }}"
     public_key: "{{ test_ssh_keypair.public_key }}"
     labels:
diff --git a/tests/integration/targets/ssh_key_info/tasks/test.yml b/tests/integration/targets/ssh_key_info/tasks/test.yml
index b515f9d..5d94326 100644
--- a/tests/integration/targets/ssh_key_info/tasks/test.yml
+++ b/tests/integration/targets/ssh_key_info/tasks/test.yml
@@ -2,7 +2,7 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 ---
 - name: Gather hcloud_ssh_key_info
-  hetzner.hcloud.hcloud_ssh_key_info:
+  hetzner.hcloud.ssh_key_info:
   register: result
 - name: Verify hcloud_ssh_key_info
   ansible.builtin.assert:
@@ -10,7 +10,7 @@
       - result.hcloud_ssh_key_info | list | count >= 1
 
 - name: Gather hcloud_ssh_key_info in check mode
-  hetzner.hcloud.hcloud_ssh_key_info:
+  hetzner.hcloud.ssh_key_info:
   check_mode: true
   register: result
 - name: Verify hcloud_ssh_key_info in check mode
@@ -19,7 +19,7 @@
       - result.hcloud_ssh_key_info | list | count >= 1
 
 - name: Gather hcloud_ssh_key_info with correct id
-  hetzner.hcloud.hcloud_ssh_key_info:
+  hetzner.hcloud.ssh_key_info:
     id: "{{ test_ssh_key.hcloud_ssh_key.id }}"
   register: result
 - name: Verify hcloud_ssh_key_info with correct id
@@ -28,7 +28,7 @@
       - result.hcloud_ssh_key_info | list | count == 1
 
 - name: Gather hcloud_ssh_key_info with wrong id
-  hetzner.hcloud.hcloud_ssh_key_info:
+  hetzner.hcloud.ssh_key_info:
     id: "{{ test_ssh_key.hcloud_ssh_key.id }}4321"
   ignore_errors: true
   register: result
@@ -38,7 +38,7 @@
       - result is failed
 
 - name: Gather hcloud_ssh_key_info with correct name
-  hetzner.hcloud.hcloud_ssh_key_info:
+  hetzner.hcloud.ssh_key_info:
     name: "{{ hcloud_ssh_key_name }}"
   register: result
 - name: Verify hcloud_ssh_key_info with correct name
@@ -47,7 +47,7 @@
       - result.hcloud_ssh_key_info | list | count == 1
 
 - name: Gather hcloud_ssh_key_info with wrong name
-  hetzner.hcloud.hcloud_ssh_key_info:
+  hetzner.hcloud.ssh_key_info:
     name: "{{ hcloud_ssh_key_name }}-invalid"
   register: result
 - name: Verify hcloud_ssh_key_info with wrong name
@@ -56,7 +56,7 @@
       - result.hcloud_ssh_key_info | list | count == 0
 
 - name: Gather hcloud_ssh_key_info with correct label selector
-  hetzner.hcloud.hcloud_ssh_key_info:
+  hetzner.hcloud.ssh_key_info:
     label_selector: "key=value"
   register: result
 - name: Verify hcloud_ssh_key_info with correct label selector
@@ -68,7 +68,7 @@
         | list | count == 1
 
 - name: Gather hcloud_ssh_key_info with wrong label selector
-  hetzner.hcloud.hcloud_ssh_key_info:
+  hetzner.hcloud.ssh_key_info:
     label_selector: "key!=value"
   register: result
 - name: Verify hcloud_ssh_key_info with wrong label selector
diff --git a/tests/integration/targets/subnetwork/tasks/cleanup.yml b/tests/integration/targets/subnetwork/tasks/cleanup.yml
index e61c34e..989d01b 100644
--- a/tests/integration/targets/subnetwork/tasks/cleanup.yml
+++ b/tests/integration/targets/subnetwork/tasks/cleanup.yml
@@ -1,5 +1,5 @@
 ---
 - name: Cleanup test_network
-  hetzner.hcloud.hcloud_network:
+  hetzner.hcloud.network:
     name: "{{ hcloud_network_name }}"
     state: absent
diff --git a/tests/integration/targets/subnetwork/tasks/prepare.yml b/tests/integration/targets/subnetwork/tasks/prepare.yml
index eedc519..69a709d 100644
--- a/tests/integration/targets/subnetwork/tasks/prepare.yml
+++ b/tests/integration/targets/subnetwork/tasks/prepare.yml
@@ -1,6 +1,6 @@
 ---
 - name: Create test_network
-  hetzner.hcloud.hcloud_network:
+  hetzner.hcloud.network:
     name: "{{ hcloud_network_name }}"
     ip_range: "10.0.0.0/16"
     state: present
diff --git a/tests/integration/targets/subnetwork/tasks/test.yml b/tests/integration/targets/subnetwork/tasks/test.yml
index 46c5b40..9e4a1a4 100644
--- a/tests/integration/targets/subnetwork/tasks/test.yml
+++ b/tests/integration/targets/subnetwork/tasks/test.yml
@@ -2,7 +2,7 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 ---
 - name: Test missing required parameters
-  hetzner.hcloud.hcloud_subnetwork:
+  hetzner.hcloud.subnetwork:
     network: "{{ hcloud_network_name }}"
     state: present
   ignore_errors: true
@@ -14,7 +14,7 @@
       - 'result.msg == "missing required arguments: ip_range, network_zone, type"'
 
 - name: Test create with checkmode
-  hetzner.hcloud.hcloud_subnetwork:
+  hetzner.hcloud.subnetwork:
     network: "{{ hcloud_network_name }}"
     network_zone: eu-central
     type: cloud
@@ -28,7 +28,7 @@
       - result is changed
 
 - name: Test create
-  hetzner.hcloud.hcloud_subnetwork:
+  hetzner.hcloud.subnetwork:
     network: "{{ hcloud_network_name }}"
     network_zone: eu-central
     type: cloud
@@ -45,7 +45,7 @@
       - result.hcloud_subnetwork.ip_range == "10.0.0.0/24"
 
 - name: Test create idempotency
-  hetzner.hcloud.hcloud_subnetwork:
+  hetzner.hcloud.subnetwork:
     network: "{{ hcloud_network_name }}"
     network_zone: eu-central
     type: cloud
@@ -58,7 +58,7 @@
       - result is not changed
 
 - name: Test delete
-  hetzner.hcloud.hcloud_subnetwork:
+  hetzner.hcloud.subnetwork:
     network: "{{ hcloud_network_name }}"
     network_zone: eu-central
     type: cloud
@@ -71,7 +71,7 @@
       - result is changed
 
 - name: Test create with vswitch
-  hetzner.hcloud.hcloud_subnetwork:
+  hetzner.hcloud.subnetwork:
     network: "{{ hcloud_network_name }}"
     network_zone: eu-central
     type: vswitch
@@ -90,7 +90,7 @@
       - result.hcloud_subnetwork.vswitch_id | string == test_vswitch_id
 
 - name: Test delete with vswitch
-  hetzner.hcloud.hcloud_subnetwork:
+  hetzner.hcloud.subnetwork:
     network: "{{ hcloud_network_name }}"
     network_zone: eu-central
     type: vswitch
diff --git a/tests/integration/targets/volume/tasks/test.yml b/tests/integration/targets/volume/tasks/test.yml
index 3658e25..446dd6e 100644
--- a/tests/integration/targets/volume/tasks/test.yml
+++ b/tests/integration/targets/volume/tasks/test.yml
@@ -2,7 +2,7 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 ---
 - name: setup server
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: "{{hcloud_server_name}}"
     server_type: cx11
     image: ubuntu-22.04
@@ -15,7 +15,7 @@
       - vol_server is changed
 
 - name: test missing size parameter on create Volume
-  hetzner.hcloud.hcloud_volume:
+  hetzner.hcloud.volume:
     name: "{{hcloud_volume_name}}"
     server: "{{hcloud_server_name}}"
   register: result
@@ -27,7 +27,7 @@
       - 'result.msg == "missing required arguments: size"'
 
 - name: test create Volume with check mode
-  hetzner.hcloud.hcloud_volume:
+  hetzner.hcloud.volume:
     name: "{{hcloud_volume_name}}"
     size: 10
     location: "fsn1"
@@ -39,7 +39,7 @@
       - result is changed
 
 - name: test create Volume
-  hetzner.hcloud.hcloud_volume:
+  hetzner.hcloud.volume:
     name: "{{hcloud_volume_name}}"
     size: 10
     location: "fsn1"
@@ -55,7 +55,7 @@
       - volume.hcloud_volume.linux_device is defined
 
 - name: test create Volume idempotence
-  hetzner.hcloud.hcloud_volume:
+  hetzner.hcloud.volume:
     name: "{{hcloud_volume_name}}"
     size: 10
     location: "fsn1"
@@ -66,7 +66,7 @@
       - volume is not changed
 
 - name: test attach Volume with checkmode
-  hetzner.hcloud.hcloud_volume:
+  hetzner.hcloud.volume:
     name: "{{hcloud_volume_name}}"
     server: "{{hcloud_server_name}}"
   check_mode: true
@@ -78,7 +78,7 @@
       - volume.hcloud_volume.server != "{{hcloud_server_name}}"
 
 - name: test attach Volume
-  hetzner.hcloud.hcloud_volume:
+  hetzner.hcloud.volume:
     name: "{{hcloud_volume_name}}"
     server: "{{hcloud_server_name}}"
   register: volume
@@ -89,7 +89,7 @@
       - volume.hcloud_volume.server == "{{hcloud_server_name}}"
 
 - name: test attach Volume idempotence
-  hetzner.hcloud.hcloud_volume:
+  hetzner.hcloud.volume:
     name: "{{hcloud_volume_name}}"
     server: "{{hcloud_server_name}}"
   register: volume
@@ -100,7 +100,7 @@
       - volume.hcloud_volume.server == "{{hcloud_server_name}}"
 
 - name: test detach Volume with checkmode
-  hetzner.hcloud.hcloud_volume:
+  hetzner.hcloud.volume:
     name: "{{hcloud_volume_name}}"
   check_mode: true
   register: volume
@@ -111,7 +111,7 @@
       - volume.hcloud_volume.server == "{{hcloud_server_name}}"
 
 - name: test detach Volume
-  hetzner.hcloud.hcloud_volume:
+  hetzner.hcloud.volume:
     name: "{{hcloud_volume_name}}"
   register: volume
 - name: verify detach volume
@@ -122,7 +122,7 @@
       - volume.hcloud_volume.server != "{{hcloud_server_name}}"
 
 - name: test update Volume label
-  hetzner.hcloud.hcloud_volume:
+  hetzner.hcloud.volume:
     name: "{{hcloud_volume_name}}"
     labels:
       key: value
@@ -134,7 +134,7 @@
       - volume.hcloud_volume.labels.key == "value"
 
 - name: test update Volume label with the same label
-  hetzner.hcloud.hcloud_volume:
+  hetzner.hcloud.volume:
     name: "{{hcloud_volume_name}}"
     labels:
       key: value
@@ -145,7 +145,7 @@
       - volume is not changed
 
 - name: test increase Volume size
-  hetzner.hcloud.hcloud_volume:
+  hetzner.hcloud.volume:
     name: "{{hcloud_volume_name}}"
     size: 11
   register: volume
@@ -156,7 +156,7 @@
       - volume.hcloud_volume.size == 11
 
 - name: test decreace Volume size
-  hetzner.hcloud.hcloud_volume:
+  hetzner.hcloud.volume:
     name: "{{hcloud_volume_name}}"
     size: 10
   register: volume
@@ -167,7 +167,7 @@
       - volume.hcloud_volume.size == 11
 
 - name: test update Volume delete protection
-  hetzner.hcloud.hcloud_volume:
+  hetzner.hcloud.volume:
     name: "{{hcloud_volume_name}}"
     delete_protection: true
   register: volume
@@ -178,7 +178,7 @@
       - volume.hcloud_volume.delete_protection is sameas true
 
 - name: test update Volume delete protection idempotency
-  hetzner.hcloud.hcloud_volume:
+  hetzner.hcloud.volume:
     name: "{{hcloud_volume_name}}"
     delete_protection: true
   register: volume
@@ -189,7 +189,7 @@
       - volume.hcloud_volume.delete_protection is sameas true
 
 - name: test Volume without delete protection set to be idempotent
-  hetzner.hcloud.hcloud_volume:
+  hetzner.hcloud.volume:
     name: "{{hcloud_volume_name}}"
   register: volume
 - name: verify test Volume without delete protection set to be idempotent
@@ -199,7 +199,7 @@
       - volume.hcloud_volume.delete_protection is sameas true
 
 - name: test delete Volume fails if it is protected
-  hetzner.hcloud.hcloud_volume:
+  hetzner.hcloud.volume:
     name: "{{hcloud_volume_name}}"
     state: absent
   ignore_errors: true
@@ -211,7 +211,7 @@
       - 'result.msg == "volume deletion is protected"'
 
 - name: test update Volume delete protection
-  hetzner.hcloud.hcloud_volume:
+  hetzner.hcloud.volume:
     name: "{{hcloud_volume_name}}"
     delete_protection: false
   register: volume
@@ -222,7 +222,7 @@
       - volume.hcloud_volume.delete_protection is sameas false
 
 - name: test delete Volume
-  hetzner.hcloud.hcloud_volume:
+  hetzner.hcloud.volume:
     name: "{{hcloud_volume_name}}"
     state: absent
   register: result
@@ -232,7 +232,7 @@
       - result is success
 
 - name: test create Volume with delete protection
-  hetzner.hcloud.hcloud_volume:
+  hetzner.hcloud.volume:
     name: "{{hcloud_volume_name}}"
     size: 10
     location: "fsn1"
@@ -245,7 +245,7 @@
       - volume.hcloud_volume.delete_protection is sameas true
 
 - name: test delete Volume fails if it is protected
-  hetzner.hcloud.hcloud_volume:
+  hetzner.hcloud.volume:
     name: "{{hcloud_volume_name}}"
     state: absent
   ignore_errors: true
@@ -257,7 +257,7 @@
       - 'result.msg == "volume deletion is protected"'
 
 - name: test update Volume delete protection
-  hetzner.hcloud.hcloud_volume:
+  hetzner.hcloud.volume:
     name: "{{hcloud_volume_name}}"
     delete_protection: false
   register: volume
@@ -268,7 +268,7 @@
       - volume.hcloud_volume.delete_protection is sameas false
 
 - name: test delete Volume
-  hetzner.hcloud.hcloud_volume:
+  hetzner.hcloud.volume:
     name: "{{hcloud_volume_name}}"
     state: absent
   register: result
@@ -278,7 +278,7 @@
       - result is success
 
 - name: cleanup
-  hetzner.hcloud.hcloud_server:
+  hetzner.hcloud.server:
     name: "{{ hcloud_server_name }}"
     state: absent
   register: result
diff --git a/tests/integration/targets/volume_info/tasks/cleanup.yml b/tests/integration/targets/volume_info/tasks/cleanup.yml
index 48f3566..8fa589a 100644
--- a/tests/integration/targets/volume_info/tasks/cleanup.yml
+++ b/tests/integration/targets/volume_info/tasks/cleanup.yml
@@ -1,5 +1,5 @@
 ---
 - name: Cleanup test_volume
-  hetzner.hcloud.hcloud_volume:
+  hetzner.hcloud.volume:
     name: "{{ hcloud_volume_name }}"
     state: absent
diff --git a/tests/integration/targets/volume_info/tasks/prepare.yml b/tests/integration/targets/volume_info/tasks/prepare.yml
index 4ec224a..de3c70b 100644
--- a/tests/integration/targets/volume_info/tasks/prepare.yml
+++ b/tests/integration/targets/volume_info/tasks/prepare.yml
@@ -1,6 +1,6 @@
 ---
 - name: Create test_volume
-  hetzner.hcloud.hcloud_volume:
+  hetzner.hcloud.volume:
     name: "{{ hcloud_volume_name }}"
     size: 10
     location: fsn1
diff --git a/tests/integration/targets/volume_info/tasks/test.yml b/tests/integration/targets/volume_info/tasks/test.yml
index 444eee7..8e08018 100644
--- a/tests/integration/targets/volume_info/tasks/test.yml
+++ b/tests/integration/targets/volume_info/tasks/test.yml
@@ -2,7 +2,7 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 ---
 - name: Gather hcloud_volume_info
-  hetzner.hcloud.hcloud_volume_info:
+  hetzner.hcloud.volume_info:
   register: result
 - name: Verify hcloud_volume_info
   ansible.builtin.assert:
@@ -10,7 +10,7 @@
       - result.hcloud_volume_info | list | count >= 1
 
 - name: Gather hcloud_volume_info in check mode
-  hetzner.hcloud.hcloud_volume_info:
+  hetzner.hcloud.volume_info:
   check_mode: true
   register: result
 - name: Verify hcloud_volume_info in check mode
@@ -19,7 +19,7 @@
       - result.hcloud_volume_info | list | count >= 1
 
 - name: Gather hcloud_volume_info with correct id
-  hetzner.hcloud.hcloud_volume_info:
+  hetzner.hcloud.volume_info:
     id: "{{ test_volume.hcloud_volume.id }}"
   register: result
 - name: Verify hcloud_volume_info with correct id
@@ -32,7 +32,7 @@
       - result.hcloud_volume_info[0].linux_device is defined
 
 - name: Gather hcloud_volume_info with wrong id
-  hetzner.hcloud.hcloud_volume_info:
+  hetzner.hcloud.volume_info:
     id: "{{ test_volume.hcloud_volume.id }}4321"
   ignore_errors: true
   register: result
@@ -42,7 +42,7 @@
       - result is failed
 
 - name: Gather hcloud_volume_info with correct name
-  hetzner.hcloud.hcloud_volume_info:
+  hetzner.hcloud.volume_info:
     name: "{{ hcloud_volume_name }}"
   register: result
 - name: Verify hcloud_volume_info with correct name
@@ -51,7 +51,7 @@
       - result.hcloud_volume_info | list | count == 1
 
 - name: Gather hcloud_volume_info with wrong name
-  hetzner.hcloud.hcloud_volume_info:
+  hetzner.hcloud.volume_info:
     name: "{{ hcloud_volume_name }}-invalid"
   register: result
 - name: Verify hcloud_volume_info with wrong name
@@ -60,7 +60,7 @@
       - result.hcloud_volume_info | list | count == 0
 
 - name: Gather hcloud_volume_info with correct label selector
-  hetzner.hcloud.hcloud_volume_info:
+  hetzner.hcloud.volume_info:
     label_selector: "key=value"
   register: result
 - name: Verify hcloud_volume_info with correct label selector
@@ -72,7 +72,7 @@
         | list | count == 1
 
 - name: Gather hcloud_volume_info with wrong label selector
-  hetzner.hcloud.hcloud_volume_info:
+  hetzner.hcloud.volume_info:
     label_selector: "key!=value"
   register: result
 - name: Verify hcloud_volume_info with wrong label selector