diff --git a/templates/cisco_asa_show_run_crypto_ikev1.template b/templates/cisco_asa_show_running-config_crypto_ikev1.template
similarity index 100%
rename from templates/cisco_asa_show_run_crypto_ikev1.template
rename to templates/cisco_asa_show_running-config_crypto_ikev1.template
diff --git a/templates/cisco_asa_show_run_crypto_map.template b/templates/cisco_asa_show_running-config_crypto_map.template
similarity index 100%
rename from templates/cisco_asa_show_run_crypto_map.template
rename to templates/cisco_asa_show_running-config_crypto_map.template
diff --git a/templates/cisco_asa_show_run_ipsec.template b/templates/cisco_asa_show_running-config_ipsec.template
similarity index 100%
rename from templates/cisco_asa_show_run_ipsec.template
rename to templates/cisco_asa_show_running-config_ipsec.template
diff --git a/templates/cisco_asa_show_run_tunnel-group.template b/templates/cisco_asa_show_running-config_tunnel-group.template
similarity index 100%
rename from templates/cisco_asa_show_run_tunnel-group.template
rename to templates/cisco_asa_show_running-config_tunnel-group.template
diff --git a/templates/index b/templates/index
index 68c45f333f..bb7727c2b9 100644
--- a/templates/index
+++ b/templates/index
@@ -64,16 +64,16 @@ brocade_netiron_show_metro.template, .*, brocade_netiron, sh[[ow]] met[[ro-ring]
 brocade_netiron_show_span.template, .*, brocade_netiron, sh[[ow]] sp[[anning-tree]]
 brocade_netiron_show_topo.template, .*, brocade_netiron, sh[[ow]] to[[pology-group]]
 
+cisco_asa_show_running-config_crypto_ikev1.template, .*, cisco_asa, sh[[ow]] ru[[nning-config]] cr[[ypto]] ikev1
+cisco_asa_show_running-config_tunnel-group.template, .*, cisco_asa, sh[[ow]] ru[[nning-config]] tu[[nnel-group]]
+cisco_asa_show_running-config_crypto_map.template, .*, cisco_asa, sh[[ow]] ru[[nning-config]] cr[[ypto]] m[[ap]]
 cisco_asa_show_vpn-sessiondb_detail_l2l.template, .*, cisco_asa, sh[[ow]] vpn-[[sessiondb]] d[[etail]] l[[2l]]
 cisco_asa_show_crypto_ikev1_sa_detail.template, .*, cisco_asa, sh[[ow]] cry[[pto]] ikev1 sa d[[etail]]
 cisco_asa_show_object-group_network.template, .*, cisco_asa, sh[[ow]] ob[[ject-group]] n[[etwork]]
-cisco_asa_show_run_crypto_ikev1.template, .*, cisco_asa, sh[[ow]] ru[[nning-config]] cr[[ypto]] ikev1
-cisco_asa_show_run_tunnel-group.template, .*, cisco_asa, sh[[ow]] ru[[nning-config]] tu[[nnel-group]]
+cisco_asa_show_running-config_ipsec.template, .*, cisco_asa, sh[[ow]] ru[[nning-config]] ips[[ec]]
 cisco_asa_show_crypto_ipsec_sa.template, .*, cisco_asa, sh[[ow]] cry[[pto]] ip[[sec]] sa
-cisco_asa_show_run_crypto_map.template, .*, cisco_asa, sh[[ow]] ru[[nning-config]] cr[[ypto]] m[[ap]]
 cisco_asa_show_access-list.template, .*, cisco_asa, sh[[ow]] ac[[cess-list]]
 cisco_asa_show_interface.template, .*, cisco_asa, sh[[ow]] int[[erface]]
-cisco_asa_show_run_ipsec.template, .*, cisco_asa, sh[[ow]] ru[[nning-config]] ips[[ec]]
 cisco_asa_show_version.template, .*, cisco_asa, sh[[ow]] ver[[sion]]
 cisco_asa_show_route.template, .*, cisco_asa, sh[[ow]] ro[[ute]]
 cisco_asa_show_name.template, .*, cisco_asa, sh[[ow]] nam[[e]]
diff --git a/tests/cisco_asa/show_run_crypto_ikev1/cisco_asa_show_run_crypto_ikev1.parsed b/tests/cisco_asa/show_running-config_crypto_ikev1/cisco_asa_show_running-config_crypto_ikev1.parsed
similarity index 100%
rename from tests/cisco_asa/show_run_crypto_ikev1/cisco_asa_show_run_crypto_ikev1.parsed
rename to tests/cisco_asa/show_running-config_crypto_ikev1/cisco_asa_show_running-config_crypto_ikev1.parsed
diff --git a/tests/cisco_asa/show_run_crypto_ikev1/cisco_asa_show_run_crypto_ikev1.raw b/tests/cisco_asa/show_running-config_crypto_ikev1/cisco_asa_show_running-config_crypto_ikev1.raw
similarity index 100%
rename from tests/cisco_asa/show_run_crypto_ikev1/cisco_asa_show_run_crypto_ikev1.raw
rename to tests/cisco_asa/show_running-config_crypto_ikev1/cisco_asa_show_running-config_crypto_ikev1.raw
diff --git a/tests/cisco_asa/show_run_crypto_map/cisco_asa_show_run_crypto_map.parsed b/tests/cisco_asa/show_running-config_crypto_map/cisco_asa_show_running-config_crypto_map.parsed
similarity index 100%
rename from tests/cisco_asa/show_run_crypto_map/cisco_asa_show_run_crypto_map.parsed
rename to tests/cisco_asa/show_running-config_crypto_map/cisco_asa_show_running-config_crypto_map.parsed
diff --git a/tests/cisco_asa/show_run_crypto_map/cisco_asa_show_run_crypto_map.raw b/tests/cisco_asa/show_running-config_crypto_map/cisco_asa_show_running-config_crypto_map.raw
similarity index 100%
rename from tests/cisco_asa/show_run_crypto_map/cisco_asa_show_run_crypto_map.raw
rename to tests/cisco_asa/show_running-config_crypto_map/cisco_asa_show_running-config_crypto_map.raw
diff --git a/tests/cisco_asa/show_run_ipsec/cisco_asa_show_run_ipsec.parsed b/tests/cisco_asa/show_running-config_ipsec/cisco_asa_show_running-config_ipsec.parsed
similarity index 100%
rename from tests/cisco_asa/show_run_ipsec/cisco_asa_show_run_ipsec.parsed
rename to tests/cisco_asa/show_running-config_ipsec/cisco_asa_show_running-config_ipsec.parsed
diff --git a/tests/cisco_asa/show_run_ipsec/cisco_asa_show_run_ipsec.raw b/tests/cisco_asa/show_running-config_ipsec/cisco_asa_show_running-config_ipsec.raw
similarity index 100%
rename from tests/cisco_asa/show_run_ipsec/cisco_asa_show_run_ipsec.raw
rename to tests/cisco_asa/show_running-config_ipsec/cisco_asa_show_running-config_ipsec.raw
diff --git a/tests/cisco_asa/show_run_tunnel-group/cisco_asa_show_run_tunnel-group.parsed b/tests/cisco_asa/show_running-config_tunnel-group/cisco_asa_show_running-config_tunnel-group.parsed
similarity index 100%
rename from tests/cisco_asa/show_run_tunnel-group/cisco_asa_show_run_tunnel-group.parsed
rename to tests/cisco_asa/show_running-config_tunnel-group/cisco_asa_show_running-config_tunnel-group.parsed
diff --git a/tests/cisco_asa/show_run_tunnel-group/cisco_asa_show_run_tunnel-group.raw b/tests/cisco_asa/show_running-config_tunnel-group/cisco_asa_show_running-config_tunnel-group.raw
similarity index 100%
rename from tests/cisco_asa/show_run_tunnel-group/cisco_asa_show_run_tunnel-group.raw
rename to tests/cisco_asa/show_running-config_tunnel-group/cisco_asa_show_running-config_tunnel-group.raw