From 02921a3c758d372490c894a523143c6c2fa65712 Mon Sep 17 00:00:00 2001
From: Nirav Katarmal <nirav.katarmal@crestdatasys.com>
Date: Fri, 23 Oct 2020 16:28:25 +0530
Subject: [PATCH] remane doc files (#146)

---
 website/aci.erb                               | 396 +++++++++---------
 ...html.markdown => aaa_domain.html.markdown} |   0
 ....markdown => access_generic.html.markdown} |   0
 ...ml.markdown => access_group.html.markdown} |   0
 ...rkdown => access_port_block.html.markdown} |   0
 ...own => access_port_selector.html.markdown} |   0
 ...wn => access_sub_port_block.html.markdown} |   0
 ...down => action_rule_profile.html.markdown} |   0
 ...{vzany.html.markdown => any.html.markdown} |   0
 ...markdown => application_epg.html.markdown} |   0
 ...down => application_profile.html.markdown} |   0
 ...hable_access_entity_profile.html.markdown} |   0
 ...> autonomous_system_profile.html.markdown} |   0
 ...l.markdown => bridge_domain.html.markdown} |   0
 ...own => cdp_interface_policy.html.markdown} |   0
 ... cloud_applicationcontainer.html.markdown} |   0
 ... => cloud_availability_zone.html.markdown} |   0
 ...kdown => cloud_aws_provider.html.markdown} |   0
 ...markdown => cloud_cidr_pool.html.markdown} |   0
 ...wn => cloud_context_profile.html.markdown} |   0
 ...own => cloud_domain_profile.html.markdown} |   0
 ... => cloud_endpoint_selector.html.markdown} |   0
 ...t_selectorfor_external_epgs.html.markdown} |   0
 ....html.markdown => cloud_epg.html.markdown} |   0
 ...kdown => cloud_external_epg.html.markdown} |   0
 ...n => cloud_provider_profile.html.markdown} |   0
 ...n => cloud_providers_region.html.markdown} |   0
 ...ml.markdown => cloud_subnet.html.markdown} |   0
 ...configuration_export_policy.html.markdown} |   0
 ...configuration_import_policy.html.markdown} |   0
 ...p.html.markdown => contract.html.markdown} |   0
 ...arkdown => contract_subject.html.markdown} |   0
 ...ation_of_redirected_traffic.html.markdown} |   0
 ... end_point_retention_policy.html.markdown} |   0
 ...markdown => epg_to_contract.html.markdown} |   0
 ...l.markdown => epg_to_domain.html.markdown} |   0
 ...kdown => epg_to_static_path.html.markdown} |   8 +-
 ...down => epgs_using_function.html.markdown} |   0
 ...al_network_instance_profile.html.markdown} |   0
 ...l.markdown => fabric_if_pol.html.markdown} |   0
 ...kdown => fabric_node_member.html.markdown} |   0
 ....markdown => fabric_path_ep.html.markdown} |   0
 ....html.markdown => fc_domain.html.markdown} |   0
 ...arkdown => fex_bundle_group.html.markdown} |   0
 ...tml.markdown => fex_profile.html.markdown} |   0
 ...ter.html.markdown => filter.html.markdown} |   0
 ...ml.markdown => filter_entry.html.markdown} |   0
 ...n => firmware_download_task.html.markdown} |   0
 ....markdown => firmware_group.html.markdown} |   0
 ...markdown => firmware_policy.html.markdown} |   0
 ...rkdown => imported_contract.html.markdown} |   0
 ...down => interface_fc_policy.html.markdown} |   0
 ...down => l2_interface_policy.html.markdown} |   0
 ...rkdown => l3_domain_profile.html.markdown} |   0
 website/docs/d/l3_ext_subnet.html.markdown    |  33 ++
 ...html.markdown => l3_outside.html.markdown} |   0
 website/docs/d/l3extsubnet.html.markdown      |  33 --
 ...tml.markdown => lacp_policy.html.markdown} |   0
 ..._access_bundle_policy_group.html.markdown} |   0
 ...af_access_port_policy_group.html.markdown} |   0
 ...n => leaf_interface_profile.html.markdown} |   0
 ...ml.markdown => leaf_profile.html.markdown} |   0
 ...l.markdown => leaf_selector.html.markdown} |   0
 ...wn => lldp_interface_policy.html.markdown} |   0
 ...html.markdown => local_user.html.markdown} |   0
 ...> logical_interface_profile.html.markdown} |   0
 ...own => logical_node_profile.html.markdown} |   0
 ...logical_node_to_fabric_node.html.markdown} |   8 +-
 ...kdown => maintenance_policy.html.markdown} |   0
 ...g_protocol_interface_policy.html.markdown} |   0
 ...html.markdown => node_block.html.markdown} |   0
 ...down => node_block_firmware.html.markdown} |   0
 ...wn => ospf_interface_policy.html.markdown} |   0
 ...markdown => physical_domain.html.markdown} |   0
 ...wn => pod_maintenance_group.html.markdown} |   0
 ...own => port_security_policy.html.markdown} |   0
 ...blk.html.markdown => ranges.html.markdown} |   0
 ... => service_redirect_policy.html.markdown} |   0
 ...n => span_destination_group.html.markdown} |   0
 ...rkdown => span_source_group.html.markdown} |   0
 ...stination_group_match_label.html.markdown} |   0
 ... => spine_interface_profile.html.markdown} |   0
 ... => spine_port_policy_group.html.markdown} |   0
 ...down => spine_port_selector.html.markdown} |   0
 ...l.markdown => spine_profile.html.markdown} |   0
 ...=> spine_switch_association.html.markdown} |   0
 ...net.html.markdown => subnet.html.markdown} |   0
 ....markdown => taboo_contract.html.markdown} |   0
 ...ant.html.markdown => tenant.html.markdown} |   0
 ...rkdown => trigger_scheduler.html.markdown} |   0
 ...apsulationfor_vxlan_traffic.html.markdown} |   0
 ....html.markdown => vlan_pool.html.markdown} |   0
 ...html.markdown => vmm_domain.html.markdown} |   0
 ...c_explicit_protection_group.html.markdown} |   0
 ...{fvctx.html.markdown => vrf.html.markdown} |   0
 ....html.markdown => vsan_pool.html.markdown} |   0
 ...html.markdown => vxlan_pool.html.markdown} |   0
 ...arkdown => x509_certificate.html.markdown} |   0
 ...html.markdown => aaa_domain.html.markdown} |   0
 ....markdown => access_generic.html.markdown} |   0
 ...ml.markdown => access_group.html.markdown} |   0
 ...rkdown => access_port_block.html.markdown} |   0
 ...own => access_port_selector.html.markdown} |   0
 ...wn => access_sub_port_block.html.markdown} |   0
 ...down => action_rule_profile.html.markdown} |   0
 ...{vzany.html.markdown => any.html.markdown} |   0
 ...markdown => application_epg.html.markdown} |   0
 ...down => application_profile.html.markdown} |   0
 ...hable_access_entity_profile.html.markdown} |   0
 ...> autonomous_system_profile.html.markdown} |   0
 ...l.markdown => bridge_domain.html.markdown} |   0
 ...own => cdp_interface_policy.html.markdown} |   0
 ... cloud_applicationcontainer.html.markdown} |   0
 ... => cloud_availability_zone.html.markdown} |   0
 ...kdown => cloud_aws_provider.html.markdown} |   0
 ...markdown => cloud_cidr_pool.html.markdown} |   0
 ...wn => cloud_context_profile.html.markdown} |   0
 ...own => cloud_domain_profile.html.markdown} |   0
 ... => cloud_endpoint_selector.html.markdown} |   0
 ...t_selectorfor_external_epgs.html.markdown} |   0
 ....html.markdown => cloud_epg.html.markdown} |   0
 ...kdown => cloud_external_epg.html.markdown} |   0
 ...n => cloud_provider_profile.html.markdown} |   0
 ...n => cloud_providers_region.html.markdown} |   0
 ...ml.markdown => cloud_subnet.html.markdown} |   0
 ...configuration_export_policy.html.markdown} |   0
 ...configuration_import_policy.html.markdown} |   0
 ...p.html.markdown => contract.html.markdown} |   0
 ...arkdown => contract_subject.html.markdown} |   0
 ...ation_of_redirected_traffic.html.markdown} |   0
 ... end_point_retention_policy.html.markdown} |   0
 ...markdown => epg_to_contract.html.markdown} |   0
 ...l.markdown => epg_to_domain.html.markdown} |   0
 ...kdown => epg_to_static_path.html.markdown} |  10 +-
 ...down => epgs_using_function.html.markdown} |   0
 ...al_network_instance_profile.html.markdown} |   0
 ...l.markdown => fabric_if_pol.html.markdown} |   0
 ...kdown => fabric_node_member.html.markdown} |   0
 ....html.markdown => fc_domain.html.markdown} |   0
 ...arkdown => fex_bundle_group.html.markdown} |   0
 ...tml.markdown => fex_profile.html.markdown} |   0
 ...ter.html.markdown => filter.html.markdown} |   0
 ...ml.markdown => filter_entry.html.markdown} |   0
 ...n => firmware_download_task.html.markdown} |   0
 ....markdown => firmware_group.html.markdown} |   0
 ...markdown => firmware_policy.html.markdown} |   0
 ...rkdown => imported_contract.html.markdown} |   0
 ...down => interface_fc_policy.html.markdown} |   0
 ...down => l2_interface_policy.html.markdown} |   0
 ...rkdown => l3_domain_profile.html.markdown} |   0
 ...l.markdown => l3_ext_subnet.html.markdown} |  22 +-
 ...html.markdown => l3_outside.html.markdown} |   0
 ...tml.markdown => lacp_policy.html.markdown} |   0
 ..._access_bundle_policy_group.html.markdown} |   0
 ...af_access_port_policy_group.html.markdown} |   0
 ...n => leaf_interface_profile.html.markdown} |   0
 ...ml.markdown => leaf_profile.html.markdown} |   0
 ...l.markdown => leaf_selector.html.markdown} |   0
 ...wn => lldp_interface_policy.html.markdown} |   0
 ...html.markdown => local_user.html.markdown} |   0
 ...> logical_interface_profile.html.markdown} |   0
 ...own => logical_node_profile.html.markdown} |   0
 ...logical_node_to_fabric_node.html.markdown} |  10 +-
 ...kdown => maintenance_policy.html.markdown} |   0
 ...g_protocol_interface_policy.html.markdown} |   0
 ...html.markdown => node_block.html.markdown} |   0
 ...down => node_block_firmware.html.markdown} |   0
 ...wn => ospf_interface_policy.html.markdown} |   0
 ...markdown => physical_domain.html.markdown} |   0
 ...wn => pod_maintenance_group.html.markdown} |   0
 ...own => port_security_policy.html.markdown} |   0
 ...blk.html.markdown => ranges.html.markdown} |   0
 ... => service_redirect_policy.html.markdown} |   0
 ...n => span_destination_group.html.markdown} |   0
 ...rkdown => span_source_group.html.markdown} |   0
 ...stination_group_match_label.html.markdown} |   0
 ... => spine_interface_profile.html.markdown} |   0
 ... => spine_port_policy_group.html.markdown} |   0
 ...down => spine_port_selector.html.markdown} |   0
 ...l.markdown => spine_profile.html.markdown} |   0
 ...=> spine_switch_association.html.markdown} |   0
 ...net.html.markdown => subnet.html.markdown} |   0
 ....markdown => taboo_contract.html.markdown} |   0
 ...ant.html.markdown => tenant.html.markdown} |   0
 ...rkdown => trigger_scheduler.html.markdown} |   0
 ...apsulationfor_vxlan_traffic.html.markdown} |   0
 ....html.markdown => vlan_pool.html.markdown} |   0
 ...html.markdown => vmm_domain.html.markdown} |   0
 ...c_explicit_protection_group.html.markdown} |   0
 ...{fvctx.html.markdown => vrf.html.markdown} |   0
 ....html.markdown => vsan_pool.html.markdown} |   0
 ...html.markdown => vxlan_pool.html.markdown} |   0
 ...arkdown => x509_certificate.html.markdown} |   0
 193 files changed, 260 insertions(+), 260 deletions(-)
 rename website/docs/d/{aaadomain.html.markdown => aaa_domain.html.markdown} (100%)
 rename website/docs/d/{infrageneric.html.markdown => access_generic.html.markdown} (100%)
 rename website/docs/d/{infrarsaccbasegrp.html.markdown => access_group.html.markdown} (100%)
 rename website/docs/d/{infraportblk.html.markdown => access_port_block.html.markdown} (100%)
 rename website/docs/d/{infrahports.html.markdown => access_port_selector.html.markdown} (100%)
 rename website/docs/d/{infrasubportblk.html.markdown => access_sub_port_block.html.markdown} (100%)
 rename website/docs/d/{rtctrlattrp.html.markdown => action_rule_profile.html.markdown} (100%)
 rename website/docs/d/{vzany.html.markdown => any.html.markdown} (100%)
 rename website/docs/d/{fvaepg.html.markdown => application_epg.html.markdown} (100%)
 rename website/docs/d/{fvap.html.markdown => application_profile.html.markdown} (100%)
 rename website/docs/d/{infraattentityp.html.markdown => attachable_access_entity_profile.html.markdown} (100%)
 rename website/docs/d/{cloudbgpasp.html.markdown => autonomous_system_profile.html.markdown} (100%)
 rename website/docs/d/{fvbd.html.markdown => bridge_domain.html.markdown} (100%)
 rename website/docs/d/{cdpifpol.html.markdown => cdp_interface_policy.html.markdown} (100%)
 rename website/docs/d/{cloudapp.html.markdown => cloud_applicationcontainer.html.markdown} (100%)
 rename website/docs/d/{cloudzone.html.markdown => cloud_availability_zone.html.markdown} (100%)
 rename website/docs/d/{cloudawsprovider.html.markdown => cloud_aws_provider.html.markdown} (100%)
 rename website/docs/d/{cloudcidr.html.markdown => cloud_cidr_pool.html.markdown} (100%)
 rename website/docs/d/{cloudctxprofile.html.markdown => cloud_context_profile.html.markdown} (100%)
 rename website/docs/d/{clouddomp.html.markdown => cloud_domain_profile.html.markdown} (100%)
 rename website/docs/d/{cloudepselector.html.markdown => cloud_endpoint_selector.html.markdown} (100%)
 rename website/docs/d/{cloudextepselector.html.markdown => cloud_endpoint_selectorfor_external_epgs.html.markdown} (100%)
 rename website/docs/d/{cloudepg.html.markdown => cloud_epg.html.markdown} (100%)
 rename website/docs/d/{cloudextepg.html.markdown => cloud_external_epg.html.markdown} (100%)
 rename website/docs/d/{cloudprovp.html.markdown => cloud_provider_profile.html.markdown} (100%)
 rename website/docs/d/{cloudregion.html.markdown => cloud_providers_region.html.markdown} (100%)
 rename website/docs/d/{cloudsubnet.html.markdown => cloud_subnet.html.markdown} (100%)
 rename website/docs/d/{configexportp.html.markdown => configuration_export_policy.html.markdown} (100%)
 rename website/docs/d/{configimportp.html.markdown => configuration_import_policy.html.markdown} (100%)
 rename website/docs/d/{vzbrcp.html.markdown => contract.html.markdown} (100%)
 rename website/docs/d/{vzsubj.html.markdown => contract_subject.html.markdown} (100%)
 rename website/docs/d/{vnsredirectdest.html.markdown => destination_of_redirected_traffic.html.markdown} (100%)
 rename website/docs/d/{fvepretpol.html.markdown => end_point_retention_policy.html.markdown} (100%)
 rename website/docs/d/{epgtocontract.html.markdown => epg_to_contract.html.markdown} (100%)
 rename website/docs/d/{fvrsdomatt.html.markdown => epg_to_domain.html.markdown} (100%)
 rename website/docs/d/{fvrspathatt.html.markdown => epg_to_static_path.html.markdown} (80%)
 rename website/docs/d/{infrarsfunctoepg.html.markdown => epgs_using_function.html.markdown} (100%)
 rename website/docs/d/{l3extinstp.html.markdown => external_network_instance_profile.html.markdown} (100%)
 rename website/docs/d/{fabrichifpol.html.markdown => fabric_if_pol.html.markdown} (100%)
 rename website/docs/d/{fabricnodeidentp.html.markdown => fabric_node_member.html.markdown} (100%)
 rename website/docs/d/{fabricpathep.html.markdown => fabric_path_ep.html.markdown} (100%)
 rename website/docs/d/{fcdomp.html.markdown => fc_domain.html.markdown} (100%)
 rename website/docs/d/{infrafexbndlgrp.html.markdown => fex_bundle_group.html.markdown} (100%)
 rename website/docs/d/{infrafexp.html.markdown => fex_profile.html.markdown} (100%)
 rename website/docs/d/{vzfilter.html.markdown => filter.html.markdown} (100%)
 rename website/docs/d/{vzentry.html.markdown => filter_entry.html.markdown} (100%)
 rename website/docs/d/{firmwareosource.html.markdown => firmware_download_task.html.markdown} (100%)
 rename website/docs/d/{firmwarefwgrp.html.markdown => firmware_group.html.markdown} (100%)
 rename website/docs/d/{firmwarefwp.html.markdown => firmware_policy.html.markdown} (100%)
 rename website/docs/d/{vzcpif.html.markdown => imported_contract.html.markdown} (100%)
 rename website/docs/d/{fcifpol.html.markdown => interface_fc_policy.html.markdown} (100%)
 rename website/docs/d/{l2ifpol.html.markdown => l2_interface_policy.html.markdown} (100%)
 rename website/docs/d/{l3extdomp.html.markdown => l3_domain_profile.html.markdown} (100%)
 create mode 100644 website/docs/d/l3_ext_subnet.html.markdown
 rename website/docs/d/{l3extout.html.markdown => l3_outside.html.markdown} (100%)
 delete mode 100644 website/docs/d/l3extsubnet.html.markdown
 rename website/docs/d/{lacplagpol.html.markdown => lacp_policy.html.markdown} (100%)
 rename website/docs/d/{infraaccbndlgrp.html.markdown => leaf_access_bundle_policy_group.html.markdown} (100%)
 rename website/docs/d/{infraaccportgrp.html.markdown => leaf_access_port_policy_group.html.markdown} (100%)
 rename website/docs/d/{infraaccportp.html.markdown => leaf_interface_profile.html.markdown} (100%)
 rename website/docs/d/{infranodep.html.markdown => leaf_profile.html.markdown} (100%)
 rename website/docs/d/{infraleafs.html.markdown => leaf_selector.html.markdown} (100%)
 rename website/docs/d/{lldpifpol.html.markdown => lldp_interface_policy.html.markdown} (100%)
 rename website/docs/d/{aaauser.html.markdown => local_user.html.markdown} (100%)
 rename website/docs/d/{l3extlifp.html.markdown => logical_interface_profile.html.markdown} (100%)
 rename website/docs/d/{l3extlnodep.html.markdown => logical_node_profile.html.markdown} (100%)
 rename website/docs/d/{l3extrsnodel3outatt.html.markdown => logical_node_to_fabric_node.html.markdown} (76%)
 rename website/docs/d/{maintmaintp.html.markdown => maintenance_policy.html.markdown} (100%)
 rename website/docs/d/{mcpifpol.html.markdown => miscabling_protocol_interface_policy.html.markdown} (100%)
 rename website/docs/d/{infranodeblk.html.markdown => node_block.html.markdown} (100%)
 rename website/docs/d/{fabricnodeblk.html.markdown => node_block_firmware.html.markdown} (100%)
 rename website/docs/d/{ospfifpol.html.markdown => ospf_interface_policy.html.markdown} (100%)
 rename website/docs/d/{physdomp.html.markdown => physical_domain.html.markdown} (100%)
 rename website/docs/d/{maintmaintgrp.html.markdown => pod_maintenance_group.html.markdown} (100%)
 rename website/docs/d/{l2portsecuritypol.html.markdown => port_security_policy.html.markdown} (100%)
 rename website/docs/d/{fvnsencapblk.html.markdown => ranges.html.markdown} (100%)
 rename website/docs/d/{vnssvcredirectpol.html.markdown => service_redirect_policy.html.markdown} (100%)
 rename website/docs/d/{spandestgrp.html.markdown => span_destination_group.html.markdown} (100%)
 rename website/docs/d/{spansrcgrp.html.markdown => span_source_group.html.markdown} (100%)
 rename website/docs/d/{spanspanlbl.html.markdown => span_sourcedestination_group_match_label.html.markdown} (100%)
 rename website/docs/d/{infraspaccportp.html.markdown => spine_interface_profile.html.markdown} (100%)
 rename website/docs/d/{infraspaccportgrp.html.markdown => spine_port_policy_group.html.markdown} (100%)
 rename website/docs/d/{infrarsspaccportp.html.markdown => spine_port_selector.html.markdown} (100%)
 rename website/docs/d/{infraspinep.html.markdown => spine_profile.html.markdown} (100%)
 rename website/docs/d/{infraspines.html.markdown => spine_switch_association.html.markdown} (100%)
 rename website/docs/d/{fvsubnet.html.markdown => subnet.html.markdown} (100%)
 rename website/docs/d/{vztaboo.html.markdown => taboo_contract.html.markdown} (100%)
 rename website/docs/d/{fvtenant.html.markdown => tenant.html.markdown} (100%)
 rename website/docs/d/{trigschedp.html.markdown => trigger_scheduler.html.markdown} (100%)
 rename website/docs/d/{infraprovacc.html.markdown => vlan_encapsulationfor_vxlan_traffic.html.markdown} (100%)
 rename website/docs/d/{fvnsvlaninstp.html.markdown => vlan_pool.html.markdown} (100%)
 rename website/docs/d/{vmmdomp.html.markdown => vmm_domain.html.markdown} (100%)
 rename website/docs/d/{fabricexplicitgep.html.markdown => vpc_explicit_protection_group.html.markdown} (100%)
 rename website/docs/d/{fvctx.html.markdown => vrf.html.markdown} (100%)
 rename website/docs/d/{fvnsvsaninstp.html.markdown => vsan_pool.html.markdown} (100%)
 rename website/docs/d/{fvnsvxlaninstp.html.markdown => vxlan_pool.html.markdown} (100%)
 rename website/docs/d/{aaausercert.html.markdown => x509_certificate.html.markdown} (100%)
 rename website/docs/r/{aaadomain.html.markdown => aaa_domain.html.markdown} (100%)
 rename website/docs/r/{infrageneric.html.markdown => access_generic.html.markdown} (100%)
 rename website/docs/r/{infrarsaccbasegrp.html.markdown => access_group.html.markdown} (100%)
 rename website/docs/r/{infraportblk.html.markdown => access_port_block.html.markdown} (100%)
 rename website/docs/r/{infrahports.html.markdown => access_port_selector.html.markdown} (100%)
 rename website/docs/r/{infrasubportblk.html.markdown => access_sub_port_block.html.markdown} (100%)
 rename website/docs/r/{rtctrlattrp.html.markdown => action_rule_profile.html.markdown} (100%)
 rename website/docs/r/{vzany.html.markdown => any.html.markdown} (100%)
 rename website/docs/r/{fvaepg.html.markdown => application_epg.html.markdown} (100%)
 rename website/docs/r/{fvap.html.markdown => application_profile.html.markdown} (100%)
 rename website/docs/r/{infraattentityp.html.markdown => attachable_access_entity_profile.html.markdown} (100%)
 rename website/docs/r/{cloudbgpasp.html.markdown => autonomous_system_profile.html.markdown} (100%)
 rename website/docs/r/{fvbd.html.markdown => bridge_domain.html.markdown} (100%)
 rename website/docs/r/{cdpifpol.html.markdown => cdp_interface_policy.html.markdown} (100%)
 rename website/docs/r/{cloudapp.html.markdown => cloud_applicationcontainer.html.markdown} (100%)
 rename website/docs/r/{cloudzone.html.markdown => cloud_availability_zone.html.markdown} (100%)
 rename website/docs/r/{cloudawsprovider.html.markdown => cloud_aws_provider.html.markdown} (100%)
 rename website/docs/r/{cloudcidr.html.markdown => cloud_cidr_pool.html.markdown} (100%)
 rename website/docs/r/{cloudctxprofile.html.markdown => cloud_context_profile.html.markdown} (100%)
 rename website/docs/r/{clouddomp.html.markdown => cloud_domain_profile.html.markdown} (100%)
 rename website/docs/r/{cloudepselector.html.markdown => cloud_endpoint_selector.html.markdown} (100%)
 rename website/docs/r/{cloudextepselector.html.markdown => cloud_endpoint_selectorfor_external_epgs.html.markdown} (100%)
 rename website/docs/r/{cloudepg.html.markdown => cloud_epg.html.markdown} (100%)
 rename website/docs/r/{cloudextepg.html.markdown => cloud_external_epg.html.markdown} (100%)
 rename website/docs/r/{cloudprovp.html.markdown => cloud_provider_profile.html.markdown} (100%)
 rename website/docs/r/{cloudregion.html.markdown => cloud_providers_region.html.markdown} (100%)
 rename website/docs/r/{cloudsubnet.html.markdown => cloud_subnet.html.markdown} (100%)
 rename website/docs/r/{configexportp.html.markdown => configuration_export_policy.html.markdown} (100%)
 rename website/docs/r/{configimportp.html.markdown => configuration_import_policy.html.markdown} (100%)
 rename website/docs/r/{vzbrcp.html.markdown => contract.html.markdown} (100%)
 rename website/docs/r/{vzsubj.html.markdown => contract_subject.html.markdown} (100%)
 rename website/docs/r/{vnsredirectdest.html.markdown => destination_of_redirected_traffic.html.markdown} (100%)
 rename website/docs/r/{fvepretpol.html.markdown => end_point_retention_policy.html.markdown} (100%)
 rename website/docs/r/{epgtocontract.html.markdown => epg_to_contract.html.markdown} (100%)
 rename website/docs/r/{fvrsdomatt.html.markdown => epg_to_domain.html.markdown} (100%)
 rename website/docs/r/{fvrspathatt.html.markdown => epg_to_static_path.html.markdown} (84%)
 rename website/docs/r/{infrarsfunctoepg.html.markdown => epgs_using_function.html.markdown} (100%)
 rename website/docs/r/{l3extinstp.html.markdown => external_network_instance_profile.html.markdown} (100%)
 rename website/docs/r/{fabrichifpol.html.markdown => fabric_if_pol.html.markdown} (100%)
 rename website/docs/r/{fabricnodeidentp.html.markdown => fabric_node_member.html.markdown} (100%)
 rename website/docs/r/{fcdomp.html.markdown => fc_domain.html.markdown} (100%)
 rename website/docs/r/{infrafexbndlgrp.html.markdown => fex_bundle_group.html.markdown} (100%)
 rename website/docs/r/{infrafexp.html.markdown => fex_profile.html.markdown} (100%)
 rename website/docs/r/{vzfilter.html.markdown => filter.html.markdown} (100%)
 rename website/docs/r/{vzentry.html.markdown => filter_entry.html.markdown} (100%)
 rename website/docs/r/{firmwareosource.html.markdown => firmware_download_task.html.markdown} (100%)
 rename website/docs/r/{firmwarefwgrp.html.markdown => firmware_group.html.markdown} (100%)
 rename website/docs/r/{firmwarefwp.html.markdown => firmware_policy.html.markdown} (100%)
 rename website/docs/r/{vzcpif.html.markdown => imported_contract.html.markdown} (100%)
 rename website/docs/r/{fcifpol.html.markdown => interface_fc_policy.html.markdown} (100%)
 rename website/docs/r/{l2ifpol.html.markdown => l2_interface_policy.html.markdown} (100%)
 rename website/docs/r/{l3extdomp.html.markdown => l3_domain_profile.html.markdown} (100%)
 rename website/docs/r/{l3extsubnet.html.markdown => l3_ext_subnet.html.markdown} (72%)
 rename website/docs/r/{l3extout.html.markdown => l3_outside.html.markdown} (100%)
 rename website/docs/r/{lacplagpol.html.markdown => lacp_policy.html.markdown} (100%)
 rename website/docs/r/{infraaccbndlgrp.html.markdown => leaf_access_bundle_policy_group.html.markdown} (100%)
 rename website/docs/r/{infraaccportgrp.html.markdown => leaf_access_port_policy_group.html.markdown} (100%)
 rename website/docs/r/{infraaccportp.html.markdown => leaf_interface_profile.html.markdown} (100%)
 rename website/docs/r/{infranodep.html.markdown => leaf_profile.html.markdown} (100%)
 rename website/docs/r/{infraleafs.html.markdown => leaf_selector.html.markdown} (100%)
 rename website/docs/r/{lldpifpol.html.markdown => lldp_interface_policy.html.markdown} (100%)
 rename website/docs/r/{aaauser.html.markdown => local_user.html.markdown} (100%)
 rename website/docs/r/{l3extlifp.html.markdown => logical_interface_profile.html.markdown} (100%)
 rename website/docs/r/{l3extlnodep.html.markdown => logical_node_profile.html.markdown} (100%)
 rename website/docs/r/{l3extrsnodel3outatt.html.markdown => logical_node_to_fabric_node.html.markdown} (82%)
 rename website/docs/r/{maintmaintp.html.markdown => maintenance_policy.html.markdown} (100%)
 rename website/docs/r/{mcpifpol.html.markdown => miscabling_protocol_interface_policy.html.markdown} (100%)
 rename website/docs/r/{infranodeblk.html.markdown => node_block.html.markdown} (100%)
 rename website/docs/r/{fabricnodeblk.html.markdown => node_block_firmware.html.markdown} (100%)
 rename website/docs/r/{ospfifpol.html.markdown => ospf_interface_policy.html.markdown} (100%)
 rename website/docs/r/{physdomp.html.markdown => physical_domain.html.markdown} (100%)
 rename website/docs/r/{maintmaintgrp.html.markdown => pod_maintenance_group.html.markdown} (100%)
 rename website/docs/r/{l2portsecuritypol.html.markdown => port_security_policy.html.markdown} (100%)
 rename website/docs/r/{fvnsencapblk.html.markdown => ranges.html.markdown} (100%)
 rename website/docs/r/{vnssvcredirectpol.html.markdown => service_redirect_policy.html.markdown} (100%)
 rename website/docs/r/{spandestgrp.html.markdown => span_destination_group.html.markdown} (100%)
 rename website/docs/r/{spansrcgrp.html.markdown => span_source_group.html.markdown} (100%)
 rename website/docs/r/{spanspanlbl.html.markdown => span_sourcedestination_group_match_label.html.markdown} (100%)
 rename website/docs/r/{infraspaccportp.html.markdown => spine_interface_profile.html.markdown} (100%)
 rename website/docs/r/{infraspaccportgrp.html.markdown => spine_port_policy_group.html.markdown} (100%)
 rename website/docs/r/{infrarsspaccportp.html.markdown => spine_port_selector.html.markdown} (100%)
 rename website/docs/r/{infraspinep.html.markdown => spine_profile.html.markdown} (100%)
 rename website/docs/r/{infraspines.html.markdown => spine_switch_association.html.markdown} (100%)
 rename website/docs/r/{fvsubnet.html.markdown => subnet.html.markdown} (100%)
 rename website/docs/r/{vztaboo.html.markdown => taboo_contract.html.markdown} (100%)
 rename website/docs/r/{fvtenant.html.markdown => tenant.html.markdown} (100%)
 rename website/docs/r/{trigschedp.html.markdown => trigger_scheduler.html.markdown} (100%)
 rename website/docs/r/{infraprovacc.html.markdown => vlan_encapsulationfor_vxlan_traffic.html.markdown} (100%)
 rename website/docs/r/{fvnsvlaninstp.html.markdown => vlan_pool.html.markdown} (100%)
 rename website/docs/r/{vmmdomp.html.markdown => vmm_domain.html.markdown} (100%)
 rename website/docs/r/{fabricexplicitgep.html.markdown => vpc_explicit_protection_group.html.markdown} (100%)
 rename website/docs/r/{fvctx.html.markdown => vrf.html.markdown} (100%)
 rename website/docs/r/{fvnsvsaninstp.html.markdown => vsan_pool.html.markdown} (100%)
 rename website/docs/r/{fvnsvxlaninstp.html.markdown => vxlan_pool.html.markdown} (100%)
 rename website/docs/r/{aaausercert.html.markdown => x509_certificate.html.markdown} (100%)

