Changing GCP Facts modules to Info Modules (#60172)

* file changes, porting guide, changelog fragment, renaming autoscaler, removing rst links
* Apply suggestions from code review

Co-Authored-By: Alicia Cozine <879121+acozine@users.noreply.github.com>
Co-Authored-By: Felix Fontein <felix@fontein.de>

170 files changed, 823 insertions, 412 deletions

diff --git a/changelogs/fragments/gcp-facts-info-rename.yaml b/changelogs/fragments/gcp-facts-info-rename.yaml
new file mode 100644
index 0000000000..8ca4cc8e34
--- /dev/null
+++ b/changelogs/fragments/gcp-facts-info-rename.yaml
@@ -0,0 +1,53 @@
+minor_changes:
+- The ``gcp_bigquery_dataset_facts`` module was renamed to ``gcp_bigquery_dataset_info``.
+- The ``gcp_bigquery_table_facts`` module was renamed to ``gcp_bigquery_table_info``.
+- The ``gcp_cloudbuild_trigger_facts`` module was renamed to ``gcp_cloudbuild_trigger_info``.
+- The ``gcp_compute_address_facts`` module was renamed to ``gcp_compute_address_info``.
+- The ``gcp_compute_backend_bucket_facts`` module was renamed to ``gcp_compute_backend_bucket_info``.
+- The ``gcp_compute_backend_service_facts`` module was renamed to ``gcp_compute_backend_service_info``.
+- The ``gcp_compute_disk_facts`` module was renamed to ``gcp_compute_disk_info``.
+- The ``gcp_compute_firewall_facts`` module was renamed to ``gcp_compute_firewall_info``.
+- The ``gcp_compute_forwarding_rule_facts`` module was renamed to ``gcp_compute_forwarding_rule_info``.
+- The ``gcp_compute_global_address_facts`` module was renamed to ``gcp_compute_global_address_info``.
+- The ``gcp_compute_global_forwarding_rule_facts`` module was renamed to ``gcp_compute_global_forwarding_rule_info``.
+- The ``gcp_compute_health_check_facts`` module was renamed to ``gcp_compute_health_check_info``.
+- The ``gcp_compute_http_health_check_facts`` module was renamed to ``gcp_compute_http_health_check_info``.
+- The ``gcp_compute_https_health_check_facts`` module was renamed to ``gcp_compute_https_health_check_info``.
+- The ``gcp_compute_image_facts`` module was renamed to ``gcp_compute_image_info``.
+- The ``gcp_compute_instance_group_facts`` module was renamed to ``gcp_compute_instance_group_info``.
+- The ``gcp_compute_instance_group_manager_facts`` module was renamed to ``gcp_compute_instance_group_manager_info``.
+- The ``gcp_compute_instance_facts`` module was renamed to ``gcp_compute_instance_info``.
+- The ``gcp_compute_instance_template_facts`` module was renamed to ``gcp_compute_instance_template_info``.
+- The ``gcp_compute_interconnect_attachment_facts`` module was renamed to ``gcp_compute_interconnect_attachment_info``.
+- The ``gcp_compute_network_facts`` module was renamed to ``gcp_compute_network_info``.
+- The ``gcp_compute_region_disk_facts`` module was renamed to ``gcp_compute_region_disk_info``.
+- The ``gcp_compute_route_facts`` module was renamed to ``gcp_compute_route_info``.
+- The ``gcp_compute_router_facts`` module was renamed to ``gcp_compute_router_info``.
+- The ``gcp_compute_ssl_certificate_facts`` module was renamed to ``gcp_compute_ssl_certificate_info``.
+- The ``gcp_compute_ssl_policy_facts`` module was renamed to ``gcp_compute_ssl_policy_info``.
+- The ``gcp_compute_subnetwork_facts`` module was renamed to ``gcp_compute_subnetwork_info``.
+- The ``gcp_compute_target_http_proxy_facts`` module was renamed to ``gcp_compute_target_http_proxy_info``.
+- The ``gcp_compute_target_https_proxy_facts`` module was renamed to ``gcp_compute_target_https_proxy_info``.
+- The ``gcp_compute_target_pool_facts`` module was renamed to ``gcp_compute_target_pool_info``.
+- The ``gcp_compute_target_ssl_proxy_facts`` module was renamed to ``gcp_compute_target_ssl_proxy_info``.
+- The ``gcp_compute_target_tcp_proxy_facts`` module was renamed to ``gcp_compute_target_tcp_proxy_info``.
+- The ``gcp_compute_target_vpn_gateway_facts`` module was renamed to ``gcp_compute_target_vpn_gateway_info``.
+- The ``gcp_compute_url_map_facts`` module was renamed to ``gcp_compute_url_map_info``.
+- The ``gcp_compute_vpn_tunnel_facts`` module was renamed to ``gcp_compute_vpn_tunnel_info``.
+- The ``gcp_container_cluster_facts`` module was renamed to ``gcp_container_cluster_info``.
+- The ``gcp_container_node_pool_facts`` module was renamed to ``gcp_container_node_pool_info``.
+- The ``gcp_dns_managed_zone_facts`` module was renamed to ``gcp_dns_managed_zone_info``.
+- The ``gcp_dns_resource_record_set_facts`` module was renamed to ``gcp_dns_resource_record_set_info``.
+- The ``gcp_iam_role_facts`` module was renamed to ``gcp_iam_role_info``.
+- The ``gcp_iam_service_account_facts`` module was renamed to ``gcp_iam_service_account_info``.
+- The ``gcp_pubsub_subscription_facts`` module was renamed to ``gcp_pubsub_subscription_info``.
+- The ``gcp_pubsub_topic_facts`` module was renamed to ``gcp_pubsub_topic_info``.
+- The ``gcp_redis_instance_facts`` module was renamed to ``gcp_redis_instance_info``.
+- The ``gcp_resourcemanager_project_facts`` module was renamed to ``gcp_resourcemanager_project_info``.
+- The ``gcp_sourcerepo_repository_facts`` module was renamed to ``gcp_sourcerepo_repository_info``.
+- The ``gcp_spanner_database_facts`` module was renamed to ``gcp_spanner_database_info``.
+- The ``gcp_spanner_instance_facts`` module was renamed to ``gcp_spanner_instance_info``.
+- The ``gcp_sql_database_facts`` module was renamed to ``gcp_sql_database_info``.
+- The ``gcp_sql_instance_facts`` module was renamed to ``gcp_sql_instance_info``.
+- The ``gcp_sql_user_facts`` module was renamed to ``gcp_sql_user_info``.
+- The ``gcp_tpu_node_facts`` module was renamed to ``gcp_tpu_node_info``.
diff --git a/docs/docsite/rst/porting_guides/porting_guide_2.9.rst b/docs/docsite/rst/porting_guides/porting_guide_2.9.rst
index 33952dd414..ee1e45cf0a 100644
--- a/docs/docsite/rst/porting_guides/porting_guide_2.9.rst
+++ b/docs/docsite/rst/porting_guides/porting_guide_2.9.rst
@@ -146,6 +146,58 @@ Noteworthy module changes
 * The ``elb_classic_lb_facts`` module was renamed to :ref:`elb_classic_lb_info <elb_classic_lb_info_module>`.
 * The ``elb_target_facts`` module was renamed to :ref:`elb_target_info <elb_target_info_module>`.
 * The ``elb_target_group_facts`` module was renamed to :ref:`elb_target_group_info <elb_target_group_info_module>`.
+* The ``gcp_bigquery_dataset_facts`` module was renamed to :ref:`gcp_bigquery_dataset_info <gcp_bigquery_dataset_info_module>`.
+* The ``gcp_bigquery_table_facts`` module was renamed to :ref:`gcp_bigquery_table_info <gcp_bigquery_table_info_module>`.
+* The ``gcp_cloudbuild_trigger_facts`` module was renamed to :ref:`gcp_cloudbuild_trigger_info <gcp_cloudbuild_trigger_info_module>`.
+* The ``gcp_compute_address_facts`` module was renamed to :ref:`gcp_compute_address_info <gcp_compute_address_info_module>`.
+* The ``gcp_compute_backend_bucket_facts`` module was renamed to :ref:`gcp_compute_backend_bucket_info <gcp_compute_backend_bucket_info_module>`.
+* The ``gcp_compute_backend_service_facts`` module was renamed to :ref:`gcp_compute_backend_service_info <gcp_compute_backend_service_info_module>`.
+* The ``gcp_compute_disk_facts`` module was renamed to :ref:`gcp_compute_disk_info <gcp_compute_disk_info_module>`.
+* The ``gcp_compute_firewall_facts`` module was renamed to :ref:`gcp_compute_firewall_info <gcp_compute_firewall_info_module>`.
+* The ``gcp_compute_forwarding_rule_facts`` module was renamed to :ref:`gcp_compute_forwarding_rule_info <gcp_compute_forwarding_rule_info_module>`.
+* The ``gcp_compute_global_address_facts`` module was renamed to :ref:`gcp_compute_global_address_info <gcp_compute_global_address_info_module>`.
+* The ``gcp_compute_global_forwarding_rule_facts`` module was renamed to :ref:`gcp_compute_global_forwarding_rule_info <gcp_compute_global_forwarding_rule_info_module>`.
+* The ``gcp_compute_health_check_facts`` module was renamed to :ref:`gcp_compute_health_check_info <gcp_compute_health_check_info_module>`.
+* The ``gcp_compute_http_health_check_facts`` module was renamed to :ref:`gcp_compute_http_health_check_info <gcp_compute_http_health_check_info_module>`.
+* The ``gcp_compute_https_health_check_facts`` module was renamed to :ref:`gcp_compute_https_health_check_info <gcp_compute_https_health_check_info_module>`.
+* The ``gcp_compute_image_facts`` module was renamed to :ref:`gcp_compute_image_info <gcp_compute_image_info_module>`.
+* The ``gcp_compute_instance_group_facts`` module was renamed to :ref:`gcp_compute_instance_group_info <gcp_compute_instance_group_info_module>`.
+* The ``gcp_compute_instance_group_manager_facts`` module was renamed to :ref:`gcp_compute_instance_group_manager_info <gcp_compute_instance_group_manager_info_module>`.
+* The ``gcp_compute_instance_facts`` module was renamed to :ref:`gcp_compute_instance_info <gcp_compute_instance_info_module>`.
+* The ``gcp_compute_instance_template_facts`` module was renamed to :ref:`gcp_compute_instance_template_info <gcp_compute_instance_template_info_module>`.
+* The ``gcp_compute_interconnect_attachment_facts`` module was renamed to :ref:`gcp_compute_interconnect_attachment_info <gcp_compute_interconnect_attachment_info_module>`.
+* The ``gcp_compute_network_facts`` module was renamed to :ref:`gcp_compute_network_info <gcp_compute_network_info_module>`.
+* The ``gcp_compute_region_disk_facts`` module was renamed to :ref:`gcp_compute_region_disk_info <gcp_compute_region_disk_info_module>`.
+* The ``gcp_compute_route_facts`` module was renamed to :ref:`gcp_compute_route_info <gcp_compute_route_info_module>`.
+* The ``gcp_compute_router_facts`` module was renamed to :ref:`gcp_compute_router_info <gcp_compute_router_info_module>`.
+* The ``gcp_compute_ssl_certificate_facts`` module was renamed to :ref:`gcp_compute_ssl_certificate_info <gcp_compute_ssl_certificate_info_module>`.
+* The ``gcp_compute_ssl_policy_facts`` module was renamed to :ref:`gcp_compute_ssl_policy_info <gcp_compute_ssl_policy_info_module>`.
+* The ``gcp_compute_subnetwork_facts`` module was renamed to :ref:`gcp_compute_subnetwork_info <gcp_compute_subnetwork_info_module>`.
+* The ``gcp_compute_target_http_proxy_facts`` module was renamed to :ref:`gcp_compute_target_http_proxy_info <gcp_compute_target_http_proxy_info_module>`.
+* The ``gcp_compute_target_https_proxy_facts`` module was renamed to :ref:`gcp_compute_target_https_proxy_info <gcp_compute_target_https_proxy_info_module>`.
+* The ``gcp_compute_target_pool_facts`` module was renamed to :ref:`gcp_compute_target_pool_info <gcp_compute_target_pool_info_module>`.
+* The ``gcp_compute_target_ssl_proxy_facts`` module was renamed to :ref:`gcp_compute_target_ssl_proxy_info <gcp_compute_target_ssl_proxy_info_module>`.
+* The ``gcp_compute_target_tcp_proxy_facts`` module was renamed to :ref:`gcp_compute_target_tcp_proxy_info <gcp_compute_target_tcp_proxy_info_module>`.
+* The ``gcp_compute_target_vpn_gateway_facts`` module was renamed to :ref:`gcp_compute_target_vpn_gateway_info <gcp_compute_target_vpn_gateway_info_module>`.
+* The ``gcp_compute_url_map_facts`` module was renamed to :ref:`gcp_compute_url_map_info <gcp_compute_url_map_info_module>`.
+* The ``gcp_compute_vpn_tunnel_facts`` module was renamed to :ref:`gcp_compute_vpn_tunnel_info <gcp_compute_vpn_tunnel_info_module>`.
+* The ``gcp_container_cluster_facts`` module was renamed to :ref:`gcp_container_cluster_info <gcp_container_cluster_info_module>`.
+* The ``gcp_container_node_pool_facts`` module was renamed to :ref:`gcp_container_node_pool_info <gcp_container_node_pool_info_module>`.
+* The ``gcp_dns_managed_zone_facts`` module was renamed to :ref:`gcp_dns_managed_zone_info <gcp_dns_managed_zone_info_module>`.
+* The ``gcp_dns_resource_record_set_facts`` module was renamed to :ref:`gcp_dns_resource_record_set_info <gcp_dns_resource_record_set_info_module>`.
+* The ``gcp_iam_role_facts`` module was renamed to :ref:`gcp_iam_role_info <gcp_iam_role_info_module>`.
+* The ``gcp_iam_service_account_facts`` module was renamed to :ref:`gcp_iam_service_account_info <gcp_iam_service_account_info_module>`.
+* The ``gcp_pubsub_subscription_facts`` module was renamed to :ref:`gcp_pubsub_subscription_info <gcp_pubsub_subscription_info_module>`.
+* The ``gcp_pubsub_topic_facts`` module was renamed to :ref:`gcp_pubsub_topic_info <gcp_pubsub_topic_info_module>`.
+* The ``gcp_redis_instance_facts`` module was renamed to :ref:`gcp_redis_instance_info <gcp_redis_instance_info_module>`.
+* The ``gcp_resourcemanager_project_facts`` module was renamed to :ref:`gcp_resourcemanager_project_info <gcp_resourcemanager_project_info_module>`.
+* The ``gcp_sourcerepo_repository_facts`` module was renamed to :ref:`gcp_sourcerepo_repository_info <gcp_sourcerepo_repository_info_module>`.
+* The ``gcp_spanner_database_facts`` module was renamed to :ref:`gcp_spanner_database_info <gcp_spanner_database_info_module>`.
+* The ``gcp_spanner_instance_facts`` module was renamed to :ref:`gcp_spanner_instance_info <gcp_spanner_instance_info_module>`.
+* The ``gcp_sql_database_facts`` module was renamed to :ref:`gcp_sql_database_info <gcp_sql_database_info_module>`.
+* The ``gcp_sql_instance_facts`` module was renamed to :ref:`gcp_sql_instance_info <gcp_sql_instance_info_module>`.
+* The ``gcp_sql_user_facts`` module was renamed to :ref:`gcp_sql_user_info <gcp_sql_user_info_module>`.
+* The ``gcp_tpu_node_facts`` module was renamed to :ref:`gcp_tpu_node_info <gcp_tpu_node_info_module>`.
 * The ``iam_mfa_device_facts`` module was renamed to :ref:`iam_mfa_device_info <iam_mfa_device_info_module>`.
 * The ``iam_role_facts`` module was renamed to :ref:`iam_role_info <iam_role_info_module>`.
 * The ``iam_server_certificate_facts`` module was renamed to :ref:`iam_server_certificate_info <iam_server_certificate_info_module>`.
diff --git a/lib/ansible/modules/cloud/google/_gcp_bigquery_dataset_facts.py b/lib/ansible/modules/cloud/google/_gcp_bigquery_dataset_facts.py
new file mode 120000
index 0000000000..048b511508
--- /dev/null
+++ b/lib/ansible/modules/cloud/google/_gcp_bigquery_dataset_facts.py
@@ -0,0 +1 @@
+gcp_bigquery_dataset_info.py
\ No newline at end of file
diff --git a/lib/ansible/modules/cloud/google/_gcp_bigquery_table_facts.py b/lib/ansible/modules/cloud/google/_gcp_bigquery_table_facts.py
new file mode 120000
index 0000000000..289c79bcfe
--- /dev/null
+++ b/lib/ansible/modules/cloud/google/_gcp_bigquery_table_facts.py
@@ -0,0 +1 @@
+gcp_bigquery_table_info.py
\ No newline at end of file
diff --git a/lib/ansible/modules/cloud/google/_gcp_cloudbuild_trigger_facts.py b/lib/ansible/modules/cloud/google/_gcp_cloudbuild_trigger_facts.py
new file mode 120000
index 0000000000..66c2c93f2c
--- /dev/null
+++ b/lib/ansible/modules/cloud/google/_gcp_cloudbuild_trigger_facts.py
@@ -0,0 +1 @@
+gcp_cloudbuild_trigger_info.py
\ No newline at end of file
diff --git a/lib/ansible/modules/cloud/google/_gcp_compute_address_facts.py b/lib/ansible/modules/cloud/google/_gcp_compute_address_facts.py
new file mode 120000
index 0000000000..d12b7e4d49
--- /dev/null
+++ b/lib/ansible/modules/cloud/google/_gcp_compute_address_facts.py
@@ -0,0 +1 @@
+gcp_compute_address_info.py
\ No newline at end of file
diff --git a/lib/ansible/modules/cloud/google/_gcp_compute_backend_bucket_facts.py b/lib/ansible/modules/cloud/google/_gcp_compute_backend_bucket_facts.py
new file mode 120000
index 0000000000..d80cf8b0ae
--- /dev/null
+++ b/lib/ansible/modules/cloud/google/_gcp_compute_backend_bucket_facts.py
@@ -0,0 +1 @@
+gcp_compute_backend_bucket_info.py
\ No newline at end of file
diff --git a/lib/ansible/modules/cloud/google/_gcp_compute_backend_service_facts.py b/lib/ansible/modules/cloud/google/_gcp_compute_backend_service_facts.py
new file mode 120000
index 0000000000..def0ed0e6f
--- /dev/null
+++ b/lib/ansible/modules/cloud/google/_gcp_compute_backend_service_facts.py
@@ -0,0 +1 @@
+gcp_compute_backend_service_info.py
\ No newline at end of file
diff --git a/lib/ansible/modules/cloud/google/_gcp_compute_disk_facts.py b/lib/ansible/modules/cloud/google/_gcp_compute_disk_facts.py
new file mode 120000
index 0000000000..52aabea81a
--- /dev/null
+++ b/lib/ansible/modules/cloud/google/_gcp_compute_disk_facts.py
@@ -0,0 +1 @@
+gcp_compute_disk_info.py
\ No newline at end of file
diff --git a/lib/ansible/modules/cloud/google/_gcp_compute_firewall_facts.py b/lib/ansible/modules/cloud/google/_gcp_compute_firewall_facts.py
new file mode 120000
index 0000000000..7a8ccaa415
--- /dev/null
+++ b/lib/ansible/modules/cloud/google/_gcp_compute_firewall_facts.py
@@ -0,0 +1 @@
+gcp_compute_firewall_info.py
\ No newline at end of file
diff --git a/lib/ansible/modules/cloud/google/_gcp_compute_forwarding_rule_facts.py b/lib/ansible/modules/cloud/google/_gcp_compute_forwarding_rule_facts.py
new file mode 120000
index 0000000000..4f09197451
--- /dev/null
+++ b/lib/ansible/modules/cloud/google/_gcp_compute_forwarding_rule_facts.py
@@ -0,0 +1 @@
+gcp_compute_forwarding_rule_info.py
\ No newline at end of file
diff --git a/lib/ansible/modules/cloud/google/_gcp_compute_global_address_facts.py b/lib/ansible/modules/cloud/google/_gcp_compute_global_address_facts.py
new file mode 120000
index 0000000000..497372674a
--- /dev/null
+++ b/lib/ansible/modules/cloud/google/_gcp_compute_global_address_facts.py
@@ -0,0 +1 @@
+gcp_compute_global_address_info.py
\ No newline at end of file
diff --git a/lib/ansible/modules/cloud/google/_gcp_compute_global_forwarding_rule_facts.py b/lib/ansible/modules/cloud/google/_gcp_compute_global_forwarding_rule_facts.py
new file mode 120000
index 0000000000..18d0b3b5db
--- /dev/null
+++ b/lib/ansible/modules/cloud/google/_gcp_compute_global_forwarding_rule_facts.py
@@ -0,0 +1 @@
+gcp_compute_global_forwarding_rule_info.py
\ No newline at end of file
diff --git a/lib/ansible/modules/cloud/google/_gcp_compute_health_check_facts.py b/lib/ansible/modules/cloud/google/_gcp_compute_health_check_facts.py
new file mode 120000
index 0000000000..a2646a6c8d
--- /dev/null
+++ b/lib/ansible/modules/cloud/google/_gcp_compute_health_check_facts.py
@@ -0,0 +1 @@
+gcp_compute_health_check_info.py
\ No newline at end of file
diff --git a/lib/ansible/modules/cloud/google/_gcp_compute_http_health_check_facts.py b/lib/ansible/modules/cloud/google/_gcp_compute_http_health_check_facts.py
new file mode 120000
index 0000000000..dbf679c115
--- /dev/null
+++ b/lib/ansible/modules/cloud/google/_gcp_compute_http_health_check_facts.py
@@ -0,0 +1 @@
+gcp_compute_http_health_check_info.py
\ No newline at end of file
diff --git a/lib/ansible/modules/cloud/google/_gcp_compute_https_health_check_facts.py b/lib/ansible/modules/cloud/google/_gcp_compute_https_health_check_facts.py
new file mode 120000
index 0000000000..887a5ffe68
--- /dev/null
+++ b/lib/ansible/modules/cloud/google/_gcp_compute_https_health_check_facts.py
@@ -0,0 +1 @@
+gcp_compute_https_health_check_info.py
\ No newline at end of file
diff --git a/lib/ansible/modules/cloud/google/_gcp_compute_image_facts.py b/lib/ansible/modules/cloud/google/_gcp_compute_image_facts.py
new file mode 120000
index 0000000000..f4ca4647ec
--- /dev/null
+++ b/lib/ansible/modules/cloud/google/_gcp_compute_image_facts.py
@@ -0,0 +1 @@
+gcp_compute_image_info.py
\ No newline at end of file
diff --git a/lib/ansible/modules/cloud/google/_gcp_compute_instance_facts.py b/lib/ansible/modules/cloud/google/_gcp_compute_instance_facts.py
new file mode 120000
index 0000000000..b886b91c69
--- /dev/null
+++ b/lib/ansible/modules/cloud/google/_gcp_compute_instance_facts.py
@@ -0,0 +1 @@
+gcp_compute_instance_info.py
\ No newline at end of file
diff --git a/lib/ansible/modules/cloud/google/_gcp_compute_instance_group_facts.py b/lib/ansible/modules/cloud/google/_gcp_compute_instance_group_facts.py
new file mode 120000
index 0000000000..8703aff9e8
--- /dev/null
+++ b/lib/ansible/modules/cloud/google/_gcp_compute_instance_group_facts.py
@@ -0,0 +1 @@
+gcp_compute_instance_group_info.py
\ No newline at end of file
diff --git a/lib/ansible/modules/cloud/google/_gcp_compute_instance_group_manager_facts.py b/lib/ansible/modules/cloud/google/_gcp_compute_instance_group_manager_facts.py
new file mode 120000
index 0000000000..2b9ec76192
--- /dev/null
+++ b/lib/ansible/modules/cloud/google/_gcp_compute_instance_group_manager_facts.py
@@ -0,0 +1 @@
+gcp_compute_instance_group_manager_info.py
\ No newline at end of file
diff --git a/lib/ansible/modules/cloud/google/_gcp_compute_instance_template_facts.py b/lib/ansible/modules/cloud/google/_gcp_compute_instance_template_facts.py
new file mode 120000
index 0000000000..a9826ba8f1
--- /dev/null
+++ b/lib/ansible/modules/cloud/google/_gcp_compute_instance_template_facts.py
@@ -0,0 +1 @@
+gcp_compute_instance_template_info.py
\ No newline at end of file
diff --git a/lib/ansible/modules/cloud/google/_gcp_compute_interconnect_attachment_facts.py b/lib/ansible/modules/cloud/google/_gcp_compute_interconnect_attachment_facts.py
new file mode 120000
index 0000000000..479308d6e7
--- /dev/null
+++ b/lib/ansible/modules/cloud/google/_gcp_compute_interconnect_attachment_facts.py
@@ -0,0 +1 @@
+gcp_compute_interconnect_attachment_info.py
\ No newline at end of file
diff --git a/lib/ansible/modules/cloud/google/_gcp_compute_network_facts.py b/lib/ansible/modules/cloud/google/_gcp_compute_network_facts.py
new file mode 120000
index 0000000000..c2e964a21d
--- /dev/null
+++ b/lib/ansible/modules/cloud/google/_gcp_compute_network_facts.py
@@ -0,0 +1 @@
+gcp_compute_network_info.py
\ No newline at end of file
diff --git a/lib/ansible/modules/cloud/google/_gcp_compute_region_disk_facts.py b/lib/ansible/modules/cloud/google/_gcp_compute_region_disk_facts.py
new file mode 120000
index 0000000000..1dbc112907
--- /dev/null
+++ b/lib/ansible/modules/cloud/google/_gcp_compute_region_disk_facts.py
@@ -0,0 +1 @@
+gcp_compute_region_disk_info.py
\ No newline at end of file
diff --git a/lib/ansible/modules/cloud/google/_gcp_compute_route_facts.py b/lib/ansible/modules/cloud/google/_gcp_compute_route_facts.py
new file mode 120000
index 0000000000..33dccb6671
--- /dev/null
+++ b/lib/ansible/modules/cloud/google/_gcp_compute_route_facts.py
@@ -0,0 +1 @@
+gcp_compute_route_info.py
\ No newline at end of file
diff --git a/lib/ansible/modules/cloud/google/_gcp_compute_router_facts.py b/lib/ansible/modules/cloud/google/_gcp_compute_router_facts.py
new file mode 120000
index 0000000000..00498a1b87
--- /dev/null
+++ b/lib/ansible/modules/cloud/google/_gcp_compute_router_facts.py
@@ -0,0 +1 @@
+gcp_compute_router_info.py
\ No newline at end of file
diff --git a/lib/ansible/modules/cloud/google/_gcp_compute_ssl_certificate_facts.py b/lib/ansible/modules/cloud/google/_gcp_compute_ssl_certificate_facts.py
new file mode 120000
index 0000000000..188f2878a9
--- /dev/null
+++ b/lib/ansible/modules/cloud/google/_gcp_compute_ssl_certificate_facts.py
@@ -0,0 +1 @@
+gcp_compute_ssl_certificate_info.py
\ No newline at end of file
diff --git a/lib/ansible/modules/cloud/google/_gcp_compute_ssl_policy_facts.py b/lib/ansible/modules/cloud/google/_gcp_compute_ssl_policy_facts.py
new file mode 120000
index 0000000000..2e64eb7d47
--- /dev/null
+++ b/lib/ansible/modules/cloud/google/_gcp_compute_ssl_policy_facts.py
@@ -0,0 +1 @@
+gcp_compute_ssl_policy_info.py
\ No newline at end of file
diff --git a/lib/ansible/modules/cloud/google/_gcp_compute_subnetwork_facts.py b/lib/ansible/modules/cloud/google/_gcp_compute_subnetwork_facts.py
new file mode 120000
index 0000000000..dc4a73ad54
--- /dev/null
+++ b/lib/ansible/modules/cloud/google/_gcp_compute_subnetwork_facts.py
@@ -0,0 +1 @@
+gcp_compute_subnetwork_info.py
\ No newline at end of file
diff --git a/lib/ansible/modules/cloud/google/_gcp_compute_target_http_proxy_facts.py b/lib/ansible/modules/cloud/google/_gcp_compute_target_http_proxy_facts.py
new file mode 120000
index 0000000000..628457e100
--- /dev/null
+++ b/lib/ansible/modules/cloud/google/_gcp_compute_target_http_proxy_facts.py
@@ -0,0 +1 @@
+gcp_compute_target_http_proxy_info.py
\ No newline at end of file
diff --git a/lib/ansible/modules/cloud/google/_gcp_compute_target_https_proxy_facts.py b/lib/ansible/modules/cloud/google/_gcp_compute_target_https_proxy_facts.py
new file mode 120000
index 0000000000..9b6beebab5
--- /dev/null
+++ b/lib/ansible/modules/cloud/google/_gcp_compute_target_https_proxy_facts.py
@@ -0,0 +1 @@
+gcp_compute_target_https_proxy_info.py
\ No newline at end of file
diff --git a/lib/ansible/modules/cloud/google/_gcp_compute_target_pool_facts.py b/lib/ansible/modules/cloud/google/_gcp_compute_target_pool_facts.py
new file mode 120000
index 0000000000..e3583a7239
--- /dev/null
+++ b/lib/ansible/modules/cloud/google/_gcp_compute_target_pool_facts.py
@@ -0,0 +1 @@
+gcp_compute_target_pool_info.py
\ No newline at end of file
diff --git a/lib/ansible/modules/cloud/google/_gcp_compute_target_ssl_proxy_facts.py b/lib/ansible/modules/cloud/google/_gcp_compute_target_ssl_proxy_facts.py
new file mode 120000
index 0000000000..6f82c12ab5
--- /dev/null
+++ b/lib/ansible/modules/cloud/google/_gcp_compute_target_ssl_proxy_facts.py
@@ -0,0 +1 @@
+gcp_compute_target_ssl_proxy_info.py
\ No newline at end of file
diff --git a/lib/ansible/modules/cloud/google/_gcp_compute_target_tcp_proxy_facts.py b/lib/ansible/modules/cloud/google/_gcp_compute_target_tcp_proxy_facts.py
new file mode 120000
index 0000000000..551871b74e
--- /dev/null
+++ b/lib/ansible/modules/cloud/google/_gcp_compute_target_tcp_proxy_facts.py
@@ -0,0 +1 @@
+gcp_compute_target_tcp_proxy_info.py
\ No newline at end of file
diff --git a/lib/ansible/modules/cloud/google/_gcp_compute_target_vpn_gateway_facts.py b/lib/ansible/modules/cloud/google/_gcp_compute_target_vpn_gateway_facts.py
new file mode 120000
index 0000000000..72c072765a
--- /dev/null
+++ b/lib/ansible/modules/cloud/google/_gcp_compute_target_vpn_gateway_facts.py
@@ -0,0 +1 @@
+gcp_compute_target_vpn_gateway_info.py
\ No newline at end of file
diff --git a/lib/ansible/modules/cloud/google/_gcp_compute_url_map_facts.py b/lib/ansible/modules/cloud/google/_gcp_compute_url_map_facts.py
new file mode 120000
index 0000000000..e8046ebc54
--- /dev/null
+++ b/lib/ansible/modules/cloud/google/_gcp_compute_url_map_facts.py
@@ -0,0 +1 @@
+gcp_compute_url_map_info.py
\ No newline at end of file
diff --git a/lib/ansible/modules/cloud/google/_gcp_compute_vpn_tunnel_facts.py b/lib/ansible/modules/cloud/google/_gcp_compute_vpn_tunnel_facts.py
new file mode 120000
index 0000000000..26de5596b8
--- /dev/null
+++ b/lib/ansible/modules/cloud/google/_gcp_compute_vpn_tunnel_facts.py
@@ -0,0 +1 @@
+gcp_compute_vpn_tunnel_info.py
\ No newline at end of file
diff --git a/lib/ansible/modules/cloud/google/_gcp_container_cluster_facts.py b/lib/ansible/modules/cloud/google/_gcp_container_cluster_facts.py
new file mode 120000
index 0000000000..50b4ee8253
--- /dev/null
+++ b/lib/ansible/modules/cloud/google/_gcp_container_cluster_facts.py
@@ -0,0 +1 @@
+gcp_container_cluster_info.py
\ No newline at end of file
diff --git a/lib/ansible/modules/cloud/google/_gcp_container_node_pool_facts.py b/lib/ansible/modules/cloud/google/_gcp_container_node_pool_facts.py
new file mode 120000
index 0000000000..2b73f3c477
--- /dev/null
+++ b/lib/ansible/modules/cloud/google/_gcp_container_node_pool_facts.py
@@ -0,0 +1 @@
+gcp_container_node_pool_info.py
\ No newline at end of file
diff --git a/lib/ansible/modules/cloud/google/_gcp_dns_managed_zone_facts.py b/lib/ansible/modules/cloud/google/_gcp_dns_managed_zone_facts.py
new file mode 120000
index 0000000000..08fc673ed2
--- /dev/null
+++ b/lib/ansible/modules/cloud/google/_gcp_dns_managed_zone_facts.py
@@ -0,0 +1 @@
+gcp_dns_managed_zone_info.py
\ No newline at end of file
diff --git a/lib/ansible/modules/cloud/google/_gcp_dns_resource_record_set_facts.py b/lib/ansible/modules/cloud/google/_gcp_dns_resource_record_set_facts.py
new file mode 120000
index 0000000000..879f4b6344
--- /dev/null
+++ b/lib/ansible/modules/cloud/google/_gcp_dns_resource_record_set_facts.py
@@ -0,0 +1 @@
+gcp_dns_resource_record_set_info.py
\ No newline at end of file
diff --git a/lib/ansible/modules/cloud/google/_gcp_iam_role_facts.py b/lib/ansible/modules/cloud/google/_gcp_iam_role_facts.py
new file mode 120000
index 0000000000..f46a8e3ec7
--- /dev/null
+++ b/lib/ansible/modules/cloud/google/_gcp_iam_role_facts.py
@@ -0,0 +1 @@
+gcp_iam_role_info.py
\ No newline at end of file
diff --git a/lib/ansible/modules/cloud/google/_gcp_iam_service_account_facts.py b/lib/ansible/modules/cloud/google/_gcp_iam_service_account_facts.py
new file mode 120000
index 0000000000..3f03024049
--- /dev/null
+++ b/lib/ansible/modules/cloud/google/_gcp_iam_service_account_facts.py
@@ -0,0 +1 @@
+gcp_iam_service_account_info.py
\ No newline at end of file
diff --git a/lib/ansible/modules/cloud/google/_gcp_pubsub_subscription_facts.py b/lib/ansible/modules/cloud/google/_gcp_pubsub_subscription_facts.py
new file mode 120000
index 0000000000..3196ae083b
--- /dev/null
+++ b/lib/ansible/modules/cloud/google/_gcp_pubsub_subscription_facts.py
@@ -0,0 +1 @@
+gcp_pubsub_subscription_info.py
\ No newline at end of file
diff --git a/lib/ansible/modules/cloud/google/_gcp_pubsub_topic_facts.py b/lib/ansible/modules/cloud/google/_gcp_pubsub_topic_facts.py
new file mode 120000
index 0000000000..388ebfc1d1
--- /dev/null
+++ b/lib/ansible/modules/cloud/google/_gcp_pubsub_topic_facts.py
@@ -0,0 +1 @@
+gcp_pubsub_topic_info.py
\ No newline at end of file
diff --git a/lib/ansible/modules/cloud/google/_gcp_redis_instance_facts.py b/lib/ansible/modules/cloud/google/_gcp_redis_instance_facts.py
new file mode 120000
index 0000000000..e6d6fa6db2
--- /dev/null
+++ b/lib/ansible/modules/cloud/google/_gcp_redis_instance_facts.py
@@ -0,0 +1 @@
+gcp_redis_instance_info.py
\ No newline at end of file
diff --git a/lib/ansible/modules/cloud/google/_gcp_resourcemanager_project_facts.py b/lib/ansible/modules/cloud/google/_gcp_resourcemanager_project_facts.py
new file mode 120000
index 0000000000..5766332a37
--- /dev/null
+++ b/lib/ansible/modules/cloud/google/_gcp_resourcemanager_project_facts.py
@@ -0,0 +1 @@
+gcp_resourcemanager_project_info.py
\ No newline at end of file
diff --git a/lib/ansible/modules/cloud/google/_gcp_sourcerepo_repository_facts.py b/lib/ansible/modules/cloud/google/_gcp_sourcerepo_repository_facts.py
new file mode 120000
index 0000000000..b6dc6a8d75
--- /dev/null
+++ b/lib/ansible/modules/cloud/google/_gcp_sourcerepo_repository_facts.py
@@ -0,0 +1 @@
+gcp_sourcerepo_repository_info.py
\ No newline at end of file
diff --git a/lib/ansible/modules/cloud/google/_gcp_spanner_database_facts.py b/lib/ansible/modules/cloud/google/_gcp_spanner_database_facts.py
new file mode 120000
index 0000000000..abadc34b30
--- /dev/null
+++ b/lib/ansible/modules/cloud/google/_gcp_spanner_database_facts.py
@@ -0,0 +1 @@
+gcp_spanner_database_info.py
\ No newline at end of file
diff --git a/lib/ansible/modules/cloud/google/_gcp_spanner_instance_facts.py b/lib/ansible/modules/cloud/google/_gcp_spanner_instance_facts.py
new file mode 120000
index 0000000000..1c1e47220a
--- /dev/null
+++ b/lib/ansible/modules/cloud/google/_gcp_spanner_instance_facts.py
@@ -0,0 +1 @@
+gcp_spanner_instance_info.py
\ No newline at end of file
diff --git a/lib/ansible/modules/cloud/google/_gcp_sql_database_facts.py b/lib/ansible/modules/cloud/google/_gcp_sql_database_facts.py
new file mode 120000
index 0000000000..de080a71eb
--- /dev/null
+++ b/lib/ansible/modules/cloud/google/_gcp_sql_database_facts.py
@@ -0,0 +1 @@
+gcp_sql_database_info.py
\ No newline at end of file
diff --git a/lib/ansible/modules/cloud/google/_gcp_sql_instance_facts.py b/lib/ansible/modules/cloud/google/_gcp_sql_instance_facts.py
new file mode 120000
index 0000000000..c6c2c5f386
--- /dev/null
+++ b/lib/ansible/modules/cloud/google/_gcp_sql_instance_facts.py
@@ -0,0 +1 @@
+gcp_sql_instance_info.py
\ No newline at end of file
diff --git a/lib/ansible/modules/cloud/google/_gcp_sql_user_facts.py b/lib/ansible/modules/cloud/google/_gcp_sql_user_facts.py
new file mode 120000
index 0000000000..44488004a4
--- /dev/null
+++ b/lib/ansible/modules/cloud/google/_gcp_sql_user_facts.py
@@ -0,0 +1 @@
+gcp_sql_user_info.py
\ No newline at end of file
diff --git a/lib/ansible/modules/cloud/google/_gcp_tpu_node_facts.py b/lib/ansible/modules/cloud/google/_gcp_tpu_node_facts.py
new file mode 120000
index 0000000000..5e0ba332eb
--- /dev/null
+++ b/lib/ansible/modules/cloud/google/_gcp_tpu_node_facts.py
@@ -0,0 +1 @@
+gcp_tpu_node_info.py
\ No newline at end of file
diff --git a/lib/ansible/modules/cloud/google/gcp_appengine_firewall_rule_facts.py b/lib/ansible/modules/cloud/google/gcp_appengine_firewall_rule_info.py
index 4fe22b1e96..b24673b3df 100644
--- a/lib/ansible/modules/cloud/google/gcp_appengine_firewall_rule_facts.py
+++ b/lib/ansible/modules/cloud/google/gcp_appengine_firewall_rule_info.py
@@ -29,10 +29,10 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ["preview"], 'supported
 
 DOCUMENTATION = '''
 ---
-module: gcp_appengine_firewall_rule_facts
+module: gcp_appengine_firewall_rule_info
 description:
-- Gather facts for GCP FirewallRule
-short_description: Gather facts for GCP FirewallRule
+- Gather info for GCP FirewallRule
+short_description: Gather info for GCP FirewallRule
 version_added: 2.9
 author: Google Inc. (@googlecloudplatform)
 requirements:
@@ -44,8 +44,8 @@ extends_documentation_fragment: gcp
 '''
 
 EXAMPLES = '''
-- name: " a firewall rule facts"
-  gcp_appengine_firewall_rule_facts:
+- name: get info on a firewall rule
+  gcp_appengine_firewall_rule_info:
     project: test_project
     auth_kind: serviceaccount
     service_account_file: "/tmp/auth.pem"
diff --git a/lib/ansible/modules/cloud/google/gcp_bigquery_dataset_facts.py b/lib/ansible/modules/cloud/google/gcp_bigquery_dataset_info.py
index 5b4df2379c..9af87b929f 100644
--- a/lib/ansible/modules/cloud/google/gcp_bigquery_dataset_facts.py
+++ b/lib/ansible/modules/cloud/google/gcp_bigquery_dataset_info.py
@@ -29,10 +29,12 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ["preview"], 'supported
 
 DOCUMENTATION = '''
 ---
-module: gcp_bigquery_dataset_facts
+module: gcp_bigquery_dataset_info
 description:
-- Gather facts for GCP Dataset
-short_description: Gather facts for GCP Dataset
+- Gather info for GCP Dataset
+- This module was called C(gcp_bigquery_dataset_facts) before Ansible 2.9. The usage
+  has not changed.
+short_description: Gather info for GCP Dataset
 version_added: 2.8
 author: Google Inc. (@googlecloudplatform)
 requirements:
@@ -44,8 +46,8 @@ extends_documentation_fragment: gcp
 '''
 
 EXAMPLES = '''
-- name: " a dataset facts"
-  gcp_bigquery_dataset_facts:
+- name: get info on a dataset
+  gcp_bigquery_dataset_info:
     project: test_project
     auth_kind: serviceaccount
     service_account_file: "/tmp/auth.pem"
@@ -200,6 +202,9 @@ import json
 def main():
     module = GcpModule(argument_spec=dict())
 
+    if module._name == 'gcp_bigquery_dataset_facts':
+        module.deprecate("The 'gcp_bigquery_dataset_facts' module has been renamed to 'gcp_bigquery_dataset_info'", version='2.13')
+
     if not module.params['scopes']:
         module.params['scopes'] = ['https://www.googleapis.com/auth/bigquery']
 
diff --git a/lib/ansible/modules/cloud/google/gcp_bigquery_table_facts.py b/lib/ansible/modules/cloud/google/gcp_bigquery_table_info.py
index 8d035b2f3b..732c592cb5 100644
--- a/lib/ansible/modules/cloud/google/gcp_bigquery_table_facts.py
+++ b/lib/ansible/modules/cloud/google/gcp_bigquery_table_info.py
@@ -29,10 +29,12 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ["preview"], 'supported
 
 DOCUMENTATION = '''
 ---
-module: gcp_bigquery_table_facts
+module: gcp_bigquery_table_info
 description:
-- Gather facts for GCP Table
-short_description: Gather facts for GCP Table
+- Gather info for GCP Table
+- This module was called C(gcp_bigquery_table_facts) before Ansible 2.9. The usage
+  has not changed.
+short_description: Gather info for GCP Table
 version_added: 2.8
 author: Google Inc. (@googlecloudplatform)
 requirements:
@@ -49,8 +51,8 @@ extends_documentation_fragment: gcp
 '''
 
 EXAMPLES = '''
-- name: " a table facts"
-  gcp_bigquery_table_facts:
+- name: get info on a table
+  gcp_bigquery_table_info:
     dataset: example_dataset
     project: test_project
     auth_kind: serviceaccount
@@ -515,6 +517,9 @@ import json
 def main():
     module = GcpModule(argument_spec=dict(dataset=dict(type='str')))
 
+    if module._name == 'gcp_bigquery_table_facts':
+        module.deprecate("The 'gcp_bigquery_table_facts' module has been renamed to 'gcp_bigquery_table_info'", version='2.13')
+
     if not module.params['scopes']:
         module.params['scopes'] = ['https://www.googleapis.com/auth/bigquery']
 
diff --git a/lib/ansible/modules/cloud/google/gcp_cloudbuild_trigger_facts.py b/lib/ansible/modules/cloud/google/gcp_cloudbuild_trigger_info.py
index c3764a9198..dabacbdd23 100644
--- a/lib/ansible/modules/cloud/google/gcp_cloudbuild_trigger_facts.py
+++ b/lib/ansible/modules/cloud/google/gcp_cloudbuild_trigger_info.py
@@ -29,10 +29,12 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ["preview"], 'supported
 
 DOCUMENTATION = '''
 ---
-module: gcp_cloudbuild_trigger_facts
+module: gcp_cloudbuild_trigger_info
 description:
-- Gather facts for GCP Trigger
-short_description: Gather facts for GCP Trigger
+- Gather info for GCP Trigger
+- This module was called C(gcp_cloudbuild_trigger_facts) before Ansible 2.9. The usage
+  has not changed.
+short_description: Gather info for GCP Trigger
 version_added: 2.8
 author: Google Inc. (@googlecloudplatform)
 requirements:
@@ -44,8 +46,8 @@ extends_documentation_fragment: gcp
 '''
 
 EXAMPLES = '''
-- name: " a trigger facts"
-  gcp_cloudbuild_trigger_facts:
+- name: get info on a trigger
+  gcp_cloudbuild_trigger_info:
     project: test_project
     auth_kind: serviceaccount
     service_account_file: "/tmp/auth.pem"
@@ -316,6 +318,9 @@ import json
 def main():
     module = GcpModule(argument_spec=dict())
 
+    if module._name == 'gcp_cloudbuild_trigger_facts':
+        module.deprecate("The 'gcp_cloudbuild_trigger_facts' module has been renamed to 'gcp_cloudbuild_trigger_info'", version='2.13')
+
     if not module.params['scopes']:
         module.params['scopes'] = ['https://www.googleapis.com/auth/cloud-platform']
 
diff --git a/lib/ansible/modules/cloud/google/gcp_cloudscheduler_job_facts.py b/lib/ansible/modules/cloud/google/gcp_cloudscheduler_job_info.py
index 0cbd05abc0..5a8a2bae05 100644
--- a/lib/ansible/modules/cloud/google/gcp_cloudscheduler_job_facts.py
+++ b/lib/ansible/modules/cloud/google/gcp_cloudscheduler_job_info.py
@@ -29,10 +29,10 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ["preview"], 'supported
 
 DOCUMENTATION = '''
 ---
-module: gcp_cloudscheduler_job_facts
+module: gcp_cloudscheduler_job_info
 description:
-- Gather facts for GCP Job
-short_description: Gather facts for GCP Job
+- Gather info for GCP Job
+short_description: Gather info for GCP Job
 version_added: 2.9
 author: Google Inc. (@googlecloudplatform)
 requirements:
@@ -49,8 +49,8 @@ extends_documentation_fragment: gcp
 '''
 
 EXAMPLES = '''
-- name: " a job facts"
-  gcp_cloudscheduler_job_facts:
+- name: get info on a job
+  gcp_cloudscheduler_job_info:
     region: us-central1
     project: test_project
     auth_kind: serviceaccount
diff --git a/lib/ansible/modules/cloud/google/gcp_cloudtasks_queue_facts.py b/lib/ansible/modules/cloud/google/gcp_cloudtasks_queue_info.py
index 905965ee12..b84e6a6763 100644
--- a/lib/ansible/modules/cloud/google/gcp_cloudtasks_queue_facts.py
+++ b/lib/ansible/modules/cloud/google/gcp_cloudtasks_queue_info.py
@@ -29,10 +29,10 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ["preview"], 'supported
 
 DOCUMENTATION = '''
 ---
-module: gcp_cloudtasks_queue_facts
+module: gcp_cloudtasks_queue_info
 description:
-- Gather facts for GCP Queue
-short_description: Gather facts for GCP Queue
+- Gather info for GCP Queue
+short_description: Gather info for GCP Queue
 version_added: 2.9
 author: Google Inc. (@googlecloudplatform)
 requirements:
@@ -49,8 +49,8 @@ extends_documentation_fragment: gcp
 '''
 
 EXAMPLES = '''
-- name: " a queue facts"
-  gcp_cloudtasks_queue_facts:
+- name: get info on a queue
+  gcp_cloudtasks_queue_info:
     location: us-central1
     project: test_project
     auth_kind: serviceaccount
diff --git a/lib/ansible/modules/cloud/google/gcp_compute_address_facts.py b/lib/ansible/modules/cloud/google/gcp_compute_address_info.py
index 313af6d34a..93e3ee89df 100644
--- a/lib/ansible/modules/cloud/google/gcp_compute_address_facts.py
+++ b/lib/ansible/modules/cloud/google/gcp_compute_address_info.py
@@ -29,10 +29,12 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ["preview"], 'supported
 
 DOCUMENTATION = '''
 ---
-module: gcp_compute_address_facts
+module: gcp_compute_address_info
 description:
-- Gather facts for GCP Address
-short_description: Gather facts for GCP Address
+- Gather info for GCP Address
+- This module was called C(gcp_compute_address_facts) before Ansible 2.9. The usage
+  has not changed.
+short_description: Gather info for GCP Address
 version_added: 2.7
 author: Google Inc. (@googlecloudplatform)
 requirements:
@@ -56,8 +58,8 @@ extends_documentation_fragment: gcp
 '''
 
 EXAMPLES = '''
-- name: " a address facts"
-  gcp_compute_address_facts:
+- name: get info on an address
+  gcp_compute_address_info:
     region: us-west1
     filters:
     - name = test_object
@@ -151,6 +153,9 @@ import json
 def main():
     module = GcpModule(argument_spec=dict(filters=dict(type='list', elements='str'), region=dict(required=True, type='str')))
 
+    if module._name == 'gcp_compute_address_facts':
+        module.deprecate("The 'gcp_compute_address_facts' module has been renamed to 'gcp_compute_address_info'", version='2.13')
+
     if not module.params['scopes']:
         module.params['scopes'] = ['https://www.googleapis.com/auth/compute']
 
diff --git a/lib/ansible/modules/cloud/google/gcp_compute_autoscaler_facts.py b/lib/ansible/modules/cloud/google/gcp_compute_autoscaler_info.py
index 180e7c9736..18481849b9 100644
--- a/lib/ansible/modules/cloud/google/gcp_compute_autoscaler_facts.py
+++ b/lib/ansible/modules/cloud/google/gcp_compute_autoscaler_info.py
@@ -29,10 +29,10 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ["preview"], 'supported
 
 DOCUMENTATION = '''
 ---
-module: gcp_compute_autoscaler_facts
+module: gcp_compute_autoscaler_info
 description:
-- Gather facts for GCP Autoscaler
-short_description: Gather facts for GCP Autoscaler
+- Gather info for GCP Autoscaler
+short_description: Gather info for GCP Autoscaler
 version_added: 2.9
 author: Google Inc. (@googlecloudplatform)
 requirements:
@@ -55,8 +55,8 @@ extends_documentation_fragment: gcp
 '''
 
 EXAMPLES = '''
-- name: " a autoscaler facts"
-  gcp_compute_autoscaler_facts:
+- name: get info on an autoscaler
+  gcp_compute_autoscaler_info:
     zone: us-central1-a
     filters:
     - name = test_object
diff --git a/lib/ansible/modules/cloud/google/gcp_compute_backend_bucket_facts.py b/lib/ansible/modules/cloud/google/gcp_compute_backend_bucket_info.py
index 5f9397a39e..c7d214b8ec 100644
--- a/lib/ansible/modules/cloud/google/gcp_compute_backend_bucket_facts.py
+++ b/lib/ansible/modules/cloud/google/gcp_compute_backend_bucket_info.py
@@ -29,10 +29,12 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ["preview"], 'supported
 
 DOCUMENTATION = '''
 ---
-module: gcp_compute_backend_bucket_facts
+module: gcp_compute_backend_bucket_info
 description:
-- Gather facts for GCP BackendBucket
-short_description: Gather facts for GCP BackendBucket
+- Gather info for GCP BackendBucket
+- This module was called C(gcp_compute_backend_bucket_facts) before Ansible 2.9. The
+  usage has not changed.
+short_description: Gather info for GCP BackendBucket
 version_added: 2.7
 author: Google Inc. (@googlecloudplatform)
 requirements:
@@ -50,8 +52,8 @@ extends_documentation_fragment: gcp
 '''
 
 EXAMPLES = '''
-- name: " a backend bucket facts"
-  gcp_compute_backend_bucket_facts:
+- name: get info on a backend bucket
+  gcp_compute_backend_bucket_info:
     filters:
     - name = test_object
     project: test_project
@@ -134,6 +136,9 @@ import json
 def main():
     module = GcpModule(argument_spec=dict(filters=dict(type='list', elements='str')))
 
+    if module._name == 'gcp_compute_backend_bucket_facts':
+        module.deprecate("The 'gcp_compute_backend_bucket_facts' module has been renamed to 'gcp_compute_backend_bucket_info'", version='2.13')
+
     if not module.params['scopes']:
         module.params['scopes'] = ['https://www.googleapis.com/auth/compute']
 
diff --git a/lib/ansible/modules/cloud/google/gcp_compute_backend_service_facts.py b/lib/ansible/modules/cloud/google/gcp_compute_backend_service_info.py
index 1aea93304a..f1535151c8 100644
--- a/lib/ansible/modules/cloud/google/gcp_compute_backend_service_facts.py
+++ b/lib/ansible/modules/cloud/google/gcp_compute_backend_service_info.py
@@ -29,10 +29,12 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ["preview"], 'supported
 
 DOCUMENTATION = '''
 ---
-module: gcp_compute_backend_service_facts
+module: gcp_compute_backend_service_info
 description:
-- Gather facts for GCP BackendService
-short_description: Gather facts for GCP BackendService
+- Gather info for GCP BackendService
+- This module was called C(gcp_compute_backend_service_facts) before Ansible 2.9.
+  The usage has not changed.
+short_description: Gather info for GCP BackendService
 version_added: 2.7
 author: Google Inc. (@googlecloudplatform)
 requirements:
@@ -50,8 +52,8 @@ extends_documentation_fragment: gcp
 '''
 
 EXAMPLES = '''
-- name: " a backend service facts"
-  gcp_compute_backend_service_facts:
+- name: get info on a backend service
+  gcp_compute_backend_service_info:
     filters:
     - name = test_object
     project: test_project
@@ -371,6 +373,9 @@ import json
 def main():
     module = GcpModule(argument_spec=dict(filters=dict(type='list', elements='str')))
 
+    if module._name == 'gcp_compute_backend_service_facts':
+        module.deprecate("The 'gcp_compute_backend_service_facts' module has been renamed to 'gcp_compute_backend_service_info'", version='2.13')
+
     if not module.params['scopes']:
         module.params['scopes'] = ['https://www.googleapis.com/auth/compute']
 
diff --git a/lib/ansible/modules/cloud/google/gcp_compute_disk_facts.py b/lib/ansible/modules/cloud/google/gcp_compute_disk_info.py
index 4a2d43d3d9..698e02cc6c 100644
--- a/lib/ansible/modules/cloud/google/gcp_compute_disk_facts.py
+++ b/lib/ansible/modules/cloud/google/gcp_compute_disk_info.py
@@ -29,10 +29,12 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ["preview"], 'supported
 
 DOCUMENTATION = '''
 ---
-module: gcp_compute_disk_facts
+module: gcp_compute_disk_info
 description:
-- Gather facts for GCP Disk
-short_description: Gather facts for GCP Disk
+- Gather info for GCP Disk
+- This module was called C(gcp_compute_disk_facts) before Ansible 2.9. The usage has
+  not changed.
+short_description: Gather info for GCP Disk
 version_added: 2.7
 author: Google Inc. (@googlecloudplatform)
 requirements:
@@ -55,8 +57,8 @@ extends_documentation_fragment: gcp
 '''
 
 EXAMPLES = '''
-- name: " a disk facts"
-  gcp_compute_disk_facts:
+- name: get info on a disk
+  gcp_compute_disk_info:
     zone: us-central1-a
     filters:
     - name = test_object
@@ -294,6 +296,9 @@ import json
 def main():
     module = GcpModule(argument_spec=dict(filters=dict(type='list', elements='str'), zone=dict(required=True, type='str')))
 
+    if module._name == 'gcp_compute_disk_facts':
+        module.deprecate("The 'gcp_compute_disk_facts' module has been renamed to 'gcp_compute_disk_info'", version='2.13')
+
     if not module.params['scopes']:
         module.params['scopes'] = ['https://www.googleapis.com/auth/compute']
 
diff --git a/lib/ansible/modules/cloud/google/gcp_compute_firewall_facts.py b/lib/ansible/modules/cloud/google/gcp_compute_firewall_info.py
index ec4ced871a..2349358eb1 100644
--- a/lib/ansible/modules/cloud/google/gcp_compute_firewall_facts.py
+++ b/lib/ansible/modules/cloud/google/gcp_compute_firewall_info.py
@@ -29,10 +29,12 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ["preview"], 'supported
 
 DOCUMENTATION = '''
 ---
-module: gcp_compute_firewall_facts
+module: gcp_compute_firewall_info
 description:
-- Gather facts for GCP Firewall
-short_description: Gather facts for GCP Firewall
+- Gather info for GCP Firewall
+- This module was called C(gcp_compute_firewall_facts) before Ansible 2.9. The usage
+  has not changed.
+short_description: Gather info for GCP Firewall
 version_added: 2.7
 author: Google Inc. (@googlecloudplatform)
 requirements:
@@ -50,8 +52,8 @@ extends_documentation_fragment: gcp
 '''
 
 EXAMPLES = '''
-- name: " a firewall facts"
-  gcp_compute_firewall_facts:
+- name: get info on a firewall
+  gcp_compute_firewall_info:
     filters:
     - name = test_object
     project: test_project
@@ -250,6 +252,9 @@ import json
 def main():
     module = GcpModule(argument_spec=dict(filters=dict(type='list', elements='str')))
 
+    if module._name == 'gcp_compute_firewall_facts':
+        module.deprecate("The 'gcp_compute_firewall_facts' module has been renamed to 'gcp_compute_firewall_info'", version='2.13')
+
     if not module.params['scopes']:
         module.params['scopes'] = ['https://www.googleapis.com/auth/compute']
 
diff --git a/lib/ansible/modules/cloud/google/gcp_compute_forwarding_rule_facts.py b/lib/ansible/modules/cloud/google/gcp_compute_forwarding_rule_info.py
index 16a21702ec..0ce70ff070 100644
--- a/lib/ansible/modules/cloud/google/gcp_compute_forwarding_rule_facts.py
+++ b/lib/ansible/modules/cloud/google/gcp_compute_forwarding_rule_info.py
@@ -29,10 +29,12 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ["preview"], 'supported
 
 DOCUMENTATION = '''
 ---
-module: gcp_compute_forwarding_rule_facts
+module: gcp_compute_forwarding_rule_info
 description:
-- Gather facts for GCP ForwardingRule
-short_description: Gather facts for GCP ForwardingRule
+- Gather info for GCP ForwardingRule
+- This module was called C(gcp_compute_forwarding_rule_facts) before Ansible 2.9.
+  The usage has not changed.
+short_description: Gather info for GCP ForwardingRule
 version_added: 2.7
 author: Google Inc. (@googlecloudplatform)
 requirements:
@@ -56,8 +58,8 @@ extends_documentation_fragment: gcp
 '''
 
 EXAMPLES = '''
-- name: " a forwarding rule facts"
-  gcp_compute_forwarding_rule_facts:
+- name: get info on a forwarding rule
+  gcp_compute_forwarding_rule_info:
     region: us-west1
     filters:
     - name = test_object
@@ -252,6 +254,9 @@ import json
 def main():
     module = GcpModule(argument_spec=dict(filters=dict(type='list', elements='str'), region=dict(required=True, type='str')))
 
+    if module._name == 'gcp_compute_forwarding_rule_facts':
+        module.deprecate("The 'gcp_compute_forwarding_rule_facts' module has been renamed to 'gcp_compute_forwarding_rule_info'", version='2.13')
+
     if not module.params['scopes']:
         module.params['scopes'] = ['https://www.googleapis.com/auth/compute']
 
diff --git a/lib/ansible/modules/cloud/google/gcp_compute_global_address_facts.py b/lib/ansible/modules/cloud/google/gcp_compute_global_address_info.py
index 8cdd0614c1..0dfd07d533 100644
--- a/lib/ansible/modules/cloud/google/gcp_compute_global_address_facts.py
+++ b/lib/ansible/modules/cloud/google/gcp_compute_global_address_info.py
@@ -29,10 +29,12 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ["preview"], 'supported
 
 DOCUMENTATION = '''
 ---
-module: gcp_compute_global_address_facts
+module: gcp_compute_global_address_info
 description:
-- Gather facts for GCP GlobalAddress
-short_description: Gather facts for GCP GlobalAddress
+- Gather info for GCP GlobalAddress
+- This module was called C(gcp_compute_global_address_facts) before Ansible 2.9. The
+  usage has not changed.
+short_description: Gather info for GCP GlobalAddress
 version_added: 2.7
 author: Google Inc. (@googlecloudplatform)
 requirements:
@@ -50,8 +52,8 @@ extends_documentation_fragment: gcp
 '''
 
 EXAMPLES = '''
-- name: " a global address facts"
-  gcp_compute_global_address_facts:
+- name: get info on a global address
+  gcp_compute_global_address_info:
     filters:
     - name = test_object
     project: test_project
@@ -151,6 +153,9 @@ import json
 def main():
     module = GcpModule(argument_spec=dict(filters=dict(type='list', elements='str')))
 
+    if module._name == 'gcp_compute_global_address_facts':
+        module.deprecate("The 'gcp_compute_global_address_facts' module has been renamed to 'gcp_compute_global_address_info'", version='2.13')
+
     if not module.params['scopes']:
         module.params['scopes'] = ['https://www.googleapis.com/auth/compute']
 
diff --git a/lib/ansible/modules/cloud/google/gcp_compute_global_forwarding_rule_facts.py b/lib/ansible/modules/cloud/google/gcp_compute_global_forwarding_rule_info.py
index 49b807e338..de5b4cd42b 100644
--- a/lib/ansible/modules/cloud/google/gcp_compute_global_forwarding_rule_facts.py
+++ b/lib/ansible/modules/cloud/google/gcp_compute_global_forwarding_rule_info.py
@@ -29,10 +29,12 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ["preview"], 'supported
 
 DOCUMENTATION = '''
 ---
-module: gcp_compute_global_forwarding_rule_facts
+module: gcp_compute_global_forwarding_rule_info
 description:
-- Gather facts for GCP GlobalForwardingRule
-short_description: Gather facts for GCP GlobalForwardingRule
+- Gather info for GCP GlobalForwardingRule
+- This module was called C(gcp_compute_global_forwarding_rule_facts) before Ansible
+  2.9. The usage has not changed.
+short_description: Gather info for GCP GlobalForwardingRule
 version_added: 2.7
 author: Google Inc. (@googlecloudplatform)
 requirements:
@@ -50,8 +52,8 @@ extends_documentation_fragment: gcp
 '''
 
 EXAMPLES = '''
-- name: " a global forwarding rule facts"
-  gcp_compute_global_forwarding_rule_facts:
+- name: get info on a global forwarding rule
+  gcp_compute_global_forwarding_rule_info:
     filters:
     - name = test_object
     project: test_project
@@ -181,6 +183,9 @@ import json
 def main():
     module = GcpModule(argument_spec=dict(filters=dict(type='list', elements='str')))
 
+    if module._name == 'gcp_compute_global_forwarding_rule_facts':
+        module.deprecate("The 'gcp_compute_global_forwarding_rule_facts' module has been renamed to 'gcp_compute_global_forwarding_rule_info'", version='2.13')
+
     if not module.params['scopes']:
         module.params['scopes'] = ['https://www.googleapis.com/auth/compute']
 
diff --git a/lib/ansible/modules/cloud/google/gcp_compute_health_check_facts.py b/lib/ansible/modules/cloud/google/gcp_compute_health_check_info.py
index 00374d675e..d2bae2ca26 100644
--- a/lib/ansible/modules/cloud/google/gcp_compute_health_check_facts.py
+++ b/lib/ansible/modules/cloud/google/gcp_compute_health_check_info.py
@@ -29,10 +29,12 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ["preview"], 'supported
 
 DOCUMENTATION = '''
 ---
-module: gcp_compute_health_check_facts
+module: gcp_compute_health_check_info
 description:
-- Gather facts for GCP HealthCheck
-short_description: Gather facts for GCP HealthCheck
+- Gather info for GCP HealthCheck
+- This module was called C(gcp_compute_health_check_facts) before Ansible 2.9. The
+  usage has not changed.
+short_description: Gather info for GCP HealthCheck
 version_added: 2.7
 author: Google Inc. (@googlecloudplatform)
 requirements:
@@ -50,8 +52,8 @@ extends_documentation_fragment: gcp
 '''
 
 EXAMPLES = '''
-- name: " a health check facts"
-  gcp_compute_health_check_facts:
+- name: get info on a health check
+  gcp_compute_health_check_info:
     filters:
     - name = test_object
     project: test_project
@@ -361,6 +363,9 @@ import json
 def main():
     module = GcpModule(argument_spec=dict(filters=dict(type='list', elements='str')))
 
+    if module._name == 'gcp_compute_health_check_facts':
+        module.deprecate("The 'gcp_compute_health_check_facts' module has been renamed to 'gcp_compute_health_check_info'", version='2.13')
+
     if not module.params['scopes']:
         module.params['scopes'] = ['https://www.googleapis.com/auth/compute']
 
diff --git a/lib/ansible/modules/cloud/google/gcp_compute_http_health_check_facts.py b/lib/ansible/modules/cloud/google/gcp_compute_http_health_check_info.py
index 13e489fd51..8a46bf0383 100644
--- a/lib/ansible/modules/cloud/google/gcp_compute_http_health_check_facts.py
+++ b/lib/ansible/modules/cloud/google/gcp_compute_http_health_check_info.py
@@ -29,10 +29,12 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ["preview"], 'supported
 
 DOCUMENTATION = '''
 ---
-module: gcp_compute_http_health_check_facts
+module: gcp_compute_http_health_check_info
 description:
-- Gather facts for GCP HttpHealthCheck
-short_description: Gather facts for GCP HttpHealthCheck
+- Gather info for GCP HttpHealthCheck
+- This module was called C(gcp_compute_http_health_check_facts) before Ansible 2.9.
+  The usage has not changed.
+short_description: Gather info for GCP HttpHealthCheck
 version_added: 2.7
 author: Google Inc. (@googlecloudplatform)
 requirements:
@@ -50,8 +52,8 @@ extends_documentation_fragment: gcp
 '''
 
 EXAMPLES = '''
-- name: " a http health check facts"
-  gcp_compute_http_health_check_facts:
+- name: get info on an HTTP health check
+  gcp_compute_http_health_check_info:
     filters:
     - name = test_object
     project: test_project
@@ -151,6 +153,9 @@ import json
 def main():
     module = GcpModule(argument_spec=dict(filters=dict(type='list', elements='str')))
 
+    if module._name == 'gcp_compute_http_health_check_facts':
+        module.deprecate("The 'gcp_compute_http_health_check_facts' module has been renamed to 'gcp_compute_http_health_check_info'", version='2.13')
+
     if not module.params['scopes']:
         module.params['scopes'] = ['https://www.googleapis.com/auth/compute']
 
diff --git a/lib/ansible/modules/cloud/google/gcp_compute_https_health_check_facts.py b/lib/ansible/modules/cloud/google/gcp_compute_https_health_check_info.py
index 28323eaa39..8d3dd4b0ec 100644
--- a/lib/ansible/modules/cloud/google/gcp_compute_https_health_check_facts.py
+++ b/lib/ansible/modules/cloud/google/gcp_compute_https_health_check_info.py
@@ -29,10 +29,12 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ["preview"], 'supported
 
 DOCUMENTATION = '''
 ---
-module: gcp_compute_https_health_check_facts
+module: gcp_compute_https_health_check_info
 description:
-- Gather facts for GCP HttpsHealthCheck
-short_description: Gather facts for GCP HttpsHealthCheck
+- Gather info for GCP HttpsHealthCheck
+- This module was called C(gcp_compute_https_health_check_facts) before Ansible 2.9.
+  The usage has not changed.
+short_description: Gather info for GCP HttpsHealthCheck
 version_added: 2.7
 author: Google Inc. (@googlecloudplatform)
 requirements:
@@ -50,8 +52,8 @@ extends_documentation_fragment: gcp
 '''
 
 EXAMPLES = '''
-- name: " a https health check facts"
-  gcp_compute_https_health_check_facts:
+- name: get info on an HTTPS health check
+  gcp_compute_https_health_check_info:
     filters:
     - name = test_object
     project: test_project
@@ -151,6 +153,9 @@ import json
 def main():
     module = GcpModule(argument_spec=dict(filters=dict(type='list', elements='str')))
 
+    if module._name == 'gcp_compute_https_health_check_facts':
+        module.deprecate("The 'gcp_compute_https_health_check_facts' module has been renamed to 'gcp_compute_https_health_check_info'", version='2.13')
+
     if not module.params['scopes']:
         module.params['scopes'] = ['https://www.googleapis.com/auth/compute']
 
diff --git a/lib/ansible/modules/cloud/google/gcp_compute_image_facts.py b/lib/ansible/modules/cloud/google/gcp_compute_image_info.py
index 59d5d34501..4ea5d7c23e 100644
--- a/lib/ansible/modules/cloud/google/gcp_compute_image_facts.py
+++ b/lib/ansible/modules/cloud/google/gcp_compute_image_info.py
@@ -29,10 +29,12 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ["preview"], 'supported
 
 DOCUMENTATION = '''
 ---
-module: gcp_compute_image_facts
+module: gcp_compute_image_info
 description:
-- Gather facts for GCP Image
-short_description: Gather facts for GCP Image
+- Gather info for GCP Image
+- This module was called C(gcp_compute_image_facts) before Ansible 2.9. The usage
+  has not changed.
+short_description: Gather info for GCP Image
 version_added: 2.7
 author: Google Inc. (@googlecloudplatform)
 requirements:
@@ -50,8 +52,8 @@ extends_documentation_fragment: gcp
 '''
 
 EXAMPLES = '''
-- name: " a image facts"
-  gcp_compute_image_facts:
+- name: get info on an image
+  gcp_compute_image_info:
     filters:
     - name = test_object
     project: test_project
@@ -293,6 +295,9 @@ import json
 def main():
     module = GcpModule(argument_spec=dict(filters=dict(type='list', elements='str')))
 
+    if module._name == 'gcp_compute_image_facts':
+        module.deprecate("The 'gcp_compute_image_facts' module has been renamed to 'gcp_compute_image_info'", version='2.13')
+
     if not module.params['scopes']:
         module.params['scopes'] = ['https://www.googleapis.com/auth/compute']
 
diff --git a/lib/ansible/modules/cloud/google/gcp_compute_instance.py b/lib/ansible/modules/cloud/google/gcp_compute_instance.py
index 8ab0b3c661..7aa9b4a508 100644
--- a/lib/ansible/modules/cloud/google/gcp_compute_instance.py
+++ b/lib/ansible/modules/cloud/google/gcp_compute_instance.py
@@ -319,10 +319,9 @@ options:
             type: str
       network:
         description:
-        - Specifies the title of an existing network. When creating an instance, if
-          neither the network nor the subnetwork is specified, the default network
-          global/networks/default is used; if the network is not specified but the
-          subnetwork is specified, the network is inferred.
+        - Specifies the title of an existing network. Not setting the network title
+          will select the default network interface, which could have SSH already
+          configured.
         - 'This field represents a link to a Network resource in GCP. It can be specified
           in two ways. First, you can place a dictionary with key ''selfLink'' and
           value of your resource''s selfLink Alternatively, you can add `register:
@@ -787,10 +786,8 @@ networkInterfaces:
       type: str
     network:
       description:
-      - Specifies the title of an existing network. When creating an instance, if
-        neither the network nor the subnetwork is specified, the default network global/networks/default
-        is used; if the network is not specified but the subnetwork is specified,
-        the network is inferred.
+      - Specifies the title of an existing network. Not setting the network title
+        will select the default network interface, which could have SSH already configured.
       returned: success
       type: dict
     networkIP:
diff --git a/lib/ansible/modules/cloud/google/gcp_compute_instance_group_facts.py b/lib/ansible/modules/cloud/google/gcp_compute_instance_group_info.py
index 2540d4a39e..493a579228 100644
--- a/lib/ansible/modules/cloud/google/gcp_compute_instance_group_facts.py
+++ b/lib/ansible/modules/cloud/google/gcp_compute_instance_group_info.py
@@ -29,10 +29,12 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ["preview"], 'supported
 
 DOCUMENTATION = '''
 ---
-module: gcp_compute_instance_group_facts
+module: gcp_compute_instance_group_info
 description:
-- Gather facts for GCP InstanceGroup
-short_description: Gather facts for GCP InstanceGroup
+- Gather info for GCP InstanceGroup
+- This module was called C(gcp_compute_instance_group_facts) before Ansible 2.9. The
+  usage has not changed.
+short_description: Gather info for GCP InstanceGroup
 version_added: 2.7
 author: Google Inc. (@googlecloudplatform)
 requirements:
@@ -55,8 +57,8 @@ extends_documentation_fragment: gcp
 '''
 
 EXAMPLES = '''
-- name: " a instance group facts"
-  gcp_compute_instance_group_facts:
+- name: get info on an instance group
+  gcp_compute_instance_group_info:
     zone: us-central1-a
     filters:
     - name = test_object
@@ -160,6 +162,9 @@ import json
 def main():
     module = GcpModule(argument_spec=dict(filters=dict(type='list', elements='str'), zone=dict(required=True, type='str')))
 
+    if module._name == 'gcp_compute_instance_group_facts':
+        module.deprecate("The 'gcp_compute_instance_group_facts' module has been renamed to 'gcp_compute_instance_group_info'", version='2.13')
+
     if not module.params['scopes']:
         module.params['scopes'] = ['https://www.googleapis.com/auth/compute']
 
diff --git a/lib/ansible/modules/cloud/google/gcp_compute_instance_group_manager_facts.py b/lib/ansible/modules/cloud/google/gcp_compute_instance_group_manager_info.py
index f4be95be0e..ef7b9d45cc 100644
--- a/lib/ansible/modules/cloud/google/gcp_compute_instance_group_manager_facts.py
+++ b/lib/ansible/modules/cloud/google/gcp_compute_instance_group_manager_info.py
@@ -29,10 +29,12 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ["preview"], 'supported
 
 DOCUMENTATION = '''
 ---
-module: gcp_compute_instance_group_manager_facts
+module: gcp_compute_instance_group_manager_info
 description:
-- Gather facts for GCP InstanceGroupManager
-short_description: Gather facts for GCP InstanceGroupManager
+- Gather info for GCP InstanceGroupManager
+- This module was called C(gcp_compute_instance_group_manager_facts) before Ansible
+  2.9. The usage has not changed.
+short_description: Gather info for GCP InstanceGroupManager
 version_added: 2.7
 author: Google Inc. (@googlecloudplatform)
 requirements:
@@ -55,8 +57,8 @@ extends_documentation_fragment: gcp
 '''
 
 EXAMPLES = '''
-- name: " a instance group manager facts"
-  gcp_compute_instance_group_manager_facts:
+- name: get info on an instance group manager
+  gcp_compute_instance_group_manager_info:
     zone: us-west1-a
     filters:
     - name = test_object
@@ -235,6 +237,9 @@ import json
 def main():
     module = GcpModule(argument_spec=dict(filters=dict(type='list', elements='str'), zone=dict(required=True, type='str')))
 
+    if module._name == 'gcp_compute_instance_group_manager_facts':
+        module.deprecate("The 'gcp_compute_instance_group_manager_facts' module has been renamed to 'gcp_compute_instance_group_manager_info'", version='2.13')
+
     if not module.params['scopes']:
         module.params['scopes'] = ['https://www.googleapis.com/auth/compute']
 
diff --git a/lib/ansible/modules/cloud/google/gcp_compute_instance_facts.py b/lib/ansible/modules/cloud/google/gcp_compute_instance_info.py
index be62cf79b6..8095f55dd6 100644
--- a/lib/ansible/modules/cloud/google/gcp_compute_instance_facts.py
+++ b/lib/ansible/modules/cloud/google/gcp_compute_instance_info.py
@@ -29,10 +29,12 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ["preview"], 'supported
 
 DOCUMENTATION = '''
 ---
-module: gcp_compute_instance_facts
+module: gcp_compute_instance_info
 description:
-- Gather facts for GCP Instance
-short_description: Gather facts for GCP Instance
+- Gather info for GCP Instance
+- This module was called C(gcp_compute_instance_facts) before Ansible 2.9. The usage
+  has not changed.
+short_description: Gather info for GCP Instance
 version_added: 2.7
 author: Google Inc. (@googlecloudplatform)
 requirements:
@@ -55,8 +57,8 @@ extends_documentation_fragment: gcp
 '''
 
 EXAMPLES = '''
-- name: " a instance facts"
-  gcp_compute_instance_facts:
+- name: get info on an instance
+  gcp_compute_instance_info:
     zone: us-central1-a
     filters:
     - name = test_object
@@ -488,6 +490,9 @@ import json
 def main():
     module = GcpModule(argument_spec=dict(filters=dict(type='list', elements='str'), zone=dict(required=True, type='str')))
 
+    if module._name == 'gcp_compute_instance_facts':
+        module.deprecate("The 'gcp_compute_instance_facts' module has been renamed to 'gcp_compute_instance_info'", version='2.13')
+
     if not module.params['scopes']:
         module.params['scopes'] = ['https://www.googleapis.com/auth/compute']
 
diff --git a/lib/ansible/modules/cloud/google/gcp_compute_instance_template_facts.py b/lib/ansible/modules/cloud/google/gcp_compute_instance_template_info.py
index 071490cf49..1db5b2962f 100644
--- a/lib/ansible/modules/cloud/google/gcp_compute_instance_template_facts.py
+++ b/lib/ansible/modules/cloud/google/gcp_compute_instance_template_info.py
@@ -29,10 +29,12 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ["preview"], 'supported
 
 DOCUMENTATION = '''
 ---
-module: gcp_compute_instance_template_facts
+module: gcp_compute_instance_template_info
 description:
-- Gather facts for GCP InstanceTemplate
-short_description: Gather facts for GCP InstanceTemplate
+- Gather info for GCP InstanceTemplate
+- This module was called C(gcp_compute_instance_template_facts) before Ansible 2.9.
+  The usage has not changed.
+short_description: Gather info for GCP InstanceTemplate
 version_added: 2.7
 author: Google Inc. (@googlecloudplatform)
 requirements:
@@ -50,8 +52,8 @@ extends_documentation_fragment: gcp
 '''
 
 EXAMPLES = '''
-- name: " a instance template facts"
-  gcp_compute_instance_template_facts:
+- name: get info on an instance template
+  gcp_compute_instance_template_info:
     filters:
     - name = test_object
     project: test_project
@@ -480,6 +482,9 @@ import json
 def main():
     module = GcpModule(argument_spec=dict(filters=dict(type='list', elements='str')))
 
+    if module._name == 'gcp_compute_instance_template_facts':
+        module.deprecate("The 'gcp_compute_instance_template_facts' module has been renamed to 'gcp_compute_instance_template_info'", version='2.13')
+
     if not module.params['scopes']:
         module.params['scopes'] = ['https://www.googleapis.com/auth/compute']
 
diff --git a/lib/ansible/modules/cloud/google/gcp_compute_interconnect_attachment_facts.py b/lib/ansible/modules/cloud/google/gcp_compute_interconnect_attachment_info.py
index d62abdada6..12be2a8703 100644
--- a/lib/ansible/modules/cloud/google/gcp_compute_interconnect_attachment_facts.py
+++ b/lib/ansible/modules/cloud/google/gcp_compute_interconnect_attachment_info.py
@@ -29,10 +29,12 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ["preview"], 'supported
 
 DOCUMENTATION = '''
 ---
-module: gcp_compute_interconnect_attachment_facts
+module: gcp_compute_interconnect_attachment_info
 description:
-- Gather facts for GCP InterconnectAttachment
-short_description: Gather facts for GCP InterconnectAttachment
+- Gather info for GCP InterconnectAttachment
+- This module was called C(gcp_compute_interconnect_attachment_facts) before Ansible
+  2.9. The usage has not changed.
+short_description: Gather info for GCP InterconnectAttachment
 version_added: 2.8
 author: Google Inc. (@googlecloudplatform)
 requirements:
@@ -55,8 +57,8 @@ extends_documentation_fragment: gcp
 '''
 
 EXAMPLES = '''
-- name: " a interconnect attachment facts"
-  gcp_compute_interconnect_attachment_facts:
+- name: get info on an interconnect attachment
+  gcp_compute_interconnect_attachment_info:
     region: us-central1
     filters:
     - name = test_object
@@ -215,6 +217,11 @@ import json
 def main():
     module = GcpModule(argument_spec=dict(filters=dict(type='list', elements='str'), region=dict(required=True, type='str')))
 
+    if module._name == 'gcp_compute_interconnect_attachment_facts':
+        module.deprecate(
+            "The 'gcp_compute_interconnect_attachment_facts' module has been renamed to 'gcp_compute_interconnect_attachment_info'", version='2.13'
+        )
+
     if not module.params['scopes']:
         module.params['scopes'] = ['https://www.googleapis.com/auth/compute']
 
diff --git a/lib/ansible/modules/cloud/google/gcp_compute_network_facts.py b/lib/ansible/modules/cloud/google/gcp_compute_network_info.py
index 6fafa0e0b3..aea0a38765 100644
--- a/lib/ansible/modules/cloud/google/gcp_compute_network_facts.py
+++ b/lib/ansible/modules/cloud/google/gcp_compute_network_info.py
@@ -29,10 +29,12 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ["preview"], 'supported
 
 DOCUMENTATION = '''
 ---
-module: gcp_compute_network_facts
+module: gcp_compute_network_info
 description:
-- Gather facts for GCP Network
-short_description: Gather facts for GCP Network
+- Gather info for GCP Network
+- This module was called C(gcp_compute_network_facts) before Ansible 2.9. The usage
+  has not changed.
+short_description: Gather info for GCP Network
 version_added: 2.7
 author: Google Inc. (@googlecloudplatform)
 requirements:
@@ -50,8 +52,8 @@ extends_documentation_fragment: gcp
 '''
 
 EXAMPLES = '''
-- name: " a network facts"
-  gcp_compute_network_facts:
+- name: get info on a network
+  gcp_compute_network_info:
     filters:
     - name = test_object
     project: test_project
@@ -154,6 +156,9 @@ import json
 def main():
     module = GcpModule(argument_spec=dict(filters=dict(type='list', elements='str')))
 
+    if module._name == 'gcp_compute_network_facts':
+        module.deprecate("The 'gcp_compute_network_facts' module has been renamed to 'gcp_compute_network_info'", version='2.13')
+
     if not module.params['scopes']:
         module.params['scopes'] = ['https://www.googleapis.com/auth/compute']
 
diff --git a/lib/ansible/modules/cloud/google/gcp_compute_region_disk_facts.py b/lib/ansible/modules/cloud/google/gcp_compute_region_disk_info.py
index 723f5cb21c..6adb7c488b 100644
--- a/lib/ansible/modules/cloud/google/gcp_compute_region_disk_facts.py
+++ b/lib/ansible/modules/cloud/google/gcp_compute_region_disk_info.py
@@ -29,10 +29,12 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ["preview"], 'supported
 
 DOCUMENTATION = '''
 ---
-module: gcp_compute_region_disk_facts
+module: gcp_compute_region_disk_info
 description:
-- Gather facts for GCP RegionDisk
-short_description: Gather facts for GCP RegionDisk
+- Gather info for GCP RegionDisk
+- This module was called C(gcp_compute_region_disk_facts) before Ansible 2.9. The
+  usage has not changed.
+short_description: Gather info for GCP RegionDisk
 version_added: 2.8
 author: Google Inc. (@googlecloudplatform)
 requirements:
@@ -55,8 +57,8 @@ extends_documentation_fragment: gcp
 '''
 
 EXAMPLES = '''
-- name: " a region disk facts"
-  gcp_compute_region_disk_facts:
+- name: get info on a region disk
+  gcp_compute_region_disk_info:
     region: us-central1
     filters:
     - name = test_object
@@ -240,6 +242,9 @@ import json
 def main():
     module = GcpModule(argument_spec=dict(filters=dict(type='list', elements='str'), region=dict(required=True, type='str')))
 
+    if module._name == 'gcp_compute_region_disk_facts':
+        module.deprecate("The 'gcp_compute_region_disk_facts' module has been renamed to 'gcp_compute_region_disk_info'", version='2.13')
+
     if not module.params['scopes']:
         module.params['scopes'] = ['https://www.googleapis.com/auth/compute']
 
diff --git a/lib/ansible/modules/cloud/google/gcp_compute_route_facts.py b/lib/ansible/modules/cloud/google/gcp_compute_route_info.py
index 08c6d99a19..cbe4caf4e5 100644
--- a/lib/ansible/modules/cloud/google/gcp_compute_route_facts.py
+++ b/lib/ansible/modules/cloud/google/gcp_compute_route_info.py
@@ -29,10 +29,12 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ["preview"], 'supported
 
 DOCUMENTATION = '''
 ---
-module: gcp_compute_route_facts
+module: gcp_compute_route_info
 description:
-- Gather facts for GCP Route
-short_description: Gather facts for GCP Route
+- Gather info for GCP Route
+- This module was called C(gcp_compute_route_facts) before Ansible 2.9. The usage
+  has not changed.
+short_description: Gather info for GCP Route
 version_added: 2.7
 author: Google Inc. (@googlecloudplatform)
 requirements:
@@ -50,8 +52,8 @@ extends_documentation_fragment: gcp
 '''
 
 EXAMPLES = '''
-- name: " a route facts"
-  gcp_compute_route_facts:
+- name: get info on a route
+  gcp_compute_route_info:
     filters:
     - name = test_object
     project: test_project
@@ -154,6 +156,9 @@ import json
 def main():
     module = GcpModule(argument_spec=dict(filters=dict(type='list', elements='str')))
 
+    if module._name == 'gcp_compute_route_facts':
+        module.deprecate("The 'gcp_compute_route_facts' module has been renamed to 'gcp_compute_route_info'", version='2.13')
+
     if not module.params['scopes']:
         module.params['scopes'] = ['https://www.googleapis.com/auth/compute']
 
diff --git a/lib/ansible/modules/cloud/google/gcp_compute_router_facts.py b/lib/ansible/modules/cloud/google/gcp_compute_router_info.py
index f536432fd9..d24bf62c63 100644
--- a/lib/ansible/modules/cloud/google/gcp_compute_router_facts.py
+++ b/lib/ansible/modules/cloud/google/gcp_compute_router_info.py
@@ -29,10 +29,12 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ["preview"], 'supported
 
 DOCUMENTATION = '''
 ---
-module: gcp_compute_router_facts
+module: gcp_compute_router_info
 description:
-- Gather facts for GCP Router
-short_description: Gather facts for GCP Router
+- Gather info for GCP Router
+- This module was called C(gcp_compute_router_facts) before Ansible 2.9. The usage
+  has not changed.
+short_description: Gather info for GCP Router
 version_added: 2.7
 author: Google Inc. (@googlecloudplatform)
 requirements:
@@ -55,8 +57,8 @@ extends_documentation_fragment: gcp
 '''
 
 EXAMPLES = '''
-- name: " a router facts"
-  gcp_compute_router_facts:
+- name: get info on a router
+  gcp_compute_router_info:
     region: us-central1
     filters:
     - name = test_object
@@ -170,6 +172,9 @@ import json
 def main():
     module = GcpModule(argument_spec=dict(filters=dict(type='list', elements='str'), region=dict(required=True, type='str')))
 
+    if module._name == 'gcp_compute_router_facts':
+        module.deprecate("The 'gcp_compute_router_facts' module has been renamed to 'gcp_compute_router_info'", version='2.13')
+
     if not module.params['scopes']:
         module.params['scopes'] = ['https://www.googleapis.com/auth/compute']
 
diff --git a/lib/ansible/modules/cloud/google/gcp_compute_ssl_certificate_facts.py b/lib/ansible/modules/cloud/google/gcp_compute_ssl_certificate_info.py
index 2f682b0d49..df51b65f1f 100644
--- a/lib/ansible/modules/cloud/google/gcp_compute_ssl_certificate_facts.py
+++ b/lib/ansible/modules/cloud/google/gcp_compute_ssl_certificate_info.py
@@ -29,10 +29,12 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ["preview"], 'supported
 
 DOCUMENTATION = '''
 ---
-module: gcp_compute_ssl_certificate_facts
+module: gcp_compute_ssl_certificate_info
 description:
-- Gather facts for GCP SslCertificate
-short_description: Gather facts for GCP SslCertificate
+- Gather info for GCP SslCertificate
+- This module was called C(gcp_compute_ssl_certificate_facts) before Ansible 2.9.
+  The usage has not changed.
+short_description: Gather info for GCP SslCertificate
 version_added: 2.7
 author: Google Inc. (@googlecloudplatform)
 requirements:
@@ -50,8 +52,8 @@ extends_documentation_fragment: gcp
 '''
 
 EXAMPLES = '''
-- name: " a ssl certificate facts"
-  gcp_compute_ssl_certificate_facts:
+- name: get info on an SSL certificate
+  gcp_compute_ssl_certificate_info:
     filters:
     - name = test_object
     project: test_project
@@ -118,6 +120,9 @@ import json
 def main():
     module = GcpModule(argument_spec=dict(filters=dict(type='list', elements='str')))
 
+    if module._name == 'gcp_compute_ssl_certificate_facts':
+        module.deprecate("The 'gcp_compute_ssl_certificate_facts' module has been renamed to 'gcp_compute_ssl_certificate_info'", version='2.13')
+
     if not module.params['scopes']:
         module.params['scopes'] = ['https://www.googleapis.com/auth/compute']
 
diff --git a/lib/ansible/modules/cloud/google/gcp_compute_ssl_policy_facts.py b/lib/ansible/modules/cloud/google/gcp_compute_ssl_policy_info.py
index f5755187bc..e1e7d72ba6 100644
--- a/lib/ansible/modules/cloud/google/gcp_compute_ssl_policy_facts.py
+++ b/lib/ansible/modules/cloud/google/gcp_compute_ssl_policy_info.py
@@ -29,10 +29,12 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ["preview"], 'supported
 
 DOCUMENTATION = '''
 ---
-module: gcp_compute_ssl_policy_facts
+module: gcp_compute_ssl_policy_info
 description:
-- Gather facts for GCP SslPolicy
-short_description: Gather facts for GCP SslPolicy
+- Gather info for GCP SslPolicy
+- This module was called C(gcp_compute_ssl_policy_facts) before Ansible 2.9. The usage
+  has not changed.
+short_description: Gather info for GCP SslPolicy
 version_added: 2.7
 author: Google Inc. (@googlecloudplatform)
 requirements:
@@ -50,8 +52,8 @@ extends_documentation_fragment: gcp
 '''
 
 EXAMPLES = '''
-- name: " a ssl policy facts"
-  gcp_compute_ssl_policy_facts:
+- name: get info on an SSL policy
+  gcp_compute_ssl_policy_info:
     filters:
     - name = test_object
     project: test_project
@@ -156,6 +158,9 @@ import json
 def main():
     module = GcpModule(argument_spec=dict(filters=dict(type='list', elements='str')))
 
+    if module._name == 'gcp_compute_ssl_policy_facts':
+        module.deprecate("The 'gcp_compute_ssl_policy_facts' module has been renamed to 'gcp_compute_ssl_policy_info'", version='2.13')
+
     if not module.params['scopes']:
         module.params['scopes'] = ['https://www.googleapis.com/auth/compute']
 
diff --git a/lib/ansible/modules/cloud/google/gcp_compute_subnetwork_facts.py b/lib/ansible/modules/cloud/google/gcp_compute_subnetwork_info.py
index 8940cb33d1..7d3419bfd3 100644
--- a/lib/ansible/modules/cloud/google/gcp_compute_subnetwork_facts.py
+++ b/lib/ansible/modules/cloud/google/gcp_compute_subnetwork_info.py
@@ -29,10 +29,12 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ["preview"], 'supported
 
 DOCUMENTATION = '''
 ---
-module: gcp_compute_subnetwork_facts
+module: gcp_compute_subnetwork_info
 description:
-- Gather facts for GCP Subnetwork
-short_description: Gather facts for GCP Subnetwork
+- Gather info for GCP Subnetwork
+- This module was called C(gcp_compute_subnetwork_facts) before Ansible 2.9. The usage
+  has not changed.
+short_description: Gather info for GCP Subnetwork
 version_added: 2.7
 author: Google Inc. (@googlecloudplatform)
 requirements:
@@ -55,8 +57,8 @@ extends_documentation_fragment: gcp
 '''
 
 EXAMPLES = '''
-- name: " a subnetwork facts"
-  gcp_compute_subnetwork_facts:
+- name: get info on a subnetwork
+  gcp_compute_subnetwork_info:
     region: us-west1
     filters:
     - name = test_object
@@ -179,6 +181,9 @@ import json
 def main():
     module = GcpModule(argument_spec=dict(filters=dict(type='list', elements='str'), region=dict(required=True, type='str')))
 
+    if module._name == 'gcp_compute_subnetwork_facts':
+        module.deprecate("The 'gcp_compute_subnetwork_facts' module has been renamed to 'gcp_compute_subnetwork_info'", version='2.13')
+
     if not module.params['scopes']:
         module.params['scopes'] = ['https://www.googleapis.com/auth/compute']
 
diff --git a/lib/ansible/modules/cloud/google/gcp_compute_target_http_proxy_facts.py b/lib/ansible/modules/cloud/google/gcp_compute_target_http_proxy_info.py
index e916afacfa..0188497d73 100644
--- a/lib/ansible/modules/cloud/google/gcp_compute_target_http_proxy_facts.py
+++ b/lib/ansible/modules/cloud/google/gcp_compute_target_http_proxy_info.py
@@ -29,10 +29,12 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ["preview"], 'supported
 
 DOCUMENTATION = '''
 ---
-module: gcp_compute_target_http_proxy_facts
+module: gcp_compute_target_http_proxy_info
 description:
-- Gather facts for GCP TargetHttpProxy
-short_description: Gather facts for GCP TargetHttpProxy
+- Gather info for GCP TargetHttpProxy
+- This module was called C(gcp_compute_target_http_proxy_facts) before Ansible 2.9.
+  The usage has not changed.
+short_description: Gather info for GCP TargetHttpProxy
 version_added: 2.7
 author: Google Inc. (@googlecloudplatform)
 requirements:
@@ -50,8 +52,8 @@ extends_documentation_fragment: gcp
 '''
 
 EXAMPLES = '''
-- name: " a target http proxy facts"
-  gcp_compute_target_http_proxy_facts:
+- name: get info on a target HTTP proxy
+  gcp_compute_target_http_proxy_info:
     filters:
     - name = test_object
     project: test_project
@@ -112,6 +114,9 @@ import json
 def main():
     module = GcpModule(argument_spec=dict(filters=dict(type='list', elements='str')))
 
+    if module._name == 'gcp_compute_target_http_proxy_facts':
+        module.deprecate("The 'gcp_compute_target_http_proxy_facts' module has been renamed to 'gcp_compute_target_http_proxy_info'", version='2.13')
+
     if not module.params['scopes']:
         module.params['scopes'] = ['https://www.googleapis.com/auth/compute']
 
diff --git a/lib/ansible/modules/cloud/google/gcp_compute_target_https_proxy_facts.py b/lib/ansible/modules/cloud/google/gcp_compute_target_https_proxy_info.py
index 842b4ed9f0..c1fee8f98e 100644
--- a/lib/ansible/modules/cloud/google/gcp_compute_target_https_proxy_facts.py
+++ b/lib/ansible/modules/cloud/google/gcp_compute_target_https_proxy_info.py
@@ -29,10 +29,12 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ["preview"], 'supported
 
 DOCUMENTATION = '''
 ---
-module: gcp_compute_target_https_proxy_facts
+module: gcp_compute_target_https_proxy_info
 description:
-- Gather facts for GCP TargetHttpsProxy
-short_description: Gather facts for GCP TargetHttpsProxy
+- Gather info for GCP TargetHttpsProxy
+- This module was called C(gcp_compute_target_https_proxy_facts) before Ansible 2.9.
+  The usage has not changed.
+short_description: Gather info for GCP TargetHttpsProxy
 version_added: 2.7
 author: Google Inc. (@googlecloudplatform)
 requirements:
@@ -50,8 +52,8 @@ extends_documentation_fragment: gcp
 '''
 
 EXAMPLES = '''
-- name: " a target https proxy facts"
-  gcp_compute_target_https_proxy_facts:
+- name: get info on a target HTTPS proxy
+  gcp_compute_target_https_proxy_info:
     filters:
     - name = test_object
     project: test_project
@@ -135,6 +137,9 @@ import json
 def main():
     module = GcpModule(argument_spec=dict(filters=dict(type='list', elements='str')))
 
+    if module._name == 'gcp_compute_target_https_proxy_facts':
+        module.deprecate("The 'gcp_compute_target_https_proxy_facts' module has been renamed to 'gcp_compute_target_https_proxy_info'", version='2.13')
+
     if not module.params['scopes']:
         module.params['scopes'] = ['https://www.googleapis.com/auth/compute']
 
diff --git a/lib/ansible/modules/cloud/google/gcp_compute_target_pool_facts.py b/lib/ansible/modules/cloud/google/gcp_compute_target_pool_info.py
index 5e90df0ff3..ddaa80a175 100644
--- a/lib/ansible/modules/cloud/google/gcp_compute_target_pool_facts.py
+++ b/lib/ansible/modules/cloud/google/gcp_compute_target_pool_info.py
@@ -29,10 +29,12 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ["preview"], 'supported
 
 DOCUMENTATION = '''
 ---
-module: gcp_compute_target_pool_facts
+module: gcp_compute_target_pool_info
 description:
-- Gather facts for GCP TargetPool
-short_description: Gather facts for GCP TargetPool
+- Gather info for GCP TargetPool
+- This module was called C(gcp_compute_target_pool_facts) before Ansible 2.9. The
+  usage has not changed.
+short_description: Gather info for GCP TargetPool
 version_added: 2.7
 author: Google Inc. (@googlecloudplatform)
 requirements:
@@ -55,8 +57,8 @@ extends_documentation_fragment: gcp
 '''
 
 EXAMPLES = '''
-- name: " a target pool facts"
-  gcp_compute_target_pool_facts:
+- name: get info on a target pool
+  gcp_compute_target_pool_info:
     region: us-west1
     filters:
     - name = test_object
@@ -171,6 +173,9 @@ import json
 def main():
     module = GcpModule(argument_spec=dict(filters=dict(type='list', elements='str'), region=dict(required=True, type='str')))
 
+    if module._name == 'gcp_compute_target_pool_facts':
+        module.deprecate("The 'gcp_compute_target_pool_facts' module has been renamed to 'gcp_compute_target_pool_info'", version='2.13')
+
     if not module.params['scopes']:
         module.params['scopes'] = ['https://www.googleapis.com/auth/compute']
 
diff --git a/lib/ansible/modules/cloud/google/gcp_compute_target_ssl_proxy_facts.py b/lib/ansible/modules/cloud/google/gcp_compute_target_ssl_proxy_info.py
index 72d8cc0d2c..1c5e02301b 100644
--- a/lib/ansible/modules/cloud/google/gcp_compute_target_ssl_proxy_facts.py
+++ b/lib/ansible/modules/cloud/google/gcp_compute_target_ssl_proxy_info.py
@@ -29,10 +29,12 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ["preview"], 'supported
 
 DOCUMENTATION = '''
 ---
-module: gcp_compute_target_ssl_proxy_facts
+module: gcp_compute_target_ssl_proxy_info
 description:
-- Gather facts for GCP TargetSslProxy
-short_description: Gather facts for GCP TargetSslProxy
+- Gather info for GCP TargetSslProxy
+- This module was called C(gcp_compute_target_ssl_proxy_facts) before Ansible 2.9.
+  The usage has not changed.
+short_description: Gather info for GCP TargetSslProxy
 version_added: 2.7
 author: Google Inc. (@googlecloudplatform)
 requirements:
@@ -50,8 +52,8 @@ extends_documentation_fragment: gcp
 '''
 
 EXAMPLES = '''
-- name: " a target ssl proxy facts"
-  gcp_compute_target_ssl_proxy_facts:
+- name: get info on a target SSL proxy
+  gcp_compute_target_ssl_proxy_info:
     filters:
     - name = test_object
     project: test_project
@@ -131,6 +133,9 @@ import json
 def main():
     module = GcpModule(argument_spec=dict(filters=dict(type='list', elements='str')))
 
+    if module._name == 'gcp_compute_target_ssl_proxy_facts':
+        module.deprecate("The 'gcp_compute_target_ssl_proxy_facts' module has been renamed to 'gcp_compute_target_ssl_proxy_info'", version='2.13')
+
     if not module.params['scopes']:
         module.params['scopes'] = ['https://www.googleapis.com/auth/compute']
 
diff --git a/lib/ansible/modules/cloud/google/gcp_compute_target_tcp_proxy_facts.py b/lib/ansible/modules/cloud/google/gcp_compute_target_tcp_proxy_info.py
index 351fd08c7e..2058f6bd6a 100644
--- a/lib/ansible/modules/cloud/google/gcp_compute_target_tcp_proxy_facts.py
+++ b/lib/ansible/modules/cloud/google/gcp_compute_target_tcp_proxy_info.py
@@ -29,10 +29,12 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ["preview"], 'supported
 
 DOCUMENTATION = '''
 ---
-module: gcp_compute_target_tcp_proxy_facts
+module: gcp_compute_target_tcp_proxy_info
 description:
-- Gather facts for GCP TargetTcpProxy
-short_description: Gather facts for GCP TargetTcpProxy
+- Gather info for GCP TargetTcpProxy
+- This module was called C(gcp_compute_target_tcp_proxy_facts) before Ansible 2.9.
+  The usage has not changed.
+short_description: Gather info for GCP TargetTcpProxy
 version_added: 2.7
 author: Google Inc. (@googlecloudplatform)
 requirements:
@@ -50,8 +52,8 @@ extends_documentation_fragment: gcp
 '''
 
 EXAMPLES = '''
-- name: " a target tcp proxy facts"
-  gcp_compute_target_tcp_proxy_facts:
+- name: get info on a target TCP proxy
+  gcp_compute_target_tcp_proxy_info:
     filters:
     - name = test_object
     project: test_project
@@ -117,6 +119,9 @@ import json
 def main():
     module = GcpModule(argument_spec=dict(filters=dict(type='list', elements='str')))
 
+    if module._name == 'gcp_compute_target_tcp_proxy_facts':
+        module.deprecate("The 'gcp_compute_target_tcp_proxy_facts' module has been renamed to 'gcp_compute_target_tcp_proxy_info'", version='2.13')
+
     if not module.params['scopes']:
         module.params['scopes'] = ['https://www.googleapis.com/auth/compute']
 
diff --git a/lib/ansible/modules/cloud/google/gcp_compute_target_vpn_gateway_facts.py b/lib/ansible/modules/cloud/google/gcp_compute_target_vpn_gateway_info.py
index 6381bbaf3f..b14bb3fcd9 100644
--- a/lib/ansible/modules/cloud/google/gcp_compute_target_vpn_gateway_facts.py
+++ b/lib/ansible/modules/cloud/google/gcp_compute_target_vpn_gateway_info.py
@@ -29,10 +29,12 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ["preview"], 'supported
 
 DOCUMENTATION = '''
 ---
-module: gcp_compute_target_vpn_gateway_facts
+module: gcp_compute_target_vpn_gateway_info
 description:
-- Gather facts for GCP TargetVpnGateway
-short_description: Gather facts for GCP TargetVpnGateway
+- Gather info for GCP TargetVpnGateway
+- This module was called C(gcp_compute_target_vpn_gateway_facts) before Ansible 2.9.
+  The usage has not changed.
+short_description: Gather info for GCP TargetVpnGateway
 version_added: 2.7
 author: Google Inc. (@googlecloudplatform)
 requirements:
@@ -55,8 +57,8 @@ extends_documentation_fragment: gcp
 '''
 
 EXAMPLES = '''
-- name: " a target vpn gateway facts"
-  gcp_compute_target_vpn_gateway_facts:
+- name: get info on a target VPN gateway
+  gcp_compute_target_vpn_gateway_info:
     region: us-west1
     filters:
     - name = test_object
@@ -133,6 +135,9 @@ import json
 def main():
     module = GcpModule(argument_spec=dict(filters=dict(type='list', elements='str'), region=dict(required=True, type='str')))
 
+    if module._name == 'gcp_compute_target_vpn_gateway_facts':
+        module.deprecate("The 'gcp_compute_target_vpn_gateway_facts' module has been renamed to 'gcp_compute_target_vpn_gateway_info'", version='2.13')
+
     if not module.params['scopes']:
         module.params['scopes'] = ['https://www.googleapis.com/auth/compute']
 
diff --git a/lib/ansible/modules/cloud/google/gcp_compute_url_map_facts.py b/lib/ansible/modules/cloud/google/gcp_compute_url_map_info.py
index 67b57b78ee..3d06b6b60a 100644
--- a/lib/ansible/modules/cloud/google/gcp_compute_url_map_facts.py
+++ b/lib/ansible/modules/cloud/google/gcp_compute_url_map_info.py
@@ -29,10 +29,12 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ["preview"], 'supported
 
 DOCUMENTATION = '''
 ---
-module: gcp_compute_url_map_facts
+module: gcp_compute_url_map_info
 description:
-- Gather facts for GCP UrlMap
-short_description: Gather facts for GCP UrlMap
+- Gather info for GCP UrlMap
+- This module was called C(gcp_compute_url_map_facts) before Ansible 2.9. The usage
+  has not changed.
+short_description: Gather info for GCP UrlMap
 version_added: 2.7
 author: Google Inc. (@googlecloudplatform)
 requirements:
@@ -50,8 +52,8 @@ extends_documentation_fragment: gcp
 '''
 
 EXAMPLES = '''
-- name: " a url map facts"
-  gcp_compute_url_map_facts:
+- name: get info on a URL map
+  gcp_compute_url_map_info:
     filters:
     - name = test_object
     project: test_project
@@ -213,6 +215,9 @@ import json
 def main():
     module = GcpModule(argument_spec=dict(filters=dict(type='list', elements='str')))
 
+    if module._name == 'gcp_compute_url_map_facts':
+        module.deprecate("The 'gcp_compute_url_map_facts' module has been renamed to 'gcp_compute_url_map_info'", version='2.13')
+
     if not module.params['scopes']:
         module.params['scopes'] = ['https://www.googleapis.com/auth/compute']
 
diff --git a/lib/ansible/modules/cloud/google/gcp_compute_vpn_tunnel_facts.py b/lib/ansible/modules/cloud/google/gcp_compute_vpn_tunnel_info.py
index 4edc389cb8..2d9d0b5cff 100644
--- a/lib/ansible/modules/cloud/google/gcp_compute_vpn_tunnel_facts.py
+++ b/lib/ansible/modules/cloud/google/gcp_compute_vpn_tunnel_info.py
@@ -29,10 +29,12 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ["preview"], 'supported
 
 DOCUMENTATION = '''
 ---
-module: gcp_compute_vpn_tunnel_facts
+module: gcp_compute_vpn_tunnel_info
 description:
-- Gather facts for GCP VpnTunnel
-short_description: Gather facts for GCP VpnTunnel
+- Gather info for GCP VpnTunnel
+- This module was called C(gcp_compute_vpn_tunnel_facts) before Ansible 2.9. The usage
+  has not changed.
+short_description: Gather info for GCP VpnTunnel
 version_added: 2.7
 author: Google Inc. (@googlecloudplatform)
 requirements:
@@ -55,8 +57,8 @@ extends_documentation_fragment: gcp
 '''
 
 EXAMPLES = '''
-- name: " a vpn tunnel facts"
-  gcp_compute_vpn_tunnel_facts:
+- name: get info on a VPN tunnel
+  gcp_compute_vpn_tunnel_info:
     region: us-west1
     filters:
     - name = test_object
@@ -160,6 +162,9 @@ import json
 def main():
     module = GcpModule(argument_spec=dict(filters=dict(type='list', elements='str'), region=dict(required=True, type='str')))
 
+    if module._name == 'gcp_compute_vpn_tunnel_facts':
+        module.deprecate("The 'gcp_compute_vpn_tunnel_facts' module has been renamed to 'gcp_compute_vpn_tunnel_info'", version='2.13')
+
     if not module.params['scopes']:
         module.params['scopes'] = ['https://www.googleapis.com/auth/compute']
 
diff --git a/lib/ansible/modules/cloud/google/gcp_container_cluster_facts.py b/lib/ansible/modules/cloud/google/gcp_container_cluster_info.py
index 207b855e78..53823bf029 100644
--- a/lib/ansible/modules/cloud/google/gcp_container_cluster_facts.py
+++ b/lib/ansible/modules/cloud/google/gcp_container_cluster_info.py
@@ -29,10 +29,12 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ["preview"], 'supported
 
 DOCUMENTATION = '''
 ---
-module: gcp_container_cluster_facts
+module: gcp_container_cluster_info
 description:
-- Gather facts for GCP Cluster
-short_description: Gather facts for GCP Cluster
+- Gather info for GCP Cluster
+- This module was called C(gcp_container_cluster_facts) before Ansible 2.9. The usage
+  has not changed.
+short_description: Gather info for GCP Cluster
 version_added: 2.8
 author: Google Inc. (@googlecloudplatform)
 requirements:
@@ -53,8 +55,8 @@ extends_documentation_fragment: gcp
 '''
 
 EXAMPLES = '''
-- name: " a cluster facts"
-  gcp_container_cluster_facts:
+- name: get info on a cluster
+  gcp_container_cluster_info:
     location: us-central1-a
     project: test_project
     auth_kind: serviceaccount
@@ -578,6 +580,9 @@ import json
 def main():
     module = GcpModule(argument_spec=dict(location=dict(required=True, type='str', aliases=['region', 'zone'])))
 
+    if module._name == 'gcp_container_cluster_facts':
+        module.deprecate("The 'gcp_container_cluster_facts' module has been renamed to 'gcp_container_cluster_info'", version='2.13')
+
     if not module.params['scopes']:
         module.params['scopes'] = ['https://www.googleapis.com/auth/cloud-platform']
 
diff --git a/lib/ansible/modules/cloud/google/gcp_container_node_pool_facts.py b/lib/ansible/modules/cloud/google/gcp_container_node_pool_info.py
index 5e8539df16..1558d668fa 100644
--- a/lib/ansible/modules/cloud/google/gcp_container_node_pool_facts.py
+++ b/lib/ansible/modules/cloud/google/gcp_container_node_pool_info.py
@@ -29,10 +29,12 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ["preview"], 'supported
 
 DOCUMENTATION = '''
 ---
-module: gcp_container_node_pool_facts
+module: gcp_container_node_pool_info
 description:
-- Gather facts for GCP NodePool
-short_description: Gather facts for GCP NodePool
+- Gather info for GCP NodePool
+- This module was called C(gcp_container_node_pool_facts) before Ansible 2.9. The
+  usage has not changed.
+short_description: Gather info for GCP NodePool
 version_added: 2.8
 author: Google Inc. (@googlecloudplatform)
 requirements:
@@ -63,8 +65,8 @@ extends_documentation_fragment: gcp
 '''
 
 EXAMPLES = '''
-- name: " a node pool facts"
-  gcp_container_node_pool_facts:
+- name: get info on a node pool
+  gcp_container_node_pool_info:
     cluster: "{{ cluster }}"
     location: us-central1-a
     project: test_project
@@ -363,6 +365,9 @@ import json
 def main():
     module = GcpModule(argument_spec=dict(location=dict(required=True, type='str', aliases=['region', 'zone']), cluster=dict(required=True, type='dict')))
 
+    if module._name == 'gcp_container_node_pool_facts':
+        module.deprecate("The 'gcp_container_node_pool_facts' module has been renamed to 'gcp_container_node_pool_info'", version='2.13')
+
     if not module.params['scopes']:
         module.params['scopes'] = ['https://www.googleapis.com/auth/cloud-platform']
 
diff --git a/lib/ansible/modules/cloud/google/gcp_dns_managed_zone_facts.py b/lib/ansible/modules/cloud/google/gcp_dns_managed_zone_info.py
index 1154270aac..a31adc65f2 100644
--- a/lib/ansible/modules/cloud/google/gcp_dns_managed_zone_facts.py
+++ b/lib/ansible/modules/cloud/google/gcp_dns_managed_zone_info.py
@@ -29,10 +29,12 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ["preview"], 'supported
 
 DOCUMENTATION = '''
 ---
-module: gcp_dns_managed_zone_facts
+module: gcp_dns_managed_zone_info
 description:
-- Gather facts for GCP ManagedZone
-short_description: Gather facts for GCP ManagedZone
+- Gather info for GCP ManagedZone
+- This module was called C(gcp_dns_managed_zone_facts) before Ansible 2.9. The usage
+  has not changed.
+short_description: Gather info for GCP ManagedZone
 version_added: 2.8
 author: Google Inc. (@googlecloudplatform)
 requirements:
@@ -48,8 +50,8 @@ extends_documentation_fragment: gcp
 '''
 
 EXAMPLES = '''
-- name: " a managed zone facts"
-  gcp_dns_managed_zone_facts:
+- name: get info on a managed zone
+  gcp_dns_managed_zone_info:
     dns_name: test.somewild2.example.com.
     project: test_project
     auth_kind: serviceaccount
@@ -206,6 +208,9 @@ import json
 def main():
     module = GcpModule(argument_spec=dict(dns_name=dict(type='list', elements='str')))
 
+    if module._name == 'gcp_dns_managed_zone_facts':
+        module.deprecate("The 'gcp_dns_managed_zone_facts' module has been renamed to 'gcp_dns_managed_zone_info'", version='2.13')
+
     if not module.params['scopes']:
         module.params['scopes'] = ['https://www.googleapis.com/auth/ndev.clouddns.readwrite']
 
diff --git a/lib/ansible/modules/cloud/google/gcp_dns_resource_record_set_facts.py b/lib/ansible/modules/cloud/google/gcp_dns_resource_record_set_info.py
index 90db02420c..409c18b8f8 100644
--- a/lib/ansible/modules/cloud/google/gcp_dns_resource_record_set_facts.py
+++ b/lib/ansible/modules/cloud/google/gcp_dns_resource_record_set_info.py
@@ -29,10 +29,12 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ["preview"], 'supported
 
 DOCUMENTATION = '''
 ---
-module: gcp_dns_resource_record_set_facts
+module: gcp_dns_resource_record_set_info
 description:
-- Gather facts for GCP ResourceRecordSet
-short_description: Gather facts for GCP ResourceRecordSet
+- Gather info for GCP ResourceRecordSet
+- This module was called C(gcp_dns_resource_record_set_facts) before Ansible 2.9.
+  The usage has not changed.
+short_description: Gather info for GCP ResourceRecordSet
 version_added: 2.8
 author: Google Inc. (@googlecloudplatform)
 requirements:
@@ -54,8 +56,8 @@ extends_documentation_fragment: gcp
 '''
 
 EXAMPLES = '''
-- name: " a resource record set facts"
-  gcp_dns_resource_record_set_facts:
+- name: get info on a resource record set
+  gcp_dns_resource_record_set_info:
     managed_zone: "{{ managed_zone }}"
     project: test_project
     auth_kind: serviceaccount
@@ -109,6 +111,9 @@ import json
 def main():
     module = GcpModule(argument_spec=dict(managed_zone=dict(required=True, type='dict')))
 
+    if module._name == 'gcp_dns_resource_record_set_facts':
+        module.deprecate("The 'gcp_dns_resource_record_set_facts' module has been renamed to 'gcp_dns_resource_record_set_info'", version='2.13')
+
     if not module.params['scopes']:
         module.params['scopes'] = ['https://www.googleapis.com/auth/ndev.clouddns.readwrite']
 
diff --git a/lib/ansible/modules/cloud/google/gcp_iam_role_facts.py b/lib/ansible/modules/cloud/google/gcp_iam_role_info.py
index ea421bd741..85a182025a 100644
--- a/lib/ansible/modules/cloud/google/gcp_iam_role_facts.py
+++ b/lib/ansible/modules/cloud/google/gcp_iam_role_info.py
@@ -29,10 +29,12 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ["preview"], 'supported
 
 DOCUMENTATION = '''
 ---
-module: gcp_iam_role_facts
+module: gcp_iam_role_info
 description:
-- Gather facts for GCP Role
-short_description: Gather facts for GCP Role
+- Gather info for GCP Role
+- This module was called C(gcp_iam_role_facts) before Ansible 2.9. The usage has not
+  changed.
+short_description: Gather info for GCP Role
 version_added: 2.8
 author: Google Inc. (@googlecloudplatform)
 requirements:
@@ -44,8 +46,8 @@ extends_documentation_fragment: gcp
 '''
 
 EXAMPLES = '''
-- name: " a role facts"
-  gcp_iam_role_facts:
+- name: get info on a role
+  gcp_iam_role_info:
     project: test_project
     auth_kind: serviceaccount
     service_account_file: "/tmp/auth.pem"
@@ -104,6 +106,9 @@ import json
 def main():
     module = GcpModule(argument_spec=dict())
 
+    if module._name == 'gcp_iam_role_facts':
+        module.deprecate("The 'gcp_iam_role_facts' module has been renamed to 'gcp_iam_role_info'", version='2.13')
+
     if not module.params['scopes']:
         module.params['scopes'] = ['https://www.googleapis.com/auth/iam']
 
diff --git a/lib/ansible/modules/cloud/google/gcp_iam_service_account_facts.py b/lib/ansible/modules/cloud/google/gcp_iam_service_account_info.py
index 4e130b68c1..2f22bde544 100644
--- a/lib/ansible/modules/cloud/google/gcp_iam_service_account_facts.py
+++ b/lib/ansible/modules/cloud/google/gcp_iam_service_account_info.py
@@ -29,10 +29,12 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ["preview"], 'supported
 
 DOCUMENTATION = '''
 ---
-module: gcp_iam_service_account_facts
+module: gcp_iam_service_account_info
 description:
-- Gather facts for GCP ServiceAccount
-short_description: Gather facts for GCP ServiceAccount
+- Gather info for GCP ServiceAccount
+- This module was called C(gcp_iam_service_account_facts) before Ansible 2.9. The
+  usage has not changed.
+short_description: Gather info for GCP ServiceAccount
 version_added: 2.8
 author: Google Inc. (@googlecloudplatform)
 requirements:
@@ -44,8 +46,8 @@ extends_documentation_fragment: gcp
 '''
 
 EXAMPLES = '''
-- name: " a service account facts"
-  gcp_iam_service_account_facts:
+- name: get info on a service account
+  gcp_iam_service_account_info:
     project: test_project
     auth_kind: serviceaccount
     service_account_file: "/tmp/auth.pem"
@@ -103,6 +105,9 @@ import json
 def main():
     module = GcpModule(argument_spec=dict())
 
+    if module._name == 'gcp_iam_service_account_facts':
+        module.deprecate("The 'gcp_iam_service_account_facts' module has been renamed to 'gcp_iam_service_account_info'", version='2.13')
+
     if not module.params['scopes']:
         module.params['scopes'] = ['https://www.googleapis.com/auth/iam']
 
diff --git a/lib/ansible/modules/cloud/google/gcp_mlengine_model_facts.py b/lib/ansible/modules/cloud/google/gcp_mlengine_model_info.py
index e23de2af24..4605c08057 100644
--- a/lib/ansible/modules/cloud/google/gcp_mlengine_model_facts.py
+++ b/lib/ansible/modules/cloud/google/gcp_mlengine_model_info.py
@@ -29,10 +29,10 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ["preview"], 'supported
 
 DOCUMENTATION = '''
 ---
-module: gcp_mlengine_model_facts
+module: gcp_mlengine_model_info
 description:
-- Gather facts for GCP Model
-short_description: Gather facts for GCP Model
+- Gather info for GCP Model
+short_description: Gather info for GCP Model
 version_added: 2.9
 author: Google Inc. (@googlecloudplatform)
 requirements:
@@ -44,8 +44,8 @@ extends_documentation_fragment: gcp
 '''
 
 EXAMPLES = '''
-- name: " a model facts"
-  gcp_mlengine_model_facts:
+- name: get info on a model
+  gcp_mlengine_model_info:
     project: test_project
     auth_kind: serviceaccount
     service_account_file: "/tmp/auth.pem"
diff --git a/lib/ansible/modules/cloud/google/gcp_mlengine_version_facts.py b/lib/ansible/modules/cloud/google/gcp_mlengine_version_info.py
index ffd5efb5c9..de02cb2508 100644
--- a/lib/ansible/modules/cloud/google/gcp_mlengine_version_facts.py
+++ b/lib/ansible/modules/cloud/google/gcp_mlengine_version_info.py
@@ -29,10 +29,10 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ["preview"], 'supported
 
 DOCUMENTATION = '''
 ---
-module: gcp_mlengine_version_facts
+module: gcp_mlengine_version_info
 description:
-- Gather facts for GCP Version
-short_description: Gather facts for GCP Version
+- Gather info for GCP Version
+short_description: Gather info for GCP Version
 version_added: 2.9
 author: Google Inc. (@googlecloudplatform)
 requirements:
@@ -54,8 +54,8 @@ extends_documentation_fragment: gcp
 '''
 
 EXAMPLES = '''
-- name: " a version facts"
-  gcp_mlengine_version_facts:
+- name: get info on a version
+  gcp_mlengine_version_info:
     model: "{{ model }}"
     project: test_project
     auth_kind: serviceaccount
diff --git a/lib/ansible/modules/cloud/google/gcp_pubsub_subscription_facts.py b/lib/ansible/modules/cloud/google/gcp_pubsub_subscription_info.py
index 478bf57c46..a0d4c48785 100644
--- a/lib/ansible/modules/cloud/google/gcp_pubsub_subscription_facts.py
+++ b/lib/ansible/modules/cloud/google/gcp_pubsub_subscription_info.py
@@ -29,10 +29,12 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ["preview"], 'supported
 
 DOCUMENTATION = '''
 ---
-module: gcp_pubsub_subscription_facts
+module: gcp_pubsub_subscription_info
 description:
-- Gather facts for GCP Subscription
-short_description: Gather facts for GCP Subscription
+- Gather info for GCP Subscription
+- This module was called C(gcp_pubsub_subscription_facts) before Ansible 2.9. The
+  usage has not changed.
+short_description: Gather info for GCP Subscription
 version_added: 2.8
 author: Google Inc. (@googlecloudplatform)
 requirements:
@@ -44,8 +46,8 @@ extends_documentation_fragment: gcp
 '''
 
 EXAMPLES = '''
-- name: " a subscription facts"
-  gcp_pubsub_subscription_facts:
+- name: get info on a subscription
+  gcp_pubsub_subscription_info:
     project: test_project
     auth_kind: serviceaccount
     service_account_file: "/tmp/auth.pem"
@@ -182,6 +184,9 @@ import json
 def main():
     module = GcpModule(argument_spec=dict())
 
+    if module._name == 'gcp_pubsub_subscription_facts':
+        module.deprecate("The 'gcp_pubsub_subscription_facts' module has been renamed to 'gcp_pubsub_subscription_info'", version='2.13')
+
     if not module.params['scopes']:
         module.params['scopes'] = ['https://www.googleapis.com/auth/pubsub']
 
diff --git a/lib/ansible/modules/cloud/google/gcp_pubsub_topic_facts.py b/lib/ansible/modules/cloud/google/gcp_pubsub_topic_info.py
index 527da46be4..a2457d62f8 100644
--- a/lib/ansible/modules/cloud/google/gcp_pubsub_topic_facts.py
+++ b/lib/ansible/modules/cloud/google/gcp_pubsub_topic_info.py
@@ -29,10 +29,12 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ["preview"], 'supported
 
 DOCUMENTATION = '''
 ---
-module: gcp_pubsub_topic_facts
+module: gcp_pubsub_topic_info
 description:
-- Gather facts for GCP Topic
-short_description: Gather facts for GCP Topic
+- Gather info for GCP Topic
+- This module was called C(gcp_pubsub_topic_facts) before Ansible 2.9. The usage has
+  not changed.
+short_description: Gather info for GCP Topic
 version_added: 2.8
 author: Google Inc. (@googlecloudplatform)
 requirements:
@@ -44,8 +46,8 @@ extends_documentation_fragment: gcp
 '''
 
 EXAMPLES = '''
-- name: " a topic facts"
-  gcp_pubsub_topic_facts:
+- name: get info on a topic
+  gcp_pubsub_topic_info:
     project: test_project
     auth_kind: serviceaccount
     service_account_file: "/tmp/auth.pem"
@@ -92,6 +94,9 @@ import json
 def main():
     module = GcpModule(argument_spec=dict())
 
+    if module._name == 'gcp_pubsub_topic_facts':
+        module.deprecate("The 'gcp_pubsub_topic_facts' module has been renamed to 'gcp_pubsub_topic_info'", version='2.13')
+
     if not module.params['scopes']:
         module.params['scopes'] = ['https://www.googleapis.com/auth/pubsub']
 
diff --git a/lib/ansible/modules/cloud/google/gcp_redis_instance_facts.py b/lib/ansible/modules/cloud/google/gcp_redis_instance_info.py
index 555bd93afe..6164fe2d96 100644
--- a/lib/ansible/modules/cloud/google/gcp_redis_instance_facts.py
+++ b/lib/ansible/modules/cloud/google/gcp_redis_instance_info.py
@@ -29,10 +29,12 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ["preview"], 'supported
 
 DOCUMENTATION = '''
 ---
-module: gcp_redis_instance_facts
+module: gcp_redis_instance_info
 description:
-- Gather facts for GCP Instance
-short_description: Gather facts for GCP Instance
+- Gather info for GCP Instance
+- This module was called C(gcp_redis_instance_facts) before Ansible 2.9. The usage
+  has not changed.
+short_description: Gather info for GCP Instance
 version_added: 2.8
 author: Google Inc. (@googlecloudplatform)
 requirements:
@@ -49,8 +51,8 @@ extends_documentation_fragment: gcp
 '''
 
 EXAMPLES = '''
-- name: " a instance facts"
-  gcp_redis_instance_facts:
+- name: get info on an instance
+  gcp_redis_instance_info:
     region: us-central1
     project: test_project
     auth_kind: serviceaccount
@@ -180,6 +182,9 @@ import json
 def main():
     module = GcpModule(argument_spec=dict(region=dict(required=True, type='str')))
 
+    if module._name == 'gcp_redis_instance_facts':
+        module.deprecate("The 'gcp_redis_instance_facts' module has been renamed to 'gcp_redis_instance_info'", version='2.13')
+
     if not module.params['scopes']:
         module.params['scopes'] = ['https://www.googleapis.com/auth/cloud-platform']
 
diff --git a/lib/ansible/modules/cloud/google/gcp_resourcemanager_project_facts.py b/lib/ansible/modules/cloud/google/gcp_resourcemanager_project_info.py
index 7d66ff9165..1f5fd17d75 100644
--- a/lib/ansible/modules/cloud/google/gcp_resourcemanager_project_facts.py
+++ b/lib/ansible/modules/cloud/google/gcp_resourcemanager_project_info.py
@@ -29,10 +29,12 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ["preview"], 'supported
 
 DOCUMENTATION = '''
 ---
-module: gcp_resourcemanager_project_facts
+module: gcp_resourcemanager_project_info
 description:
-- Gather facts for GCP Project
-short_description: Gather facts for GCP Project
+- Gather info for GCP Project
+- This module was called C(gcp_resourcemanager_project_facts) before Ansible 2.9.
+  The usage has not changed.
+short_description: Gather info for GCP Project
 version_added: 2.8
 author: Google Inc. (@googlecloudplatform)
 requirements:
@@ -44,8 +46,8 @@ extends_documentation_fragment: gcp
 '''
 
 EXAMPLES = '''
-- name: " a project facts"
-  gcp_resourcemanager_project_facts:
+- name: get info on a project
+  gcp_resourcemanager_project_info:
     project: test_project
     auth_kind: serviceaccount
     service_account_file: "/tmp/auth.pem"
@@ -130,6 +132,9 @@ import json
 def main():
     module = GcpModule(argument_spec=dict())
 
+    if module._name == 'gcp_resourcemanager_project_facts':
+        module.deprecate("The 'gcp_resourcemanager_project_facts' module has been renamed to 'gcp_resourcemanager_project_info'", version='2.13')
+
     if not module.params['scopes']:
         module.params['scopes'] = ['https://www.googleapis.com/auth/cloud-platform']
 
diff --git a/lib/ansible/modules/cloud/google/gcp_sourcerepo_repository_facts.py b/lib/ansible/modules/cloud/google/gcp_sourcerepo_repository_info.py
index 328a39a70d..baecdd483f 100644
--- a/lib/ansible/modules/cloud/google/gcp_sourcerepo_repository_facts.py
+++ b/lib/ansible/modules/cloud/google/gcp_sourcerepo_repository_info.py
@@ -29,10 +29,12 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ["preview"], 'supported
 
 DOCUMENTATION = '''
 ---
-module: gcp_sourcerepo_repository_facts
+module: gcp_sourcerepo_repository_info
 description:
-- Gather facts for GCP Repository
-short_description: Gather facts for GCP Repository
+- Gather info for GCP Repository
+- This module was called C(gcp_sourcerepo_repository_facts) before Ansible 2.9. The
+  usage has not changed.
+short_description: Gather info for GCP Repository
 version_added: 2.8
 author: Google Inc. (@googlecloudplatform)
 requirements:
@@ -44,8 +46,8 @@ extends_documentation_fragment: gcp
 '''
 
 EXAMPLES = '''
-- name: " a repository facts"
-  gcp_sourcerepo_repository_facts:
+- name: get info on a repository
+  gcp_sourcerepo_repository_info:
     project: test_project
     auth_kind: serviceaccount
     service_account_file: "/tmp/auth.pem"
@@ -90,6 +92,9 @@ import json
 def main():
     module = GcpModule(argument_spec=dict())
 
+    if module._name == 'gcp_sourcerepo_repository_facts':
+        module.deprecate("The 'gcp_sourcerepo_repository_facts' module has been renamed to 'gcp_sourcerepo_repository_info'", version='2.13')
+
     if not module.params['scopes']:
         module.params['scopes'] = ['https://www.googleapis.com/auth/cloud-platform']
 
diff --git a/lib/ansible/modules/cloud/google/gcp_spanner_database_facts.py b/lib/ansible/modules/cloud/google/gcp_spanner_database_info.py
index b0027a221d..24c6d322e0 100644
--- a/lib/ansible/modules/cloud/google/gcp_spanner_database_facts.py
+++ b/lib/ansible/modules/cloud/google/gcp_spanner_database_info.py
@@ -29,10 +29,12 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ["preview"], 'supported
 
 DOCUMENTATION = '''
 ---
-module: gcp_spanner_database_facts
+module: gcp_spanner_database_info
 description:
-- Gather facts for GCP Database
-short_description: Gather facts for GCP Database
+- Gather info for GCP Database
+- This module was called C(gcp_spanner_database_facts) before Ansible 2.9. The usage
+  has not changed.
+short_description: Gather info for GCP Database
 version_added: 2.8
 author: Google Inc. (@googlecloudplatform)
 requirements:
@@ -54,8 +56,8 @@ extends_documentation_fragment: gcp
 '''
 
 EXAMPLES = '''
-- name: " a database facts"
-  gcp_spanner_database_facts:
+- name: get info on a database
+  gcp_spanner_database_info:
     instance: "{{ instance }}"
     project: test_project
     auth_kind: serviceaccount
@@ -103,6 +105,9 @@ import json
 def main():
     module = GcpModule(argument_spec=dict(instance=dict(required=True, type='dict')))
 
+    if module._name == 'gcp_spanner_database_facts':
+        module.deprecate("The 'gcp_spanner_database_facts' module has been renamed to 'gcp_spanner_database_info'", version='2.13')
+
     if not module.params['scopes']:
         module.params['scopes'] = ['https://www.googleapis.com/auth/spanner.admin']
 
diff --git a/lib/ansible/modules/cloud/google/gcp_spanner_instance_facts.py b/lib/ansible/modules/cloud/google/gcp_spanner_instance_info.py
index 8891c4e68d..375ea6d20e 100644
--- a/lib/ansible/modules/cloud/google/gcp_spanner_instance_facts.py
+++ b/lib/ansible/modules/cloud/google/gcp_spanner_instance_info.py
@@ -29,10 +29,12 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ["preview"], 'supported
 
 DOCUMENTATION = '''
 ---
-module: gcp_spanner_instance_facts
+module: gcp_spanner_instance_info
 description:
-- Gather facts for GCP Instance
-short_description: Gather facts for GCP Instance
+- Gather info for GCP Instance
+- This module was called C(gcp_spanner_instance_facts) before Ansible 2.9. The usage
+  has not changed.
+short_description: Gather info for GCP Instance
 version_added: 2.8
 author: Google Inc. (@googlecloudplatform)
 requirements:
@@ -44,8 +46,8 @@ extends_documentation_fragment: gcp
 '''
 
 EXAMPLES = '''
-- name: " a instance facts"
-  gcp_spanner_instance_facts:
+- name: get info on an instance
+  gcp_spanner_instance_info:
     project: test_project
     auth_kind: serviceaccount
     service_account_file: "/tmp/auth.pem"
@@ -106,6 +108,9 @@ import json
 def main():
     module = GcpModule(argument_spec=dict())
 
+    if module._name == 'gcp_spanner_instance_facts':
+        module.deprecate("The 'gcp_spanner_instance_facts' module has been renamed to 'gcp_spanner_instance_info'", version='2.13')
+
     if not module.params['scopes']:
         module.params['scopes'] = ['https://www.googleapis.com/auth/spanner.admin']
 
diff --git a/lib/ansible/modules/cloud/google/gcp_sql_database_facts.py b/lib/ansible/modules/cloud/google/gcp_sql_database_info.py
index bea7019fcc..6d1b34654b 100644
--- a/lib/ansible/modules/cloud/google/gcp_sql_database_facts.py
+++ b/lib/ansible/modules/cloud/google/gcp_sql_database_info.py
@@ -29,10 +29,12 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ["preview"], 'supported
 
 DOCUMENTATION = '''
 ---
-module: gcp_sql_database_facts
+module: gcp_sql_database_info
 description:
-- Gather facts for GCP Database
-short_description: Gather facts for GCP Database
+- Gather info for GCP Database
+- This module was called C(gcp_sql_database_facts) before Ansible 2.9. The usage has
+  not changed.
+short_description: Gather info for GCP Database
 version_added: 2.8
 author: Google Inc. (@googlecloudplatform)
 requirements:
@@ -49,8 +51,8 @@ extends_documentation_fragment: gcp
 '''
 
 EXAMPLES = '''
-- name: " a database facts"
-  gcp_sql_database_facts:
+- name: get info on a database
+  gcp_sql_database_info:
     instance: "{{ instance }}"
     project: test_project
     auth_kind: serviceaccount
@@ -100,6 +102,9 @@ import json
 def main():
     module = GcpModule(argument_spec=dict(instance=dict(required=True, type='str')))
 
+    if module._name == 'gcp_sql_database_facts':
+        module.deprecate("The 'gcp_sql_database_facts' module has been renamed to 'gcp_sql_database_info'", version='2.13')
+
     if not module.params['scopes']:
         module.params['scopes'] = ['https://www.googleapis.com/auth/sqlservice.admin']
 
diff --git a/lib/ansible/modules/cloud/google/gcp_sql_instance_facts.py b/lib/ansible/modules/cloud/google/gcp_sql_instance_info.py
index c7a0f71f5b..41e545aa61 100644
--- a/lib/ansible/modules/cloud/google/gcp_sql_instance_facts.py
+++ b/lib/ansible/modules/cloud/google/gcp_sql_instance_info.py
@@ -29,10 +29,12 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ["preview"], 'supported
 
 DOCUMENTATION = '''
 ---
-module: gcp_sql_instance_facts
+module: gcp_sql_instance_info
 description:
-- Gather facts for GCP Instance
-short_description: Gather facts for GCP Instance
+- Gather info for GCP Instance
+- This module was called C(gcp_sql_instance_facts) before Ansible 2.9. The usage has
+  not changed.
+short_description: Gather info for GCP Instance
 version_added: 2.8
 author: Google Inc. (@googlecloudplatform)
 requirements:
@@ -44,8 +46,8 @@ extends_documentation_fragment: gcp
 '''
 
 EXAMPLES = '''
-- name: " a instance facts"
-  gcp_sql_instance_facts:
+- name: get info on an instance
+  gcp_sql_instance_info:
     project: test_project
     auth_kind: serviceaccount
     service_account_file: "/tmp/auth.pem"
@@ -383,6 +385,9 @@ import json
 def main():
     module = GcpModule(argument_spec=dict())
 
+    if module._name == 'gcp_sql_instance_facts':
+        module.deprecate("The 'gcp_sql_instance_facts' module has been renamed to 'gcp_sql_instance_info'", version='2.13')
+
     if not module.params['scopes']:
         module.params['scopes'] = ['https://www.googleapis.com/auth/sqlservice.admin']
 
diff --git a/lib/ansible/modules/cloud/google/gcp_sql_user_facts.py b/lib/ansible/modules/cloud/google/gcp_sql_user_info.py
index 2ea0ff9c64..36e9204c1c 100644
--- a/lib/ansible/modules/cloud/google/gcp_sql_user_facts.py
+++ b/lib/ansible/modules/cloud/google/gcp_sql_user_info.py
@@ -29,10 +29,12 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ["preview"], 'supported
 
 DOCUMENTATION = '''
 ---
-module: gcp_sql_user_facts
+module: gcp_sql_user_info
 description:
-- Gather facts for GCP User
-short_description: Gather facts for GCP User
+- Gather info for GCP User
+- This module was called C(gcp_sql_user_facts) before Ansible 2.9. The usage has not
+  changed.
+short_description: Gather info for GCP User
 version_added: 2.8
 author: Google Inc. (@googlecloudplatform)
 requirements:
@@ -54,8 +56,8 @@ extends_documentation_fragment: gcp
 '''
 
 EXAMPLES = '''
-- name: " a user facts"
-  gcp_sql_user_facts:
+- name: get info on a user
+  gcp_sql_user_info:
     instance: "{{ instance }}"
     project: test_project
     auth_kind: serviceaccount
@@ -106,6 +108,9 @@ import json
 def main():
     module = GcpModule(argument_spec=dict(instance=dict(required=True, type='dict')))
 
+    if module._name == 'gcp_sql_user_facts':
+        module.deprecate("The 'gcp_sql_user_facts' module has been renamed to 'gcp_sql_user_info'", version='2.13')
+
     if not module.params['scopes']:
         module.params['scopes'] = ['https://www.googleapis.com/auth/sqlservice.admin']
 
diff --git a/lib/ansible/modules/cloud/google/gcp_tpu_node_facts.py b/lib/ansible/modules/cloud/google/gcp_tpu_node_info.py
index a26246ff7c..57e63b495c 100644
--- a/lib/ansible/modules/cloud/google/gcp_tpu_node_facts.py
+++ b/lib/ansible/modules/cloud/google/gcp_tpu_node_info.py
@@ -29,10 +29,10 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ["preview"], 'supported
 
 DOCUMENTATION = '''
 ---
-module: gcp_tpu_node_facts
+module: gcp_tpu_node_info
 description:
-- Gather facts for GCP Node
-short_description: Gather facts for GCP Node
+- Gather info for GCP Node
+short_description: Gather info for GCP Node
 version_added: 2.9
 author: Google Inc. (@googlecloudplatform)
 requirements:
@@ -49,8 +49,8 @@ extends_documentation_fragment: gcp
 '''
 
 EXAMPLES = '''
-- name: " a node facts"
-  gcp_tpu_node_facts:
+- name: get info on a node
+  gcp_tpu_node_info:
     zone: us-central1-b
     project: test_project
     auth_kind: serviceaccount
diff --git a/test/integration/targets/gcp_appengine_firewall_rule/tasks/main.yml b/test/integration/targets/gcp_appengine_firewall_rule/tasks/main.yml
index 94dac0184c..5233e460a0 100644
--- a/test/integration/targets/gcp_appengine_firewall_rule/tasks/main.yml
+++ b/test/integration/targets/gcp_appengine_firewall_rule/tasks/main.yml
@@ -38,7 +38,7 @@
     that:
       - result.changed == true
 - name: verify that firewall_rule was created
-  gcp_appengine_firewall_rule_facts:
+  gcp_appengine_firewall_rule_info:
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
       service_account_file: "{{ gcp_cred_file }}"
@@ -80,7 +80,7 @@
     that:
       - result.changed == true
 - name: verify that firewall_rule was deleted
-  gcp_appengine_firewall_rule_facts:
+  gcp_appengine_firewall_rule_info:
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
       service_account_file: "{{ gcp_cred_file }}"
diff --git a/test/integration/targets/gcp_bigquery_dataset/tasks/main.yml b/test/integration/targets/gcp_bigquery_dataset/tasks/main.yml
index a37964fe2c..ac1eae0dde 100644
--- a/test/integration/targets/gcp_bigquery_dataset/tasks/main.yml
+++ b/test/integration/targets/gcp_bigquery_dataset/tasks/main.yml
@@ -38,7 +38,7 @@
     that:
       - result.changed == true
 - name: verify that dataset was created
-  gcp_bigquery_dataset_facts:
+  gcp_bigquery_dataset_info:
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
       service_account_file: "{{ gcp_cred_file }}"
@@ -80,7 +80,7 @@
     that:
       - result.changed == true
 - name: verify that dataset was deleted
-  gcp_bigquery_dataset_facts:
+  gcp_bigquery_dataset_info:
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
       service_account_file: "{{ gcp_cred_file }}"
diff --git a/test/integration/targets/gcp_bigquery_table/tasks/main.yml b/test/integration/targets/gcp_bigquery_table/tasks/main.yml
index 90993bedcc..caa12eb97f 100644
--- a/test/integration/targets/gcp_bigquery_table/tasks/main.yml
+++ b/test/integration/targets/gcp_bigquery_table/tasks/main.yml
@@ -54,7 +54,7 @@
     that:
       - result.changed == true
 - name: verify that table was created
-  gcp_bigquery_table_facts:
+  gcp_bigquery_table_info:
       dataset: example_dataset
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
@@ -103,7 +103,7 @@
     that:
       - result.changed == true
 - name: verify that table was deleted
-  gcp_bigquery_table_facts:
+  gcp_bigquery_table_info:
       dataset: example_dataset
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
diff --git a/test/integration/targets/gcp_cloudscheduler_job/tasks/main.yml b/test/integration/targets/gcp_cloudscheduler_job/tasks/main.yml
index b48ccd6096..ffe687b767 100644
--- a/test/integration/targets/gcp_cloudscheduler_job/tasks/main.yml
+++ b/test/integration/targets/gcp_cloudscheduler_job/tasks/main.yml
@@ -56,7 +56,7 @@
     that:
       - result.changed == true
 - name: verify that job was created
-  gcp_cloudscheduler_job_facts:
+  gcp_cloudscheduler_job_info:
       region: us-central1
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
@@ -117,7 +117,7 @@
     that:
       - result.changed == true
 - name: verify that job was deleted
-  gcp_cloudscheduler_job_facts:
+  gcp_cloudscheduler_job_info:
       region: us-central1
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
diff --git a/test/integration/targets/gcp_cloudtasks_queue/tasks/main.yml b/test/integration/targets/gcp_cloudtasks_queue/tasks/main.yml
index 5ef0e6c871..19d583c442 100644
--- a/test/integration/targets/gcp_cloudtasks_queue/tasks/main.yml
+++ b/test/integration/targets/gcp_cloudtasks_queue/tasks/main.yml
@@ -36,7 +36,7 @@
     that:
       - result.changed == true
 - name: verify that queue was created
-  gcp_cloudtasks_queue_facts:
+  gcp_cloudtasks_queue_info:
       location: us-central1
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
@@ -77,7 +77,7 @@
     that:
       - result.changed == true
 - name: verify that queue was deleted
-  gcp_cloudtasks_queue_facts:
+  gcp_cloudtasks_queue_info:
       location: us-central1
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
diff --git a/test/integration/targets/gcp_compute_address/tasks/main.yml b/test/integration/targets/gcp_compute_address/tasks/main.yml
index cf6cda5566..124e44d2f1 100644
--- a/test/integration/targets/gcp_compute_address/tasks/main.yml
+++ b/test/integration/targets/gcp_compute_address/tasks/main.yml
@@ -36,7 +36,7 @@
     that:
       - result.changed == true
 - name: verify that address was created
-  gcp_compute_address_facts:
+  gcp_compute_address_info:
       filters:
          - name = test-address1
       region: us-west1
@@ -79,7 +79,7 @@
     that:
       - result.changed == true
 - name: verify that address was deleted
-  gcp_compute_address_facts:
+  gcp_compute_address_info:
       filters:
          - name = test-address1
       region: us-west1
diff --git a/test/integration/targets/gcp_compute_autoscaler/tasks/main.yml b/test/integration/targets/gcp_compute_autoscaler/tasks/main.yml
index 7e4ffe7d7e..899c88df1f 100644
--- a/test/integration/targets/gcp_compute_autoscaler/tasks/main.yml
+++ b/test/integration/targets/gcp_compute_autoscaler/tasks/main.yml
@@ -100,7 +100,7 @@
     that:
       - result.changed == true
 - name: verify that autoscaler was created
-  gcp_compute_autoscaler_facts:
+  gcp_compute_autoscaler_info:
       filters:
          - name = {{ resource_name }}
       zone: us-central1-a
@@ -157,7 +157,7 @@
     that:
       - result.changed == true
 - name: verify that autoscaler was deleted
-  gcp_compute_autoscaler_facts:
+  gcp_compute_autoscaler_info:
       filters:
          - name = {{ resource_name }}
       zone: us-central1-a
diff --git a/test/integration/targets/gcp_compute_backend_bucket/tasks/main.yml b/test/integration/targets/gcp_compute_backend_bucket/tasks/main.yml
index fa7feb8cab..35963c90c1 100644
--- a/test/integration/targets/gcp_compute_backend_bucket/tasks/main.yml
+++ b/test/integration/targets/gcp_compute_backend_bucket/tasks/main.yml
@@ -48,7 +48,7 @@
     that:
       - result.changed == true
 - name: verify that backend_bucket was created
-  gcp_compute_backend_bucket_facts:
+  gcp_compute_backend_bucket_info:
       filters:
          - name = {{ resource_name }}
       project: "{{ gcp_project }}"
@@ -94,7 +94,7 @@
     that:
       - result.changed == true
 - name: verify that backend_bucket was deleted
-  gcp_compute_backend_bucket_facts:
+  gcp_compute_backend_bucket_info:
       filters:
          - name = {{ resource_name }}
       project: "{{ gcp_project }}"
diff --git a/test/integration/targets/gcp_compute_backend_service/tasks/main.yml b/test/integration/targets/gcp_compute_backend_service/tasks/main.yml
index 5457be19bd..b93a9bd963 100644
--- a/test/integration/targets/gcp_compute_backend_service/tasks/main.yml
+++ b/test/integration/targets/gcp_compute_backend_service/tasks/main.yml
@@ -65,7 +65,7 @@
     that:
       - result.changed == true
 - name: verify that backend_service was created
-  gcp_compute_backend_service_facts:
+  gcp_compute_backend_service_info:
       filters:
          - name = {{ resource_name }}
       project: "{{ gcp_project }}"
@@ -115,7 +115,7 @@
     that:
       - result.changed == true
 - name: verify that backend_service was deleted
-  gcp_compute_backend_service_facts:
+  gcp_compute_backend_service_info:
       filters:
          - name = {{ resource_name }}
       project: "{{ gcp_project }}"
diff --git a/test/integration/targets/gcp_compute_disk/tasks/main.yml b/test/integration/targets/gcp_compute_disk/tasks/main.yml
index 874176d522..9dd08f1b48 100644
--- a/test/integration/targets/gcp_compute_disk/tasks/main.yml
+++ b/test/integration/targets/gcp_compute_disk/tasks/main.yml
@@ -42,7 +42,7 @@
     that:
       - result.changed == true
 - name: verify that disk was created
-  gcp_compute_disk_facts:
+  gcp_compute_disk_info:
       filters:
          - name = {{ resource_name }}
       zone: us-central1-a
@@ -91,7 +91,7 @@
     that:
       - result.changed == true
 - name: verify that disk was deleted
-  gcp_compute_disk_facts:
+  gcp_compute_disk_info:
       filters:
          - name = {{ resource_name }}
       zone: us-central1-a
diff --git a/test/integration/targets/gcp_compute_firewall/tasks/main.yml b/test/integration/targets/gcp_compute_firewall/tasks/main.yml
index 231eb28fd8..7a775501f5 100644
--- a/test/integration/targets/gcp_compute_firewall/tasks/main.yml
+++ b/test/integration/targets/gcp_compute_firewall/tasks/main.yml
@@ -52,7 +52,7 @@
     that:
       - result.changed == true
 - name: verify that firewall was created
-  gcp_compute_firewall_facts:
+  gcp_compute_firewall_info:
       filters:
          - name = {{ resource_name }}
       project: "{{ gcp_project }}"
@@ -110,7 +110,7 @@
     that:
       - result.changed == true
 - name: verify that firewall was deleted
-  gcp_compute_firewall_facts:
+  gcp_compute_firewall_info:
       filters:
          - name = {{ resource_name }}
       project: "{{ gcp_project }}"
diff --git a/test/integration/targets/gcp_compute_forwarding_rule/tasks/main.yml b/test/integration/targets/gcp_compute_forwarding_rule/tasks/main.yml
index c0560dfe39..c46fa9b8ba 100644
--- a/test/integration/targets/gcp_compute_forwarding_rule/tasks/main.yml
+++ b/test/integration/targets/gcp_compute_forwarding_rule/tasks/main.yml
@@ -62,7 +62,7 @@
     that:
       - result.changed == true
 - name: verify that forwarding_rule was created
-  gcp_compute_forwarding_rule_facts:
+  gcp_compute_forwarding_rule_info:
       filters:
          - name = {{ resource_name }}
       region: us-west1
@@ -113,7 +113,7 @@
     that:
       - result.changed == true
 - name: verify that forwarding_rule was deleted
-  gcp_compute_forwarding_rule_facts:
+  gcp_compute_forwarding_rule_info:
       filters:
          - name = {{ resource_name }}
       region: us-west1
diff --git a/test/integration/targets/gcp_compute_global_address/tasks/main.yml b/test/integration/targets/gcp_compute_global_address/tasks/main.yml
index 8dbfa8b5d5..fdbd73770a 100644
--- a/test/integration/targets/gcp_compute_global_address/tasks/main.yml
+++ b/test/integration/targets/gcp_compute_global_address/tasks/main.yml
@@ -34,7 +34,7 @@
     that:
       - result.changed == true
 - name: verify that global_address was created
-  gcp_compute_global_address_facts:
+  gcp_compute_global_address_info:
       filters:
          - name = {{ resource_name }}
       project: "{{ gcp_project }}"
@@ -74,7 +74,7 @@
     that:
       - result.changed == true
 - name: verify that global_address was deleted
-  gcp_compute_global_address_facts:
+  gcp_compute_global_address_info:
       filters:
          - name = {{ resource_name }}
       project: "{{ gcp_project }}"
diff --git a/test/integration/targets/gcp_compute_global_forwarding_rule/tasks/main.yml b/test/integration/targets/gcp_compute_global_forwarding_rule/tasks/main.yml
index 3f7f00bbdc..2b04b73bb8 100644
--- a/test/integration/targets/gcp_compute_global_forwarding_rule/tasks/main.yml
+++ b/test/integration/targets/gcp_compute_global_forwarding_rule/tasks/main.yml
@@ -102,7 +102,7 @@
     that:
       - result.changed == true
 - name: verify that global_forwarding_rule was created
-  gcp_compute_global_forwarding_rule_facts:
+  gcp_compute_global_forwarding_rule_info:
       filters:
          - name = {{ resource_name }}
       project: "{{ gcp_project }}"
@@ -150,7 +150,7 @@
     that:
       - result.changed == true
 - name: verify that global_forwarding_rule was deleted
-  gcp_compute_global_forwarding_rule_facts:
+  gcp_compute_global_forwarding_rule_info:
       filters:
          - name = {{ resource_name }}
       project: "{{ gcp_project }}"
diff --git a/test/integration/targets/gcp_compute_health_check/tasks/main.yml b/test/integration/targets/gcp_compute_health_check/tasks/main.yml
index 72aed1667d..ab1c837cc7 100644
--- a/test/integration/targets/gcp_compute_health_check/tasks/main.yml
+++ b/test/integration/targets/gcp_compute_health_check/tasks/main.yml
@@ -50,7 +50,7 @@
     that:
       - result.changed == true
 - name: verify that health_check was created
-  gcp_compute_health_check_facts:
+  gcp_compute_health_check_info:
       filters:
          - name = {{ resource_name }}
       project: "{{ gcp_project }}"
@@ -106,7 +106,7 @@
     that:
       - result.changed == true
 - name: verify that health_check was deleted
-  gcp_compute_health_check_facts:
+  gcp_compute_health_check_info:
       filters:
          - name = {{ resource_name }}
       project: "{{ gcp_project }}"
diff --git a/test/integration/targets/gcp_compute_http_health_check/tasks/main.yml b/test/integration/targets/gcp_compute_http_health_check/tasks/main.yml
index 948568eaa9..0ed41a0b62 100644
--- a/test/integration/targets/gcp_compute_http_health_check/tasks/main.yml
+++ b/test/integration/targets/gcp_compute_http_health_check/tasks/main.yml
@@ -42,7 +42,7 @@
     that:
       - result.changed == true
 - name: verify that http_health_check was created
-  gcp_compute_http_health_check_facts:
+  gcp_compute_http_health_check_info:
       filters:
          - name = {{ resource_name }}
       project: "{{ gcp_project }}"
@@ -90,7 +90,7 @@
     that:
       - result.changed == true
 - name: verify that http_health_check was deleted
-  gcp_compute_http_health_check_facts:
+  gcp_compute_http_health_check_info:
       filters:
          - name = {{ resource_name }}
       project: "{{ gcp_project }}"
diff --git a/test/integration/targets/gcp_compute_https_health_check/tasks/main.yml b/test/integration/targets/gcp_compute_https_health_check/tasks/main.yml
index d9952c2101..5935badaa0 100644
--- a/test/integration/targets/gcp_compute_https_health_check/tasks/main.yml
+++ b/test/integration/targets/gcp_compute_https_health_check/tasks/main.yml
@@ -42,7 +42,7 @@
     that:
       - result.changed == true
 - name: verify that https_health_check was created
-  gcp_compute_https_health_check_facts:
+  gcp_compute_https_health_check_info:
       filters:
          - name = {{ resource_name }}
       project: "{{ gcp_project }}"
@@ -90,7 +90,7 @@
     that:
       - result.changed == true
 - name: verify that https_health_check was deleted
-  gcp_compute_https_health_check_facts:
+  gcp_compute_https_health_check_info:
       filters:
          - name = {{ resource_name }}
       project: "{{ gcp_project }}"
diff --git a/test/integration/targets/gcp_compute_image/tasks/main.yml b/test/integration/targets/gcp_compute_image/tasks/main.yml
index 05706b6757..b51608bc11 100644
--- a/test/integration/targets/gcp_compute_image/tasks/main.yml
+++ b/test/integration/targets/gcp_compute_image/tasks/main.yml
@@ -45,7 +45,7 @@
     that:
       - result.changed == true
 - name: verify that image was created
-  gcp_compute_image_facts:
+  gcp_compute_image_info:
       filters:
          - name = {{ resource_name }}
       project: "{{ gcp_project }}"
@@ -87,7 +87,7 @@
     that:
       - result.changed == true
 - name: verify that image was deleted
-  gcp_compute_image_facts:
+  gcp_compute_image_info:
       filters:
          - name = {{ resource_name }}
       project: "{{ gcp_project }}"
diff --git a/test/integration/targets/gcp_compute_instance/tasks/main.yml b/test/integration/targets/gcp_compute_instance/tasks/main.yml
index b173e7909f..766f33222d 100644
--- a/test/integration/targets/gcp_compute_instance/tasks/main.yml
+++ b/test/integration/targets/gcp_compute_instance/tasks/main.yml
@@ -96,7 +96,7 @@
     that:
       - result.changed == true
 - name: verify that instance was created
-  gcp_compute_instance_facts:
+  gcp_compute_instance_info:
       filters:
          - name = {{ resource_name }}
       zone: us-central1-a
@@ -171,7 +171,7 @@
     that:
       - result.changed == true
 - name: verify that instance was deleted
-  gcp_compute_instance_facts:
+  gcp_compute_instance_info:
       filters:
          - name = {{ resource_name }}
       zone: us-central1-a
diff --git a/test/integration/targets/gcp_compute_instance_group/tasks/main.yml b/test/integration/targets/gcp_compute_instance_group/tasks/main.yml
index 2687523fbc..b16a128bbd 100644
--- a/test/integration/targets/gcp_compute_instance_group/tasks/main.yml
+++ b/test/integration/targets/gcp_compute_instance_group/tasks/main.yml
@@ -52,7 +52,7 @@
     that:
       - result.changed == true
 - name: verify that instance_group was created
-  gcp_compute_instance_group_facts:
+  gcp_compute_instance_group_info:
       filters:
          - name = {{ resource_name }}
       zone: us-central1-a
@@ -103,7 +103,7 @@
     that:
       - result.changed == true
 - name: verify that instance_group was deleted
-  gcp_compute_instance_group_facts:
+  gcp_compute_instance_group_info:
       filters:
          - name = {{ resource_name }}
       zone: us-central1-a
diff --git a/test/integration/targets/gcp_compute_instance_group_manager/tasks/main.yml b/test/integration/targets/gcp_compute_instance_group_manager/tasks/main.yml
index 1ce66abe35..39c62e3956 100644
--- a/test/integration/targets/gcp_compute_instance_group_manager/tasks/main.yml
+++ b/test/integration/targets/gcp_compute_instance_group_manager/tasks/main.yml
@@ -80,7 +80,7 @@
     that:
       - result.changed == true
 - name: verify that instance_group_manager was created
-  gcp_compute_instance_group_manager_facts:
+  gcp_compute_instance_group_manager_info:
       filters:
          - name = {{ resource_name }}
       zone: us-west1-a
@@ -129,7 +129,7 @@
     that:
       - result.changed == true
 - name: verify that instance_group_manager was deleted
-  gcp_compute_instance_group_manager_facts:
+  gcp_compute_instance_group_manager_info:
       filters:
          - name = {{ resource_name }}
       zone: us-west1-a
diff --git a/test/integration/targets/gcp_compute_instance_template/tasks/main.yml b/test/integration/targets/gcp_compute_instance_template/tasks/main.yml
index 9d5f809ff9..b1336624bc 100644
--- a/test/integration/targets/gcp_compute_instance_template/tasks/main.yml
+++ b/test/integration/targets/gcp_compute_instance_template/tasks/main.yml
@@ -77,7 +77,7 @@
     that:
       - result.changed == true
 - name: verify that instance_template was created
-  gcp_compute_instance_template_facts:
+  gcp_compute_instance_template_info:
       filters:
          - name = {{ resource_name }}
       project: "{{ gcp_project }}"
@@ -143,7 +143,7 @@
     that:
       - result.changed == true
 - name: verify that instance_template was deleted
-  gcp_compute_instance_template_facts:
+  gcp_compute_instance_template_info:
       filters:
          - name = {{ resource_name }}
       project: "{{ gcp_project }}"
diff --git a/test/integration/targets/gcp_compute_network/tasks/main.yml b/test/integration/targets/gcp_compute_network/tasks/main.yml
index a20a9ffcd1..fa121c8fbe 100644
--- a/test/integration/targets/gcp_compute_network/tasks/main.yml
+++ b/test/integration/targets/gcp_compute_network/tasks/main.yml
@@ -36,7 +36,7 @@
     that:
       - result.changed == true
 - name: verify that network was created
-  gcp_compute_network_facts:
+  gcp_compute_network_info:
       filters:
          - name = {{ resource_name }}
       project: "{{ gcp_project }}"
@@ -78,7 +78,7 @@
     that:
       - result.changed == true
 - name: verify that network was deleted
-  gcp_compute_network_facts:
+  gcp_compute_network_info:
       filters:
          - name = {{ resource_name }}
       project: "{{ gcp_project }}"
diff --git a/test/integration/targets/gcp_compute_region_disk/tasks/main.yml b/test/integration/targets/gcp_compute_region_disk/tasks/main.yml
index b2cc4e626d..462dd56af1 100644
--- a/test/integration/targets/gcp_compute_region_disk/tasks/main.yml
+++ b/test/integration/targets/gcp_compute_region_disk/tasks/main.yml
@@ -48,7 +48,7 @@
     that:
       - result.changed == true
 - name: verify that region_disk was created
-  gcp_compute_region_disk_facts:
+  gcp_compute_region_disk_info:
       filters:
          - name = {{ resource_name }}
       region: us-central1
@@ -103,7 +103,7 @@
     that:
       - result.changed == true
 - name: verify that region_disk was deleted
-  gcp_compute_region_disk_facts:
+  gcp_compute_region_disk_info:
       filters:
          - name = {{ resource_name }}
       region: us-central1
diff --git a/test/integration/targets/gcp_compute_route/tasks/main.yml b/test/integration/targets/gcp_compute_route/tasks/main.yml
index ebaaa659be..8ffb557a61 100644
--- a/test/integration/targets/gcp_compute_route/tasks/main.yml
+++ b/test/integration/targets/gcp_compute_route/tasks/main.yml
@@ -54,7 +54,7 @@
     that:
       - result.changed == true
 - name: verify that route was created
-  gcp_compute_route_facts:
+  gcp_compute_route_info:
       filters:
          - name = {{ resource_name }}
       project: "{{ gcp_project }}"
@@ -106,7 +106,7 @@
     that:
       - result.changed == true
 - name: verify that route was deleted
-  gcp_compute_route_facts:
+  gcp_compute_route_info:
       filters:
          - name = {{ resource_name }}
       project: "{{ gcp_project }}"
diff --git a/test/integration/targets/gcp_compute_router/tasks/main.yml b/test/integration/targets/gcp_compute_router/tasks/main.yml
index da46eb280b..8a80e03efd 100644
--- a/test/integration/targets/gcp_compute_router/tasks/main.yml
+++ b/test/integration/targets/gcp_compute_router/tasks/main.yml
@@ -62,7 +62,7 @@
     that:
       - result.changed == true
 - name: verify that router was created
-  gcp_compute_router_facts:
+  gcp_compute_router_info:
       filters:
          - name = {{ resource_name }}
       region: us-central1
@@ -123,7 +123,7 @@
     that:
       - result.changed == true
 - name: verify that router was deleted
-  gcp_compute_router_facts:
+  gcp_compute_router_info:
       filters:
          - name = {{ resource_name }}
       region: us-central1
diff --git a/test/integration/targets/gcp_compute_snapshot/tasks/main.yml b/test/integration/targets/gcp_compute_snapshot/tasks/main.yml
index 541496bd2e..f3f7932838 100644
--- a/test/integration/targets/gcp_compute_snapshot/tasks/main.yml
+++ b/test/integration/targets/gcp_compute_snapshot/tasks/main.yml
@@ -51,7 +51,7 @@
     that:
       - result.changed == true
 - name: verify that snapshot was created
-  gcp_compute_snapshot_facts:
+  gcp_compute_snapshot_info:
       filters:
          - name = {{ resource_name }}
       project: "{{ gcp_project }}"
@@ -99,7 +99,7 @@
     that:
       - result.changed == true
 - name: verify that snapshot was deleted
-  gcp_compute_snapshot_facts:
+  gcp_compute_snapshot_info:
       filters:
          - name = {{ resource_name }}
       project: "{{ gcp_project }}"
diff --git a/test/integration/targets/gcp_compute_ssl_certificate/tasks/main.yml b/test/integration/targets/gcp_compute_ssl_certificate/tasks/main.yml
index b715841cdd..aaf7a47ebc 100644
--- a/test/integration/targets/gcp_compute_ssl_certificate/tasks/main.yml
+++ b/test/integration/targets/gcp_compute_ssl_certificate/tasks/main.yml
@@ -84,7 +84,7 @@
     that:
       - result.changed == true
 - name: verify that ssl_certificate was created
-  gcp_compute_ssl_certificate_facts:
+  gcp_compute_ssl_certificate_info:
       filters:
          - name = {{ resource_name }}
       project: "{{ gcp_project }}"
@@ -174,7 +174,7 @@
     that:
       - result.changed == true
 - name: verify that ssl_certificate was deleted
-  gcp_compute_ssl_certificate_facts:
+  gcp_compute_ssl_certificate_info:
       filters:
          - name = {{ resource_name }}
       project: "{{ gcp_project }}"
diff --git a/test/integration/targets/gcp_compute_ssl_policy/tasks/main.yml b/test/integration/targets/gcp_compute_ssl_policy/tasks/main.yml
index 56d27b688b..8c0b6f7ce2 100644
--- a/test/integration/targets/gcp_compute_ssl_policy/tasks/main.yml
+++ b/test/integration/targets/gcp_compute_ssl_policy/tasks/main.yml
@@ -44,7 +44,7 @@
     that:
       - result.changed == true
 - name: verify that ssl_policy was created
-  gcp_compute_ssl_policy_facts:
+  gcp_compute_ssl_policy_info:
       filters:
          - name = {{ resource_name }}
       project: "{{ gcp_project }}"
@@ -94,7 +94,7 @@
     that:
       - result.changed == true
 - name: verify that ssl_policy was deleted
-  gcp_compute_ssl_policy_facts:
+  gcp_compute_ssl_policy_info:
       filters:
          - name = {{ resource_name }}
       project: "{{ gcp_project }}"
diff --git a/test/integration/targets/gcp_compute_subnetwork/tasks/main.yml b/test/integration/targets/gcp_compute_subnetwork/tasks/main.yml
index a1e8672f20..ff956ae6ad 100644
--- a/test/integration/targets/gcp_compute_subnetwork/tasks/main.yml
+++ b/test/integration/targets/gcp_compute_subnetwork/tasks/main.yml
@@ -49,7 +49,7 @@
     that:
       - result.changed == true
 - name: verify that subnetwork was created
-  gcp_compute_subnetwork_facts:
+  gcp_compute_subnetwork_info:
       filters:
          - name = ansiblenet
       region: us-west1
@@ -96,7 +96,7 @@
     that:
       - result.changed == true
 - name: verify that subnetwork was deleted
-  gcp_compute_subnetwork_facts:
+  gcp_compute_subnetwork_info:
       filters:
          - name = ansiblenet
       region: us-west1
diff --git a/test/integration/targets/gcp_compute_target_http_proxy/tasks/main.yml b/test/integration/targets/gcp_compute_target_http_proxy/tasks/main.yml
index 23bb30133c..06b8cb81a6 100644
--- a/test/integration/targets/gcp_compute_target_http_proxy/tasks/main.yml
+++ b/test/integration/targets/gcp_compute_target_http_proxy/tasks/main.yml
@@ -79,7 +79,7 @@
     that:
       - result.changed == true
 - name: verify that target_http_proxy was created
-  gcp_compute_target_http_proxy_facts:
+  gcp_compute_target_http_proxy_info:
       filters:
          - name = {{ resource_name }}
       project: "{{ gcp_project }}"
@@ -121,7 +121,7 @@
     that:
       - result.changed == true
 - name: verify that target_http_proxy was deleted
-  gcp_compute_target_http_proxy_facts:
+  gcp_compute_target_http_proxy_info:
       filters:
          - name = {{ resource_name }}
       project: "{{ gcp_project }}"
diff --git a/test/integration/targets/gcp_compute_target_https_proxy/tasks/main.yml b/test/integration/targets/gcp_compute_target_https_proxy/tasks/main.yml
index ac449524fb..72af987ecf 100644
--- a/test/integration/targets/gcp_compute_target_https_proxy/tasks/main.yml
+++ b/test/integration/targets/gcp_compute_target_https_proxy/tasks/main.yml
@@ -116,7 +116,7 @@
     that:
       - result.changed == true
 - name: verify that target_https_proxy was created
-  gcp_compute_target_https_proxy_facts:
+  gcp_compute_target_https_proxy_info:
       filters:
          - name = {{ resource_name }}
       project: "{{ gcp_project }}"
@@ -162,7 +162,7 @@
     that:
       - result.changed == true
 - name: verify that target_https_proxy was deleted
-  gcp_compute_target_https_proxy_facts:
+  gcp_compute_target_https_proxy_info:
       filters:
          - name = {{ resource_name }}
       project: "{{ gcp_project }}"
diff --git a/test/integration/targets/gcp_compute_target_pool/tasks/main.yml b/test/integration/targets/gcp_compute_target_pool/tasks/main.yml
index c5e83fc547..756a5cccf9 100644
--- a/test/integration/targets/gcp_compute_target_pool/tasks/main.yml
+++ b/test/integration/targets/gcp_compute_target_pool/tasks/main.yml
@@ -36,7 +36,7 @@
     that:
       - result.changed == true
 - name: verify that target_pool was created
-  gcp_compute_target_pool_facts:
+  gcp_compute_target_pool_info:
       filters:
          - name = {{ resource_name }}
       region: us-west1
@@ -79,7 +79,7 @@
     that:
       - result.changed == true
 - name: verify that target_pool was deleted
-  gcp_compute_target_pool_facts:
+  gcp_compute_target_pool_info:
       filters:
          - name = {{ resource_name }}
       region: us-west1
diff --git a/test/integration/targets/gcp_compute_target_ssl_proxy/tasks/main.yml b/test/integration/targets/gcp_compute_target_ssl_proxy/tasks/main.yml
index 3284559036..f1f31f3262 100644
--- a/test/integration/targets/gcp_compute_target_ssl_proxy/tasks/main.yml
+++ b/test/integration/targets/gcp_compute_target_ssl_proxy/tasks/main.yml
@@ -111,7 +111,7 @@
     that:
       - result.changed == true
 - name: verify that target_ssl_proxy was created
-  gcp_compute_target_ssl_proxy_facts:
+  gcp_compute_target_ssl_proxy_info:
       filters:
          - name = {{ resource_name }}
       project: "{{ gcp_project }}"
@@ -157,7 +157,7 @@
     that:
       - result.changed == true
 - name: verify that target_ssl_proxy was deleted
-  gcp_compute_target_ssl_proxy_facts:
+  gcp_compute_target_ssl_proxy_info:
       filters:
          - name = {{ resource_name }}
       project: "{{ gcp_project }}"
diff --git a/test/integration/targets/gcp_compute_target_tcp_proxy/tasks/main.yml b/test/integration/targets/gcp_compute_target_tcp_proxy/tasks/main.yml
index 55d72bcad8..8f24675699 100644
--- a/test/integration/targets/gcp_compute_target_tcp_proxy/tasks/main.yml
+++ b/test/integration/targets/gcp_compute_target_tcp_proxy/tasks/main.yml
@@ -76,7 +76,7 @@
     that:
       - result.changed == true
 - name: verify that target_tcp_proxy was created
-  gcp_compute_target_tcp_proxy_facts:
+  gcp_compute_target_tcp_proxy_info:
       filters:
          - name = {{ resource_name }}
       project: "{{ gcp_project }}"
@@ -120,7 +120,7 @@
     that:
       - result.changed == true
 - name: verify that target_tcp_proxy was deleted
-  gcp_compute_target_tcp_proxy_facts:
+  gcp_compute_target_tcp_proxy_info:
       filters:
          - name = {{ resource_name }}
       project: "{{ gcp_project }}"
diff --git a/test/integration/targets/gcp_compute_target_vpn_gateway/tasks/main.yml b/test/integration/targets/gcp_compute_target_vpn_gateway/tasks/main.yml
index c2d2e86e64..6fd3d01dd0 100644
--- a/test/integration/targets/gcp_compute_target_vpn_gateway/tasks/main.yml
+++ b/test/integration/targets/gcp_compute_target_vpn_gateway/tasks/main.yml
@@ -55,7 +55,7 @@
     that:
       - result.changed == true
 - name: verify that target_vpn_gateway was created
-  gcp_compute_target_vpn_gateway_facts:
+  gcp_compute_target_vpn_gateway_info:
       filters:
          - name = {{ resource_name }}
       region: us-west1
@@ -100,7 +100,7 @@
     that:
       - result.changed == true
 - name: verify that target_vpn_gateway was deleted
-  gcp_compute_target_vpn_gateway_facts:
+  gcp_compute_target_vpn_gateway_info:
       filters:
          - name = {{ resource_name }}
       region: us-west1
diff --git a/test/integration/targets/gcp_compute_url_map/tasks/main.yml b/test/integration/targets/gcp_compute_url_map/tasks/main.yml
index e7b4ca2733..1aec572f69 100644
--- a/test/integration/targets/gcp_compute_url_map/tasks/main.yml
+++ b/test/integration/targets/gcp_compute_url_map/tasks/main.yml
@@ -70,7 +70,7 @@
     that:
       - result.changed == true
 - name: verify that url_map was created
-  gcp_compute_url_map_facts:
+  gcp_compute_url_map_info:
       filters:
          - name = {{ resource_name }}
       project: "{{ gcp_project }}"
@@ -112,7 +112,7 @@
     that:
       - result.changed == true
 - name: verify that url_map was deleted
-  gcp_compute_url_map_facts:
+  gcp_compute_url_map_info:
       filters:
          - name = {{ resource_name }}
       project: "{{ gcp_project }}"
diff --git a/test/integration/targets/gcp_compute_vpn_tunnel/tasks/main.yml b/test/integration/targets/gcp_compute_vpn_tunnel/tasks/main.yml
index 63a964310c..abd5dbb6d2 100644
--- a/test/integration/targets/gcp_compute_vpn_tunnel/tasks/main.yml
+++ b/test/integration/targets/gcp_compute_vpn_tunnel/tasks/main.yml
@@ -78,7 +78,7 @@
     that:
       - result.changed == true
 - name: verify that vpn_tunnel was created
-  gcp_compute_vpn_tunnel_facts:
+  gcp_compute_vpn_tunnel_info:
       filters:
          - name = {{ resource_name }}
       region: us-west1
@@ -127,7 +127,7 @@
     that:
       - result.changed == true
 - name: verify that vpn_tunnel was deleted
-  gcp_compute_vpn_tunnel_facts:
+  gcp_compute_vpn_tunnel_info:
       filters:
          - name = {{ resource_name }}
       region: us-west1
diff --git a/test/integration/targets/gcp_container_cluster/tasks/main.yml b/test/integration/targets/gcp_container_cluster/tasks/main.yml
index d494a38fac..1581a30fbb 100644
--- a/test/integration/targets/gcp_container_cluster/tasks/main.yml
+++ b/test/integration/targets/gcp_container_cluster/tasks/main.yml
@@ -50,7 +50,7 @@
     that:
       - result.changed == true
 - name: verify that cluster was created
-  gcp_container_cluster_facts:
+  gcp_container_cluster_info:
       location: us-central1-a
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
@@ -105,7 +105,7 @@
     that:
       - result.changed == true
 - name: verify that cluster was deleted
-  gcp_container_cluster_facts:
+  gcp_container_cluster_info:
       location: us-central1-a
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
diff --git a/test/integration/targets/gcp_container_node_pool/tasks/main.yml b/test/integration/targets/gcp_container_node_pool/tasks/main.yml
index 9432233ebc..d62b747059 100644
--- a/test/integration/targets/gcp_container_node_pool/tasks/main.yml
+++ b/test/integration/targets/gcp_container_node_pool/tasks/main.yml
@@ -50,7 +50,7 @@
     that:
       - result.changed == true
 - name: verify that node_pool was created
-  gcp_container_node_pool_facts:
+  gcp_container_node_pool_info:
       cluster: "{{ cluster }}"
       location: us-central1-a
       project: "{{ gcp_project }}"
@@ -96,7 +96,7 @@
     that:
       - result.changed == true
 - name: verify that node_pool was deleted
-  gcp_container_node_pool_facts:
+  gcp_container_node_pool_info:
       cluster: "{{ cluster }}"
       location: us-central1-a
       project: "{{ gcp_project }}"
diff --git a/test/integration/targets/gcp_dns_managed_zone/tasks/main.yml b/test/integration/targets/gcp_dns_managed_zone/tasks/main.yml
index 8c75d72f6d..21ce21009f 100644
--- a/test/integration/targets/gcp_dns_managed_zone/tasks/main.yml
+++ b/test/integration/targets/gcp_dns_managed_zone/tasks/main.yml
@@ -38,7 +38,7 @@
     that:
       - result.changed == true
 - name: verify that managed_zone was created
-  gcp_dns_managed_zone_facts:
+  gcp_dns_managed_zone_info:
       dns_name: test.somewild2.example.com.
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
@@ -81,7 +81,7 @@
     that:
       - result.changed == true
 - name: verify that managed_zone was deleted
-  gcp_dns_managed_zone_facts:
+  gcp_dns_managed_zone_info:
       dns_name: test.somewild2.example.com.
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
diff --git a/test/integration/targets/gcp_dns_resource_record_set/tasks/main.yml b/test/integration/targets/gcp_dns_resource_record_set/tasks/main.yml
index 4527d4f503..8b5529656a 100644
--- a/test/integration/targets/gcp_dns_resource_record_set/tasks/main.yml
+++ b/test/integration/targets/gcp_dns_resource_record_set/tasks/main.yml
@@ -56,7 +56,7 @@
     that:
       - result.changed == true
 - name: verify that resource_record_set was created
-  gcp_dns_resource_record_set_facts:
+  gcp_dns_resource_record_set_info:
       managed_zone: "{{ managed_zone }}"
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
@@ -107,7 +107,7 @@
     that:
       - result.changed == true
 - name: verify that resource_record_set was deleted
-  gcp_dns_resource_record_set_facts:
+  gcp_dns_resource_record_set_info:
       managed_zone: "{{ managed_zone }}"
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
diff --git a/test/integration/targets/gcp_iam_role/tasks/main.yml b/test/integration/targets/gcp_iam_role/tasks/main.yml
index 8745bd24b6..04779f9489 100644
--- a/test/integration/targets/gcp_iam_role/tasks/main.yml
+++ b/test/integration/targets/gcp_iam_role/tasks/main.yml
@@ -46,7 +46,7 @@
     that:
       - result.changed == true
 - name: verify that role was created
-  gcp_iam_role_facts:
+  gcp_iam_role_info:
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
       service_account_file: "{{ gcp_cred_file }}"
@@ -96,7 +96,7 @@
     that:
       - result.changed == true
 - name: verify that role was deleted
-  gcp_iam_role_facts:
+  gcp_iam_role_info:
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
       service_account_file: "{{ gcp_cred_file }}"
diff --git a/test/integration/targets/gcp_iam_service_account/tasks/main.yml b/test/integration/targets/gcp_iam_service_account/tasks/main.yml
index ec1ae99b59..1911ad9c27 100644
--- a/test/integration/targets/gcp_iam_service_account/tasks/main.yml
+++ b/test/integration/targets/gcp_iam_service_account/tasks/main.yml
@@ -36,7 +36,7 @@
     that:
       - result.changed == true
 - name: verify that service_account was created
-  gcp_iam_service_account_facts:
+  gcp_iam_service_account_info:
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
       service_account_file: "{{ gcp_cred_file }}"
@@ -76,7 +76,7 @@
     that:
       - result.changed == true
 - name: verify that service_account was deleted
-  gcp_iam_service_account_facts:
+  gcp_iam_service_account_info:
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
       service_account_file: "{{ gcp_cred_file }}"
diff --git a/test/integration/targets/gcp_mlengine_model/tasks/main.yml b/test/integration/targets/gcp_mlengine_model/tasks/main.yml
index 50eec5a1ba..c30bd524a8 100644
--- a/test/integration/targets/gcp_mlengine_model/tasks/main.yml
+++ b/test/integration/targets/gcp_mlengine_model/tasks/main.yml
@@ -40,7 +40,7 @@
     that:
       - result.changed == true
 - name: verify that model was created
-  gcp_mlengine_model_facts:
+  gcp_mlengine_model_info:
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
       service_account_file: "{{ gcp_cred_file }}"
@@ -84,7 +84,7 @@
     that:
       - result.changed == true
 - name: verify that model was deleted
-  gcp_mlengine_model_facts:
+  gcp_mlengine_model_info:
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
       service_account_file: "{{ gcp_cred_file }}"
diff --git a/test/integration/targets/gcp_mlengine_version/tasks/main.yml b/test/integration/targets/gcp_mlengine_version/tasks/main.yml
index 95c5db23ce..c84d3a5e9e 100644
--- a/test/integration/targets/gcp_mlengine_version/tasks/main.yml
+++ b/test/integration/targets/gcp_mlengine_version/tasks/main.yml
@@ -57,7 +57,7 @@
     that:
       - result.changed == true
 - name: verify that version was created
-  gcp_mlengine_version_facts:
+  gcp_mlengine_version_info:
       model: "{{ model }}"
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
@@ -106,7 +106,7 @@
     that:
       - result.changed == true
 - name: verify that version was deleted
-  gcp_mlengine_version_facts:
+  gcp_mlengine_version_info:
       model: "{{ model }}"
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
diff --git a/test/integration/targets/gcp_pubsub_subscription/tasks/main.yml b/test/integration/targets/gcp_pubsub_subscription/tasks/main.yml
index 19baea9a6e..c7babda72e 100644
--- a/test/integration/targets/gcp_pubsub_subscription/tasks/main.yml
+++ b/test/integration/targets/gcp_pubsub_subscription/tasks/main.yml
@@ -46,7 +46,7 @@
     that:
       - result.changed == true
 - name: verify that subscription was created
-  gcp_pubsub_subscription_facts:
+  gcp_pubsub_subscription_info:
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
       service_account_file: "{{ gcp_cred_file }}"
@@ -88,7 +88,7 @@
     that:
       - result.changed == true
 - name: verify that subscription was deleted
-  gcp_pubsub_subscription_facts:
+  gcp_pubsub_subscription_info:
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
       service_account_file: "{{ gcp_cred_file }}"
diff --git a/test/integration/targets/gcp_pubsub_topic/tasks/main.yml b/test/integration/targets/gcp_pubsub_topic/tasks/main.yml
index 83167361cc..9dff2b2d71 100644
--- a/test/integration/targets/gcp_pubsub_topic/tasks/main.yml
+++ b/test/integration/targets/gcp_pubsub_topic/tasks/main.yml
@@ -34,7 +34,7 @@
     that:
       - result.changed == true
 - name: verify that topic was created
-  gcp_pubsub_topic_facts:
+  gcp_pubsub_topic_info:
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
       service_account_file: "{{ gcp_cred_file }}"
@@ -72,7 +72,7 @@
     that:
       - result.changed == true
 - name: verify that topic was deleted
-  gcp_pubsub_topic_facts:
+  gcp_pubsub_topic_info:
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
       service_account_file: "{{ gcp_cred_file }}"
diff --git a/test/integration/targets/gcp_redis_instance/tasks/main.yml b/test/integration/targets/gcp_redis_instance/tasks/main.yml
index a0856f6f61..b859625b98 100644
--- a/test/integration/targets/gcp_redis_instance/tasks/main.yml
+++ b/test/integration/targets/gcp_redis_instance/tasks/main.yml
@@ -62,7 +62,7 @@
     that:
       - result.changed == true
 - name: verify that instance was created
-  gcp_redis_instance_facts:
+  gcp_redis_instance_info:
       region: us-central1
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
@@ -121,7 +121,7 @@
     that:
       - result.changed == true
 - name: verify that instance was deleted
-  gcp_redis_instance_facts:
+  gcp_redis_instance_info:
       region: us-central1
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
diff --git a/test/integration/targets/gcp_resourcemanager_project/tasks/main.yml b/test/integration/targets/gcp_resourcemanager_project/tasks/main.yml
index b594d69ec8..083660a9d2 100644
--- a/test/integration/targets/gcp_resourcemanager_project/tasks/main.yml
+++ b/test/integration/targets/gcp_resourcemanager_project/tasks/main.yml
@@ -40,7 +40,7 @@
     that:
       - result.changed == true
 - name: verify that project was created
-  gcp_resourcemanager_project_facts:
+  gcp_resourcemanager_project_info:
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
       service_account_file: "{{ gcp_cred_file }}"
@@ -84,7 +84,7 @@
     that:
       - result.changed == true
 - name: verify that project was deleted
-  gcp_resourcemanager_project_facts:
+  gcp_resourcemanager_project_info:
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
       service_account_file: "{{ gcp_cred_file }}"
diff --git a/test/integration/targets/gcp_sourcerepo_repository/tasks/main.yml b/test/integration/targets/gcp_sourcerepo_repository/tasks/main.yml
index bfa9540130..5ae6e34945 100644
--- a/test/integration/targets/gcp_sourcerepo_repository/tasks/main.yml
+++ b/test/integration/targets/gcp_sourcerepo_repository/tasks/main.yml
@@ -34,7 +34,7 @@
     that:
       - result.changed == true
 - name: verify that repository was created
-  gcp_sourcerepo_repository_facts:
+  gcp_sourcerepo_repository_info:
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
       service_account_file: "{{ gcp_cred_file }}"
@@ -72,7 +72,7 @@
     that:
       - result.changed == true
 - name: verify that repository was deleted
-  gcp_sourcerepo_repository_facts:
+  gcp_sourcerepo_repository_info:
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
       service_account_file: "{{ gcp_cred_file }}"
diff --git a/test/integration/targets/gcp_spanner_database/tasks/main.yml b/test/integration/targets/gcp_spanner_database/tasks/main.yml
index 693c6d59d4..3fda4e4397 100644
--- a/test/integration/targets/gcp_spanner_database/tasks/main.yml
+++ b/test/integration/targets/gcp_spanner_database/tasks/main.yml
@@ -49,7 +49,7 @@
     that:
       - result.changed == true
 - name: verify that database was created
-  gcp_spanner_database_facts:
+  gcp_spanner_database_info:
       instance: "{{ instance }}"
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
@@ -90,7 +90,7 @@
     that:
       - result.changed == true
 - name: verify that database was deleted
-  gcp_spanner_database_facts:
+  gcp_spanner_database_info:
       instance: "{{ instance }}"
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
diff --git a/test/integration/targets/gcp_spanner_instance/tasks/main.yml b/test/integration/targets/gcp_spanner_instance/tasks/main.yml
index 0dd460fa5f..8fb40459a8 100644
--- a/test/integration/targets/gcp_spanner_instance/tasks/main.yml
+++ b/test/integration/targets/gcp_spanner_instance/tasks/main.yml
@@ -44,7 +44,7 @@
     that:
       - result.changed == true
 - name: verify that instance was created
-  gcp_spanner_instance_facts:
+  gcp_spanner_instance_info:
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
       service_account_file: "{{ gcp_cred_file }}"
@@ -92,7 +92,7 @@
     that:
       - result.changed == true
 - name: verify that instance was deleted
-  gcp_spanner_instance_facts:
+  gcp_spanner_instance_info:
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
       service_account_file: "{{ gcp_cred_file }}"
diff --git a/test/integration/targets/gcp_sql_database/tasks/main.yml b/test/integration/targets/gcp_sql_database/tasks/main.yml
index 827900e390..0c22c3f640 100644
--- a/test/integration/targets/gcp_sql_database/tasks/main.yml
+++ b/test/integration/targets/gcp_sql_database/tasks/main.yml
@@ -53,7 +53,7 @@
     that:
       - result.changed == true
 - name: verify that database was created
-  gcp_sql_database_facts:
+  gcp_sql_database_info:
       instance: "{{ instance }}"
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
@@ -96,7 +96,7 @@
     that:
       - result.changed == true
 - name: verify that database was deleted
-  gcp_sql_database_facts:
+  gcp_sql_database_info:
       instance: "{{ instance }}"
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
diff --git a/test/integration/targets/gcp_sql_instance/tasks/main.yml b/test/integration/targets/gcp_sql_instance/tasks/main.yml
index ada068d21a..1ddcda92ad 100644
--- a/test/integration/targets/gcp_sql_instance/tasks/main.yml
+++ b/test/integration/targets/gcp_sql_instance/tasks/main.yml
@@ -48,7 +48,7 @@
     that:
       - result.changed == true
 - name: verify that instance was created
-  gcp_sql_instance_facts:
+  gcp_sql_instance_info:
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
       service_account_file: "{{ gcp_cred_file }}"
@@ -100,7 +100,7 @@
     that:
       - result.changed == true
 - name: verify that instance was deleted
-  gcp_sql_instance_facts:
+  gcp_sql_instance_info:
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
       service_account_file: "{{ gcp_cred_file }}"
diff --git a/test/integration/targets/gcp_sql_user/tasks/main.yml b/test/integration/targets/gcp_sql_user/tasks/main.yml
index e7c5b2b0ac..d7f6d09daf 100644
--- a/test/integration/targets/gcp_sql_user/tasks/main.yml
+++ b/test/integration/targets/gcp_sql_user/tasks/main.yml
@@ -55,7 +55,7 @@
     that:
       - result.changed == true
 - name: verify that user was created
-  gcp_sql_user_facts:
+  gcp_sql_user_info:
       instance: "{{ instance }}"
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
@@ -100,7 +100,7 @@
     that:
       - result.changed == true
 - name: verify that user was deleted
-  gcp_sql_user_facts:
+  gcp_sql_user_info:
       instance: "{{ instance }}"
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
diff --git a/test/integration/targets/gcp_tpu_node/tasks/main.yml b/test/integration/targets/gcp_tpu_node/tasks/main.yml
index 06157f93f1..ed4803d422 100644
--- a/test/integration/targets/gcp_tpu_node/tasks/main.yml
+++ b/test/integration/targets/gcp_tpu_node/tasks/main.yml
@@ -42,7 +42,7 @@
     that:
       - result.changed == true
 - name: verify that node was created
-  gcp_tpu_node_facts:
+  gcp_tpu_node_info:
       zone: us-central1-b
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
@@ -89,7 +89,7 @@
     that:
       - result.changed == true
 - name: verify that node was deleted
-  gcp_tpu_node_facts:
+  gcp_tpu_node_info:
       zone: us-central1-b
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"