diff --git a/package/etc/conf.d/log_paths/p_rfc3164-cisco_nx-os.conf.tmpl b/package/etc/conf.d/log_paths/p_rfc3164-cisco_nxos.conf.tmpl
similarity index 100%
rename from package/etc/conf.d/log_paths/p_rfc3164-cisco_nx-os.conf.tmpl
rename to package/etc/conf.d/log_paths/p_rfc3164-cisco_nxos.conf.tmpl
diff --git a/package/etc/conf.d/log_paths/p_rfc3164_microfocus_arcsight.conf.tmpl b/package/etc/conf.d/log_paths/p_rfc3164-microfocus_arcsight.conf.tmpl
similarity index 100%
rename from package/etc/conf.d/log_paths/p_rfc3164_microfocus_arcsight.conf.tmpl
rename to package/etc/conf.d/log_paths/p_rfc3164-microfocus_arcsight.conf.tmpl
diff --git a/package/etc/conf.d/log_paths/p_rfc5424_noversion-cisco_asa.conf.tmpl b/package/etc/conf.d/log_paths/p_rfc5424-noversion_cisco_asa.conf.tmpl
similarity index 100%
rename from package/etc/conf.d/log_paths/p_rfc5424_noversion-cisco_asa.conf.tmpl
rename to package/etc/conf.d/log_paths/p_rfc5424-noversion_cisco_asa.conf.tmpl
diff --git a/package/etc/conf.d/log_paths/p_rfc_5424_noversion-symantec_proxy.conf.tmpl b/package/etc/conf.d/log_paths/p_rfc5424-noversion_symantec_proxy.conf.tmpl
similarity index 100%
rename from package/etc/conf.d/log_paths/p_rfc_5424_noversion-symantec_proxy.conf.tmpl
rename to package/etc/conf.d/log_paths/p_rfc5424-noversion_symantec_proxy.conf.tmpl
diff --git a/package/etc/conf.d/log_paths/p_rfc_5424_strict-juniper_junos.conf.tmpl b/package/etc/conf.d/log_paths/p_rfc5424-strict_juniper_junos.conf.tmpl
similarity index 100%
rename from package/etc/conf.d/log_paths/p_rfc_5424_strict-juniper_junos.conf.tmpl
rename to package/etc/conf.d/log_paths/p_rfc5424-strict_juniper_junos.conf.tmpl
diff --git a/package/etc/context_templates/compliance_meta_by_source.conf b/package/etc/context_templates/compliance_meta_by_source.conf
index f325b4f..322b938 100644
--- a/package/etc/context_templates/compliance_meta_by_source.conf
+++ b/package/etc/context_templates/compliance_meta_by_source.conf
@@ -1,5 +1,5 @@
 @version: 3.24
-filter f_test_test {
-    host("something-*" type(glob)) or
-    netmask(192.168.100.1/24)
-};
+#filter f_test_test {
+#    host("something-*" type(glob)) or
+#    netmask(192.168.100.1/24)
+#};
diff --git a/package/etc/context_templates/vendor_product_by_source.conf b/package/etc/context_templates/vendor_product_by_source.conf
index b736ac3..0f9ca65 100644
--- a/package/etc/context_templates/vendor_product_by_source.conf
+++ b/package/etc/context_templates/vendor_product_by_source.conf
@@ -1,9 +1,5 @@
 @version: 3.24
 
-filter f_cisco_meraki {
-    host("testcm-*" type(glob)) or
-    netmask(192.168.100.1/24)
-};
 filter f_test_test {
     host("testvp-*" type(glob)) or
     netmask(192.168.100.1/24)
@@ -20,6 +16,10 @@ filter f_juniper_idp {
     host("jnpidp-*" type(glob)) or
     netmask(192.168.3.0/24)
 };
+filter f_cisco_meraki {
+    host("testcm-*" type(glob)) or
+    netmask(192.168.4.0/24)
+};
 filter f_juniper_netscreen {
     host("jnpns-*" type(glob)) or
     netmask(192.168.4.0/24)
@@ -27,7 +27,7 @@ filter f_juniper_netscreen {
 filter f_cisco_nx_os {
     host("csconx-*" type(glob)) or
     netmask(192.168.5.0/24)
-};    
+};
 filter f_proofpoint_pps_sendmail {
     host("pps-*" type(glob)) or
     netmask(192.168.6.0/24)
@@ -35,4 +35,4 @@ filter f_proofpoint_pps_sendmail {
 filter f_proofpoint_pps_filter {
     host("pps-*" type(glob)) or
     netmask(192.168.7.0/24)
-};
\ No newline at end of file
+};