diff --git a/website/aci.erb b/website/aci.erb
index 17163b5f5..021fe3792 100644
--- a/website/aci.erb
+++ b/website/aci.erb
@@ -16,292 +16,292 @@
           <a href="#">Data Resources</a>
                   <ul class="nav nav-visible">
                       <li<%= sidebar_current("docs-aci-data-source-aaa_domain") %>>
-                        <a href="/docs/providers/aci/d/aaadomain.html">aci_aaa_domain</a>
+                        <a href="/docs/providers/aci/d/aaa_domain.html">aci_aaa_domain</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-data-source-access_generic") %>>
-                        <a href="/docs/providers/aci/d/infrageneric.html">aci_access_generic</a>
+                        <a href="/docs/providers/aci/d/access_generic.html">aci_access_generic</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-data-source-access_group") %>>
-                        <a href="/docs/providers/aci/d/infrarsaccbasegrp.html">aci_access_group</a>
+                        <a href="/docs/providers/aci/d/access_group.html">aci_access_group</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-data-source-access_port_block") %>>
-                        <a href="/docs/providers/aci/d/infraportblk.html">aci_access_port_block</a>
+                        <a href="/docs/providers/aci/d/access_port_block.html">aci_access_port_block</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-data-source-access_port_selector") %>>
-                        <a href="/docs/providers/aci/d/infrahports.html">aci_access_port_selector</a>
+                        <a href="/docs/providers/aci/d/access_port_selector.html">aci_access_port_selector</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-data-source-access_sub_port_block") %>>
-                        <a href="/docs/providers/aci/d/infrasubportblk.html">aci_access_sub_port_block</a>
+                        <a href="/docs/providers/aci/d/access_sub_port_block.html">aci_access_sub_port_block</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-data-source-action_rule_profile") %>>
-                        <a href="/docs/providers/aci/d/rtctrlattrp.html">aci_action_rule_profile</a>
+                        <a href="/docs/providers/aci/d/action_rule_profile.html">aci_action_rule_profile</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-data-source-any") %>>
-                        <a href="/docs/providers/aci/d/vzany.html">aci_any</a>
+                        <a href="/docs/providers/aci/d/any.html">aci_any</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-data-source-application_epg") %>>
-                        <a href="/docs/providers/aci/d/fvaepg.html">aci_application_epg</a>
+                        <a href="/docs/providers/aci/d/application_epg.html">aci_application_epg</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-data-source-application_profile") %>>
-                        <a href="/docs/providers/aci/d/fvap.html">aci_application_profile</a>
+                        <a href="/docs/providers/aci/d/application_profile.html">aci_application_profile</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-data-source-attachable_access_entity_profile") %>>
-                        <a href="/docs/providers/aci/d/infraattentityp.html">aci_attachable_access_entity_profile</a>
+                        <a href="/docs/providers/aci/d/attachable_access_entity_profile.html">aci_attachable_access_entity_profile</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-data-source-autonomous_system_profile") %>>
-                        <a href="/docs/providers/aci/d/cloudbgpasp.html">aci_autonomous_system_profile</a>
+                        <a href="/docs/providers/aci/d/autonomous_system_profile.html">aci_autonomous_system_profile</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-data-source-bridge_domain") %>>
-                        <a href="/docs/providers/aci/d/fvbd.html">aci_bridge_domain</a>
+                        <a href="/docs/providers/aci/d/bridge_domain.html">aci_bridge_domain</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-data-source-cdp_interface_policy") %>>
-                        <a href="/docs/providers/aci/d/cdpifpol.html">aci_cdp_interface_policy</a>
+                        <a href="/docs/providers/aci/d/cdp_interface_policy.html">aci_cdp_interface_policy</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-data-source-cloud_applicationcontainer") %>>
-                        <a href="/docs/providers/aci/d/cloudapp.html">aci_cloud_applicationcontainer</a>
+                        <a href="/docs/providers/aci/d/cloud_applicationcontainer.html">aci_cloud_applicationcontainer</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-data-source-cloud_availability_zone") %>>
-                        <a href="/docs/providers/aci/d/cloudzone.html">aci_cloud_availability_zone</a>
+                        <a href="/docs/providers/aci/d/cloud_availability_zone.html">aci_cloud_availability_zone</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-data-source-cloud_aws_provider") %>>
-                        <a href="/docs/providers/aci/d/cloudawsprovider.html">aci_cloud_aws_provider</a>
+                        <a href="/docs/providers/aci/d/cloud_aws_provider.html">aci_cloud_aws_provider</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-data-source-cloud_cidr_pool") %>>
-                        <a href="/docs/providers/aci/d/cloudcidr.html">aci_cloud_cidr_pool</a>
+                        <a href="/docs/providers/aci/d/cloud_cidr_pool.html">aci_cloud_cidr_pool</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-data-source-cloud_context_profile") %>>
-                        <a href="/docs/providers/aci/d/cloudctxprofile.html">aci_cloud_context_profile</a>
+                        <a href="/docs/providers/aci/d/cloud_context_profile.html">aci_cloud_context_profile</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-data-source-cloud_domain_profile") %>>
-                        <a href="/docs/providers/aci/d/clouddomp.html">aci_cloud_domain_profile</a>
+                        <a href="/docs/providers/aci/d/cloud_domain_profile.html">aci_cloud_domain_profile</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-data-source-cloud_endpoint_selector") %>>
-                        <a href="/docs/providers/aci/d/cloudepselector.html">aci_cloud_endpoint_selector</a>
+                        <a href="/docs/providers/aci/d/cloud_endpoint_selector.html">aci_cloud_endpoint_selector</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-data-source-cloud_endpoint_selectorfor_external_epgs") %>>
-                        <a href="/docs/providers/aci/d/cloudextepselector.html">aci_cloud_endpoint_selectorfor_external_epgs</a>
+                        <a href="/docs/providers/aci/d/cloud_endpoint_selectorfor_external_epgs.html">aci_cloud_endpoint_selectorfor_external_epgs</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-data-source-cloud_epg") %>>
-                        <a href="/docs/providers/aci/d/cloudepg.html">aci_cloud_epg</a>
+                        <a href="/docs/providers/aci/d/cloud_epg.html">aci_cloud_epg</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-data-source-cloud_external_epg") %>>
-                        <a href="/docs/providers/aci/d/cloudextepg.html">aci_cloud_external_epg</a>
+                        <a href="/docs/providers/aci/d/cloud_external_epg.html">aci_cloud_external_epg</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-data-source-cloud_provider_profile") %>>
-                        <a href="/docs/providers/aci/d/cloudprovp.html">aci_cloud_provider_profile</a>
+                        <a href="/docs/providers/aci/d/cloud_provider_profile.html">aci_cloud_provider_profile</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-data-source-cloud_providers_region") %>>
-                        <a href="/docs/providers/aci/d/cloudregion.html">aci_cloud_providers_region</a>
+                        <a href="/docs/providers/aci/d/cloud_providers_region.html">aci_cloud_providers_region</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-data-source-cloud_subnet") %>>
-                        <a href="/docs/providers/aci/d/cloudsubnet.html">aci_cloud_subnet</a>
+                        <a href="/docs/providers/aci/d/cloud_subnet.html">aci_cloud_subnet</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-data-source-configuration_export_policy") %>>
-                        <a href="/docs/providers/aci/d/configexportp.html">aci_configuration_export_policy</a>
+                        <a href="/docs/providers/aci/d/configuration_export_policy.html">aci_configuration_export_policy</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-data-source-configuration_import_policy") %>>
-                        <a href="/docs/providers/aci/d/configimportp.html">aci_configuration_import_policy</a>
+                        <a href="/docs/providers/aci/d/configuration_import_policy.html">aci_configuration_import_policy</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-data-source-contract") %>>
-                        <a href="/docs/providers/aci/d/vzbrcp.html">aci_contract</a>
+                        <a href="/docs/providers/aci/d/contract.html">aci_contract</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-data-source-contract_subject") %>>
-                        <a href="/docs/providers/aci/d/vzsubj.html">aci_contract_subject</a>
+                        <a href="/docs/providers/aci/d/contract_subject.html">aci_contract_subject</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-data-source-destination_of_redirected_traffic") %>>
-                        <a href="/docs/providers/aci/d/vnsredirectdest.html">aci_destination_of_redirected_traffic</a>
+                        <a href="/docs/providers/aci/d/destination_of_redirected_traffic.html">aci_destination_of_redirected_traffic</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-data-source-end_point_retention_policy") %>>
-                        <a href="/docs/providers/aci/d/fvepretpol.html">aci_end_point_retention_policy</a>
+                        <a href="/docs/providers/aci/d/end_point_retention_policy.html">aci_end_point_retention_policy</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-data-source-epg_to_contract") %>>
-                        <a href="/docs/providers/aci/d/epgtocontract.html">aci_epg_to_contract</a>
+                        <a href="/docs/providers/aci/d/epg_to_contract.html">aci_epg_to_contract</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-data-source-epg_to_domain") %>>
-                        <a href="/docs/providers/aci/d/fvrsdomatt.html">aci_epg_to_domain</a>
+                        <a href="/docs/providers/aci/d/epg_to_domain.html">aci_epg_to_domain</a>
                       </li>
