diff --git a/file/malware/malware-aar.yaml b/file/malware/aar-malware.yaml
similarity index 96%
rename from file/malware/malware-aar.yaml
rename to file/malware/aar-malware.yaml
index 93560e01d20..826b2d9e3c1 100644
--- a/file/malware/malware-aar.yaml
+++ b/file/malware/aar-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-aar
+id: aar-malware
 
 info:
   name: AAR Malware - Detect
diff --git a/file/malware/malware-adzok.yaml b/file/malware/adzok-malware.yaml
similarity index 95%
rename from file/malware/malware-adzok.yaml
rename to file/malware/adzok-malware.yaml
index 936914772e6..77504dd2783 100644
--- a/file/malware/malware-adzok.yaml
+++ b/file/malware/adzok-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-adzok
+id: adzok-malware
 
 info:
   name: Adzok Malware - Detect
@@ -14,7 +14,7 @@ file:
     matchers-condition: or
     matchers:
       - type: word
-        part: raw        
+        part: raw
         words:
           - "key.classPK"
           - "svd$1.classPK"
@@ -26,7 +26,7 @@ file:
         condition: and
 
       - type: word
-        part: raw      
+        part: raw
         words:
           - "config.xmlPK"
           - "svd$1.classPK"
@@ -38,6 +38,7 @@ file:
         condition: and
 
       - type: word
+        part: raw
         words:
           - "config.xmlPK"
           - "key.classPK"
@@ -49,6 +50,7 @@ file:
         condition: and
 
       - type: word
+        part: raw
         words:
           - "config.xmlPK"
           - "key.classPK"
@@ -60,7 +62,7 @@ file:
         condition: and
 
       - type: word
-        part: raw      
+        part: raw
         words:
           - "config.xmlPK"
           - "key.classPK"
diff --git a/file/malware/malware-alfa.yaml b/file/malware/alfa-malware.yaml
similarity index 95%
rename from file/malware/malware-alfa.yaml
rename to file/malware/alfa-malware.yaml
index 3912ee6ed33..3f794408eac 100644
--- a/file/malware/malware-alfa.yaml
+++ b/file/malware/alfa-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-alfa
+id: alfa-malware
 
 info:
   name: Alfa Malware - Detect
diff --git a/file/malware/malware-alienspy.yaml b/file/malware/alienspy-malware.yaml
similarity index 95%
rename from file/malware/malware-alienspy.yaml
rename to file/malware/alienspy-malware.yaml
index d89c705fb4b..bd5ead14b34 100644
--- a/file/malware/malware-alienspy.yaml
+++ b/file/malware/alienspy-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-alienspy
+id: alienspy-malware
 
 info:
   name: AlienSpy Malware - Detect
diff --git a/file/malware/malware-alina.yaml b/file/malware/alina-malware.yaml
similarity index 89%
rename from file/malware/malware-alina.yaml
rename to file/malware/alina-malware.yaml
index 5ab9a371239..9b4f6141e01 100644
--- a/file/malware/malware-alina.yaml
+++ b/file/malware/alina-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-alina
+id: alina-malware
 
 info:
   name: Alina Malware - Detect
@@ -13,7 +13,7 @@ file:
 
     matchers:
       - type: word
-        part: raw      
+        part: raw
         words:
           - 'Alina v1.0'
           - 'POST'
diff --git a/file/malware/malware-alpha.yaml b/file/malware/alpha-malware.yaml
similarity index 95%
rename from file/malware/malware-alpha.yaml
rename to file/malware/alpha-malware.yaml
index c6669790a7c..667414d798c 100644
--- a/file/malware/malware-alpha.yaml
+++ b/file/malware/alpha-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-alpha
+id: alpha-malware
 
 info:
   name: Alpha Malware - Detect
diff --git a/file/malware/malware-andromeda.yaml b/file/malware/andromeda-malware.yaml
similarity index 95%
rename from file/malware/malware-andromeda.yaml
rename to file/malware/andromeda-malware.yaml
index c5395393c93..64c77322546 100644
--- a/file/malware/malware-andromeda.yaml
+++ b/file/malware/andromeda-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-andromeda
+id: andromeda-malware
 
 info:
   name: Andromeda Malware - Detect
diff --git a/file/malware/malware-ap0calypse.yaml b/file/malware/ap0calypse-malware.yaml
similarity index 95%
rename from file/malware/malware-ap0calypse.yaml
rename to file/malware/ap0calypse-malware.yaml
index e52e22d9d0d..55f1f59b8d1 100644
--- a/file/malware/malware-ap0calypse.yaml
+++ b/file/malware/ap0calypse-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-ap0calypse
+id: ap0calypse-malware
 
 info:
   name: Ap0calypse Malware - Detect
diff --git a/file/malware/malware-arcom.yaml b/file/malware/arcom-malware.yaml
similarity index 96%
rename from file/malware/malware-arcom.yaml
rename to file/malware/arcom-malware.yaml
index 2722c13a20c..a26bb3d29fd 100644
--- a/file/malware/malware-arcom.yaml
+++ b/file/malware/arcom-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-arcom
+id: arcom-malware
 
 info:
   name: Arcom Malware - Detect
diff --git a/file/malware/malware-arkei.yaml b/file/malware/arkei-malware.yaml
similarity index 95%
rename from file/malware/malware-arkei.yaml
rename to file/malware/arkei-malware.yaml
index 1fb0d9c7981..aedc5ee182b 100644
--- a/file/malware/malware-arkei.yaml
+++ b/file/malware/arkei-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-arkei
+id: arkei-malware
 
 info:
   name: Arkei Malware - Detect
diff --git a/file/malware/malware-backoff.yaml b/file/malware/backoff-malware.yaml
similarity index 95%
rename from file/malware/malware-backoff.yaml
rename to file/malware/backoff-malware.yaml
index 302af86899e..3219fcd5648 100644
--- a/file/malware/malware-backoff.yaml
+++ b/file/malware/backoff-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-backoff
+id: backoff-malware
 
 info:
   name: Backoff Malware - Detect
diff --git a/file/malware/malware-bandook.yaml b/file/malware/bandook-malware.yaml
similarity index 96%
rename from file/malware/malware-bandook.yaml
rename to file/malware/bandook-malware.yaml
index 50f72413d87..a7ac27a5c32 100644
--- a/file/malware/malware-bandook.yaml
+++ b/file/malware/bandook-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-bandook
+id: bandook-malware
 
 info:
   name: Bandook Malware - Detect
diff --git a/file/malware/malware-blacknix.yaml b/file/malware/blacknix-malware.yaml
similarity index 95%
rename from file/malware/malware-blacknix.yaml
rename to file/malware/blacknix-malware.yaml
index 7c472ab953e..9b76d440688 100644
--- a/file/malware/malware-blacknix.yaml
+++ b/file/malware/blacknix-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-blacknix
+id: blacknix-malware
 
 info:
   name: BlackNix Malware - Detect
