diff --git a/plugins/modules/ec2_vpc_egress_igw.py b/plugins/modules/ec2_vpc_egress_igw.py
index 9b4040484c3..e93ce7791e9 100644
--- a/plugins/modules/ec2_vpc_egress_igw.py
+++ b/plugins/modules/ec2_vpc_egress_igw.py
@@ -36,10 +36,10 @@
 
 # Ensure that the VPC has an Internet Gateway.
 # The Internet Gateway ID is can be accessed via {{eigw.gateway_id}} for use in setting up NATs etc.
-ec2_vpc_egress_igw:
-  vpc_id: vpc-abcdefgh
-  state: present
-register: eigw
+- community.aws.ec2_vpc_egress_igw:
+    vpc_id: vpc-abcdefgh
+    state: present
+  register: eigw
 
 '''
 
diff --git a/plugins/modules/ec2_vpc_endpoint.py b/plugins/modules/ec2_vpc_endpoint.py
index 1b89387bf36..7978c48dfde 100644
--- a/plugins/modules/ec2_vpc_endpoint.py
+++ b/plugins/modules/ec2_vpc_endpoint.py
@@ -22,7 +22,7 @@
     type: str
   service:
     description:
-      - An AWS supported vpc endpoint service. Use the M(ec2_vpc_endpoint_info)
+      - An AWS supported vpc endpoint service. Use the M(community.aws.ec2_vpc_endpoint_info)
         module to describe the supported endpoint services.
       - Required when creating an endpoint.
     required: false
@@ -99,7 +99,7 @@
 # Note: These examples do not set authentication details, see the AWS Guide for details.
 
 - name: Create new vpc endpoint with a json template for policy
-  ec2_vpc_endpoint:
+  community.aws.ec2_vpc_endpoint:
     state: present
     region: ap-southeast-2
     vpc_id: vpc-12345678
@@ -111,7 +111,7 @@
   register: new_vpc_endpoint
 
 - name: Create new vpc endpoint with the default policy
-  ec2_vpc_endpoint:
+  community.aws.ec2_vpc_endpoint:
     state: present
     region: ap-southeast-2
     vpc_id: vpc-12345678
@@ -122,7 +122,7 @@
   register: new_vpc_endpoint
 
 - name: Create new vpc endpoint with json file
-  ec2_vpc_endpoint:
+  community.aws.ec2_vpc_endpoint:
     state: present
     region: ap-southeast-2
     vpc_id: vpc-12345678
@@ -134,7 +134,7 @@
   register: new_vpc_endpoint
 
 - name: Delete newly created vpc endpoint
-  ec2_vpc_endpoint:
+  community.aws.ec2_vpc_endpoint:
     state: absent
     vpc_endpoint_id: "{{ new_vpc_endpoint.result['VpcEndpointId'] }}"
     region: ap-southeast-2
diff --git a/plugins/modules/ec2_vpc_endpoint_info.py b/plugins/modules/ec2_vpc_endpoint_info.py
index 75ceb6b9bc7..0f23ca53217 100644
--- a/plugins/modules/ec2_vpc_endpoint_info.py
+++ b/plugins/modules/ec2_vpc_endpoint_info.py
@@ -43,19 +43,19 @@
 EXAMPLES = '''
 # Simple example of listing all support AWS services for VPC endpoints
 - name: List supported AWS endpoint services
-  ec2_vpc_endpoint_info:
+  community.aws.ec2_vpc_endpoint_info:
     query: services
     region: ap-southeast-2
   register: supported_endpoint_services
 
 - name: Get all endpoints in ap-southeast-2 region
-  ec2_vpc_endpoint_info:
+  community.aws.ec2_vpc_endpoint_info:
     query: endpoints
     region: ap-southeast-2
   register: existing_endpoints
 
 - name: Get all endpoints with specific filters
-  ec2_vpc_endpoint_info:
+  community.aws.ec2_vpc_endpoint_info:
     query: endpoints
     region: ap-southeast-2
     filters:
@@ -68,7 +68,7 @@
   register: existing_endpoints
 
 - name: Get details on specific endpoint