-                      <li<%= sidebar_current("docs-aci-data-source-static_path") %>>
-                        <a href="/docs/providers/aci/d/fvrspathatt.html">aci_epg_to_static_path</a>
+                      <li<%= sidebar_current("docs-aci-data-source-epg_to_static_path") %>>
+                        <a href="/docs/providers/aci/d/epg_to_static_path.html">aci_epg_to_static_path</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-data-source-epgs_using_function") %>>
-                        <a href="/docs/providers/aci/d/infrarsfunctoepg.html">aci_epgs_using_function</a>
+                        <a href="/docs/providers/aci/d/epgs_using_function.html">aci_epgs_using_function</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-data-source-external_network_instance_profile") %>>
-                        <a href="/docs/providers/aci/d/l3extinstp.html">aci_external_network_instance_profile</a>
+                        <a href="/docs/providers/aci/d/external_network_instance_profile.html">aci_external_network_instance_profile</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-data-source-fabric_if_pol") %>>
-                        <a href="/docs/providers/aci/d/fabrichifpol.html">aci_fabric_if_pol</a>
+                        <a href="/docs/providers/aci/d/fabric_if_pol.html">aci_fabric_if_pol</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-data-source-fabric_node_member") %>>
-                        <a href="/docs/providers/aci/d/fabricnodeidentp.html">aci_fabric_node_member</a>
+                        <a href="/docs/providers/aci/d/fabric_node_member.html">aci_fabric_node_member</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-data-source-fabric_path_ep") %>>
-                        <a href="/docs/providers/aci/d/fabricpathep.html">aci_fabric_path_ep</a>
+                        <a href="/docs/providers/aci/d/fabric_path_ep.html">aci_fabric_path_ep</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-data-source-fc_domain") %>>
-                        <a href="/docs/providers/aci/d/fcdomp.html">aci_fc_domain</a>
+                        <a href="/docs/providers/aci/d/fc_domain.html">aci_fc_domain</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-data-source-fex_bundle_group") %>>
-                        <a href="/docs/providers/aci/d/infrafexbndlgrp.html">aci_fex_bundle_group</a>
+                        <a href="/docs/providers/aci/d/fex_bundle_group.html">aci_fex_bundle_group</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-data-source-fex_profile") %>>
-                        <a href="/docs/providers/aci/d/infrafexp.html">aci_fex_profile</a>
+                        <a href="/docs/providers/aci/d/fex_profile.html">aci_fex_profile</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-data-source-filter") %>>
-                        <a href="/docs/providers/aci/d/vzfilter.html">aci_filter</a>
+                        <a href="/docs/providers/aci/d/filter.html">aci_filter</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-data-source-filter_entry") %>>
-                        <a href="/docs/providers/aci/d/vzentry.html">aci_filter_entry</a>
+                        <a href="/docs/providers/aci/d/filter_entry.html">aci_filter_entry</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-data-source-firmware_download_task") %>>
-                        <a href="/docs/providers/aci/d/firmwareosource.html">aci_firmware_download_task</a>
+                        <a href="/docs/providers/aci/d/firmware_download_task.html">aci_firmware_download_task</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-data-source-firmware_group") %>>
-                        <a href="/docs/providers/aci/d/firmwarefwgrp.html">aci_firmware_group</a>
+                        <a href="/docs/providers/aci/d/firmware_group.html">aci_firmware_group</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-data-source-firmware_policy") %>>
-                        <a href="/docs/providers/aci/d/firmwarefwp.html">aci_firmware_policy</a>
+                        <a href="/docs/providers/aci/d/firmware_policy.html">aci_firmware_policy</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-data-source-imported_contract") %>>
-                        <a href="/docs/providers/aci/d/vzcpif.html">aci_imported_contract</a>
+                        <a href="/docs/providers/aci/d/imported_contract.html">aci_imported_contract</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-data-source-interface_fc_policy") %>>
-                        <a href="/docs/providers/aci/d/fcifpol.html">aci_interface_fc_policy</a>
+                        <a href="/docs/providers/aci/d/interface_fc_policy.html">aci_interface_fc_policy</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-data-source-l2_interface_policy") %>>
-                        <a href="/docs/providers/aci/d/l2ifpol.html">aci_l2_interface_policy</a>
+                        <a href="/docs/providers/aci/d/l2_interface_policy.html">aci_l2_interface_policy</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-data-source-l3_domain_profile") %>>
-                        <a href="/docs/providers/aci/d/l3extdomp.html">aci_l3_domain_profile</a>
+                        <a href="/docs/providers/aci/d/l3_domain_profile.html">aci_l3_domain_profile</a>
                       </li>
-                      <li<%= sidebar_current("docs-aci-data-source-subnet") %>>
-                        <a href="/docs/providers/aci/d/l3extsubnet.html">aci_l3_ext_subnet</a>
+                      <li<%= sidebar_current("docs-aci-data-source-l3_ext_subnet") %>>
+                        <a href="/docs/providers/aci/d/l3_ext_subnet.html">aci_l3_ext_subnet</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-data-source-l3_outside") %>>
-                        <a href="/docs/providers/aci/d/l3extout.html">aci_l3_outside</a>
+                        <a href="/docs/providers/aci/d/l3_outside.html">aci_l3_outside</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-data-source-lacp_policy") %>>
-                        <a href="/docs/providers/aci/d/lacplagpol.html">aci_lacp_policy</a>
+                        <a href="/docs/providers/aci/d/lacp_policy.html">aci_lacp_policy</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-data-source-leaf_access_bundle_policy_group") %>>
-                        <a href="/docs/providers/aci/d/infraaccbndlgrp.html">aci_leaf_access_bundle_policy_group</a>
+                        <a href="/docs/providers/aci/d/leaf_access_bundle_policy_group.html">aci_leaf_access_bundle_policy_group</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-data-source-leaf_access_port_policy_group") %>>
-                        <a href="/docs/providers/aci/d/infraaccportgrp.html">aci_leaf_access_port_policy_group</a>
+                        <a href="/docs/providers/aci/d/leaf_access_port_policy_group.html">aci_leaf_access_port_policy_group</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-data-source-leaf_interface_profile") %>>
-                        <a href="/docs/providers/aci/d/infraaccportp.html">aci_leaf_interface_profile</a>
+                        <a href="/docs/providers/aci/d/leaf_interface_profile.html">aci_leaf_interface_profile</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-data-source-leaf_profile") %>>
-                        <a href="/docs/providers/aci/d/infranodep.html">aci_leaf_profile</a>
+                        <a href="/docs/providers/aci/d/leaf_profile.html">aci_leaf_profile</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-data-source-lldp_interface_policy") %>>
-                        <a href="/docs/providers/aci/d/lldpifpol.html">aci_lldp_interface_policy</a>
+                        <a href="/docs/providers/aci/d/lldp_interface_policy.html">aci_lldp_interface_policy</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-data-source-local_user") %>>
-                        <a href="/docs/providers/aci/d/aaauser.html">aci_local_user</a>
+                        <a href="/docs/providers/aci/d/local_user.html">aci_local_user</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-data-source-logical_interface_profile") %>>
-                        <a href="/docs/providers/aci/d/l3extlifp.html">aci_logical_interface_profile</a>
+                        <a href="/docs/providers/aci/d/logical_interface_profile.html">aci_logical_interface_profile</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-data-source-logical_node_profile") %>>
-                        <a href="/docs/providers/aci/d/l3extlnodep.html">aci_logical_node_profile</a>
+                        <a href="/docs/providers/aci/d/logical_node_profile.html">aci_logical_node_profile</a>
                       </li>
-                      <li<%= sidebar_current("docs-aci-data-source-fabric_node") %>>
-                        <a href="/docs/providers/aci/d/l3extrsnodel3outatt.html">aci_logical_node_to_fabric_node</a>
+                      <li<%= sidebar_current("docs-aci-data-source-logical_node_to_fabric_node") %>>
+                        <a href="/docs/providers/aci/d/logical_node_to_fabric_node.html">aci_logical_node_to_fabric_node</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-data-source-maintenance_policy") %>>
-                        <a href="/docs/providers/aci/d/maintmaintp.html">aci_maintenance_policy</a>
+                        <a href="/docs/providers/aci/d/maintenance_policy.html">aci_maintenance_policy</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-data-source-miscabling_protocol_interface_policy") %>>
-                        <a href="/docs/providers/aci/d/mcpifpol.html">aci_miscabling_protocol_interface_policy</a>
+                        <a href="/docs/providers/aci/d/miscabling_protocol_interface_policy.html">aci_miscabling_protocol_interface_policy</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-data-source-node_block") %>>
-                        <a href="/docs/providers/aci/d/infranodeblk.html">aci_node_block</a>
+                        <a href="/docs/providers/aci/d/node_block.html">aci_node_block</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-data-source-node_block_firmware") %>>
-                        <a href="/docs/providers/aci/d/fabricnodeblk.html">aci_node_block_firmware</a>
+                        <a href="/docs/providers/aci/d/node_block_firmware.html">aci_node_block_firmware</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-data-source-ospf_interface_policy") %>>
-                        <a href="/docs/providers/aci/d/ospfifpol.html">aci_ospf_interface_policy</a>
+                        <a href="/docs/providers/aci/d/ospf_interface_policy.html">aci_ospf_interface_policy</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-data-source-physical_domain") %>>
-                        <a href="/docs/providers/aci/d/physdomp.html">aci_physical_domain</a>
+                        <a href="/docs/providers/aci/d/physical_domain.html">aci_physical_domain</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-data-source-pod_maintenance_group") %>>
-                        <a href="/docs/providers/aci/d/maintmaintgrp.html">aci_pod_maintenance_group</a>
+                        <a href="/docs/providers/aci/d/pod_maintenance_group.html">aci_pod_maintenance_group</a>
                       </li>