diff --git a/file/malware/malware-blackworm.yaml b/file/malware/blackworm-malware.yaml
similarity index 96%
rename from file/malware/malware-blackworm.yaml
rename to file/malware/blackworm-malware.yaml
index 6c301cf3c5e..0e03c364772 100644
--- a/file/malware/malware-blackworm.yaml
+++ b/file/malware/blackworm-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-blackworm
+id: blackworm-malware
 
 info:
   name: Blackworm Malware - Detect
diff --git a/file/malware/malware-bluebanana.yaml b/file/malware/bluebanana-malware.yaml
similarity index 95%
rename from file/malware/malware-bluebanana.yaml
rename to file/malware/bluebanana-malware.yaml
index b1c4c1d7fe8..450c03fec5e 100644
--- a/file/malware/malware-bluebanana.yaml
+++ b/file/malware/bluebanana-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-bluebanana
+id: bluebanana-malware
 
 info:
   name: BlueBanana Malware - Detect
diff --git a/file/malware/malware-bozok.yaml b/file/malware/bozok-malware.yaml
similarity index 96%
rename from file/malware/malware-bozok.yaml
rename to file/malware/bozok-malware.yaml
index 42777b820d8..1b4d7ec3fe3 100644
--- a/file/malware/malware-bozok.yaml
+++ b/file/malware/bozok-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-bozok
+id: bozok-malware
 
 info:
   name: Bozok Malware - Detect
diff --git a/file/malware/malware-bublik.yaml b/file/malware/bublik-malware.yaml
similarity index 95%
rename from file/malware/malware-bublik.yaml
rename to file/malware/bublik-malware.yaml
index 37bf5230b90..31fd9982b4e 100644
--- a/file/malware/malware-bublik.yaml
+++ b/file/malware/bublik-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-bublik
+id: bublik-malware
 
 info:
   name: Bublik Malware Detector
diff --git a/file/malware/malware-cap-hookexkeylogger.yaml b/file/malware/cap-hookexkeylogger-malware.yaml
similarity index 96%
rename from file/malware/malware-cap-hookexkeylogger.yaml
rename to file/malware/cap-hookexkeylogger-malware.yaml
index 7326b5d6443..14535018bf1 100644
--- a/file/malware/malware-cap-hookexkeylogger.yaml
+++ b/file/malware/cap-hookexkeylogger-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-cap-hookexkeylogger
+id: cap-hookexkeylogger-malware
 
 info:
   name: CAP HookExKeylogger Malware - Detect
diff --git a/file/malware/malware-cerberus.yaml b/file/malware/cerberus-malware.yaml
similarity index 96%
rename from file/malware/malware-cerberus.yaml
rename to file/malware/cerberus-malware.yaml
index f94a15ced03..259ad785fad 100644
--- a/file/malware/malware-cerberus.yaml
+++ b/file/malware/cerberus-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-cerberus
+id: cerberus-malware
 
 info:
   name: Cerberus Malware - Detect
diff --git a/file/malware/malware-clientmesh.yaml b/file/malware/clientmesh-malware.yaml
similarity index 96%
rename from file/malware/malware-clientmesh.yaml
rename to file/malware/clientmesh-malware.yaml
index 8b48ecbc428..3a8713d7bef 100644
--- a/file/malware/malware-clientmesh.yaml
+++ b/file/malware/clientmesh-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-clientmesh
+id: clientmesh-malware
 
 info:
   name: ClientMesh Malware - Detect
diff --git a/file/malware/malware-crimson.yaml b/file/malware/crimson-malware.yaml
similarity index 96%
rename from file/malware/malware-crimson.yaml
rename to file/malware/crimson-malware.yaml
index b950998db37..8d79c7a7663 100644
--- a/file/malware/malware-crimson.yaml
+++ b/file/malware/crimson-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-crimson
+id: crimson-malware
 
 info:
   name: Crimson Malware - Detect
diff --git a/file/malware/malware-cryptxxx-dropper.yaml b/file/malware/cryptxxx-dropper-malware.yaml
similarity index 93%
rename from file/malware/malware-cryptxxx-dropper.yaml
rename to file/malware/cryptxxx-dropper-malware.yaml
index 76da6ac45c1..df19738c6c2 100644
--- a/file/malware/malware-cryptxxx-dropper.yaml
+++ b/file/malware/cryptxxx-dropper-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-cryptxxx-dropper
+id: cryptxxx-dropper-malware
 
 info:
   name: CryptXXX Dropper Malware - Detect
diff --git a/file/malware/malware-cryptxxx.yaml b/file/malware/cryptxxx-malware.yaml
similarity index 98%
rename from file/malware/malware-cryptxxx.yaml
rename to file/malware/cryptxxx-malware.yaml
index d9b211b6e04..07866a3b0bc 100644
--- a/file/malware/malware-cryptxxx.yaml
+++ b/file/malware/cryptxxx-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-cryptxxx
+id: cryptxxx-malware
 
 info:
   name: CryptXXX Malware - Detect
diff --git a/file/malware/malware-cxpid.yaml b/file/malware/cxpid-malware.yaml
similarity index 97%
rename from file/malware/malware-cxpid.yaml
rename to file/malware/cxpid-malware.yaml
index 06d905857c3..6019bd1e37e 100644
--- a/file/malware/malware-cxpid.yaml
+++ b/file/malware/cxpid-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-cxpid
+id: cxpid-malware
 
 info:
   name: Cxpid Malware - Detect
diff --git a/file/malware/malware-cythosia.yaml b/file/malware/cythosia-malware.yaml
similarity index 94%
rename from file/malware/malware-cythosia.yaml
rename to file/malware/cythosia-malware.yaml
index 7f22d1a958d..081a55ed58c 100644
--- a/file/malware/malware-cythosia.yaml
+++ b/file/malware/cythosia-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-cythosia
+id: cythosia-malware
 
 info:
   name: Cythosia Malware - Detect
diff --git a/file/malware/malware-darkrat.yaml b/file/malware/darkrat-malware.yaml
similarity index 96%
rename from file/malware/malware-darkrat.yaml
rename to file/malware/darkrat-malware.yaml
index 07e81f1fb86..69503ad5c09 100644
--- a/file/malware/malware-darkrat.yaml
+++ b/file/malware/darkrat-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-darkrat
+id: darkrat-malware
 
 info:
   name: DarkRAT Malware - Detect
diff --git a/file/malware/malware-ddostf.yaml b/file/malware/ddostf-malware.yaml
similarity index 91%
rename from file/malware/malware-ddostf.yaml
rename to file/malware/ddostf-malware.yaml
index 9cc8fba4a0d..90db92b876e 100644
--- a/file/malware/malware-ddostf.yaml
+++ b/file/malware/ddostf-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-ddostf
+id: ddostf-malware
 
 info:
   name: DDoSTf Malware - Detect
@@ -25,6 +25,6 @@ file:
 
       - type: binary
         binary:
-          - 'E8AEBEE7BDAE5443505F4B454550494E54564CE99499E8AFAFEFBC9A00' #TCP_KEEPINTVL
-          - 'E8AEBEE7BDAE5443505F4B454550434E54E99499E8AFAFEFBC9A00' #TCP_KEEPCNT
+          - 'E8AEBEE7BDAE5443505F4B454550494E54564CE99499E8AFAFEFBC9A00'
+          - 'E8AEBEE7BDAE5443505F4B454550434E54E99499E8AFAFEFBC9A00'
         condition: and
\ No newline at end of file
diff --git a/file/malware/malware-derkziel.yaml b/file/malware/derkziel-malware.yaml
similarity index 95%
rename from file/malware/malware-derkziel.yaml
rename to file/malware/derkziel-malware.yaml
index 1067b63cf8b..7c2aa65ec2c 100644
--- a/file/malware/malware-derkziel.yaml
+++ b/file/malware/derkziel-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-derkziel
+id: derkziel-malware
 
 info:
   name: Derkziel Malware - Detect
diff --git a/file/malware/malware-dexter.yaml b/file/malware/dexter-malware.yaml
similarity index 96%
rename from file/malware/malware-dexter.yaml
rename to file/malware/dexter-malware.yaml
index 02547803ad8..a0a340ab11c 100644
--- a/file/malware/malware-dexter.yaml
+++ b/file/malware/dexter-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-dexter
+id: dexter-malware
 
 info:
   name: Dexter Malware - Detect
diff --git a/file/malware/malware-diamondfox.yaml b/file/malware/diamondfox-malware.yaml
similarity index 95%
rename from file/malware/malware-diamondfox.yaml
rename to file/malware/diamondfox-malware.yaml
index 4d57515d229..da9087a0903 100644
--- a/file/malware/malware-diamondfox.yaml
+++ b/file/malware/diamondfox-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-diamondfox
+id: diamondfox-malware
 
 info:
   name: DiamondFox Malware - Detect
diff --git a/file/malware/malware-dmalocker.yaml b/file/malware/dmalocker-malware.yaml
similarity index 90%
rename from file/malware/malware-dmalocker.yaml
rename to file/malware/dmalocker-malware.yaml
index 02efa733f44..da1c8fc5565 100644
--- a/file/malware/malware-dmalocker.yaml
+++ b/file/malware/dmalocker-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-dmalocker
+id: dmalocker-malware
 
 info:
   name: DMA Locker Malware - Detect
@@ -19,4 +19,4 @@ file:
           - "21444d414c4f434b332e30"
           - "3F520000FFFFFFFF06000000524C4141"
           - "21444d414c4f434b342e30"
-        condition: or  
+        condition: or
diff --git a/file/malware/malware-doublepulsar.yaml b/file/malware/doublepulsar-malware.yaml
similarity index 80%
rename from file/malware/malware-doublepulsar.yaml
rename to file/malware/doublepulsar-malware.yaml
index ab4c1e1da26..f75042ae22f 100644
--- a/file/malware/malware-doublepulsar.yaml
+++ b/file/malware/doublepulsar-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-doublepulsar
+id: doublepulsar-malware
 
 info:
   name: DoublePulsar Malware - Detect
@@ -14,6 +14,6 @@ file:
     matchers:
       - type: binary
         binary:
-          - "FD0C8C5CB8C424C5CCCCCC0EE8CC246BCCCCCC0F24CDCCCCCC275C9775BACDCCCCC3FE" #xor
-          - "45208D938D928D918D90929391970F9F9E9D99844529844D20CCCDCCCC9B844503844514844549CC3333332477CCCCCC844549C43333332484CDCCCC844549DC333333844749CC333333844741" #dll
-        condition: or  
\ No newline at end of file
+          - "FD0C8C5CB8C424C5CCCCCC0EE8CC246BCCCCCC0F24CDCCCCCC275C9775BACDCCCCC3FE"
+          - "45208D938D928D918D90929391970F9F9E9D99844529844D20CCCDCCCC9B844503844514844549CC3333332477CCCCCC844549C43333332484CDCCCC844549DC333333844749CC333333844741"
+        condition: or
\ No newline at end of file
diff --git a/file/malware/malware-eicar.yaml b/file/malware/eicar-malware.yaml
similarity index 95%
rename from file/malware/malware-eicar.yaml
rename to file/malware/eicar-malware.yaml
index 2a62a9135cb..efdae29c314 100644
--- a/file/malware/malware-eicar.yaml
+++ b/file/malware/eicar-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-eicar
+id: eicar-malware
 
 info:
   name: Eicar Malware - Detect
diff --git a/file/malware/malware-erebus.yaml b/file/malware/erebus-malware.yaml
similarity index 95%
rename from file/malware/malware-erebus.yaml
rename to file/malware/erebus-malware.yaml
index a575a5fddb3..bf341570614 100644
--- a/file/malware/malware-erebus.yaml
+++ b/file/malware/erebus-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-erebus
+id: erebus-malware
 
 info:
   name: Erebus Malware - Detect
diff --git a/file/malware/malware-ezcob.yaml b/file/malware/ezcob-malware.yaml
similarity index 93%
rename from file/malware/malware-ezcob.yaml
rename to file/malware/ezcob-malware.yaml
index 1a15fe25d83..8aa21c05051 100644
--- a/file/malware/malware-ezcob.yaml
+++ b/file/malware/ezcob-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-ezcob
+id: ezcob-malware
 
 info:
   name: Ezcob Malware - Detect
@@ -20,4 +20,4 @@ file:
           - 'Ezcob'
           - 'l\x12i\x12u\x122\x120\x121\x123\x120\x124\x121\x126'
           - '20110113144935'
-        condition: or  
\ No newline at end of file
+        condition: or
\ No newline at end of file
diff --git a/file/malware/malware-fudcrypt.yaml b/file/malware/fudcrypt-malware.yaml
similarity index 97%
rename from file/malware/malware-fudcrypt.yaml
rename to file/malware/fudcrypt-malware.yaml
index faf98bc7017..1a257fd1ce9 100644
--- a/file/malware/malware-fudcrypt.yaml
+++ b/file/malware/fudcrypt-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-fudcrypt
+id: fudcrypt-malware
 
 info:
   name: FUDCrypt Malware - Detect
diff --git a/file/malware/malware-gafgyt_bash.yaml b/file/malware/gafgyt-bash-malware.yaml
similarity index 94%
rename from file/malware/malware-gafgyt_bash.yaml
rename to file/malware/gafgyt-bash-malware.yaml
index 8e55bb2b5c1..89b33c0f3d2 100644
--- a/file/malware/malware-gafgyt_bash.yaml
+++ b/file/malware/gafgyt-bash-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-gafgyt-bash
+id: gafgyt-bash-malware
 
 info:
   name: Gafgyt Malware - Detect
diff --git a/file/malware/malware-gafgyt-generic.yaml b/file/malware/gafgyt-generic-malware.yaml
similarity index 93%
rename from file/malware/malware-gafgyt-generic.yaml
rename to file/malware/gafgyt-generic-malware.yaml
index fd92168f66a..0f1cf80b47c 100644
--- a/file/malware/malware-gafgyt-generic.yaml
+++ b/file/malware/gafgyt-generic-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-gafgyt-generic
+id: gafgyt-generic-malware
 
 info:
   name: Gafgyt Malware - Detect