-  ec2_vpc_endpoint_info:
+  community.aws.ec2_vpc_endpoint_info:
     query: endpoints
     region: ap-southeast-2
     vpc_endpoint_ids:
diff --git a/plugins/modules/ec2_vpc_igw.py b/plugins/modules/ec2_vpc_igw.py
index 0c85169c7d7..6b1a69911d4 100644
--- a/plugins/modules/ec2_vpc_igw.py
+++ b/plugins/modules/ec2_vpc_igw.py
@@ -44,10 +44,10 @@
 
 # Ensure that the VPC has an Internet Gateway.
 # The Internet Gateway ID is can be accessed via {{igw.gateway_id}} for use in setting up NATs etc.
-ec2_vpc_igw:
-  vpc_id: vpc-abcdefgh
-  state: present
-register: igw
+- community.aws.ec2_vpc_igw:
+    vpc_id: vpc-abcdefgh
+    state: present
+  register: igw
 
 '''
 
diff --git a/plugins/modules/ec2_vpc_igw_info.py b/plugins/modules/ec2_vpc_igw_info.py
index 29845d2ccf5..dcc07a4349b 100644
--- a/plugins/modules/ec2_vpc_igw_info.py
+++ b/plugins/modules/ec2_vpc_igw_info.py
@@ -36,13 +36,13 @@
 # # Note: These examples do not set authentication details, see the AWS Guide for details.
 
 - name: Gather information about all Internet Gateways for an account or profile
-  ec2_vpc_igw_info:
+  community.aws.ec2_vpc_igw_info:
     region: ap-southeast-2
     profile: production
   register: igw_info
 
 - name: Gather information about a filtered list of Internet Gateways
-  ec2_vpc_igw_info:
+  community.aws.ec2_vpc_igw_info:
     region: ap-southeast-2
     profile: production
     filters:
@@ -50,7 +50,7 @@
   register: igw_info
 
 - name: Gather information about a specific internet gateway by InternetGatewayId
-  ec2_vpc_igw_info:
+  community.aws.ec2_vpc_igw_info:
     region: ap-southeast-2
     profile: production
     internet_gateway_ids: igw-c1231234
diff --git a/plugins/modules/ec2_vpc_nacl.py b/plugins/modules/ec2_vpc_nacl.py
index 23130310720..5c14fec8040 100644
--- a/plugins/modules/ec2_vpc_nacl.py
+++ b/plugins/modules/ec2_vpc_nacl.py
@@ -86,7 +86,7 @@
 # Complete example to create and delete a network ACL
 # that allows SSH, HTTP and ICMP in, and all traffic out.
 - name: "Create and associate production DMZ network ACL with DMZ subnets"
-  ec2_vpc_nacl:
+  community.aws.ec2_vpc_nacl:
     vpc_id: vpc-12345678
     name: prod-dmz-nacl
     region: ap-southeast-2
@@ -106,7 +106,7 @@
     state: 'present'
 
 - name: "Remove the ingress and egress rules - defaults to deny all"
-  ec2_vpc_nacl:
+  community.aws.ec2_vpc_nacl:
     vpc_id: vpc-12345678
     name: prod-dmz-nacl
     region: ap-southeast-2
@@ -120,20 +120,20 @@
     state: present
 
 - name: "Remove the NACL subnet associations and tags"
-  ec2_vpc_nacl:
+  community.aws.ec2_vpc_nacl:
     vpc_id: 'vpc-12345678'
     name: prod-dmz-nacl
     region: ap-southeast-2
     state: present
 
 - name: "Delete nacl and subnet associations"
-  ec2_vpc_nacl:
+  community.aws.ec2_vpc_nacl:
     vpc_id: vpc-12345678
     name: prod-dmz-nacl
     state: absent
 
 - name: "Delete nacl by its id"
-  ec2_vpc_nacl:
+  community.aws.ec2_vpc_nacl:
     nacl_id: acl-33b4ee5b
     state: absent
 '''