-                      <li<%= sidebar_current("docs-aci-data-source-port_security_policy") %>>
-                        <a href="/docs/providers/aci/d/l2portsecuritypol.html">aci_port_security_policy</a>
+                      <li<%= sidebar_current("docs-aci-data-source-pod_maintenance_group") %>>
+                        <a href="/docs/providers/aci/d/pod_maintenance_group.html">aci_port_security_policy</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-data-source-ranges") %>>
-                        <a href="/docs/providers/aci/d/fvnsencapblk.html">aci_ranges</a>
+                        <a href="/docs/providers/aci/d/ranges.html">aci_ranges</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-data-source-service_redirect_policy") %>>
-                        <a href="/docs/providers/aci/d/vnssvcredirectpol.html">aci_service_redirect_policy</a>
+                        <a href="/docs/providers/aci/d/service_redirect_policy.html">aci_service_redirect_policy</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-data-source-span_destination_group") %>>
-                        <a href="/docs/providers/aci/d/spandestgrp.html">aci_span_destination_group</a>
+                        <a href="/docs/providers/aci/d/span_destination_group.html">aci_span_destination_group</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-data-source-span_source_group") %>>
-                        <a href="/docs/providers/aci/d/spansrcgrp.html">aci_span_source_group</a>
+                        <a href="/docs/providers/aci/d/span_source_group.html">aci_span_source_group</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-data-source-span_sourcedestination_group_match_label") %>>
-                        <a href="/docs/providers/aci/d/spanspanlbl.html">aci_span_sourcedestination_group_match_label</a>
+                        <a href="/docs/providers/aci/d/span_sourcedestination_group_match_label.html">aci_span_sourcedestination_group_match_label</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-data-source-spine_interface_profile") %>>
-                        <a href="/docs/providers/aci/d/infraspaccportp.html">aci_spine_interface_profile</a>
+                        <a href="/docs/providers/aci/d/spine_interface_profile.html">aci_spine_interface_profile</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-data-source-spine_port_policy_group") %>>
-                        <a href="/docs/providers/aci/d/infraspaccportgrp.html">aci_spine_port_policy_group</a>
+                        <a href="/docs/providers/aci/d/spine_port_policy_group.html">aci_spine_port_policy_group</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-data-source-spine_port_selector") %>>
-                        <a href="/docs/providers/aci/d/infrarsspaccportp.html">aci_spine_port_selector</a>
+                        <a href="/docs/providers/aci/d/spine_port_selector.html">aci_spine_port_selector</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-data-source-spine_profile") %>>
-                        <a href="/docs/providers/aci/d/infraspinep.html">aci_spine_profile</a>
+                        <a href="/docs/providers/aci/d/spine_profile.html">aci_spine_profile</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-data-source-spine_switch_association") %>>
-                        <a href="/docs/providers/aci/d/infraspines.html">aci_spine_switch_association</a>
+                        <a href="/docs/providers/aci/d/spine_switch_association.html">aci_spine_switch_association</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-data-source-subnet") %>>
-                        <a href="/docs/providers/aci/d/fvsubnet.html">aci_subnet</a>
+                        <a href="/docs/providers/aci/d/subnet.html">aci_subnet</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-data-source-leaf_selector") %>>
-                        <a href="/docs/providers/aci/d/infraleafs.html">aci_leaf_selector</a>
+                        <a href="/docs/providers/aci/d/leaf_selector.html">aci_leaf_selector</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-data-source-taboo_contract") %>>
-                        <a href="/docs/providers/aci/d/vztaboo.html">aci_taboo_contract</a>
+                        <a href="/docs/providers/aci/d/taboo_contract.html">aci_taboo_contract</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-data-source-tenant") %>>
-                        <a href="/docs/providers/aci/d/fvtenant.html">aci_tenant</a>
+                        <a href="/docs/providers/aci/d/tenant.html">aci_tenant</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-data-source-trigger_scheduler") %>>
-                        <a href="/docs/providers/aci/d/trigschedp.html">aci_trigger_scheduler</a>
+                        <a href="/docs/providers/aci/d/trigger_scheduler.html">aci_trigger_scheduler</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-data-source-vlan_encapsulationfor_vxlan_traffic") %>>
-                        <a href="/docs/providers/aci/d/infraprovacc.html">aci_vlan_encapsulationfor_vxlan_traffic</a>
+                        <a href="/docs/providers/aci/d/vlan_encapsulationfor_vxlan_traffic.html">aci_vlan_encapsulationfor_vxlan_traffic</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-data-source-vlan_pool") %>>
-                        <a href="/docs/providers/aci/d/fvnsvlaninstp.html">aci_vlan_pool</a>
+                        <a href="/docs/providers/aci/d/vlan_pool.html">aci_vlan_pool</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-data-source-vmm_domain") %>>
-                        <a href="/docs/providers/aci/d/vmmdomp.html">aci_vmm_domain</a>
+                        <a href="/docs/providers/aci/d/vmm_domain.html">aci_vmm_domain</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-data-source-vpc_explicit_protection_group") %>>
-                        <a href="/docs/providers/aci/d/fabricexplicitgep.html">aci_vpc_explicit_protection_group</a>
+                        <a href="/docs/providers/aci/d/vpc_explicit_protection_group.html">aci_vpc_explicit_protection_group</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-data-source-vrf") %>>
-                        <a href="/docs/providers/aci/d/fvctx.html">aci_vrf</a>
+                        <a href="/docs/providers/aci/d/vrf.html">aci_vrf</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-data-source-vsan_pool") %>>
-                        <a href="/docs/providers/aci/d/fvnsvsaninstp.html">aci_vsan_pool</a>
+                        <a href="/docs/providers/aci/d/vsan_pool.html">aci_vsan_pool</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-data-source-vxlan_pool") %>>
-                        <a href="/docs/providers/aci/d/fvnsvxlaninstp.html">aci_vxlan_pool</a>
+                        <a href="/docs/providers/aci/d/vxlan_pool.html">aci_vxlan_pool</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-data-source-x509_certificate") %>>
-                        <a href="/docs/providers/aci/d/aaausercert.html">aci_x509_certificate</a>
+                        <a href="/docs/providers/aci/d/x509_certificate.html">aci_x509_certificate</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-index") %>>
                         <a href="/docs/providers/aci/index.html">ACI</a>
@@ -313,289 +313,289 @@
           <a href="#">Resources</a>
                   <ul class="nav nav-visible">
                       <li<%= sidebar_current("docs-aci-resource-aaa_domain") %>>
-                        <a href="/docs/providers/aci/r/aaadomain.html">aci_aaa_domain</a>
+                        <a href="/docs/providers/aci/r/aaa_domain.html">aci_aaa_domain</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-resource-access_generic") %>>
-                        <a href="/docs/providers/aci/r/infrageneric.html">aci_access_generic</a>
+                        <a href="/docs/providers/aci/r/access_generic.html">aci_access_generic</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-resource-access_group") %>>
-                        <a href="/docs/providers/aci/r/infrarsaccbasegrp.html">aci_access_group</a>
+                        <a href="/docs/providers/aci/r/access_group.html">aci_access_group</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-resource-access_port_block") %>>
-                        <a href="/docs/providers/aci/r/infraportblk.html">aci_access_port_block</a>
+                        <a href="/docs/providers/aci/r/access_port_block.html">aci_access_port_block</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-resource-access_port_selector") %>>
-                        <a href="/docs/providers/aci/r/infrahports.html">aci_access_port_selector</a>
+                        <a href="/docs/providers/aci/r/access_port_selector.html">aci_access_port_selector</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-resource-access_sub_port_block") %>>
-                        <a href="/docs/providers/aci/r/infrasubportblk.html">aci_access_sub_port_block</a>
+                        <a href="/docs/providers/aci/r/access_sub_port_block.html">aci_access_sub_port_block</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-resource-action_rule_profile") %>>
-                        <a href="/docs/providers/aci/r/rtctrlattrp.html">aci_action_rule_profile</a>
+                        <a href="/docs/providers/aci/r/action_rule_profile.html">aci_action_rule_profile</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-resource-any") %>>
-                        <a href="/docs/providers/aci/r/vzany.html">aci_any</a>
+                        <a href="/docs/providers/aci/r/any.html">aci_any</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-resource-application_epg") %>>
-                        <a href="/docs/providers/aci/r/fvaepg.html">aci_application_epg</a>
+                        <a href="/docs/providers/aci/r/application_epg.html">aci_application_epg</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-resource-application_profile") %>>
-                        <a href="/docs/providers/aci/r/fvap.html">aci_application_profile</a>
+                        <a href="/docs/providers/aci/r/application_profile.html">aci_application_profile</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-resource-attachable_access_entity_profile") %>>
-                        <a href="/docs/providers/aci/r/infraattentityp.html">aci_attachable_access_entity_profile</a>
+                        <a href="/docs/providers/aci/r/attachable_access_entity_profile.html">aci_attachable_access_entity_profile</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-resource-autonomous_system_profile") %>>
-                        <a href="/docs/providers/aci/r/cloudbgpasp.html">aci_autonomous_system_profile</a>
+                        <a href="/docs/providers/aci/r/autonomous_system_profile.html">aci_autonomous_system_profile</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-resource-bridge_domain") %>>
-                        <a href="/docs/providers/aci/r/fvbd.html">aci_bridge_domain</a>
+                        <a href="/docs/providers/aci/r/bridge_domain.html">aci_bridge_domain</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-resource-cdp_interface_policy") %>>
-                        <a href="/docs/providers/aci/r/cdpifpol.html">aci_cdp_interface_policy</a>
+                        <a href="/docs/providers/aci/r/cdp_interface_policy.html">aci_cdp_interface_policy</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-resource-cloud_applicationcontainer") %>>
-                        <a href="/docs/providers/aci/r/cloudapp.html">aci_cloud_applicationcontainer</a>
+                        <a href="/docs/providers/aci/r/cloud_applicationcontainer.html">aci_cloud_applicationcontainer</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-resource-cloud_availability_zone") %>>
-                        <a href="/docs/providers/aci/r/cloudzone.html">aci_cloud_availability_zone</a>
+                        <a href="/docs/providers/aci/r/cloud_availability_zone.html">aci_cloud_availability_zone</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-resource-cloud_aws_provider") %>>
-                        <a href="/docs/providers/aci/r/cloudawsprovider.html">aci_cloud_aws_provider</a>
+                        <a href="/docs/providers/aci/r/cloud_aws_provider.html">aci_cloud_aws_provider</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-resource-cloud_cidr_pool") %>>
-                        <a href="/docs/providers/aci/r/cloudcidr.html">aci_cloud_cidr_pool</a>
+                        <a href="/docs/providers/aci/r/cloud_cidr_pool.html">aci_cloud_cidr_pool</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-resource-cloud_context_profile") %>>
-                        <a href="/docs/providers/aci/r/cloudctxprofile.html">aci_cloud_context_profile</a>
+                        <a href="/docs/providers/aci/r/cloud_context_profile.html">aci_cloud_context_profile</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-resource-cloud_domain_profile") %>>
-                        <a href="/docs/providers/aci/r/clouddomp.html">aci_cloud_domain_profile</a>
+                        <a href="/docs/providers/aci/r/cloud_domain_profile.html">aci_cloud_domain_profile</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-resource-cloud_endpoint_selector") %>>
-                        <a href="/docs/providers/aci/r/cloudepselector.html">aci_cloud_endpoint_selector</a>
+                        <a href="/docs/providers/aci/r/cloud_endpoint_selector.html">aci_cloud_endpoint_selector</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-resource-cloud_endpoint_selectorfor_external_epgs") %>>
-                        <a href="/docs/providers/aci/r/cloudextepselector.html">aci_cloud_endpoint_selectorfor_external_epgs</a>
+                        <a href="/docs/providers/aci/r/cloud_endpoint_selectorfor_external_epgs.html">aci_cloud_endpoint_selectorfor_external_epgs</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-resource-cloud_epg") %>>
-                        <a href="/docs/providers/aci/r/cloudepg.html">aci_cloud_epg</a>
+                        <a href="/docs/providers/aci/r/cloud_epg.html">aci_cloud_epg</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-resource-cloud_external_epg") %>>
-                        <a href="/docs/providers/aci/r/cloudextepg.html">aci_cloud_external_epg</a>
+                        <a href="/docs/providers/aci/r/cloud_external_epg.html">aci_cloud_external_epg</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-resource-cloud_provider_profile") %>>
-                        <a href="/docs/providers/aci/r/cloudprovp.html">aci_cloud_provider_profile</a>
+                        <a href="/docs/providers/aci/r/cloud_provider_profile.html">aci_cloud_provider_profile</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-resource-cloud_providers_region") %>>
-                        <a href="/docs/providers/aci/r/cloudregion.html">aci_cloud_providers_region</a>
+                        <a href="/docs/providers/aci/r/cloud_providers_region.html">aci_cloud_providers_region</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-resource-cloud_subnet") %>>
-                        <a href="/docs/providers/aci/r/cloudsubnet.html">aci_cloud_subnet</a>
+                        <a href="/docs/providers/aci/r/cloud_subnet.html">aci_cloud_subnet</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-resource-configuration_export_policy") %>>
-                        <a href="/docs/providers/aci/r/configexportp.html">aci_configuration_export_policy</a>
+                        <a href="/docs/providers/aci/r/configuration_export_policy.html">aci_configuration_export_policy</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-resource-configuration_import_policy") %>>
-                        <a href="/docs/providers/aci/r/configimportp.html">aci_configuration_import_policy</a>
+                        <a href="/docs/providers/aci/r/configuration_import_policy.html">aci_configuration_import_policy</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-resource-contract") %>>
-                        <a href="/docs/providers/aci/r/vzbrcp.html">aci_contract</a>
+                        <a href="/docs/providers/aci/r/contract.html">aci_contract</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-resource-contract_subject") %>>
-                        <a href="/docs/providers/aci/r/vzsubj.html">aci_contract_subject</a>
+                        <a href="/docs/providers/aci/r/contract_subject.html">aci_contract_subject</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-resource-destination_of_redirected_traffic") %>>
-                        <a href="/docs/providers/aci/r/vnsredirectdest.html">aci_destination_of_redirected_traffic</a>
+                        <a href="/docs/providers/aci/r/destination_of_redirected_traffic.html">aci_destination_of_redirected_traffic</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-resource-end_point_retention_policy") %>>
-                        <a href="/docs/providers/aci/r/fvepretpol.html">aci_end_point_retention_policy</a>
+                        <a href="/docs/providers/aci/r/end_point_retention_policy.html">aci_end_point_retention_policy</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-resource-epg_to_contract") %>>
-                        <a href="/docs/providers/aci/r/epgtocontract.html">aci_epg_to_contract</a>
+                        <a href="/docs/providers/aci/r/epg_to_contract.html">aci_epg_to_contract</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-resource-epg_to_domain") %>>
-                        <a href="/docs/providers/aci/r/fvrsdomatt.html">aci_epg_to_domain</a>
+                        <a href="/docs/providers/aci/r/epg_to_domain.html">aci_epg_to_domain</a>
                       </li>
-                      <li<%= sidebar_current("docs-aci-resource-static_path") %>>
-                        <a href="/docs/providers/aci/r/fvrspathatt.html">aci_epg_to_static_path</a>
+                      <li<%= sidebar_current("docs-aci-resource-epg_to_static_path") %>>
+                        <a href="/docs/providers/aci/r/epg_to_static_path.html">aci_epg_to_static_path</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-resource-epgs_using_function") %>>
-                        <a href="/docs/providers/aci/r/infrarsfunctoepg.html">aci_epgs_using_function</a>
+                        <a href="/docs/providers/aci/r/epgs_using_function.html">aci_epgs_using_function</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-resource-external_network_instance_profile") %>>
-                        <a href="/docs/providers/aci/r/l3extinstp.html">aci_external_network_instance_profile</a>
+                        <a href="/docs/providers/aci/r/external_network_instance_profile.html">aci_external_network_instance_profile</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-resource-fabric_if_pol") %>>
-                        <a href="/docs/providers/aci/r/fabrichifpol.html">aci_fabric_if_pol</a>
+                        <a href="/docs/providers/aci/r/fabric_if_pol.html">aci_fabric_if_pol</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-resource-fabric_node_member") %>>
-                        <a href="/docs/providers/aci/r/fabricnodeidentp.html">aci_fabric_node_member</a>
+                        <a href="/docs/providers/aci/r/fabric_node_member.html">aci_fabric_node_member</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-resource-fc_domain") %>>
-                        <a href="/docs/providers/aci/r/fcdomp.html">aci_fc_domain</a>
+                        <a href="/docs/providers/aci/r/fc_domain.html">aci_fc_domain</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-resource-fex_bundle_group") %>>
-                        <a href="/docs/providers/aci/r/infrafexbndlgrp.html">aci_fex_bundle_group</a>
+                        <a href="/docs/providers/aci/r/fex_bundle_group.html">aci_fex_bundle_group</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-resource-fex_profile") %>>
-                        <a href="/docs/providers/aci/r/infrafexp.html">aci_fex_profile</a>
+                        <a href="/docs/providers/aci/r/fex_profile.html">aci_fex_profile</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-resource-filter") %>>
-                        <a href="/docs/providers/aci/r/vzfilter.html">aci_filter</a>
+                        <a href="/docs/providers/aci/r/filter.html">aci_filter</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-resource-filter_entry") %>>
-                        <a href="/docs/providers/aci/r/vzentry.html">aci_filter_entry</a>
+                        <a href="/docs/providers/aci/r/filter_entry.html">aci_filter_entry</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-resource-firmware_download_task") %>>
-                        <a href="/docs/providers/aci/r/firmwareosource.html">aci_firmware_download_task</a>
+                        <a href="/docs/providers/aci/r/firmware_download_task.html">aci_firmware_download_task</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-resource-firmware_group") %>>
-                        <a href="/docs/providers/aci/r/firmwarefwgrp.html">aci_firmware_group</a>
+                        <a href="/docs/providers/aci/r/firmware_group.html">aci_firmware_group</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-resource-firmware_policy") %>>
-                        <a href="/docs/providers/aci/r/firmwarefwp.html">aci_firmware_policy</a>
+                        <a href="/docs/providers/aci/r/firmware_policy.html">aci_firmware_policy</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-resource-imported_contract") %>>
-                        <a href="/docs/providers/aci/r/vzcpif.html">aci_imported_contract</a>
+                        <a href="/docs/providers/aci/r/imported_contract.html">aci_imported_contract</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-resource-interface_fc_policy") %>>
-                        <a href="/docs/providers/aci/r/fcifpol.html">aci_interface_fc_policy</a>
+                        <a href="/docs/providers/aci/r/interface_fc_policy.html">aci_interface_fc_policy</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-resource-l2_interface_policy") %>>
-                        <a href="/docs/providers/aci/r/l2ifpol.html">aci_l2_interface_policy</a>
+                        <a href="/docs/providers/aci/r/l2_interface_policy.html">aci_l2_interface_policy</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-resource-l3_domain_profile") %>>
-                        <a href="/docs/providers/aci/r/l3extdomp.html">aci_l3_domain_profile</a>
+                        <a href="/docs/providers/aci/r/l3_domain_profile.html">aci_l3_domain_profile</a>
                       </li>