diff --git a/file/malware/malware-gafgyt-hihi.yaml b/file/malware/gafgyt-hihi-malware.yaml
similarity index 95%
rename from file/malware/malware-gafgyt-hihi.yaml
rename to file/malware/gafgyt-hihi-malware.yaml
index 77ef142a76b..61375a18aca 100644
--- a/file/malware/malware-gafgyt-hihi.yaml
+++ b/file/malware/gafgyt-hihi-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-gafgyt-hihi
+id: gafgyt-hihi-malware
 
 info:
   name: Gafgyt Malware - Detect
diff --git a/file/malware/malware-gafgyt-hoho.yaml b/file/malware/gafgyt-hoho-malware.yaml
similarity index 94%
rename from file/malware/malware-gafgyt-hoho.yaml
rename to file/malware/gafgyt-hoho-malware.yaml
index d18a26f5f7c..f41ce242841 100644
--- a/file/malware/malware-gafgyt-hoho.yaml
+++ b/file/malware/gafgyt-hoho-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-gafgyt-hoho
+id: gafgyt-hoho-malware
 
 info:
   name: Gafgyt Malware - Detect
diff --git a/file/malware/malware-gafgyt-jackmy.yaml b/file/malware/gafgyt-jackmy-malware.yaml
similarity index 93%
rename from file/malware/malware-gafgyt-jackmy.yaml
rename to file/malware/gafgyt-jackmy-malware.yaml
index 98ab2474809..5db07220503 100644
--- a/file/malware/malware-gafgyt-jackmy.yaml
+++ b/file/malware/gafgyt-jackmy-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-gafgyt-jackmy
+id: gafgyt-jackmy-malware
 
 info:
   name: Gafgyt Malware - Detect
diff --git a/file/malware/malware-gafgyt-oh.yaml b/file/malware/gafgyt-oh-malware.yaml
similarity index 86%
rename from file/malware/malware-gafgyt-oh.yaml
rename to file/malware/gafgyt-oh-malware.yaml
index 0977509400e..1fbc949209e 100644
--- a/file/malware/malware-gafgyt-oh.yaml
+++ b/file/malware/gafgyt-oh-malware.yaml
@@ -1,7 +1,7 @@
-id: malware-gafgyt-oh
+id: gafgyt-oh-malware
 
 info:
-  name: Gafgyt Malware - Detect
+  name: Gafgyt Oh Malware - Detect
   author: daffainfo
   severity: info
   reference: https://github.com/Yara-Rules/rules/blob/master/malware/MALW_Gafgyt.yar
diff --git a/file/malware/malware-genome.yaml b/file/malware/genome-malware.yaml
similarity index 96%
rename from file/malware/malware-genome.yaml
rename to file/malware/genome-malware.yaml
index 78934341e8b..4d2f0180300 100644
--- a/file/malware/malware-genome.yaml
+++ b/file/malware/genome-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-genome
+id: genome-malware
 
 info:
   name: Genome Malware - Detect
diff --git a/file/malware/malware-glass.yaml b/file/malware/glass-malware.yaml
similarity index 95%
rename from file/malware/malware-glass.yaml
rename to file/malware/glass-malware.yaml
index 6f08140d406..4729c20f2de 100644
--- a/file/malware/malware-glass.yaml
+++ b/file/malware/glass-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-glass
+id: glass-malware
 
 info:
   name: Glass Malware - Detect
diff --git a/file/malware/malware-glasses.yaml b/file/malware/glasses-malware.yaml
similarity index 97%
rename from file/malware/malware-glasses.yaml
rename to file/malware/glasses-malware.yaml
index 34beb4ed445..9dd8240a7d0 100644
--- a/file/malware/malware-glasses.yaml
+++ b/file/malware/glasses-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-glasses
+id: glasses-malware
 
 info:
   name: Glasses Malware - Detect
diff --git a/file/malware/malware-gozi.yaml b/file/malware/gozi-malware.yaml
similarity index 96%
rename from file/malware/malware-gozi.yaml
rename to file/malware/gozi-malware.yaml
index 290a0b3fe12..0de45dd78e7 100644
--- a/file/malware/malware-gozi.yaml
+++ b/file/malware/gozi-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-gozi
+id: gozi-malware
 
 info:
   name: Gozi Malware - Detect
diff --git a/file/malware/malware-gpgqwerty.yaml b/file/malware/gpgqwerty-malware.yaml
similarity index 95%
rename from file/malware/malware-gpgqwerty.yaml
rename to file/malware/gpgqwerty-malware.yaml
index 942f331ba0e..98fc738eda5 100644
--- a/file/malware/malware-gpgqwerty.yaml
+++ b/file/malware/gpgqwerty-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-gpgqwerty
+id: gpgqwerty-malware
 
 info:
   name: GPGQwerty Malware - Detect
diff --git a/file/malware/malware-greame.yaml b/file/malware/greame-malware.yaml
similarity index 97%
rename from file/malware/malware-greame.yaml
rename to file/malware/greame-malware.yaml
index eb2b55c98d1..c87fb4e61fb 100644
--- a/file/malware/malware-greame.yaml
+++ b/file/malware/greame-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-greame
+id: greame-malware
 
 info:
   name: Greame Malware - Detect
diff --git a/file/malware/malware-grozlex.yaml b/file/malware/grozlex-malware.yaml
similarity index 95%
rename from file/malware/malware-grozlex.yaml
rename to file/malware/grozlex-malware.yaml
index e20952cf8b3..86893d6184e 100644
--- a/file/malware/malware-grozlex.yaml
+++ b/file/malware/grozlex-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-grozlex
+id: grozlex-malware
 
 info:
   name: Grozlex Malware - Detect
diff --git a/file/malware/malware-hawkeye.yaml b/file/malware/hawkeye-malware.yaml
similarity index 96%
rename from file/malware/malware-hawkeye.yaml
rename to file/malware/hawkeye-malware.yaml
index 06ffc468e54..734d77c7656 100644
--- a/file/malware/malware-hawkeye.yaml
+++ b/file/malware/hawkeye-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-hawkeye
+id: hawkeye-malware
 
 info:
   name: HawkEye Malware - Detect
diff --git a/file/malware/malware-imminent.yaml b/file/malware/imminent-malware.yaml
similarity index 97%
rename from file/malware/malware-imminent.yaml
rename to file/malware/imminent-malware.yaml
index b689afb4953..e093fb86f83 100644
--- a/file/malware/malware-imminent.yaml
+++ b/file/malware/imminent-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-imminent
+id: imminent-malware
 
 info:
   name: Imminent Malware - Detect
diff --git a/file/malware/malware-infinity.yaml b/file/malware/infinity-malware.yaml
similarity index 96%
rename from file/malware/malware-infinity.yaml
rename to file/malware/infinity-malware.yaml
index ac5a2502004..e8313431399 100644
--- a/file/malware/malware-infinity.yaml
+++ b/file/malware/infinity-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-infinity
+id: infinity-malware
 
 info:
   name: Infinity Malware - Detect