diff --git a/plugins/modules/ec2_vpc_nacl_info.py b/plugins/modules/ec2_vpc_nacl_info.py
index d4c0c431465..31b1099b04c 100644
--- a/plugins/modules/ec2_vpc_nacl_info.py
+++ b/plugins/modules/ec2_vpc_nacl_info.py
@@ -44,17 +44,17 @@
 
 # Gather information about all Network ACLs:
 - name: Get All NACLs
-  register: all_nacls
-  ec2_vpc_nacl_info:
+  community.aws.ec2_vpc_nacl_info:
     region: us-west-2
+  register: all_nacls
 
 # Retrieve default Network ACLs:
 - name: Get Default NACLs
-  register: default_nacls
-  ec2_vpc_nacl_info:
+  community.aws.ec2_vpc_nacl_info:
     region: us-west-2
     filters:
       'default': 'true'
+  register: default_nacls
 '''
 
 RETURN = '''
diff --git a/plugins/modules/ec2_vpc_nat_gateway.py b/plugins/modules/ec2_vpc_nat_gateway.py
index d8ee5167b67..306c8ac49c4 100644
--- a/plugins/modules/ec2_vpc_nat_gateway.py
+++ b/plugins/modules/ec2_vpc_nat_gateway.py
@@ -84,7 +84,7 @@
 # Note: These examples do not set authentication details, see the AWS Guide for details.
 
 - name: Create new nat gateway with client token.
-  ec2_vpc_nat_gateway:
+  community.aws.ec2_vpc_nat_gateway:
     state: present
     subnet_id: subnet-12345678
     eip_address: 52.1.1.1
@@ -93,7 +93,7 @@
   register: new_nat_gateway
 
 - name: Create new nat gateway using an allocation-id.
-  ec2_vpc_nat_gateway:
+  community.aws.ec2_vpc_nat_gateway:
     state: present
     subnet_id: subnet-12345678
     allocation_id: eipalloc-12345678
@@ -101,7 +101,7 @@
   register: new_nat_gateway
 
 - name: Create new nat gateway, using an EIP address  and wait for available status.
-  ec2_vpc_nat_gateway:
+  community.aws.ec2_vpc_nat_gateway:
     state: present
     subnet_id: subnet-12345678
     eip_address: 52.1.1.1
@@ -110,7 +110,7 @@
   register: new_nat_gateway
 
 - name: Create new nat gateway and allocate new EIP.
-  ec2_vpc_nat_gateway:
+  community.aws.ec2_vpc_nat_gateway:
     state: present
     subnet_id: subnet-12345678
     wait: true
@@ -118,7 +118,7 @@
   register: new_nat_gateway
 
 - name: Create new nat gateway and allocate new EIP if a nat gateway does not yet exist in the subnet.
-  ec2_vpc_nat_gateway:
+  community.aws.ec2_vpc_nat_gateway:
     state: present
     subnet_id: subnet-12345678
     wait: true
@@ -127,7 +127,7 @@
   register: new_nat_gateway
 
 - name: Delete nat gateway using discovered nat gateways from facts module.
-  ec2_vpc_nat_gateway:
+  community.aws.ec2_vpc_nat_gateway:
     state: absent
     region: ap-southeast-2
     wait: true
@@ -137,7 +137,7 @@
   loop: "{{ gateways_to_remove.result }}"
 
 - name: Delete nat gateway and wait for deleted status.
-  ec2_vpc_nat_gateway:
+  community.aws.ec2_vpc_nat_gateway:
     state: absent
     nat_gateway_id: nat-12345678
     wait: true
@@ -145,7 +145,7 @@
     region: ap-southeast-2
 
 - name: Delete nat gateway and release EIP.
-  ec2_vpc_nat_gateway:
+  community.aws.ec2_vpc_nat_gateway:
     state: absent
     nat_gateway_id: nat-12345678
     release_eip: true