-                      <li<%= sidebar_current("docs-aci-resource-subnet") %>>
-                        <a href="/docs/providers/aci/r/l3extsubnet.html">aci_l3_ext_subnet</a>
+                      <li<%= sidebar_current("docs-aci-resource-l3_ext_subnet") %>>
+                        <a href="/docs/providers/aci/r/l3_ext_subnet.html">aci_l3_ext_subnet</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-resource-l3_outside") %>>
-                        <a href="/docs/providers/aci/r/l3extout.html">aci_l3_outside</a>
+                        <a href="/docs/providers/aci/r/l3_outside.html">aci_l3_outside</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-resource-lacp_policy") %>>
-                        <a href="/docs/providers/aci/r/lacplagpol.html">aci_lacp_policy</a>
+                        <a href="/docs/providers/aci/r/lacp_policy.html">aci_lacp_policy</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-resource-leaf_access_bundle_policy_group") %>>
-                        <a href="/docs/providers/aci/r/infraaccbndlgrp.html">aci_leaf_access_bundle_policy_group</a>
+                        <a href="/docs/providers/aci/r/leaf_access_bundle_policy_group.html">aci_leaf_access_bundle_policy_group</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-resource-leaf_access_port_policy_group") %>>
-                        <a href="/docs/providers/aci/r/infraaccportgrp.html">aci_leaf_access_port_policy_group</a>
+                        <a href="/docs/providers/aci/r/leaf_access_port_policy_group.html">aci_leaf_access_port_policy_group</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-resource-leaf_interface_profile") %>>
-                        <a href="/docs/providers/aci/r/infraaccportp.html">aci_leaf_interface_profile</a>
+                        <a href="/docs/providers/aci/r/leaf_interface_profile.html">aci_leaf_interface_profile</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-resource-leaf_profile") %>>
-                        <a href="/docs/providers/aci/r/infranodep.html">aci_leaf_profile</a>
+                        <a href="/docs/providers/aci/r/leaf_profile.html">aci_leaf_profile</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-resource-lldp_interface_policy") %>>
-                        <a href="/docs/providers/aci/r/lldpifpol.html">aci_lldp_interface_policy</a>
+                        <a href="/docs/providers/aci/r/lldp_interface_policy.html">aci_lldp_interface_policy</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-resource-local_user") %>>
-                        <a href="/docs/providers/aci/r/aaauser.html">aci_local_user</a>
+                        <a href="/docs/providers/aci/r/local_user.html">aci_local_user</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-resource-logical_interface_profile") %>>
-                        <a href="/docs/providers/aci/r/l3extlifp.html">aci_logical_interface_profile</a>
+                        <a href="/docs/providers/aci/r/logical_interface_profile.html">aci_logical_interface_profile</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-resource-logical_node_profile") %>>
-                        <a href="/docs/providers/aci/r/l3extlnodep.html">aci_logical_node_profile</a>
+                        <a href="/docs/providers/aci/r/logical_node_profile.html">aci_logical_node_profile</a>
                       </li>
-                      <li<%= sidebar_current("docs-aci-resource-fabric_node") %>>
-                        <a href="/docs/providers/aci/r/l3extrsnodel3outatt.html">aci_logical_node_to_fabric_node</a>
+                      <li<%= sidebar_current("docs-aci-resource-logical_node_to_fabric_node") %>>
+                        <a href="/docs/providers/aci/r/logical_node_to_fabric_node.html">aci_logical_node_to_fabric_node</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-resource-maintenance_policy") %>>
-                        <a href="/docs/providers/aci/r/maintmaintp.html">aci_maintenance_policy</a>
+                        <a href="/docs/providers/aci/r/maintenance_policy.html">aci_maintenance_policy</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-resource-miscabling_protocol_interface_policy") %>>
-                        <a href="/docs/providers/aci/r/mcpifpol.html">aci_miscabling_protocol_interface_policy</a>
+                        <a href="/docs/providers/aci/r/miscabling_protocol_interface_policy.html">aci_miscabling_protocol_interface_policy</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-resource-node_block") %>>
-                        <a href="/docs/providers/aci/r/infranodeblk.html">aci_node_block</a>
+                        <a href="/docs/providers/aci/r/node_block.html">aci_node_block</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-resource-node_block_firmware") %>>
-                        <a href="/docs/providers/aci/r/fabricnodeblk.html">aci_node_block_firmware</a>
+                        <a href="/docs/providers/aci/r/node_block_firmware.html">aci_node_block_firmware</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-resource-ospf_interface_policy") %>>
-                        <a href="/docs/providers/aci/r/ospfifpol.html">aci_ospf_interface_policy</a>
+                        <a href="/docs/providers/aci/r/ospf_interface_policy.html">aci_ospf_interface_policy</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-resource-physical_domain") %>>
-                        <a href="/docs/providers/aci/r/physdomp.html">aci_physical_domain</a>
+                        <a href="/docs/providers/aci/r/physical_domain.html">aci_physical_domain</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-resource-pod_maintenance_group") %>>
-                        <a href="/docs/providers/aci/r/maintmaintgrp.html">aci_pod_maintenance_group</a>
+                        <a href="/docs/providers/aci/r/pod_maintenance_group.html">aci_pod_maintenance_group</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-resource-port_security_policy") %>>
-                        <a href="/docs/providers/aci/r/l2portsecuritypol.html">aci_port_security_policy</a>
+                        <a href="/docs/providers/aci/r/port_security_policy.html">aci_port_security_policy</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-resource-ranges") %>>
-                        <a href="/docs/providers/aci/r/fvnsencapblk.html">aci_ranges</a>
+                        <a href="/docs/providers/aci/r/ranges.html">aci_ranges</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-resource-service_redirect_policy") %>>
-                        <a href="/docs/providers/aci/r/vnssvcredirectpol.html">aci_service_redirect_policy</a>
+                        <a href="/docs/providers/aci/r/service_redirect_policy.html">aci_service_redirect_policy</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-resource-span_destination_group") %>>
-                        <a href="/docs/providers/aci/r/spandestgrp.html">aci_span_destination_group</a>
+                        <a href="/docs/providers/aci/r/span_destination_group.html">aci_span_destination_group</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-resource-span_source_group") %>>
-                        <a href="/docs/providers/aci/r/spansrcgrp.html">aci_span_source_group</a>
+                        <a href="/docs/providers/aci/r/span_source_group.html">aci_span_source_group</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-resource-span_sourcedestination_group_match_label") %>>
-                        <a href="/docs/providers/aci/r/spanspanlbl.html">aci_span_sourcedestination_group_match_label</a>
+                        <a href="/docs/providers/aci/r/span_sourcedestination_group_match_label.html">aci_span_sourcedestination_group_match_label</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-resource-spine_interface_profile") %>>
-                        <a href="/docs/providers/aci/r/infraspaccportp.html">aci_spine_interface_profile</a>
+                        <a href="/docs/providers/aci/r/spine_interface_profile.html">aci_spine_interface_profile</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-resource-spine_port_policy_group") %>>
-                        <a href="/docs/providers/aci/r/infraspaccportgrp.html">aci_spine_port_policy_group</a>
+                        <a href="/docs/providers/aci/r/spine_port_policy_group.html">aci_spine_port_policy_group</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-resource-spine_port_selector") %>>
-                        <a href="/docs/providers/aci/r/infrarsspaccportp.html">aci_spine_port_selector</a>
+                        <a href="/docs/providers/aci/r/spine_port_selector.html">aci_spine_port_selector</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-resource-spine_profile") %>>
-                        <a href="/docs/providers/aci/r/infraspinep.html">aci_spine_profile</a>
+                        <a href="/docs/providers/aci/r/spine_profile.html">aci_spine_profile</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-resource-spine_switch_association") %>>
-                        <a href="/docs/providers/aci/r/infraspines.html">aci_spine_switch_association</a>
+                        <a href="/docs/providers/aci/r/spine_switch_association.html">aci_spine_switch_association</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-resource-subnet") %>>
-                        <a href="/docs/providers/aci/r/fvsubnet.html">aci_subnet</a>
+                        <a href="/docs/providers/aci/r/subnet.html">aci_subnet</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-resource-leaf_selector") %>>
-                        <a href="/docs/providers/aci/r/infraleafs.html">aci_leaf_selector</a>
+                        <a href="/docs/providers/aci/r/leaf_selector.html">aci_leaf_selector</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-resource-taboo_contract") %>>
-                        <a href="/docs/providers/aci/r/vztaboo.html">aci_taboo_contract</a>
+                        <a href="/docs/providers/aci/r/taboo_contract.html">aci_taboo_contract</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-resource-tenant") %>>
-                        <a href="/docs/providers/aci/r/fvtenant.html">aci_tenant</a>
+                        <a href="/docs/providers/aci/r/tenant.html">aci_tenant</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-resource-trigger_scheduler") %>>
-                        <a href="/docs/providers/aci/r/trigschedp.html">aci_trigger_scheduler</a>
+                        <a href="/docs/providers/aci/r/trigger_scheduler.html">aci_trigger_scheduler</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-resource-vlan_encapsulationfor_vxlan_traffic") %>>
-                        <a href="/docs/providers/aci/r/infraprovacc.html">aci_vlan_encapsulationfor_vxlan_traffic</a>
+                        <a href="/docs/providers/aci/r/vlan_encapsulationfor_vxlan_traffic.html">aci_vlan_encapsulationfor_vxlan_traffic</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-resource-vlan_pool") %>>
-                        <a href="/docs/providers/aci/r/fvnsvlaninstp.html">aci_vlan_pool</a>
+                        <a href="/docs/providers/aci/r/vlan_pool.html">aci_vlan_pool</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-resource-vmm_domain") %>>
-                        <a href="/docs/providers/aci/r/vmmdomp.html">aci_vmm_domain</a>
+                        <a href="/docs/providers/aci/r/vmm_domain.html">aci_vmm_domain</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-resource-vpc_explicit_protection_group") %>>
-                        <a href="/docs/providers/aci/r/fabricexplicitgep.html">aci_vpc_explicit_protection_group</a>
+                        <a href="/docs/providers/aci/r/vpc_explicit_protection_group.html">aci_vpc_explicit_protection_group</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-resource-vrf") %>>
-                        <a href="/docs/providers/aci/r/fvctx.html">aci_vrf</a>
+                        <a href="/docs/providers/aci/r/vrf.html">aci_vrf</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-resource-vsan_pool") %>>
-                        <a href="/docs/providers/aci/r/fvnsvsaninstp.html">aci_vsan_pool</a>
+                        <a href="/docs/providers/aci/r/vsan_pool.html">aci_vsan_pool</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-resource-vxlan_pool") %>>
-                        <a href="/docs/providers/aci/r/fvnsvxlaninstp.html">aci_vxlan_pool</a>
+                        <a href="/docs/providers/aci/r/vxlan_pool.html">aci_vxlan_pool</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-resource-x509_certificate") %>>
-                        <a href="/docs/providers/aci/r/aaausercert.html">aci_x509_certificate</a>
+                        <a href="/docs/providers/aci/r/x509_certificate.html">aci_x509_certificate</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-index") %>>
                         <a href="/docs/providers/aci/index.html">ACI</a>
diff --git a/website/docs/d/aaadomain.html.markdown b/website/docs/d/aaa_domain.html.markdown
similarity index 100%
rename from website/docs/d/aaadomain.html.markdown
rename to website/docs/d/aaa_domain.html.markdown
diff --git a/website/docs/d/infrageneric.html.markdown b/website/docs/d/access_generic.html.markdown
similarity index 100%
rename from website/docs/d/infrageneric.html.markdown
rename to website/docs/d/access_generic.html.markdown
diff --git a/website/docs/d/infrarsaccbasegrp.html.markdown b/website/docs/d/access_group.html.markdown
similarity index 100%
rename from website/docs/d/infrarsaccbasegrp.html.markdown
rename to website/docs/d/access_group.html.markdown
diff --git a/website/docs/d/infraportblk.html.markdown b/website/docs/d/access_port_block.html.markdown
similarity index 100%
rename from website/docs/d/infraportblk.html.markdown
rename to website/docs/d/access_port_block.html.markdown
diff --git a/website/docs/d/infrahports.html.markdown b/website/docs/d/access_port_selector.html.markdown
similarity index 100%
rename from website/docs/d/infrahports.html.markdown
rename to website/docs/d/access_port_selector.html.markdown
diff --git a/website/docs/d/infrasubportblk.html.markdown b/website/docs/d/access_sub_port_block.html.markdown
similarity index 100%
rename from website/docs/d/infrasubportblk.html.markdown
rename to website/docs/d/access_sub_port_block.html.markdown
diff --git a/website/docs/d/rtctrlattrp.html.markdown b/website/docs/d/action_rule_profile.html.markdown
similarity index 100%
rename from website/docs/d/rtctrlattrp.html.markdown
rename to website/docs/d/action_rule_profile.html.markdown
diff --git a/website/docs/d/vzany.html.markdown b/website/docs/d/any.html.markdown
similarity index 100%
rename from website/docs/d/vzany.html.markdown
rename to website/docs/d/any.html.markdown
diff --git a/website/docs/d/fvaepg.html.markdown b/website/docs/d/application_epg.html.markdown
similarity index 100%
rename from website/docs/d/fvaepg.html.markdown
rename to website/docs/d/application_epg.html.markdown
diff --git a/website/docs/d/fvap.html.markdown b/website/docs/d/application_profile.html.markdown
similarity index 100%
rename from website/docs/d/fvap.html.markdown
rename to website/docs/d/application_profile.html.markdown
diff --git a/website/docs/d/infraattentityp.html.markdown b/website/docs/d/attachable_access_entity_profile.html.markdown
similarity index 100%
rename from website/docs/d/infraattentityp.html.markdown
rename to website/docs/d/attachable_access_entity_profile.html.markdown
diff --git a/website/docs/d/cloudbgpasp.html.markdown b/website/docs/d/autonomous_system_profile.html.markdown
similarity index 100%
rename from website/docs/d/cloudbgpasp.html.markdown
rename to website/docs/d/autonomous_system_profile.html.markdown
diff --git a/website/docs/d/fvbd.html.markdown b/website/docs/d/bridge_domain.html.markdown
similarity index 100%
rename from website/docs/d/fvbd.html.markdown
rename to website/docs/d/bridge_domain.html.markdown
diff --git a/website/docs/d/cdpifpol.html.markdown b/website/docs/d/cdp_interface_policy.html.markdown
similarity index 100%
rename from website/docs/d/cdpifpol.html.markdown
rename to website/docs/d/cdp_interface_policy.html.markdown
diff --git a/website/docs/d/cloudapp.html.markdown b/website/docs/d/cloud_applicationcontainer.html.markdown
similarity index 100%
rename from website/docs/d/cloudapp.html.markdown
rename to website/docs/d/cloud_applicationcontainer.html.markdown
diff --git a/website/docs/d/cloudzone.html.markdown b/website/docs/d/cloud_availability_zone.html.markdown
similarity index 100%
rename from website/docs/d/cloudzone.html.markdown
rename to website/docs/d/cloud_availability_zone.html.markdown
diff --git a/website/docs/d/cloudawsprovider.html.markdown b/website/docs/d/cloud_aws_provider.html.markdown
similarity index 100%
rename from website/docs/d/cloudawsprovider.html.markdown
rename to website/docs/d/cloud_aws_provider.html.markdown
diff --git a/website/docs/d/cloudcidr.html.markdown b/website/docs/d/cloud_cidr_pool.html.markdown
similarity index 100%
rename from website/docs/d/cloudcidr.html.markdown
rename to website/docs/d/cloud_cidr_pool.html.markdown
diff --git a/website/docs/d/cloudctxprofile.html.markdown b/website/docs/d/cloud_context_profile.html.markdown
similarity index 100%
rename from website/docs/d/cloudctxprofile.html.markdown
rename to website/docs/d/cloud_context_profile.html.markdown
diff --git a/website/docs/d/clouddomp.html.markdown b/website/docs/d/cloud_domain_profile.html.markdown
similarity index 100%
rename from website/docs/d/clouddomp.html.markdown
rename to website/docs/d/cloud_domain_profile.html.markdown
diff --git a/website/docs/d/cloudepselector.html.markdown b/website/docs/d/cloud_endpoint_selector.html.markdown
similarity index 100%
rename from website/docs/d/cloudepselector.html.markdown
rename to website/docs/d/cloud_endpoint_selector.html.markdown
diff --git a/website/docs/d/cloudextepselector.html.markdown b/website/docs/d/cloud_endpoint_selectorfor_external_epgs.html.markdown
similarity index 100%
rename from website/docs/d/cloudextepselector.html.markdown
rename to website/docs/d/cloud_endpoint_selectorfor_external_epgs.html.markdown
diff --git a/website/docs/d/cloudepg.html.markdown b/website/docs/d/cloud_epg.html.markdown
similarity index 100%
rename from website/docs/d/cloudepg.html.markdown
rename to website/docs/d/cloud_epg.html.markdown
diff --git a/website/docs/d/cloudextepg.html.markdown b/website/docs/d/cloud_external_epg.html.markdown
similarity index 100%
rename from website/docs/d/cloudextepg.html.markdown
rename to website/docs/d/cloud_external_epg.html.markdown
diff --git a/website/docs/d/cloudprovp.html.markdown b/website/docs/d/cloud_provider_profile.html.markdown
similarity index 100%
rename from website/docs/d/cloudprovp.html.markdown
rename to website/docs/d/cloud_provider_profile.html.markdown
diff --git a/website/docs/d/cloudregion.html.markdown b/website/docs/d/cloud_providers_region.html.markdown
similarity index 100%
rename from website/docs/d/cloudregion.html.markdown
rename to website/docs/d/cloud_providers_region.html.markdown
diff --git a/website/docs/d/cloudsubnet.html.markdown b/website/docs/d/cloud_subnet.html.markdown
similarity index 100%
rename from website/docs/d/cloudsubnet.html.markdown
rename to website/docs/d/cloud_subnet.html.markdown
diff --git a/website/docs/d/configexportp.html.markdown b/website/docs/d/configuration_export_policy.html.markdown
similarity index 100%
rename from website/docs/d/configexportp.html.markdown
rename to website/docs/d/configuration_export_policy.html.markdown
diff --git a/website/docs/d/configimportp.html.markdown b/website/docs/d/configuration_import_policy.html.markdown
similarity index 100%
rename from website/docs/d/configimportp.html.markdown
rename to website/docs/d/configuration_import_policy.html.markdown
diff --git a/website/docs/d/vzbrcp.html.markdown b/website/docs/d/contract.html.markdown
similarity index 100%
rename from website/docs/d/vzbrcp.html.markdown
rename to website/docs/d/contract.html.markdown
diff --git a/website/docs/d/vzsubj.html.markdown b/website/docs/d/contract_subject.html.markdown
similarity index 100%
rename from website/docs/d/vzsubj.html.markdown
rename to website/docs/d/contract_subject.html.markdown
diff --git a/website/docs/d/vnsredirectdest.html.markdown b/website/docs/d/destination_of_redirected_traffic.html.markdown
similarity index 100%
rename from website/docs/d/vnsredirectdest.html.markdown
rename to website/docs/d/destination_of_redirected_traffic.html.markdown
diff --git a/website/docs/d/fvepretpol.html.markdown b/website/docs/d/end_point_retention_policy.html.markdown
similarity index 100%
rename from website/docs/d/fvepretpol.html.markdown
rename to website/docs/d/end_point_retention_policy.html.markdown
diff --git a/website/docs/d/epgtocontract.html.markdown b/website/docs/d/epg_to_contract.html.markdown
similarity index 100%
rename from website/docs/d/epgtocontract.html.markdown
rename to website/docs/d/epg_to_contract.html.markdown
diff --git a/website/docs/d/fvrsdomatt.html.markdown b/website/docs/d/epg_to_domain.html.markdown
similarity index 100%
rename from website/docs/d/fvrsdomatt.html.markdown
rename to website/docs/d/epg_to_domain.html.markdown
diff --git a/website/docs/d/fvrspathatt.html.markdown b/website/docs/d/epg_to_static_path.html.markdown
similarity index 80%
rename from website/docs/d/fvrspathatt.html.markdown
rename to website/docs/d/epg_to_static_path.html.markdown
index 0fae359d4..8057f79d8 100644
--- a/website/docs/d/fvrspathatt.html.markdown
+++ b/website/docs/d/epg_to_static_path.html.markdown
@@ -1,13 +1,13 @@
 ---
 layout: "aci"