diff --git a/file/malware/malware-insta11.yaml b/file/malware/insta11-malware.yaml
similarity index 96%
rename from file/malware/malware-insta11.yaml
rename to file/malware/insta11-malware.yaml
index 9e6e6bb960b..97870e5da4b 100644
--- a/file/malware/malware-insta11.yaml
+++ b/file/malware/insta11-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-insta11
+id: insta11-malware
 
 info:
   name: Insta11 Malware - Detect
diff --git a/file/malware/malware-intel-virtualization.yaml b/file/malware/intel-virtualization-malware.yaml
similarity index 95%
rename from file/malware/malware-intel-virtualization.yaml
rename to file/malware/intel-virtualization-malware.yaml
index 7b5b8c02483..650f218f8f7 100644
--- a/file/malware/malware-intel-virtualization.yaml
+++ b/file/malware/intel-virtualization-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-intel-virtualization
+id: intel-virtualization-malware
 
 info:
   name: Intel Virtualization Malware - Detect
diff --git a/file/malware/malware-iotreaper.yaml b/file/malware/iotreaper-malware.yaml
similarity index 96%
rename from file/malware/malware-iotreaper.yaml
rename to file/malware/iotreaper-malware.yaml
index f29d6b21bf7..d64ea0d220e 100644
--- a/file/malware/malware-iotreaper.yaml
+++ b/file/malware/iotreaper-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-iotreaper
+id: iotreaper-malware
 
 info:
   name: IotReaper Malware - Detect
diff --git a/file/malware/malware-linux-aesddos.yaml b/file/malware/linux-aesddos-malware.yaml
similarity index 96%
rename from file/malware/malware-linux-aesddos.yaml
rename to file/malware/linux-aesddos-malware.yaml
index 809f6d73a0b..389b681e8b0 100644
--- a/file/malware/malware-linux-aesddos.yaml
+++ b/file/malware/linux-aesddos-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-linux-aesddos
+id: linux-aesddos-malware
 
 info:
   name: Linux AESDDOS Malware - Detect
diff --git a/file/malware/malware-linux-billgates.yaml b/file/malware/linux-billgates-malware.yaml
similarity index 94%
rename from file/malware/malware-linux-billgates.yaml
rename to file/malware/linux-billgates-malware.yaml
index d7040da7452..24ec63d6739 100644
--- a/file/malware/malware-linux-billgates.yaml
+++ b/file/malware/linux-billgates-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-linux-billgates
+id: linux-billgates-malware
 
 info:
   name: Linux BillGates Malware - Detect
diff --git a/file/malware/malware-linux-elknot.yaml b/file/malware/linux-elknot-malware.yaml
similarity index 95%
rename from file/malware/malware-linux-elknot.yaml
rename to file/malware/linux-elknot-malware.yaml
index b44d10a8bbe..2a4e11bb7a7 100644
--- a/file/malware/malware-linux-elknot.yaml
+++ b/file/malware/linux-elknot-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-linux-elknot
+id: linux-elknot-malware
 
 info:
   name: Linux Elknot Malware - Detect
diff --git a/file/malware/malware-linux-mrblack.yaml b/file/malware/linux-mrblack-malware.yaml
similarity index 94%
rename from file/malware/malware-linux-mrblack.yaml
rename to file/malware/linux-mrblack-malware.yaml
index ccfd769a7c5..6b67dda9f95 100644
--- a/file/malware/malware-linux-mrblack.yaml
+++ b/file/malware/linux-mrblack-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-linux-mrblack
+id: linux-mrblack-malware
 
 info:
   name: Linux MrBlack Malware - Detect
diff --git a/file/malware/malware-linux-tsunami.yaml b/file/malware/linux-tsunami-malware.yaml
similarity index 95%
rename from file/malware/malware-linux-tsunami.yaml
rename to file/malware/linux-tsunami-malware.yaml
index 9870baa8727..2f89e2327e6 100644
--- a/file/malware/malware-linux-tsunami.yaml
+++ b/file/malware/linux-tsunami-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-linux-tsunami
+id: linux-tsunami-malware
 
 info:
   name: Linux Tsunami Malware - Detect
diff --git a/file/malware/malware-locky.yaml b/file/malware/locky-malware.yaml
similarity index 97%
rename from file/malware/malware-locky.yaml
rename to file/malware/locky-malware.yaml
index c928ad3004c..248e653c88c 100644
--- a/file/malware/malware-locky.yaml
+++ b/file/malware/locky-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-locky
+id: locky-malware
 
 info:
   name: Locky Malware - Detect
diff --git a/file/malware/malware-lostdoor.yaml b/file/malware/lostdoor-malware.yaml
similarity index 96%
rename from file/malware/malware-lostdoor.yaml
rename to file/malware/lostdoor-malware.yaml
index 43ccd12e19d..e68a90d5b25 100644
--- a/file/malware/malware-lostdoor.yaml
+++ b/file/malware/lostdoor-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-lostdoor
+id: lostdoor-malware
 
 info:
   name: LostDoor Malware - Detect
diff --git a/file/malware/malware-luminositylink.yaml b/file/malware/luminositylink-malware.yaml
similarity index 96%
rename from file/malware/malware-luminositylink.yaml
rename to file/malware/luminositylink-malware.yaml
index fa54204c12b..f3076fb6af8 100644
--- a/file/malware/malware-luminositylink.yaml
+++ b/file/malware/luminositylink-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-luminositylink
+id: luminositylink-malware
 
 info:
   name: LuminosityLink Malware - Detect
diff --git a/file/malware/malware-luxnet.yaml b/file/malware/luxnet-malware.yaml
similarity index 96%
rename from file/malware/malware-luxnet.yaml
rename to file/malware/luxnet-malware.yaml
index 6238b41b13a..4fca112cf09 100644
--- a/file/malware/malware-luxnet.yaml
+++ b/file/malware/luxnet-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-luxnet
+id: luxnet-malware
 
 info:
   name: LuxNet Malware - Detect
diff --git a/file/malware/malware-macgyver-installer.yaml b/file/malware/macgyver-installer-malware.yaml
similarity index 95%
rename from file/malware/malware-macgyver-installer.yaml
rename to file/malware/macgyver-installer-malware.yaml
index b696f8817c4..d4006264ee4 100644
--- a/file/malware/malware-macgyver-installer.yaml
+++ b/file/malware/macgyver-installer-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-macgyver-installer
+id: macgyver-installer--malware
 
 info:
   name: MacGyver.cap Installer Malware - Detect
diff --git a/file/malware/malware-macgyver.yaml b/file/malware/macgyver-malware.yaml
similarity index 97%
rename from file/malware/malware-macgyver.yaml
rename to file/malware/macgyver-malware.yaml
index a2a9c66e214..c56023d78b7 100644
--- a/file/malware/malware-macgyver.yaml
+++ b/file/malware/macgyver-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-macgyver
+id: macgyver-malware
 
 info:
   name: MacGyver.cap Malware - Detect