diff --git a/plugins/modules/ec2_vpc_nat_gateway_info.py b/plugins/modules/ec2_vpc_nat_gateway_info.py
index 85f96cc7340..83fb9b0f182 100644
--- a/plugins/modules/ec2_vpc_nat_gateway_info.py
+++ b/plugins/modules/ec2_vpc_nat_gateway_info.py
@@ -35,7 +35,7 @@
 EXAMPLES = '''
 # Simple example of listing all nat gateways
 - name: List all managed nat gateways in ap-southeast-2
-  ec2_vpc_nat_gateway_info:
+  community.aws.ec2_vpc_nat_gateway_info:
     region: ap-southeast-2
   register: all_ngws
 
@@ -44,7 +44,7 @@
     msg: "{{ all_ngws.result }}"
 
 - name: Get details on specific nat gateways
-  ec2_vpc_nat_gateway_info:
+  community.aws.ec2_vpc_nat_gateway_info:
     nat_gateway_ids:
       - nat-1234567891234567
       - nat-7654321987654321
@@ -52,14 +52,14 @@
   register: specific_ngws
 
 - name: Get all nat gateways with specific filters
-  ec2_vpc_nat_gateway_info:
+  community.aws.ec2_vpc_nat_gateway_info:
     region: ap-southeast-2
     filters:
       state: ['pending']
   register: pending_ngws
 
 - name: Get nat gateways with specific filter
-  ec2_vpc_nat_gateway_info:
+  community.aws.ec2_vpc_nat_gateway_info:
     region: ap-southeast-2
     filters:
       subnet-id: subnet-12345678
diff --git a/plugins/modules/ec2_vpc_peer.py b/plugins/modules/ec2_vpc_peer.py
index c029eb5afa0..b8e263c1242 100644
--- a/plugins/modules/ec2_vpc_peer.py
+++ b/plugins/modules/ec2_vpc_peer.py
@@ -61,7 +61,7 @@
 EXAMPLES = '''
 # Complete example to create and accept a local peering connection.
 - name: Create local account VPC peering Connection
-  ec2_vpc_peer:
+  community.aws.ec2_vpc_peer:
     region: ap-southeast-2
     vpc_id: vpc-12345678
     peer_vpc_id: vpc-87654321
@@ -73,7 +73,7 @@
   register: vpc_peer
 
 - name: Accept local VPC peering request
-  ec2_vpc_peer:
+  community.aws.ec2_vpc_peer:
     region: ap-southeast-2
     peering_id: "{{ vpc_peer.peering_id }}"
     state: accept
@@ -81,7 +81,7 @@
 
 # Complete example to delete a local peering connection.
 - name: Create local account VPC peering Connection
-  ec2_vpc_peer:
+  community.aws.ec2_vpc_peer:
     region: ap-southeast-2
     vpc_id: vpc-12345678
     peer_vpc_id: vpc-87654321
@@ -93,7 +93,7 @@
   register: vpc_peer
 
 - name: delete a local VPC peering Connection
-  ec2_vpc_peer:
+  community.aws.ec2_vpc_peer:
     region: ap-southeast-2
     peering_id: "{{ vpc_peer.peering_id }}"
     state: absent
@@ -101,7 +101,7 @@
 
   # Complete example to create and accept a cross account peering connection.
 - name: Create cross account VPC peering Connection
-  ec2_vpc_peer:
+  community.aws.ec2_vpc_peer:
     region: ap-southeast-2
     vpc_id: vpc-12345678
     peer_vpc_id: vpc-12345678
@@ -114,7 +114,7 @@
   register: vpc_peer
 
 - name: Accept peering connection from remote account
-  ec2_vpc_peer:
+  community.aws.ec2_vpc_peer:
     region: ap-southeast-2
     peering_id: "{{ vpc_peer.peering_id }}"
     profile: bot03_profile_for_cross_account
@@ -123,7 +123,7 @@
 
 # Complete example to create and accept an intra-region peering connection.
 - name: Create intra-region VPC peering Connection
-  ec2_vpc_peer:
+  community.aws.ec2_vpc_peer:
     region: us-east-1
     vpc_id: vpc-12345678
     peer_vpc_id: vpc-87654321
@@ -136,7 +136,7 @@
   register: vpc_peer
 
 - name: Accept peering connection from peer region