-page_title: "ACI: aci_static_path"
-sidebar_current: "docs-aci-data-source-static_path"
+page_title: "ACI: aci_epg_to_static_path"
+sidebar_current: "docs-aci-data-source-epg_to_static_path"
 description: |-
-  Data source for ACI Static Path
+  Data source for ACI EPG to Static Path
 ---
 
 # aci_epg_to_static_path #
-Data source for ACI Static Path
+Data source for ACI EPG to Static Path
 
 ## Example Usage ##
 
diff --git a/website/docs/d/infrarsfunctoepg.html.markdown b/website/docs/d/epgs_using_function.html.markdown
similarity index 100%
rename from website/docs/d/infrarsfunctoepg.html.markdown
rename to website/docs/d/epgs_using_function.html.markdown
diff --git a/website/docs/d/l3extinstp.html.markdown b/website/docs/d/external_network_instance_profile.html.markdown
similarity index 100%
rename from website/docs/d/l3extinstp.html.markdown
rename to website/docs/d/external_network_instance_profile.html.markdown
diff --git a/website/docs/d/fabrichifpol.html.markdown b/website/docs/d/fabric_if_pol.html.markdown
similarity index 100%
rename from website/docs/d/fabrichifpol.html.markdown
rename to website/docs/d/fabric_if_pol.html.markdown
diff --git a/website/docs/d/fabricnodeidentp.html.markdown b/website/docs/d/fabric_node_member.html.markdown
similarity index 100%
rename from website/docs/d/fabricnodeidentp.html.markdown
rename to website/docs/d/fabric_node_member.html.markdown
diff --git a/website/docs/d/fabricpathep.html.markdown b/website/docs/d/fabric_path_ep.html.markdown
similarity index 100%
rename from website/docs/d/fabricpathep.html.markdown
rename to website/docs/d/fabric_path_ep.html.markdown
diff --git a/website/docs/d/fcdomp.html.markdown b/website/docs/d/fc_domain.html.markdown
similarity index 100%
rename from website/docs/d/fcdomp.html.markdown
rename to website/docs/d/fc_domain.html.markdown
diff --git a/website/docs/d/infrafexbndlgrp.html.markdown b/website/docs/d/fex_bundle_group.html.markdown
similarity index 100%
rename from website/docs/d/infrafexbndlgrp.html.markdown
rename to website/docs/d/fex_bundle_group.html.markdown
diff --git a/website/docs/d/infrafexp.html.markdown b/website/docs/d/fex_profile.html.markdown
similarity index 100%
rename from website/docs/d/infrafexp.html.markdown
rename to website/docs/d/fex_profile.html.markdown
diff --git a/website/docs/d/vzfilter.html.markdown b/website/docs/d/filter.html.markdown
similarity index 100%
rename from website/docs/d/vzfilter.html.markdown
rename to website/docs/d/filter.html.markdown
diff --git a/website/docs/d/vzentry.html.markdown b/website/docs/d/filter_entry.html.markdown
similarity index 100%
rename from website/docs/d/vzentry.html.markdown
rename to website/docs/d/filter_entry.html.markdown
diff --git a/website/docs/d/firmwareosource.html.markdown b/website/docs/d/firmware_download_task.html.markdown
similarity index 100%
rename from website/docs/d/firmwareosource.html.markdown
rename to website/docs/d/firmware_download_task.html.markdown
diff --git a/website/docs/d/firmwarefwgrp.html.markdown b/website/docs/d/firmware_group.html.markdown
similarity index 100%
rename from website/docs/d/firmwarefwgrp.html.markdown
rename to website/docs/d/firmware_group.html.markdown
diff --git a/website/docs/d/firmwarefwp.html.markdown b/website/docs/d/firmware_policy.html.markdown
similarity index 100%
rename from website/docs/d/firmwarefwp.html.markdown
rename to website/docs/d/firmware_policy.html.markdown
diff --git a/website/docs/d/vzcpif.html.markdown b/website/docs/d/imported_contract.html.markdown
similarity index 100%
rename from website/docs/d/vzcpif.html.markdown
rename to website/docs/d/imported_contract.html.markdown
diff --git a/website/docs/d/fcifpol.html.markdown b/website/docs/d/interface_fc_policy.html.markdown
similarity index 100%
rename from website/docs/d/fcifpol.html.markdown
rename to website/docs/d/interface_fc_policy.html.markdown
diff --git a/website/docs/d/l2ifpol.html.markdown b/website/docs/d/l2_interface_policy.html.markdown
similarity index 100%
rename from website/docs/d/l2ifpol.html.markdown
rename to website/docs/d/l2_interface_policy.html.markdown
diff --git a/website/docs/d/l3extdomp.html.markdown b/website/docs/d/l3_domain_profile.html.markdown
similarity index 100%
rename from website/docs/d/l3extdomp.html.markdown
rename to website/docs/d/l3_domain_profile.html.markdown
diff --git a/website/docs/d/l3_ext_subnet.html.markdown b/website/docs/d/l3_ext_subnet.html.markdown
new file mode 100644
index 000000000..5ed872333
--- /dev/null
+++ b/website/docs/d/l3_ext_subnet.html.markdown
@@ -0,0 +1,33 @@
+---
+layout: "aci"
+page_title: "ACI: aci_l3_ext_subnet"
+sidebar_current: "docs-aci-data-source-l3_ext_subnet"
+description: |-
+  Data source for ACI l3 extension subnet
+---
+
+# aci_l3_ext_subnet #
+Data source for ACI l3 extension subnet
+
+## Example Usage ##
+
+```hcl
+data "aci_l3_ext_subnet" "example" {
+
+  external_network_instance_profile_dn  = "${aci_external_network_instance_profile.example.id}"
+  ip                                    = "10.0.3.28/27"
+}
+```
+## Argument Reference ##
+* `external_network_instance_profile_dn` - (Required) Distinguished name of parent ExternalNetworkInstanceProfile object.
+* `ip` - (Required) ip of Object l3 extension subnet.
+
+
+
+## Attribute Reference
+
+* `id` - Attribute id set to the Dn of the l3 extension subnet.
+* `aggregate` - (Optional) Aggregate Routes for l3 extension subnet.
+* `annotation` - (Optional) annotation for object l3 extension subnet.
+* `name_alias` - (Optional) name_alias for object l3 extension subnet.
+* `scope` - (Optional) The domain applicable to the capability.
diff --git a/website/docs/d/l3extout.html.markdown b/website/docs/d/l3_outside.html.markdown
similarity index 100%
rename from website/docs/d/l3extout.html.markdown
rename to website/docs/d/l3_outside.html.markdown
diff --git a/website/docs/d/l3extsubnet.html.markdown b/website/docs/d/l3extsubnet.html.markdown
deleted file mode 100644
index 733f6ea3b..000000000
--- a/website/docs/d/l3extsubnet.html.markdown
+++ /dev/null
@@ -1,33 +0,0 @@
----
-layout: "aci"
-page_title: "ACI: aci_subnet"
-sidebar_current: "docs-aci-data-source-subnet"
-description: |-
-  Data source for ACI Subnet
----
-
-# aci_subnet #
-Data source for ACI Subnet
-
-## Example Usage ##
-
-```hcl
-data "aci_l3_ext_subnet" "example" {
-
-  external_network_instance_profile_dn  = "${aci_external_network_instance_profile.example.id}"
-  ip                                    = "10.0.3.28/27"
-}
-```
-## Argument Reference ##
-* `external_network_instance_profile_dn` - (Required) Distinguished name of parent ExternalNetworkInstanceProfile object.
-* `ip` - (Required) ip of Object subnet.
-
-
-
-## Attribute Reference
-
-* `id` - Attribute id set to the Dn of the Subnet.
-* `aggregate` - (Optional) Aggregate Routes for Subnet.
-* `annotation` - (Optional) annotation for object subnet.
-* `name_alias` - (Optional) name_alias for object subnet.
-* `scope` - (Optional) The domain applicable to the capability.
diff --git a/website/docs/d/lacplagpol.html.markdown b/website/docs/d/lacp_policy.html.markdown
similarity index 100%
rename from website/docs/d/lacplagpol.html.markdown
rename to website/docs/d/lacp_policy.html.markdown
diff --git a/website/docs/d/infraaccbndlgrp.html.markdown b/website/docs/d/leaf_access_bundle_policy_group.html.markdown
similarity index 100%
rename from website/docs/d/infraaccbndlgrp.html.markdown
rename to website/docs/d/leaf_access_bundle_policy_group.html.markdown
diff --git a/website/docs/d/infraaccportgrp.html.markdown b/website/docs/d/leaf_access_port_policy_group.html.markdown
similarity index 100%
rename from website/docs/d/infraaccportgrp.html.markdown
rename to website/docs/d/leaf_access_port_policy_group.html.markdown
diff --git a/website/docs/d/infraaccportp.html.markdown b/website/docs/d/leaf_interface_profile.html.markdown
similarity index 100%
rename from website/docs/d/infraaccportp.html.markdown
rename to website/docs/d/leaf_interface_profile.html.markdown
diff --git a/website/docs/d/infranodep.html.markdown b/website/docs/d/leaf_profile.html.markdown
similarity index 100%
rename from website/docs/d/infranodep.html.markdown
rename to website/docs/d/leaf_profile.html.markdown
diff --git a/website/docs/d/infraleafs.html.markdown b/website/docs/d/leaf_selector.html.markdown
similarity index 100%
rename from website/docs/d/infraleafs.html.markdown
rename to website/docs/d/leaf_selector.html.markdown
diff --git a/website/docs/d/lldpifpol.html.markdown b/website/docs/d/lldp_interface_policy.html.markdown
similarity index 100%
rename from website/docs/d/lldpifpol.html.markdown
rename to website/docs/d/lldp_interface_policy.html.markdown
diff --git a/website/docs/d/aaauser.html.markdown b/website/docs/d/local_user.html.markdown
similarity index 100%
rename from website/docs/d/aaauser.html.markdown
rename to website/docs/d/local_user.html.markdown
diff --git a/website/docs/d/l3extlifp.html.markdown b/website/docs/d/logical_interface_profile.html.markdown
similarity index 100%
rename from website/docs/d/l3extlifp.html.markdown
rename to website/docs/d/logical_interface_profile.html.markdown
diff --git a/website/docs/d/l3extlnodep.html.markdown b/website/docs/d/logical_node_profile.html.markdown
similarity index 100%
rename from website/docs/d/l3extlnodep.html.markdown
rename to website/docs/d/logical_node_profile.html.markdown
diff --git a/website/docs/d/l3extrsnodel3outatt.html.markdown b/website/docs/d/logical_node_to_fabric_node.html.markdown
similarity index 76%
rename from website/docs/d/l3extrsnodel3outatt.html.markdown
rename to website/docs/d/logical_node_to_fabric_node.html.markdown
index 36a607a31..1a534916c 100644
--- a/website/docs/d/l3extrsnodel3outatt.html.markdown
+++ b/website/docs/d/logical_node_to_fabric_node.html.markdown
@@ -1,13 +1,13 @@
 ---
 layout: "aci"
-page_title: "ACI: aci_fabric_node"
-sidebar_current: "docs-aci-data-source-fabric_node"
+page_title: "ACI: aci_logical_node_to_fabric_node"
+sidebar_current: "docs-aci-data-source-logical_node_to_fabric_node"
 description: |-
-  Data source for ACI Fabric Node
+  Data source for ACI Logical Node to Fabric Node
 ---
 
 # aci_logical_node_to_fabric_node #
-Data source for ACI Fabric Node
+Data source for ACI Logical Node to Fabric Node
 
 ## Example Usage ##
 