diff --git a/file/malware/malware-madness.yaml b/file/malware/madness-malware.yaml
similarity index 97%
rename from file/malware/malware-madness.yaml
rename to file/malware/madness-malware.yaml
index cb8801f96fc..8ab243f4a97 100644
--- a/file/malware/malware-madness.yaml
+++ b/file/malware/madness-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-madness
+id: madness-malware
 
 info:
   name: Madness DDOS Malware - Detect
diff --git a/file/malware/malware-miner.yaml b/file/malware/miner--malware.yaml
similarity index 94%
rename from file/malware/malware-miner.yaml
rename to file/malware/miner--malware.yaml
index 78dcfca54eb..50884f91ce6 100644
--- a/file/malware/malware-miner.yaml
+++ b/file/malware/miner--malware.yaml
@@ -1,4 +1,4 @@
-id: malware-miner
+id: miner-malware
 
 info:
   name: Miner Malware - Detect
diff --git a/file/malware/malware-miniasp3.yaml b/file/malware/miniasp3-malware.yaml
similarity index 98%
rename from file/malware/malware-miniasp3.yaml
rename to file/malware/miniasp3-malware.yaml
index f3864f9c331..318b0f6d90c 100644
--- a/file/malware/malware-miniasp3.yaml
+++ b/file/malware/miniasp3-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-miniasp3
+id: miniasp3-malware
 
 info:
   name: MiniASP3 Malware - Detect
diff --git a/file/malware/malware-naikon.yaml b/file/malware/naikon-malware.yaml
similarity index 97%
rename from file/malware/malware-naikon.yaml
rename to file/malware/naikon-malware.yaml
index 29a5a3c3b98..bd0ac87b0dd 100644
--- a/file/malware/malware-naikon.yaml
+++ b/file/malware/naikon-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-naikon
+id: naikon-malware
 
 info:
   name: Naikon Malware - Detect
diff --git a/file/malware/malware-naspyupdate.yaml b/file/malware/naspyupdate-malware.yaml
similarity index 95%
rename from file/malware/malware-naspyupdate.yaml
rename to file/malware/naspyupdate-malware.yaml
index dc09d730743..3ac092de7c4 100644
--- a/file/malware/malware-naspyupdate.yaml
+++ b/file/malware/naspyupdate-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-naspyupdate
+id: naspyupdate-malware
 
 info:
   name: nAspyUpdate Malware - Detect
diff --git a/file/malware/malware-notepad.yaml b/file/malware/notepad-malware.yaml
similarity index 95%
rename from file/malware/malware-notepad.yaml
rename to file/malware/notepad-malware.yaml
index 547d2cfca25..6d4880f8f2b 100644
--- a/file/malware/malware-notepad.yaml
+++ b/file/malware/notepad-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-notepad
+id: notepad-malware
 
 info:
   name: Notepad v1.1 Malware - Detect
diff --git a/file/malware/malware-olyx.yaml b/file/malware/olyx-malware.yaml
similarity index 96%
rename from file/malware/malware-olyx.yaml
rename to file/malware/olyx-malware.yaml
index 85dbe26c4b4..8bfb443752e 100644
--- a/file/malware/malware-olyx.yaml
+++ b/file/malware/olyx-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-olyx
+id: olyx-malware
 
 info:
   name: Olyx Malware - Detect
diff --git a/file/malware/malware-osx-leverage.yaml b/file/malware/osx-leverage-malware.yaml
similarity index 97%
rename from file/malware/malware-osx-leverage.yaml
rename to file/malware/osx-leverage-malware.yaml
index 66a94200615..47ca40521b7 100644
--- a/file/malware/malware-osx-leverage.yaml
+++ b/file/malware/osx-leverage-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-osx-leverage
+id: osx-leverage-malware
 
 info:
   name: OSX Leverage Malware - Detect
diff --git a/file/malware/malware-paradox.yaml b/file/malware/paradox-malware.yaml
similarity index 96%
rename from file/malware/malware-paradox.yaml
rename to file/malware/paradox-malware.yaml
index f49cd1bfd8b..a1e868b53be 100644
--- a/file/malware/malware-paradox.yaml
+++ b/file/malware/paradox-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-paradox
+id: paradox-malware
 
 info:
   name: Paradox Malware - Detect
diff --git a/file/malware/malware-plasma.yaml b/file/malware/plasma-malware.yaml
similarity index 97%
rename from file/malware/malware-plasma.yaml
rename to file/malware/plasma-malware.yaml
index ae5675d1978..f777e38f467 100644
--- a/file/malware/malware-plasma.yaml
+++ b/file/malware/plasma-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-plasma
+id: plasma-malware
 
 info:
   name: Plasma Malware - Detect
diff --git a/file/malware/malware-poetrat.yaml b/file/malware/poetrat-malware.yaml
similarity index 97%
rename from file/malware/malware-poetrat.yaml
rename to file/malware/poetrat-malware.yaml
index da3a9fd06aa..bdc08275158 100644
--- a/file/malware/malware-poetrat.yaml
+++ b/file/malware/poetrat-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-poetrat
+id: poetrat-malware
 
 info:
   name: PoetRat Malware - Detect
diff --git a/file/malware/malware-pony.yaml b/file/malware/pony-malware.yaml
similarity index 96%
rename from file/malware/malware-pony.yaml
rename to file/malware/pony-malware.yaml
index ce66b4cff69..f919ab5a802 100644
--- a/file/malware/malware-pony.yaml
+++ b/file/malware/pony-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-pony
+id: pony-malware
 
 info:
   name: Pony Malware - Detect
diff --git a/file/malware/malware-pubsab.yaml b/file/malware/pubsab-malware.yaml
similarity index 96%
rename from file/malware/malware-pubsab.yaml
rename to file/malware/pubsab-malware.yaml
index 7d5d4ca4a87..ade33db8547 100644
--- a/file/malware/malware-pubsab.yaml
+++ b/file/malware/pubsab-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-pubsab
+id: pubsab-malware
 
 info:
   name: PubSab Malware - Detect
diff --git a/file/malware/malware-punisher.yaml b/file/malware/punisher-malware.yaml
similarity index 96%
rename from file/malware/malware-punisher.yaml
rename to file/malware/punisher-malware.yaml
index 994f001911c..45b9c0c6088 100644
--- a/file/malware/malware-punisher.yaml
+++ b/file/malware/punisher-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-punisher
+id: punisher-malware
 
 info:
   name: Punisher Malware - Detect
diff --git a/file/malware/malware-pypi.yaml b/file/malware/pypi-malware.yaml
similarity index 96%
rename from file/malware/malware-pypi.yaml
rename to file/malware/pypi-malware.yaml
index d501a05fc69..a03e0c67734 100644
--- a/file/malware/malware-pypi.yaml
+++ b/file/malware/pypi-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-pypi
+id: pypi-malware
 
 info:
   name: Fake PyPI Malware - Detect