-  ec2_vpc_peer:
+  community.aws.ec2_vpc_peer:
     region: us-west-2
     peering_id: "{{ vpc_peer.peering_id }}"
     state: accept
@@ -144,7 +144,7 @@
 
 # Complete example to create and reject a local peering connection.
 - name: Create local account VPC peering Connection
-  ec2_vpc_peer:
+  community.aws.ec2_vpc_peer:
     region: ap-southeast-2
     vpc_id: vpc-12345678
     peer_vpc_id: vpc-87654321
@@ -156,14 +156,14 @@
   register: vpc_peer
 
 - name: Reject a local VPC peering Connection
-  ec2_vpc_peer:
+  community.aws.ec2_vpc_peer:
     region: ap-southeast-2
     peering_id: "{{ vpc_peer.peering_id }}"
     state: reject
 
 # Complete example to create and accept a cross account peering connection.
 - name: Create cross account VPC peering Connection
-  ec2_vpc_peer:
+  community.aws.ec2_vpc_peer:
     region: ap-southeast-2
     vpc_id: vpc-12345678
     peer_vpc_id: vpc-12345678
@@ -176,7 +176,7 @@
   register: vpc_peer
 
 - name: Accept a cross account VPC peering connection request
-  ec2_vpc_peer:
+  community.aws.ec2_vpc_peer:
     region: ap-southeast-2
     peering_id: "{{ vpc_peer.peering_id }}"
     profile: bot03_profile_for_cross_account
@@ -188,7 +188,7 @@
 
 # Complete example to create and reject a cross account peering connection.
 - name: Create cross account VPC peering Connection
-  ec2_vpc_peer:
+  community.aws.ec2_vpc_peer:
     region: ap-southeast-2
     vpc_id: vpc-12345678
     peer_vpc_id: vpc-12345678
@@ -201,7 +201,7 @@
   register: vpc_peer
 
 - name: Reject a cross account VPC peering Connection
-  ec2_vpc_peer:
+  community.aws.ec2_vpc_peer:
     region: ap-southeast-2
     peering_id: "{{ vpc_peer.peering_id }}"
     profile: bot03_profile_for_cross_account
diff --git a/plugins/modules/ec2_vpc_peering_info.py b/plugins/modules/ec2_vpc_peering_info.py
index 75af1b65613..8472fc4f58c 100644
--- a/plugins/modules/ec2_vpc_peering_info.py
+++ b/plugins/modules/ec2_vpc_peering_info.py
@@ -35,7 +35,7 @@
 EXAMPLES = '''
 # Simple example of listing all VPC Peers
 - name: List all vpc peers
-  ec2_vpc_peering_info:
+  community.aws.ec2_vpc_peering_info:
     region: ap-southeast-2
   register: all_vpc_peers
 
@@ -44,7 +44,7 @@
     msg: "{{ all_vpc_peers.result }}"
 
 - name: Get details on specific VPC peer
-  ec2_vpc_peering_info:
+  community.aws.ec2_vpc_peering_info:
     peer_connection_ids:
       - pcx-12345678
       - pcx-87654321
@@ -52,7 +52,7 @@
   register: all_vpc_peers
 
 - name: Get all vpc peers with specific filters
-  ec2_vpc_peering_info:
+  community.aws.ec2_vpc_peering_info:
     region: ap-southeast-2
     filters:
       status-code: ['pending-acceptance']
diff --git a/plugins/modules/ec2_vpc_route_table.py b/plugins/modules/ec2_vpc_route_table.py
index 442efca01d7..0b8230ac7e1 100644
--- a/plugins/modules/ec2_vpc_route_table.py
+++ b/plugins/modules/ec2_vpc_route_table.py
@@ -85,7 +85,7 @@
 
 # Basic creation example:
 - name: Set up public subnet route table
-  ec2_vpc_route_table:
+  community.aws.ec2_vpc_route_table:
     vpc_id: vpc-1245678
     region: us-west-1
     tags:
@@ -100,7 +100,7 @@
   register: public_route_table
 
 - name: Set up NAT-protected route table
-  ec2_vpc_route_table:
+  community.aws.ec2_vpc_route_table:
     vpc_id: vpc-1245678
     region: us-west-1
     tags:
@@ -115,7 +115,7 @@
   register: nat_route_table
 
 - name: delete route table
-  ec2_vpc_route_table:
+  community.aws.ec2_vpc_route_table:
     vpc_id: vpc-1245678
     region: us-west-1
     route_table_id: "{{ route_table.id }}"
diff --git a/plugins/modules/ec2_vpc_route_table_info.py b/plugins/modules/ec2_vpc_route_table_info.py
index acb203f1eab..4823f2db49e 100644
--- a/plugins/modules/ec2_vpc_route_table_info.py
+++ b/plugins/modules/ec2_vpc_route_table_info.py
@@ -29,21 +29,21 @@
 EXAMPLES = '''
 # Note: These examples do not set authentication details, see the AWS Guide for details.
 
