diff --git a/rules/cloud/gcp/gcp_dlp_re-identifies_sensitive_information.yml b/rules/cloud/gcp/gcp_dlp_re_identifies_sensitive_information.yml
similarity index 100%
rename from rules/cloud/gcp/gcp_dlp_re-identifies_sensitive_information.yml
rename to rules/cloud/gcp/gcp_dlp_re_identifies_sensitive_information.yml
diff --git a/rules/cloud/okta/okta_application_sign-on_policy_modified_or_deleted.yml b/rules/cloud/okta/okta_application_sign_on_policy_modified_or_deleted.yml
similarity index 100%
rename from rules/cloud/okta/okta_application_sign-on_policy_modified_or_deleted.yml
rename to rules/cloud/okta/okta_application_sign_on_policy_modified_or_deleted.yml
diff --git a/rules/network/zeek/zeek-dce_rpc_domain_user_enumeration.yml b/rules/network/zeek/zeek_dce_rpc_domain_user_enumeration.yml
similarity index 100%
rename from rules/network/zeek/zeek-dce_rpc_domain_user_enumeration.yml
rename to rules/network/zeek/zeek_dce_rpc_domain_user_enumeration.yml
diff --git a/rules/web/web_pulsesecure_cve-2019-11510.yml b/rules/web/web_pulsesecure_cve_2019_11510.yml
similarity index 100%
rename from rules/web/web_pulsesecure_cve-2019-11510.yml
rename to rules/web/web_pulsesecure_cve_2019_11510.yml
diff --git a/rules/windows/builtin/win_invoke_obfuscation_clip+_services.yml b/rules/windows/builtin/win_invoke_obfuscation_clip_services.yml
similarity index 100%
rename from rules/windows/builtin/win_invoke_obfuscation_clip+_services.yml
rename to rules/windows/builtin/win_invoke_obfuscation_clip_services.yml
diff --git a/rules/windows/builtin/win_invoke_obfuscation_clip+_services_security.yml b/rules/windows/builtin/win_invoke_obfuscation_clip_services_security.yml
similarity index 100%
rename from rules/windows/builtin/win_invoke_obfuscation_clip+_services_security.yml
rename to rules/windows/builtin/win_invoke_obfuscation_clip_services_security.yml
diff --git a/rules/windows/builtin/win_invoke_obfuscation_var+_services.yml b/rules/windows/builtin/win_invoke_obfuscation_var_services.yml
similarity index 100%
rename from rules/windows/builtin/win_invoke_obfuscation_var+_services.yml
rename to rules/windows/builtin/win_invoke_obfuscation_var_services.yml
diff --git a/rules/windows/builtin/win_invoke_obfuscation_var+_services_security.yml b/rules/windows/builtin/win_invoke_obfuscation_var_services_security.yml
similarity index 100%
rename from rules/windows/builtin/win_invoke_obfuscation_var+_services_security.yml
rename to rules/windows/builtin/win_invoke_obfuscation_var_services_security.yml
diff --git a/rules/windows/builtin/win_invoke_obfuscation_via_var++_services.yml b/rules/windows/builtin/win_invoke_obfuscation_via_var_services.yml
similarity index 100%
rename from rules/windows/builtin/win_invoke_obfuscation_via_var++_services.yml
rename to rules/windows/builtin/win_invoke_obfuscation_via_var_services.yml
diff --git a/rules/windows/builtin/win_invoke_obfuscation_via_var++_services_security.yml b/rules/windows/builtin/win_invoke_obfuscation_via_var_services_security.yml
similarity index 100%
rename from rules/windows/builtin/win_invoke_obfuscation_via_var++_services_security.yml
rename to rules/windows/builtin/win_invoke_obfuscation_via_var_services_security.yml
diff --git a/rules/windows/file_event/file_event_winrm_AWL_bypass.yml b/rules/windows/file_event/file_event_winrm_awl_bypass.yml
similarity index 100%
rename from rules/windows/file_event/file_event_winrm_AWL_bypass.yml
rename to rules/windows/file_event/file_event_winrm_awl_bypass.yml
diff --git a/rules/windows/powershell/powershell_invoke_obfuscation_clip+.yml b/rules/windows/powershell/powershell_invoke_obfuscation_clip.yml
similarity index 100%
rename from rules/windows/powershell/powershell_invoke_obfuscation_clip+.yml
rename to rules/windows/powershell/powershell_invoke_obfuscation_clip.yml
diff --git a/rules/windows/powershell/powershell_invoke_obfuscation_var+.yml b/rules/windows/powershell/powershell_invoke_obfuscation_var.yml
similarity index 100%
rename from rules/windows/powershell/powershell_invoke_obfuscation_var+.yml
rename to rules/windows/powershell/powershell_invoke_obfuscation_var.yml
diff --git a/rules/windows/powershell/powershell_invoke_obfuscation_via_var++.yml b/rules/windows/powershell/powershell_invoke_obfuscation_via_var.yml
similarity index 100%
rename from rules/windows/powershell/powershell_invoke_obfuscation_via_var++.yml
rename to rules/windows/powershell/powershell_invoke_obfuscation_via_var.yml
diff --git a/rules/windows/process_creation/win_invoke_obfuscation_var+.yml b/rules/windows/process_creation/win_invoke_obfuscation_var.yml
similarity index 100%
rename from rules/windows/process_creation/win_invoke_obfuscation_var+.yml
rename to rules/windows/process_creation/win_invoke_obfuscation_var.yml
diff --git a/rules/windows/process_creation/win_invoke_obfuscation_via_var++.yml b/rules/windows/process_creation/win_invoke_obfuscation_via_var.yml
similarity index 100%
rename from rules/windows/process_creation/win_invoke_obfuscation_via_var++.yml
rename to rules/windows/process_creation/win_invoke_obfuscation_via_var.yml
diff --git a/rules/windows/process_creation/win_susp_winrm_AWL_bypass.yml b/rules/windows/process_creation/win_susp_winrm_awl_bypass.yml
similarity index 100%
rename from rules/windows/process_creation/win_susp_winrm_AWL_bypass.yml
rename to rules/windows/process_creation/win_susp_winrm_awl_bypass.yml