diff --git a/file/malware/malware-pythorat.yaml b/file/malware/pythorat-malware.yaml
similarity index 96%
rename from file/malware/malware-pythorat.yaml
rename to file/malware/pythorat-malware.yaml
index 02526990167..e5fb6642a4a 100644
--- a/file/malware/malware-pythorat.yaml
+++ b/file/malware/pythorat-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-pythorat
+id: pythorat-malware
 
 info:
   name: PythoRAT Malware - Detect
diff --git a/file/malware/malware-qrat.yaml b/file/malware/qrat-malware.yaml
similarity index 98%
rename from file/malware/malware-qrat.yaml
rename to file/malware/qrat-malware.yaml
index 06ef96a5b76..76853066d2c 100644
--- a/file/malware/malware-qrat.yaml
+++ b/file/malware/qrat-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-qrat
+id: qrat-malware
 
 info:
   name: QRat Malware - Detect
diff --git a/file/malware/malware-satana-dropper.yaml b/file/malware/satana-dropper-malware.yaml
similarity index 94%
rename from file/malware/malware-satana-dropper.yaml
rename to file/malware/satana-dropper-malware.yaml
index 2f880e5a198..c82a39dc6cf 100644
--- a/file/malware/malware-satana-dropper.yaml
+++ b/file/malware/satana-dropper-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-satana-dropper
+id: satana-dropper-malware
 
 info:
   name: Satana Dropper Malware - Detect
diff --git a/file/malware/malware-satana.yaml b/file/malware/satana-malware.yaml
similarity index 97%
rename from file/malware/malware-satana.yaml
rename to file/malware/satana-malware.yaml
index f8aa9388dff..01e87bbeec5 100644
--- a/file/malware/malware-satana.yaml
+++ b/file/malware/satana-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-satana
+id: satana-malware
 
 info:
   name: Satana Malware - Detect
diff --git a/file/malware/malware-shimrat.yaml b/file/malware/shimrat-malware.yaml
similarity index 97%
rename from file/malware/malware-shimrat.yaml
rename to file/malware/shimrat-malware.yaml
index 4a0d431bea9..3a75f5be239 100644
--- a/file/malware/malware-shimrat.yaml
+++ b/file/malware/shimrat-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-shimrat
+id: shimrat-malware
 
 info:
   name: ShimRat Malware - Detect
diff --git a/file/malware/malware-shimratreporter.yaml b/file/malware/shimratreporter-malware.yaml
similarity index 93%
rename from file/malware/malware-shimratreporter.yaml
rename to file/malware/shimratreporter-malware.yaml
index 40b7b7320b2..98d2b9a06c8 100644
--- a/file/malware/malware-shimratreporter.yaml
+++ b/file/malware/shimratreporter-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-shimratreporter
+id: shimratreporter-malware
 
 info:
   name: ShimRatReporter Malware - Detect
@@ -13,7 +13,7 @@ file:
 
     matchers:
       - type: word
-        part: raw  
+        part: raw
         words:
           - "IP-INFO"
           - "Network-INFO"
diff --git a/file/malware/malware-sigma.yaml b/file/malware/sigma-malware.yaml
similarity index 96%
rename from file/malware/malware-sigma.yaml
rename to file/malware/sigma-malware.yaml
index 8b6d4c546d5..70eca55e9b3 100644
--- a/file/malware/malware-sigma.yaml
+++ b/file/malware/sigma-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-sigma
+id: sigma-malware
 
 info:
   name: Sigma Malware - Detect
diff --git a/file/malware/malware-smallnet.yaml b/file/malware/smallnet-malware.yaml
similarity index 96%
rename from file/malware/malware-smallnet.yaml
rename to file/malware/smallnet-malware.yaml
index 8d23150519a..80cf24245b0 100644
--- a/file/malware/malware-smallnet.yaml
+++ b/file/malware/smallnet-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-smallnet
+id: smallnet-malware
 
 info:
   name: SmallNet Malware - Detect
diff --git a/file/malware/malware-snake.yaml b/file/malware/snake-malware.yaml
similarity index 98%
rename from file/malware/malware-snake.yaml
rename to file/malware/snake-malware.yaml
index 5d287ecebe1..5940273e811 100644
--- a/file/malware/malware-snake.yaml
+++ b/file/malware/snake-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-snake
+id: snake-malware
 
 info:
   name: Snake Malware - Detect
diff --git a/file/malware/malware-sub7nation.yaml b/file/malware/sub7nation-malware.yaml
similarity index 96%
rename from file/malware/malware-sub7nation.yaml
rename to file/malware/sub7nation-malware.yaml
index f2d05510cdb..9336dd7bbef 100644
--- a/file/malware/malware-sub7nation.yaml
+++ b/file/malware/sub7nation-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-sub7nation
+id: sub7nation-malware
 
 info:
   name: Sub7Nation Malware - Detect
diff --git a/file/malware/malware-t5000.yaml b/file/malware/t5000-malware.yaml
similarity index 98%
rename from file/malware/malware-t5000.yaml
rename to file/malware/t5000-malware.yaml
index e036cecaae2..a3fc68f0e08 100644
--- a/file/malware/malware-t5000.yaml
+++ b/file/malware/t5000-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-t5000
+id: t5000-malware
 
 info:
   name: T5000 Malware - Detect
diff --git a/file/malware/malware-tedroo.yaml b/file/malware/tedroo-malware.yaml
similarity index 94%
rename from file/malware/malware-tedroo.yaml
rename to file/malware/tedroo-malware.yaml
index 5601de18ddd..0ca935a0c89 100644
--- a/file/malware/malware-tedroo.yaml
+++ b/file/malware/tedroo-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-tedroo
+id: tedroo-malware
 
 info:
   name: Tedroo Malware - Detect
diff --git a/file/malware/malware-terminator.yaml b/file/malware/terminator-malware.yaml
similarity index 94%
rename from file/malware/malware-terminator.yaml
rename to file/malware/terminator-malware.yaml
index ab15802317f..82645aa4c96 100644
--- a/file/malware/malware-terminator.yaml
+++ b/file/malware/terminator-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-terminator
+id: terminator-malware
 
 info:
   name: Terminator Malware - Detect
diff --git a/file/malware/malware-teslacrypt.yaml b/file/malware/teslacrypt-malware.yaml
similarity index 93%
rename from file/malware/malware-teslacrypt.yaml
rename to file/malware/teslacrypt-malware.yaml
index c2034d393bd..b89352ca1a5 100644
--- a/file/malware/malware-teslacrypt.yaml
+++ b/file/malware/teslacrypt-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-teslacrypt
+id: teslacrypt-malware
 
 info:
   name: TeslaCrypt Malware - Detect
diff --git a/file/malware/malware-tox.yaml b/file/malware/tox-malware.yaml
similarity index 98%
rename from file/malware/malware-tox.yaml
rename to file/malware/tox-malware.yaml
index 0aeb523f371..fb71d2c6d27 100644
--- a/file/malware/malware-tox.yaml
+++ b/file/malware/tox-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-tox
+id: tox-malware
 
 info:
   name: Tox Malware - Detect