-# Gather information about all VPC route tables
-- ec2_vpc_route_table_info:
+- name: Gather information about all VPC route tables
+  community.aws.ec2_vpc_route_table_info:
 
-# Gather information about a particular VPC route table using route table ID
-- ec2_vpc_route_table_info:
+- name: Gather information about a particular VPC route table using route table ID
+  community.aws.ec2_vpc_route_table_info:
     filters:
       route-table-id: rtb-00112233
 
-# Gather information about any VPC route table with a tag key Name and value Example
-- ec2_vpc_route_table_info:
+- name: Gather information about any VPC route table with a tag key Name and value Example
+  community.aws.ec2_vpc_route_table_info:
     filters:
       "tag:Name": Example
 
-# Gather information about any VPC route table within VPC with ID vpc-abcdef00
-- ec2_vpc_route_table_info:
+- name: Gather information about any VPC route table within VPC with ID vpc-abcdef00
+  community.aws.ec2_vpc_route_table_info:
     filters:
       vpc-id: vpc-abcdef00
 
diff --git a/plugins/modules/ec2_vpc_vgw.py b/plugins/modules/ec2_vpc_vgw.py
index 004a64c394c..d1ea852d0e3 100644
--- a/plugins/modules/ec2_vpc_vgw.py
+++ b/plugins/modules/ec2_vpc_vgw.py
@@ -64,7 +64,7 @@
 
 EXAMPLES = '''
 - name: Create a new vgw attached to a specific VPC
-  ec2_vpc_vgw:
+  community.aws.ec2_vpc_vgw:
     state: present
     region: ap-southeast-2
     profile: personal
@@ -74,7 +74,7 @@
   register: created_vgw
 
 - name: Create a new unattached vgw
-  ec2_vpc_vgw:
+  community.aws.ec2_vpc_vgw:
     state: present
     region: ap-southeast-2
     profile: personal
@@ -86,7 +86,7 @@
   register: created_vgw
 
 - name: Remove a new vgw using the name
-  ec2_vpc_vgw:
+  community.aws.ec2_vpc_vgw:
     state: absent
     region: ap-southeast-2
     profile: personal
@@ -95,7 +95,7 @@
   register: deleted_vgw
 
 - name: Remove a new vgw using the vpn_gateway_id
-  ec2_vpc_vgw:
+  community.aws.ec2_vpc_vgw:
     state: absent
     region: ap-southeast-2
     profile: personal
diff --git a/plugins/modules/ec2_vpc_vgw_info.py b/plugins/modules/ec2_vpc_vgw_info.py
index a8c8da426c9..d526b54a372 100644
--- a/plugins/modules/ec2_vpc_vgw_info.py
+++ b/plugins/modules/ec2_vpc_vgw_info.py
@@ -36,13 +36,13 @@
 # # Note: These examples do not set authentication details, see the AWS Guide for details.
 
 - name: Gather information about all virtual gateways for an account or profile
-  ec2_vpc_vgw_info:
+  community.aws.ec2_vpc_vgw_info:
     region: ap-southeast-2
     profile: production
   register: vgw_info
 
 - name: Gather information about a filtered list of Virtual Gateways
-  ec2_vpc_vgw_info:
+  community.aws.ec2_vpc_vgw_info:
     region: ap-southeast-2
     profile: production
     filters:
@@ -50,7 +50,7 @@
   register: vgw_info
 
 - name: Gather information about a specific virtual gateway by VpnGatewayIds
-  ec2_vpc_vgw_info:
+  community.aws.ec2_vpc_vgw_info:
     region: ap-southeast-2
     profile: production
     vpn_gateway_ids: vgw-c432f6a7
diff --git a/plugins/modules/ec2_vpc_vpn.py b/plugins/modules/ec2_vpc_vpn.py
index c344cc8e73e..4d0f06fb5a3 100644
--- a/plugins/modules/ec2_vpc_vpn.py
+++ b/plugins/modules/ec2_vpc_vpn.py
@@ -145,13 +145,13 @@
 # It is assumed that their matching environment variables are set.
 
 - name: create a VPN connection
-  ec2_vpc_vpn:
+  community.aws.ec2_vpc_vpn:
     state: present
     vpn_gateway_id: vgw-XXXXXXXX
     customer_gateway_id: cgw-XXXXXXXX
 
 - name: modify VPN connection tags
-  ec2_vpc_vpn:
+  community.aws.ec2_vpc_vpn:
     state: present
     vpn_connection_id: vpn-XXXXXXXX
     tags:
@@ -159,12 +159,12 @@
       Other: ansible-tag-2
 
 - name: delete a connection
-  ec2_vpc_vpn:
+  community.aws.ec2_vpc_vpn:
     vpn_connection_id: vpn-XXXXXXXX
     state: absent
 
 - name: modify VPN tags (identifying VPN by filters)
-  ec2_vpc_vpn:
+  community.aws.ec2_vpc_vpn:
     state: present
     filters:
       cidr: 194.168.1.0/24
@@ -177,7 +177,7 @@
     static_only: true
 
 - name: set up VPN with tunnel options utilizing 'TunnelInsideCidr' only
-  ec2_vpc_vpn:
+  community.aws.ec2_vpc_vpn:
     state: present
     filters:
       vpn: vpn-XXXXXXXX
@@ -189,7 +189,7 @@
         TunnelInsideCidr: '169.254.100.5/30'
 
 - name: add routes and remove any preexisting ones
-  ec2_vpc_vpn:
+  community.aws.ec2_vpc_vpn:
     state: present
     filters:
       vpn: vpn-XXXXXXXX
@@ -199,14 +199,14 @@
     purge_routes: true
 
 - name: remove all routes
-  ec2_vpc_vpn:
+  community.aws.ec2_vpc_vpn:
     state: present
     vpn_connection_id: vpn-XXXXXXXX
     routes: []
     purge_routes: true
 
 - name: delete a VPN identified by filters
-  ec2_vpc_vpn:
+  community.aws.ec2_vpc_vpn:
     state: absent
     filters:
       tags:
diff --git a/plugins/modules/ec2_vpc_vpn_info.py b/plugins/modules/ec2_vpc_vpn_info.py
index 427b4b8cec8..f34ddb8a937 100644
--- a/plugins/modules/ec2_vpc_vpn_info.py
+++ b/plugins/modules/ec2_vpc_vpn_info.py
@@ -37,16 +37,16 @@
 EXAMPLES = '''
 # # Note: These examples do not set authentication details, see the AWS Guide for details.
 - name: Gather information about all vpn connections
-  ec2_vpc_vpn_info:
+  community.aws.ec2_vpc_vpn_info:
 
 - name: Gather information about a filtered list of vpn connections, based on tags
-  ec2_vpc_vpn_info:
+  community.aws.ec2_vpc_vpn_info:
     filters:
       "tag:Name": test-connection
   register: vpn_conn_info
 
 - name: Gather information about vpn connections by specifying connection IDs.
-  ec2_vpc_vpn_info:
+  community.aws.ec2_vpc_vpn_info:
     filters:
       vpn-gateway-id: vgw-cbe66beb
   register: vpn_conn_info