diff --git a/website/docs/d/maintmaintp.html.markdown b/website/docs/d/maintenance_policy.html.markdown
similarity index 100%
rename from website/docs/d/maintmaintp.html.markdown
rename to website/docs/d/maintenance_policy.html.markdown
diff --git a/website/docs/d/mcpifpol.html.markdown b/website/docs/d/miscabling_protocol_interface_policy.html.markdown
similarity index 100%
rename from website/docs/d/mcpifpol.html.markdown
rename to website/docs/d/miscabling_protocol_interface_policy.html.markdown
diff --git a/website/docs/d/infranodeblk.html.markdown b/website/docs/d/node_block.html.markdown
similarity index 100%
rename from website/docs/d/infranodeblk.html.markdown
rename to website/docs/d/node_block.html.markdown
diff --git a/website/docs/d/fabricnodeblk.html.markdown b/website/docs/d/node_block_firmware.html.markdown
similarity index 100%
rename from website/docs/d/fabricnodeblk.html.markdown
rename to website/docs/d/node_block_firmware.html.markdown
diff --git a/website/docs/d/ospfifpol.html.markdown b/website/docs/d/ospf_interface_policy.html.markdown
similarity index 100%
rename from website/docs/d/ospfifpol.html.markdown
rename to website/docs/d/ospf_interface_policy.html.markdown
diff --git a/website/docs/d/physdomp.html.markdown b/website/docs/d/physical_domain.html.markdown
similarity index 100%
rename from website/docs/d/physdomp.html.markdown
rename to website/docs/d/physical_domain.html.markdown
diff --git a/website/docs/d/maintmaintgrp.html.markdown b/website/docs/d/pod_maintenance_group.html.markdown
similarity index 100%
rename from website/docs/d/maintmaintgrp.html.markdown
rename to website/docs/d/pod_maintenance_group.html.markdown
diff --git a/website/docs/d/l2portsecuritypol.html.markdown b/website/docs/d/port_security_policy.html.markdown
similarity index 100%
rename from website/docs/d/l2portsecuritypol.html.markdown
rename to website/docs/d/port_security_policy.html.markdown
diff --git a/website/docs/d/fvnsencapblk.html.markdown b/website/docs/d/ranges.html.markdown
similarity index 100%
rename from website/docs/d/fvnsencapblk.html.markdown
rename to website/docs/d/ranges.html.markdown
diff --git a/website/docs/d/vnssvcredirectpol.html.markdown b/website/docs/d/service_redirect_policy.html.markdown
similarity index 100%
rename from website/docs/d/vnssvcredirectpol.html.markdown
rename to website/docs/d/service_redirect_policy.html.markdown
diff --git a/website/docs/d/spandestgrp.html.markdown b/website/docs/d/span_destination_group.html.markdown
similarity index 100%
rename from website/docs/d/spandestgrp.html.markdown
rename to website/docs/d/span_destination_group.html.markdown
diff --git a/website/docs/d/spansrcgrp.html.markdown b/website/docs/d/span_source_group.html.markdown
similarity index 100%
rename from website/docs/d/spansrcgrp.html.markdown
rename to website/docs/d/span_source_group.html.markdown
diff --git a/website/docs/d/spanspanlbl.html.markdown b/website/docs/d/span_sourcedestination_group_match_label.html.markdown
similarity index 100%
rename from website/docs/d/spanspanlbl.html.markdown
rename to website/docs/d/span_sourcedestination_group_match_label.html.markdown
diff --git a/website/docs/d/infraspaccportp.html.markdown b/website/docs/d/spine_interface_profile.html.markdown
similarity index 100%
rename from website/docs/d/infraspaccportp.html.markdown
rename to website/docs/d/spine_interface_profile.html.markdown
diff --git a/website/docs/d/infraspaccportgrp.html.markdown b/website/docs/d/spine_port_policy_group.html.markdown
similarity index 100%
rename from website/docs/d/infraspaccportgrp.html.markdown
rename to website/docs/d/spine_port_policy_group.html.markdown
diff --git a/website/docs/d/infrarsspaccportp.html.markdown b/website/docs/d/spine_port_selector.html.markdown
similarity index 100%
rename from website/docs/d/infrarsspaccportp.html.markdown
rename to website/docs/d/spine_port_selector.html.markdown
diff --git a/website/docs/d/infraspinep.html.markdown b/website/docs/d/spine_profile.html.markdown
similarity index 100%
rename from website/docs/d/infraspinep.html.markdown
rename to website/docs/d/spine_profile.html.markdown
diff --git a/website/docs/d/infraspines.html.markdown b/website/docs/d/spine_switch_association.html.markdown
similarity index 100%
rename from website/docs/d/infraspines.html.markdown
rename to website/docs/d/spine_switch_association.html.markdown
diff --git a/website/docs/d/fvsubnet.html.markdown b/website/docs/d/subnet.html.markdown
similarity index 100%
rename from website/docs/d/fvsubnet.html.markdown
rename to website/docs/d/subnet.html.markdown
diff --git a/website/docs/d/vztaboo.html.markdown b/website/docs/d/taboo_contract.html.markdown
similarity index 100%
rename from website/docs/d/vztaboo.html.markdown
rename to website/docs/d/taboo_contract.html.markdown
diff --git a/website/docs/d/fvtenant.html.markdown b/website/docs/d/tenant.html.markdown
similarity index 100%
rename from website/docs/d/fvtenant.html.markdown
rename to website/docs/d/tenant.html.markdown
diff --git a/website/docs/d/trigschedp.html.markdown b/website/docs/d/trigger_scheduler.html.markdown
similarity index 100%
rename from website/docs/d/trigschedp.html.markdown
rename to website/docs/d/trigger_scheduler.html.markdown
diff --git a/website/docs/d/infraprovacc.html.markdown b/website/docs/d/vlan_encapsulationfor_vxlan_traffic.html.markdown
similarity index 100%
rename from website/docs/d/infraprovacc.html.markdown
rename to website/docs/d/vlan_encapsulationfor_vxlan_traffic.html.markdown
diff --git a/website/docs/d/fvnsvlaninstp.html.markdown b/website/docs/d/vlan_pool.html.markdown
similarity index 100%
rename from website/docs/d/fvnsvlaninstp.html.markdown
rename to website/docs/d/vlan_pool.html.markdown
diff --git a/website/docs/d/vmmdomp.html.markdown b/website/docs/d/vmm_domain.html.markdown
similarity index 100%
rename from website/docs/d/vmmdomp.html.markdown
rename to website/docs/d/vmm_domain.html.markdown
diff --git a/website/docs/d/fabricexplicitgep.html.markdown b/website/docs/d/vpc_explicit_protection_group.html.markdown
similarity index 100%
rename from website/docs/d/fabricexplicitgep.html.markdown
rename to website/docs/d/vpc_explicit_protection_group.html.markdown
diff --git a/website/docs/d/fvctx.html.markdown b/website/docs/d/vrf.html.markdown
similarity index 100%
rename from website/docs/d/fvctx.html.markdown
rename to website/docs/d/vrf.html.markdown
diff --git a/website/docs/d/fvnsvsaninstp.html.markdown b/website/docs/d/vsan_pool.html.markdown
similarity index 100%
rename from website/docs/d/fvnsvsaninstp.html.markdown
rename to website/docs/d/vsan_pool.html.markdown
diff --git a/website/docs/d/fvnsvxlaninstp.html.markdown b/website/docs/d/vxlan_pool.html.markdown
similarity index 100%
rename from website/docs/d/fvnsvxlaninstp.html.markdown
rename to website/docs/d/vxlan_pool.html.markdown
diff --git a/website/docs/d/aaausercert.html.markdown b/website/docs/d/x509_certificate.html.markdown
similarity index 100%
rename from website/docs/d/aaausercert.html.markdown
rename to website/docs/d/x509_certificate.html.markdown
diff --git a/website/docs/r/aaadomain.html.markdown b/website/docs/r/aaa_domain.html.markdown
similarity index 100%
rename from website/docs/r/aaadomain.html.markdown
rename to website/docs/r/aaa_domain.html.markdown
diff --git a/website/docs/r/infrageneric.html.markdown b/website/docs/r/access_generic.html.markdown
similarity index 100%
rename from website/docs/r/infrageneric.html.markdown
rename to website/docs/r/access_generic.html.markdown
diff --git a/website/docs/r/infrarsaccbasegrp.html.markdown b/website/docs/r/access_group.html.markdown
similarity index 100%
rename from website/docs/r/infrarsaccbasegrp.html.markdown
rename to website/docs/r/access_group.html.markdown
diff --git a/website/docs/r/infraportblk.html.markdown b/website/docs/r/access_port_block.html.markdown
similarity index 100%
rename from website/docs/r/infraportblk.html.markdown
rename to website/docs/r/access_port_block.html.markdown
diff --git a/website/docs/r/infrahports.html.markdown b/website/docs/r/access_port_selector.html.markdown
similarity index 100%
rename from website/docs/r/infrahports.html.markdown
rename to website/docs/r/access_port_selector.html.markdown
diff --git a/website/docs/r/infrasubportblk.html.markdown b/website/docs/r/access_sub_port_block.html.markdown
similarity index 100%
rename from website/docs/r/infrasubportblk.html.markdown
rename to website/docs/r/access_sub_port_block.html.markdown
diff --git a/website/docs/r/rtctrlattrp.html.markdown b/website/docs/r/action_rule_profile.html.markdown
similarity index 100%
rename from website/docs/r/rtctrlattrp.html.markdown
rename to website/docs/r/action_rule_profile.html.markdown
diff --git a/website/docs/r/vzany.html.markdown b/website/docs/r/any.html.markdown
similarity index 100%
rename from website/docs/r/vzany.html.markdown
rename to website/docs/r/any.html.markdown
diff --git a/website/docs/r/fvaepg.html.markdown b/website/docs/r/application_epg.html.markdown
similarity index 100%
rename from website/docs/r/fvaepg.html.markdown
rename to website/docs/r/application_epg.html.markdown
diff --git a/website/docs/r/fvap.html.markdown b/website/docs/r/application_profile.html.markdown
similarity index 100%
rename from website/docs/r/fvap.html.markdown
rename to website/docs/r/application_profile.html.markdown
diff --git a/website/docs/r/infraattentityp.html.markdown b/website/docs/r/attachable_access_entity_profile.html.markdown
similarity index 100%
rename from website/docs/r/infraattentityp.html.markdown
rename to website/docs/r/attachable_access_entity_profile.html.markdown
diff --git a/website/docs/r/cloudbgpasp.html.markdown b/website/docs/r/autonomous_system_profile.html.markdown
similarity index 100%
rename from website/docs/r/cloudbgpasp.html.markdown
rename to website/docs/r/autonomous_system_profile.html.markdown
diff --git a/website/docs/r/fvbd.html.markdown b/website/docs/r/bridge_domain.html.markdown
similarity index 100%
rename from website/docs/r/fvbd.html.markdown
rename to website/docs/r/bridge_domain.html.markdown
diff --git a/website/docs/r/cdpifpol.html.markdown b/website/docs/r/cdp_interface_policy.html.markdown
similarity index 100%
rename from website/docs/r/cdpifpol.html.markdown
rename to website/docs/r/cdp_interface_policy.html.markdown
diff --git a/website/docs/r/cloudapp.html.markdown b/website/docs/r/cloud_applicationcontainer.html.markdown
similarity index 100%
rename from website/docs/r/cloudapp.html.markdown
rename to website/docs/r/cloud_applicationcontainer.html.markdown
diff --git a/website/docs/r/cloudzone.html.markdown b/website/docs/r/cloud_availability_zone.html.markdown
similarity index 100%
rename from website/docs/r/cloudzone.html.markdown
rename to website/docs/r/cloud_availability_zone.html.markdown
diff --git a/website/docs/r/cloudawsprovider.html.markdown b/website/docs/r/cloud_aws_provider.html.markdown
similarity index 100%
rename from website/docs/r/cloudawsprovider.html.markdown
rename to website/docs/r/cloud_aws_provider.html.markdown
diff --git a/website/docs/r/cloudcidr.html.markdown b/website/docs/r/cloud_cidr_pool.html.markdown
similarity index 100%
rename from website/docs/r/cloudcidr.html.markdown
rename to website/docs/r/cloud_cidr_pool.html.markdown
diff --git a/website/docs/r/cloudctxprofile.html.markdown b/website/docs/r/cloud_context_profile.html.markdown
similarity index 100%
rename from website/docs/r/cloudctxprofile.html.markdown
rename to website/docs/r/cloud_context_profile.html.markdown
diff --git a/website/docs/r/clouddomp.html.markdown b/website/docs/r/cloud_domain_profile.html.markdown
similarity index 100%
rename from website/docs/r/clouddomp.html.markdown
rename to website/docs/r/cloud_domain_profile.html.markdown
diff --git a/website/docs/r/cloudepselector.html.markdown b/website/docs/r/cloud_endpoint_selector.html.markdown
similarity index 100%
rename from website/docs/r/cloudepselector.html.markdown
rename to website/docs/r/cloud_endpoint_selector.html.markdown
diff --git a/website/docs/r/cloudextepselector.html.markdown b/website/docs/r/cloud_endpoint_selectorfor_external_epgs.html.markdown
similarity index 100%
rename from website/docs/r/cloudextepselector.html.markdown
rename to website/docs/r/cloud_endpoint_selectorfor_external_epgs.html.markdown
diff --git a/website/docs/r/cloudepg.html.markdown b/website/docs/r/cloud_epg.html.markdown
similarity index 100%
rename from website/docs/r/cloudepg.html.markdown
rename to website/docs/r/cloud_epg.html.markdown
diff --git a/website/docs/r/cloudextepg.html.markdown b/website/docs/r/cloud_external_epg.html.markdown
similarity index 100%
rename from website/docs/r/cloudextepg.html.markdown
rename to website/docs/r/cloud_external_epg.html.markdown
diff --git a/website/docs/r/cloudprovp.html.markdown b/website/docs/r/cloud_provider_profile.html.markdown
similarity index 100%
rename from website/docs/r/cloudprovp.html.markdown
rename to website/docs/r/cloud_provider_profile.html.markdown
diff --git a/website/docs/r/cloudregion.html.markdown b/website/docs/r/cloud_providers_region.html.markdown
similarity index 100%
rename from website/docs/r/cloudregion.html.markdown
rename to website/docs/r/cloud_providers_region.html.markdown
diff --git a/website/docs/r/cloudsubnet.html.markdown b/website/docs/r/cloud_subnet.html.markdown
similarity index 100%
rename from website/docs/r/cloudsubnet.html.markdown
rename to website/docs/r/cloud_subnet.html.markdown
diff --git a/website/docs/r/configexportp.html.markdown b/website/docs/r/configuration_export_policy.html.markdown
similarity index 100%
rename from website/docs/r/configexportp.html.markdown
rename to website/docs/r/configuration_export_policy.html.markdown
diff --git a/website/docs/r/configimportp.html.markdown b/website/docs/r/configuration_import_policy.html.markdown
similarity index 100%
rename from website/docs/r/configimportp.html.markdown
rename to website/docs/r/configuration_import_policy.html.markdown
diff --git a/website/docs/r/vzbrcp.html.markdown b/website/docs/r/contract.html.markdown
similarity index 100%
rename from website/docs/r/vzbrcp.html.markdown
rename to website/docs/r/contract.html.markdown
diff --git a/website/docs/r/vzsubj.html.markdown b/website/docs/r/contract_subject.html.markdown
similarity index 100%
rename from website/docs/r/vzsubj.html.markdown
rename to website/docs/r/contract_subject.html.markdown
diff --git a/website/docs/r/vnsredirectdest.html.markdown b/website/docs/r/destination_of_redirected_traffic.html.markdown
similarity index 100%
rename from website/docs/r/vnsredirectdest.html.markdown
rename to website/docs/r/destination_of_redirected_traffic.html.markdown
diff --git a/website/docs/r/fvepretpol.html.markdown b/website/docs/r/end_point_retention_policy.html.markdown
similarity index 100%
rename from website/docs/r/fvepretpol.html.markdown
rename to website/docs/r/end_point_retention_policy.html.markdown
diff --git a/website/docs/r/epgtocontract.html.markdown b/website/docs/r/epg_to_contract.html.markdown
similarity index 100%
rename from website/docs/r/epgtocontract.html.markdown
rename to website/docs/r/epg_to_contract.html.markdown
diff --git a/website/docs/r/fvrsdomatt.html.markdown b/website/docs/r/epg_to_domain.html.markdown
similarity index 100%
rename from website/docs/r/fvrsdomatt.html.markdown
rename to website/docs/r/epg_to_domain.html.markdown
diff --git a/website/docs/r/fvrspathatt.html.markdown b/website/docs/r/epg_to_static_path.html.markdown
similarity index 84%
rename from website/docs/r/fvrspathatt.html.markdown
rename to website/docs/r/epg_to_static_path.html.markdown
index e3e0c0f7c..d4ddee26d 100644
--- a/website/docs/r/fvrspathatt.html.markdown
+++ b/website/docs/r/epg_to_static_path.html.markdown
@@ -1,13 +1,13 @@
 ---
 layout: "aci"
-page_title: "ACI: aci_static_path"
-sidebar_current: "docs-aci-resource-static_path"
+page_title: "ACI: aci_epg_to_static_path"
+sidebar_current: "docs-aci-resource-epg_to_static_path"
 description: |-
-  Manages ACI Static Path
+  Manages ACI EPG to Static Path
 ---
 
 # aci_epg_to_static_path #
-Manages ACI Static Path
+Manages ACI EPG to Static Path
 
 ## Example Usage ##
 
@@ -44,5 +44,5 @@ An existing Static Path can be [imported][docs-import] into this resource via it
 
 
 ```
-terraform import aci_static_path.example <Dn>
+terraform import aci_epg_to_static_path.example <Dn>
 ```