diff --git a/file/malware/malware-treasurehunt.yaml b/file/malware/treasurehunt-malware.yaml
similarity index 95%
rename from file/malware/malware-treasurehunt.yaml
rename to file/malware/treasurehunt-malware.yaml
index 41db143e54d..c47c1fa499f 100644
--- a/file/malware/malware-treasurehunt.yaml
+++ b/file/malware/treasurehunt-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-treasurehunt
+id: treasurehunt-malware
 
 info:
   name: Trickbot Malware - Detect
diff --git a/file/malware/malware-trickbot.yaml b/file/malware/trickbot-malware.yaml
similarity index 95%
rename from file/malware/malware-trickbot.yaml
rename to file/malware/trickbot-malware.yaml
index cdb0eb64c64..8952cddcb8e 100644
--- a/file/malware/malware-trickbot.yaml
+++ b/file/malware/trickbot-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-trickbot
+id: trickbot-malware
 
 info:
   name: Trickbot Malware - Detect
diff --git a/file/malware/malware-trumpbot.yaml b/file/malware/trumpbot-malware.yaml
similarity index 94%
rename from file/malware/malware-trumpbot.yaml
rename to file/malware/trumpbot-malware.yaml
index 4a7111f6aaa..d940cf10c11 100644
--- a/file/malware/malware-trumpbot.yaml
+++ b/file/malware/trumpbot-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-trumpbot
+id: trumpbot-malware
 
 info:
   name: TrumpBot Malware - Detect
diff --git a/file/malware/malware-universal-1337.yaml b/file/malware/universal-1337-malware.yaml
similarity index 95%
rename from file/malware/malware-universal-1337.yaml
rename to file/malware/universal-1337-malware.yaml
index d169ae82487..939e130630b 100644
--- a/file/malware/malware-universal-1337.yaml
+++ b/file/malware/universal-1337-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-universal-1337
+id: universal-1337-malware
 
 info:
   name: Universal 1337 Stealer Malware - Detect
diff --git a/file/malware/malware-unrecom.yaml b/file/malware/unrecom-malware.yaml
similarity index 95%
rename from file/malware/malware-unrecom.yaml
rename to file/malware/unrecom-malware.yaml
index 6c20daabf87..5a5ea9b335a 100644
--- a/file/malware/malware-unrecom.yaml
+++ b/file/malware/unrecom-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-unrecom
+id: unrecom-malware
 
 info:
   name: Unrecom Malware - Detect
diff --git a/file/malware/malware-urausy.yaml b/file/malware/urausy-malware.yaml
similarity index 96%
rename from file/malware/malware-urausy.yaml
rename to file/malware/urausy-malware.yaml
index 3bd1404e968..a412bb4f7b0 100644
--- a/file/malware/malware-urausy.yaml
+++ b/file/malware/urausy-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-urausy
+id: urausy-malware
 
 info:
   name: Urausy Skype Malware - Detect
diff --git a/file/malware/malware-vertex.yaml b/file/malware/vertex-malware.yaml
similarity index 96%
rename from file/malware/malware-vertex.yaml
rename to file/malware/vertex-malware.yaml
index 6297d377cab..b4e68411c8a 100644
--- a/file/malware/malware-vertex.yaml
+++ b/file/malware/vertex-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-vertex
+id: vertex-malware
 
 info:
   name: Vertex Malware - Detect
diff --git a/file/malware/malware-virusrat.yaml b/file/malware/virusrat-malware.yaml
similarity index 97%
rename from file/malware/malware-virusrat.yaml
rename to file/malware/virusrat-malware.yaml
index aab47d1c494..2cdabae5cd0 100644
--- a/file/malware/malware-virusrat.yaml
+++ b/file/malware/virusrat-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-virusrat
+id: virusrat-malware
 
 info:
   name: VirusRat Malware - Detect
diff --git a/file/malware/malware-wabot.yaml b/file/malware/wabot-malware.yaml
similarity index 95%
rename from file/malware/malware-wabot.yaml
rename to file/malware/wabot-malware.yaml
index b683592403f..cabadc8daec 100644
--- a/file/malware/malware-wabot.yaml
+++ b/file/malware/wabot-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-wabot
+id: wabot-malware
 
 info:
   name: Warp Malware - Detect
diff --git a/file/malware/malware-warp.yaml b/file/malware/warp-malware.yaml
similarity index 96%
rename from file/malware/malware-warp.yaml
rename to file/malware/warp-malware.yaml
index a559918c758..2dd06313d15 100644
--- a/file/malware/malware-warp.yaml
+++ b/file/malware/warp-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-warp
+id: warp-malware
 
 info:
   name: Warp Malware - Detect
diff --git a/file/malware/malware-xhide.yaml b/file/malware/xhide-malware.yaml
similarity index 95%
rename from file/malware/malware-xhide.yaml
rename to file/malware/xhide-malware.yaml
index 493071d936b..daba5648b1c 100644
--- a/file/malware/malware-xhide.yaml
+++ b/file/malware/xhide-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-xhide
+id: xhide-malware
 
 info:
   name: xHide Malware - Detect
diff --git a/file/malware/malware-xor-ddos.yaml b/file/malware/xor-ddos-malware.yaml
similarity index 95%
rename from file/malware/malware-xor-ddos.yaml
rename to file/malware/xor-ddos-malware.yaml
index d3f72eea4c6..5a0f7098127 100644
--- a/file/malware/malware-xor-ddos.yaml
+++ b/file/malware/xor-ddos-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-xor-ddos
+id: xor-ddos-malware
 
 info:
   name: XOR_DDosv1 Malware - Detect
diff --git a/file/malware/malware-yayih.yaml b/file/malware/yayih-malware.yaml
similarity index 96%
rename from file/malware/malware-yayih.yaml
rename to file/malware/yayih-malware.yaml
index 0194ce7e8c0..75287207476 100644
--- a/file/malware/malware-yayih.yaml
+++ b/file/malware/yayih-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-yayih
+id: yayih-malware
 
 info:
   name: Yayih Malware - Detect
diff --git a/file/malware/malware-zeghost.yaml b/file/malware/zeghost-malware.yaml
similarity index 95%
rename from file/malware/malware-zeghost.yaml
rename to file/malware/zeghost-malware.yaml
index c72be673f0c..e5ab80c5f57 100644
--- a/file/malware/malware-zeghost.yaml
+++ b/file/malware/zeghost-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-zeghost
+id: zeghost-malware
 
 info:
   name: Zegost Malware - Detect
diff --git a/file/malware/malware-zoxpng.yaml b/file/malware/zoxpng-malware.yaml
similarity index 95%
rename from file/malware/malware-zoxpng.yaml
rename to file/malware/zoxpng-malware.yaml
index 006b699c34c..caac47273a6 100644
--- a/file/malware/malware-zoxpng.yaml
+++ b/file/malware/zoxpng-malware.yaml
@@ -1,4 +1,4 @@
-id: malware-zoxpng
+id: zoxpng-malware
 
 info:
   name: ZoxPNG Malware - Detect