\ No newline at end of file
diff --git a/website/docs/r/infrarsfunctoepg.html.markdown b/website/docs/r/epgs_using_function.html.markdown
similarity index 100%
rename from website/docs/r/infrarsfunctoepg.html.markdown
rename to website/docs/r/epgs_using_function.html.markdown
diff --git a/website/docs/r/l3extinstp.html.markdown b/website/docs/r/external_network_instance_profile.html.markdown
similarity index 100%
rename from website/docs/r/l3extinstp.html.markdown
rename to website/docs/r/external_network_instance_profile.html.markdown
diff --git a/website/docs/r/fabrichifpol.html.markdown b/website/docs/r/fabric_if_pol.html.markdown
similarity index 100%
rename from website/docs/r/fabrichifpol.html.markdown
rename to website/docs/r/fabric_if_pol.html.markdown
diff --git a/website/docs/r/fabricnodeidentp.html.markdown b/website/docs/r/fabric_node_member.html.markdown
similarity index 100%
rename from website/docs/r/fabricnodeidentp.html.markdown
rename to website/docs/r/fabric_node_member.html.markdown
diff --git a/website/docs/r/fcdomp.html.markdown b/website/docs/r/fc_domain.html.markdown
similarity index 100%
rename from website/docs/r/fcdomp.html.markdown
rename to website/docs/r/fc_domain.html.markdown
diff --git a/website/docs/r/infrafexbndlgrp.html.markdown b/website/docs/r/fex_bundle_group.html.markdown
similarity index 100%
rename from website/docs/r/infrafexbndlgrp.html.markdown
rename to website/docs/r/fex_bundle_group.html.markdown
diff --git a/website/docs/r/infrafexp.html.markdown b/website/docs/r/fex_profile.html.markdown
similarity index 100%
rename from website/docs/r/infrafexp.html.markdown
rename to website/docs/r/fex_profile.html.markdown
diff --git a/website/docs/r/vzfilter.html.markdown b/website/docs/r/filter.html.markdown
similarity index 100%
rename from website/docs/r/vzfilter.html.markdown
rename to website/docs/r/filter.html.markdown
diff --git a/website/docs/r/vzentry.html.markdown b/website/docs/r/filter_entry.html.markdown
similarity index 100%
rename from website/docs/r/vzentry.html.markdown
rename to website/docs/r/filter_entry.html.markdown
diff --git a/website/docs/r/firmwareosource.html.markdown b/website/docs/r/firmware_download_task.html.markdown
similarity index 100%
rename from website/docs/r/firmwareosource.html.markdown
rename to website/docs/r/firmware_download_task.html.markdown
diff --git a/website/docs/r/firmwarefwgrp.html.markdown b/website/docs/r/firmware_group.html.markdown
similarity index 100%
rename from website/docs/r/firmwarefwgrp.html.markdown
rename to website/docs/r/firmware_group.html.markdown
diff --git a/website/docs/r/firmwarefwp.html.markdown b/website/docs/r/firmware_policy.html.markdown
similarity index 100%
rename from website/docs/r/firmwarefwp.html.markdown
rename to website/docs/r/firmware_policy.html.markdown
diff --git a/website/docs/r/vzcpif.html.markdown b/website/docs/r/imported_contract.html.markdown
similarity index 100%
rename from website/docs/r/vzcpif.html.markdown
rename to website/docs/r/imported_contract.html.markdown
diff --git a/website/docs/r/fcifpol.html.markdown b/website/docs/r/interface_fc_policy.html.markdown
similarity index 100%
rename from website/docs/r/fcifpol.html.markdown
rename to website/docs/r/interface_fc_policy.html.markdown
diff --git a/website/docs/r/l2ifpol.html.markdown b/website/docs/r/l2_interface_policy.html.markdown
similarity index 100%
rename from website/docs/r/l2ifpol.html.markdown
rename to website/docs/r/l2_interface_policy.html.markdown
diff --git a/website/docs/r/l3extdomp.html.markdown b/website/docs/r/l3_domain_profile.html.markdown
similarity index 100%
rename from website/docs/r/l3extdomp.html.markdown
rename to website/docs/r/l3_domain_profile.html.markdown
diff --git a/website/docs/r/l3extsubnet.html.markdown b/website/docs/r/l3_ext_subnet.html.markdown
similarity index 72%
rename from website/docs/r/l3extsubnet.html.markdown
rename to website/docs/r/l3_ext_subnet.html.markdown
index b941a8037..f2f3318fa 100644
--- a/website/docs/r/l3extsubnet.html.markdown
+++ b/website/docs/r/l3_ext_subnet.html.markdown
@@ -1,13 +1,13 @@
 ---
 layout: "aci"
-page_title: "ACI: aci_subnet"
-sidebar_current: "docs-aci-resource-subnet"
+page_title: "ACI: aci_l3_ext_subnet"
+sidebar_current: "docs-aci-resource-l3_ext_subnet"
 description: |-
-  Manages ACI Subnet
+  Manages ACI l3 extension subnet
 ---
 
-# aci_subnet #
-Manages ACI Subnet
+# aci_l3_ext_subnet #
+Manages ACI l3 extension subnet
 
 ## Example Usage ##
 
@@ -24,10 +24,10 @@ Manages ACI Subnet
 ```
 ## Argument Reference ##
 * `external_network_instance_profile_dn` - (Required) Distinguished name of parent ExternalNetworkInstanceProfile object.
-* `ip` - (Required) ip of Object subnet.
-* `aggregate` - (Optional) Aggregate Routes for Subnet. Allowed values are "import-rtctrl", "export-rtctrl" and "shared-rtctrl".
-* `annotation` - (Optional) annotation for object subnet.
-* `name_alias` - (Optional) name_alias for object subnet.
+* `ip` - (Required) ip of Object l3 extension subnet.
+* `aggregate` - (Optional) Aggregate Routes for l3 extension subnet. Allowed values are "import-rtctrl", "export-rtctrl" and "shared-rtctrl".
+* `annotation` - (Optional) annotation for object l3 extension subnet.
+* `name_alias` - (Optional) name_alias for object l3 extension subnet.
 * `scope` - (Optional) The domain applicable to the capability. Allowed values are "import-rtctrl", "export-rtctrl", "import-security", "shared-security" and "shared-rtctrl". Default is "import-security".
 
 * `relation_l3ext_rs_subnet_to_profile` - (Optional) Relation to class rtctrlProfile. Cardinality - N_TO_M. Type - Set of Map.
@@ -39,7 +39,7 @@ Manages ACI Subnet
 ## Attribute Reference
 
 The only attribute that this resource exports is the `id`, which is set to the
-Dn of the Subnet.
+Dn of the l3 extension subnet.
 
 ## Importing ##
 
@@ -48,5 +48,5 @@ An existing Subnet can be [imported][docs-import] into this resource via its Dn,
 
 
 ```
-terraform import aci_subnet.example <Dn>
+terraform import aci_l3_ext_subnet.example <Dn>
 ```
\ No newline at end of file
diff --git a/website/docs/r/l3extout.html.markdown b/website/docs/r/l3_outside.html.markdown
similarity index 100%
rename from website/docs/r/l3extout.html.markdown
rename to website/docs/r/l3_outside.html.markdown
diff --git a/website/docs/r/lacplagpol.html.markdown b/website/docs/r/lacp_policy.html.markdown
similarity index 100%
rename from website/docs/r/lacplagpol.html.markdown
rename to website/docs/r/lacp_policy.html.markdown
diff --git a/website/docs/r/infraaccbndlgrp.html.markdown b/website/docs/r/leaf_access_bundle_policy_group.html.markdown
similarity index 100%
rename from website/docs/r/infraaccbndlgrp.html.markdown
rename to website/docs/r/leaf_access_bundle_policy_group.html.markdown
diff --git a/website/docs/r/infraaccportgrp.html.markdown b/website/docs/r/leaf_access_port_policy_group.html.markdown
similarity index 100%
rename from website/docs/r/infraaccportgrp.html.markdown
rename to website/docs/r/leaf_access_port_policy_group.html.markdown
diff --git a/website/docs/r/infraaccportp.html.markdown b/website/docs/r/leaf_interface_profile.html.markdown
similarity index 100%
rename from website/docs/r/infraaccportp.html.markdown
rename to website/docs/r/leaf_interface_profile.html.markdown
diff --git a/website/docs/r/infranodep.html.markdown b/website/docs/r/leaf_profile.html.markdown
similarity index 100%
rename from website/docs/r/infranodep.html.markdown
rename to website/docs/r/leaf_profile.html.markdown
diff --git a/website/docs/r/infraleafs.html.markdown b/website/docs/r/leaf_selector.html.markdown
similarity index 100%
rename from website/docs/r/infraleafs.html.markdown
rename to website/docs/r/leaf_selector.html.markdown
diff --git a/website/docs/r/lldpifpol.html.markdown b/website/docs/r/lldp_interface_policy.html.markdown
similarity index 100%
rename from website/docs/r/lldpifpol.html.markdown
rename to website/docs/r/lldp_interface_policy.html.markdown
diff --git a/website/docs/r/aaauser.html.markdown b/website/docs/r/local_user.html.markdown
similarity index 100%
rename from website/docs/r/aaauser.html.markdown
rename to website/docs/r/local_user.html.markdown
diff --git a/website/docs/r/l3extlifp.html.markdown b/website/docs/r/logical_interface_profile.html.markdown
similarity index 100%
rename from website/docs/r/l3extlifp.html.markdown
rename to website/docs/r/logical_interface_profile.html.markdown
diff --git a/website/docs/r/l3extlnodep.html.markdown b/website/docs/r/logical_node_profile.html.markdown
similarity index 100%
rename from website/docs/r/l3extlnodep.html.markdown
rename to website/docs/r/logical_node_profile.html.markdown
diff --git a/website/docs/r/l3extrsnodel3outatt.html.markdown b/website/docs/r/logical_node_to_fabric_node.html.markdown
similarity index 82%
rename from website/docs/r/l3extrsnodel3outatt.html.markdown
rename to website/docs/r/logical_node_to_fabric_node.html.markdown
index 6330b35ca..459d9e351 100644
--- a/website/docs/r/l3extrsnodel3outatt.html.markdown
+++ b/website/docs/r/logical_node_to_fabric_node.html.markdown
@@ -1,13 +1,13 @@
 ---
 layout: "aci"
-page_title: "ACI: aci_fabric_node"
-sidebar_current: "docs-aci-resource-fabric_node"
+page_title: "ACI: aci_logical_node_to_fabric_node"
+sidebar_current: "docs-aci-resource-logical_node_to_fabric_node"
 description: |-
-  Manages ACI Fabric Node
+  Manages ACI Logical Node to Fabric Node
 ---
 
 # aci_logical_node_to_fabric_node #
-Manages ACI Fabric Node
+Manages ACI Logical Node to Fabric Node
 
 ## Example Usage ##
 
@@ -46,5 +46,5 @@ An existing Fabric Node can be [imported][docs-import] into this resource via it
 
 
 ```
-terraform import aci_fabric_node.example <Dn>
+terraform import aci_logical_node_to_fabric_node.example <Dn>
 ```
\ No newline at end of file
diff --git a/website/docs/r/maintmaintp.html.markdown b/website/docs/r/maintenance_policy.html.markdown
similarity index 100%
rename from website/docs/r/maintmaintp.html.markdown
rename to website/docs/r/maintenance_policy.html.markdown
diff --git a/website/docs/r/mcpifpol.html.markdown b/website/docs/r/miscabling_protocol_interface_policy.html.markdown
similarity index 100%
rename from website/docs/r/mcpifpol.html.markdown
rename to website/docs/r/miscabling_protocol_interface_policy.html.markdown
diff --git a/website/docs/r/infranodeblk.html.markdown b/website/docs/r/node_block.html.markdown
similarity index 100%
rename from website/docs/r/infranodeblk.html.markdown
rename to website/docs/r/node_block.html.markdown
diff --git a/website/docs/r/fabricnodeblk.html.markdown b/website/docs/r/node_block_firmware.html.markdown
similarity index 100%
rename from website/docs/r/fabricnodeblk.html.markdown
rename to website/docs/r/node_block_firmware.html.markdown
diff --git a/website/docs/r/ospfifpol.html.markdown b/website/docs/r/ospf_interface_policy.html.markdown
similarity index 100%
rename from website/docs/r/ospfifpol.html.markdown
rename to website/docs/r/ospf_interface_policy.html.markdown
diff --git a/website/docs/r/physdomp.html.markdown b/website/docs/r/physical_domain.html.markdown
similarity index 100%
rename from website/docs/r/physdomp.html.markdown
rename to website/docs/r/physical_domain.html.markdown
diff --git a/website/docs/r/maintmaintgrp.html.markdown b/website/docs/r/pod_maintenance_group.html.markdown
similarity index 100%
rename from website/docs/r/maintmaintgrp.html.markdown
rename to website/docs/r/pod_maintenance_group.html.markdown
diff --git a/website/docs/r/l2portsecuritypol.html.markdown b/website/docs/r/port_security_policy.html.markdown
similarity index 100%
rename from website/docs/r/l2portsecuritypol.html.markdown
rename to website/docs/r/port_security_policy.html.markdown
diff --git a/website/docs/r/fvnsencapblk.html.markdown b/website/docs/r/ranges.html.markdown
similarity index 100%
rename from website/docs/r/fvnsencapblk.html.markdown
rename to website/docs/r/ranges.html.markdown
diff --git a/website/docs/r/vnssvcredirectpol.html.markdown b/website/docs/r/service_redirect_policy.html.markdown
similarity index 100%
rename from website/docs/r/vnssvcredirectpol.html.markdown
rename to website/docs/r/service_redirect_policy.html.markdown
diff --git a/website/docs/r/spandestgrp.html.markdown b/website/docs/r/span_destination_group.html.markdown
similarity index 100%
rename from website/docs/r/spandestgrp.html.markdown
rename to website/docs/r/span_destination_group.html.markdown
diff --git a/website/docs/r/spansrcgrp.html.markdown b/website/docs/r/span_source_group.html.markdown
similarity index 100%
rename from website/docs/r/spansrcgrp.html.markdown
rename to website/docs/r/span_source_group.html.markdown
diff --git a/website/docs/r/spanspanlbl.html.markdown b/website/docs/r/span_sourcedestination_group_match_label.html.markdown
similarity index 100%
rename from website/docs/r/spanspanlbl.html.markdown
rename to website/docs/r/span_sourcedestination_group_match_label.html.markdown
diff --git a/website/docs/r/infraspaccportp.html.markdown b/website/docs/r/spine_interface_profile.html.markdown
similarity index 100%
rename from website/docs/r/infraspaccportp.html.markdown
rename to website/docs/r/spine_interface_profile.html.markdown
diff --git a/website/docs/r/infraspaccportgrp.html.markdown b/website/docs/r/spine_port_policy_group.html.markdown
similarity index 100%
rename from website/docs/r/infraspaccportgrp.html.markdown
rename to website/docs/r/spine_port_policy_group.html.markdown
diff --git a/website/docs/r/infrarsspaccportp.html.markdown b/website/docs/r/spine_port_selector.html.markdown
similarity index 100%
rename from website/docs/r/infrarsspaccportp.html.markdown
rename to website/docs/r/spine_port_selector.html.markdown
diff --git a/website/docs/r/infraspinep.html.markdown b/website/docs/r/spine_profile.html.markdown
similarity index 100%
rename from website/docs/r/infraspinep.html.markdown
rename to website/docs/r/spine_profile.html.markdown
diff --git a/website/docs/r/infraspines.html.markdown b/website/docs/r/spine_switch_association.html.markdown
similarity index 100%
rename from website/docs/r/infraspines.html.markdown
rename to website/docs/r/spine_switch_association.html.markdown
diff --git a/website/docs/r/fvsubnet.html.markdown b/website/docs/r/subnet.html.markdown
similarity index 100%
rename from website/docs/r/fvsubnet.html.markdown
rename to website/docs/r/subnet.html.markdown
diff --git a/website/docs/r/vztaboo.html.markdown b/website/docs/r/taboo_contract.html.markdown
similarity index 100%
rename from website/docs/r/vztaboo.html.markdown
rename to website/docs/r/taboo_contract.html.markdown
diff --git a/website/docs/r/fvtenant.html.markdown b/website/docs/r/tenant.html.markdown
similarity index 100%
rename from website/docs/r/fvtenant.html.markdown
rename to website/docs/r/tenant.html.markdown
diff --git a/website/docs/r/trigschedp.html.markdown b/website/docs/r/trigger_scheduler.html.markdown
similarity index 100%
rename from website/docs/r/trigschedp.html.markdown
rename to website/docs/r/trigger_scheduler.html.markdown
diff --git a/website/docs/r/infraprovacc.html.markdown b/website/docs/r/vlan_encapsulationfor_vxlan_traffic.html.markdown
similarity index 100%
rename from website/docs/r/infraprovacc.html.markdown
rename to website/docs/r/vlan_encapsulationfor_vxlan_traffic.html.markdown
diff --git a/website/docs/r/fvnsvlaninstp.html.markdown b/website/docs/r/vlan_pool.html.markdown
similarity index 100%
rename from website/docs/r/fvnsvlaninstp.html.markdown
rename to website/docs/r/vlan_pool.html.markdown
diff --git a/website/docs/r/vmmdomp.html.markdown b/website/docs/r/vmm_domain.html.markdown
similarity index 100%
rename from website/docs/r/vmmdomp.html.markdown
rename to website/docs/r/vmm_domain.html.markdown
diff --git a/website/docs/r/fabricexplicitgep.html.markdown b/website/docs/r/vpc_explicit_protection_group.html.markdown
similarity index 100%
rename from website/docs/r/fabricexplicitgep.html.markdown
rename to website/docs/r/vpc_explicit_protection_group.html.markdown
diff --git a/website/docs/r/fvctx.html.markdown b/website/docs/r/vrf.html.markdown
similarity index 100%
rename from website/docs/r/fvctx.html.markdown
rename to website/docs/r/vrf.html.markdown
diff --git a/website/docs/r/fvnsvsaninstp.html.markdown b/website/docs/r/vsan_pool.html.markdown
similarity index 100%
rename from website/docs/r/fvnsvsaninstp.html.markdown
rename to website/docs/r/vsan_pool.html.markdown
diff --git a/website/docs/r/fvnsvxlaninstp.html.markdown b/website/docs/r/vxlan_pool.html.markdown
similarity index 100%
rename from website/docs/r/fvnsvxlaninstp.html.markdown
rename to website/docs/r/vxlan_pool.html.markdown
diff --git a/website/docs/r/aaausercert.html.markdown b/website/docs/r/x509_certificate.html.markdown
similarity index 100%
rename from website/docs/r/aaausercert.html.markdown
rename to website/docs/r/x509_certificate.html.markdown