diff --git a/http/honeypot/cisco-asa-honeypot-detect.yaml b/http/honeypot/cisco-asa-honeypot-detect.yaml
index 03d5765559..f73a6097d5 100644
--- a/http/honeypot/cisco-asa-honeypot-detect.yaml
+++ b/http/honeypot/cisco-asa-honeypot-detect.yaml
@@ -1,7 +1,7 @@
 id: cisco-asa-honeypot-detect
 
 info:
-  name: Cisco ASA Honeypot Detection
+  name: Cisco ASA Honeypot - Detect
   author: UnaPibaGeek
   severity: info
   description: |
@@ -11,7 +11,7 @@ info:
     max-request: 2
     vendor: cisco
     product: asa
-  tags: cisco,asa,honeypot
+  tags: cisco,asa,honeypot,ir,cti
 
 http:
   - method: GET
diff --git a/http/honeypot/citrix-honeypot-detect.yaml b/http/honeypot/citrix-honeypot-detect.yaml
index 600f76356f..60a386269d 100644
--- a/http/honeypot/citrix-honeypot-detect.yaml
+++ b/http/honeypot/citrix-honeypot-detect.yaml
@@ -1,7 +1,7 @@
 id: citrix-honeypot-detect
 
 info:
-  name: Citrix Honeypot Detection
+  name: Citrix Honeypot - Detect
   author: UnaPibaGeek
   severity: info
   description: |
@@ -11,7 +11,7 @@ info:
     max-request: 2
     vendor: citrix
     product: citrix
-  tags: citrix,honeypot
+  tags: citrix,honeypot,ir,cti
 
 http:
   - method: GET
diff --git a/http/honeypot/dionaea-http-honeypot-detect.yaml b/http/honeypot/dionaea-http-honeypot-detect.yaml
index e0d54d732e..aa8bb2b9b2 100644
--- a/http/honeypot/dionaea-http-honeypot-detect.yaml
+++ b/http/honeypot/dionaea-http-honeypot-detect.yaml
@@ -1,7 +1,7 @@
 id: dionaea-http-honeypot-detect
 
 info:
-  name: Dionaea HTTP Honeypot Detection
+  name: Dionaea HTTP Honeypot - Detect
   author: UnaPibaGeek
   severity: info
   description: |
@@ -11,7 +11,7 @@ info:
     max-request: 2
     vendor: dionaea
     product: http
-  tags: dionaea,http,honeypot
+  tags: dionaea,honeypot,ir,cti
 
 http:
   - raw:
diff --git a/http/honeypot/elasticpot-honeypot-detect.yaml b/http/honeypot/elasticpot-honeypot-detect.yaml
index 27bf8a2a53..3c3a429228 100644
--- a/http/honeypot/elasticpot-honeypot-detect.yaml
+++ b/http/honeypot/elasticpot-honeypot-detect.yaml
@@ -1,7 +1,7 @@
 id: elasticpot-honeypot-detect
 
 info:
-  name: ElasticPot Honeypot Detection
+  name: ElasticPot Honeypot - Detect
   author: UnaPibaGeek
   severity: info
   description: |
@@ -11,7 +11,7 @@ info:
     max-request: 2
     vendor: ElasticPot
     product: Elasticsearch
-  tags: elasticpot,elasticsearch,honeypot
+  tags: elasticpot,elasticsearch,honeypot,ir,cti
 
 http:
   - method: GET
diff --git a/http/honeypot/snare-honeypot-detect.yaml b/http/honeypot/snare-honeypot-detect.yaml
index 2a6325a889..9e467f3fe3 100644
--- a/http/honeypot/snare-honeypot-detect.yaml
+++ b/http/honeypot/snare-honeypot-detect.yaml
@@ -1,7 +1,7 @@
 id: snare-honeypot-detect
 
 info:
-  name: Snare Honeypot Detection
+  name: Snare Honeypot - Detect
   author: UnaPibaGeek
   severity: info
   description: |
@@ -11,7 +11,7 @@ info:
     max-request: 2
     vendor: snare
     product: http
-  tags: snare,http,honeypot
+  tags: snare,honeypot,ir,cti
 
 http:
   - raw:
diff --git a/network/honeypot/adbhoney-honeypot-cnxn-detect.yaml b/network/honeypot/adbhoney-honeypot-cnxn-detect.yaml
index effc2bdd68..14b4aba5fe 100644
--- a/network/honeypot/adbhoney-honeypot-cnxn-detect.yaml
+++ b/network/honeypot/adbhoney-honeypot-cnxn-detect.yaml
@@ -1,7 +1,7 @@
 id: adbhoney-honeypot-cnxn-detect
 
 info:
-  name: ADBHoney Honeypot Detection
+  name: ADBHoney Honeypot - Detect
   author: UnaPibaGeek
   severity: info
   description: |
@@ -11,7 +11,7 @@ info:
     max-request: 4
     vendor: android
     product: adb
-  tags: adbhoney,android,adb,honeypot
+  tags: adbhoney,android,adb,honeypot,ir,cti,network
 
 tcp:
   - host:
diff --git a/network/honeypot/adbhoney-honeypot-shell-detect.yaml b/network/honeypot/adbhoney-honeypot-shell-detect.yaml
index 2da2f47658..d6ed082fcb 100644
--- a/network/honeypot/adbhoney-honeypot-shell-detect.yaml
+++ b/network/honeypot/adbhoney-honeypot-shell-detect.yaml
@@ -1,7 +1,7 @@
 id: adbhoney-honeypot-shell-detect
 
 info:
-  name: ADBHoney Honeypot Detection (shell probe)
+  name: ADBHoney Honeypot (shell probe) - Detect
   author: UnaPibaGeek
   severity: info
   description: |
@@ -11,7 +11,7 @@ info:
     max-request: 4
     vendor: android
     product: adb
-  tags: adbhoney,android,adb,honeypot
+  tags: adbhoney,android,adb,honeypot,ir,cti,network
 
 tcp:
   - host:
diff --git a/network/honeypot/conpot-siemens-honeypot-detect.yaml b/network/honeypot/conpot-siemens-honeypot-detect.yaml
index f86487ab13..133839384f 100644
--- a/network/honeypot/conpot-siemens-honeypot-detect.yaml
+++ b/network/honeypot/conpot-siemens-honeypot-detect.yaml
@@ -1,7 +1,7 @@
 id: conpot-siemens-honeypot-detect
 
 info:
-  name: Conpot (Siemens) Honeypot Detection
+  name: Conpot (Siemens) Honeypot - Detect
   author: UnaPibaGeek
   severity: info
   description: |
@@ -11,7 +11,7 @@ info:
     max-request: 2
     vendor: conpot
     product: siemens
-  tags: conpot,siemens,honeypot
+  tags: conpot,siemens,honeypot,ir,cti,network
 
 tcp:
   - host:
diff --git a/network/honeypot/cowrie-ssh-honeypot-detect.yaml b/network/honeypot/cowrie-ssh-honeypot-detect.yaml
index 34f253583b..abbf3c0f9c 100644
--- a/network/honeypot/cowrie-ssh-honeypot-detect.yaml
+++ b/network/honeypot/cowrie-ssh-honeypot-detect.yaml
@@ -1,7 +1,7 @@
 id: cowrie-ssh-honeypot-detect
 
 info:
-  name: Cowrie SSH Honeypot Detection
+  name: Cowrie SSH Honeypot - Detect
   author: UnaPibaGeek
   severity: info
   description: |
@@ -11,7 +11,7 @@ info:
     max-request: 2
     vendor: cowrie
     product: ssh
-  tags: cowrie,twisted,ssh,honeypot
+  tags: cowrie,twisted,ssh,honeypot,ir,cti,network
 
 tcp:
   - host:
diff --git a/network/honeypot/dionaea-ftp-honeypot-detect.yaml b/network/honeypot/dionaea-ftp-honeypot-detect.yaml
index 01b50042e9..1e7d6fdc7c 100644
--- a/network/honeypot/dionaea-ftp-honeypot-detect.yaml
+++ b/network/honeypot/dionaea-ftp-honeypot-detect.yaml
@@ -1,7 +1,7 @@
 id: dionaea-ftp-honeypot-detect
 
 info:
-  name: Dionaea FTP Honeypot Detection
+  name: Dionaea FTP Honeypot - Detect
   author: UnaPibaGeek
   severity: info
   description: |
@@ -11,7 +11,7 @@ info:
     max-request: 4
     vendor: dionaea
     product: ftp
-  tags: dionaea,ftp,honeypot
+  tags: dionaea,ftp,honeypot,ir,cti,network
 
 tcp:
   - host:
diff --git a/network/honeypot/dionaea-mongodb-honeypot-detect.yaml b/network/honeypot/dionaea-mongodb-honeypot-detect.yaml
index 54de2d8c3c..60eaf0328c 100644
--- a/network/honeypot/dionaea-mongodb-honeypot-detect.yaml
+++ b/network/honeypot/dionaea-mongodb-honeypot-detect.yaml
@@ -1,7 +1,7 @@
 id: dionaea-mongodb-honeypot-detect
 
 info:
-  name: Dionaea MongoDB Honeypot Detection
+  name: Dionaea MongoDB Honeypot - Detect
   author: UnaPibaGeek
   severity: info
   description: |
@@ -11,7 +11,7 @@ info:
     max-request: 2
     product: dionaea
     vendor: mongodb
-  tags: dionaea,mongodb,honeypot
+  tags: dionaea,mongodb,honeypot,ir,cti,network
 
 tcp:
   - inputs:
diff --git a/network/honeypot/dionaea-mqtt-honeypot-detect.yaml b/network/honeypot/dionaea-mqtt-honeypot-detect.yaml
index d4693ff851..4242b1d5b9 100644
--- a/network/honeypot/dionaea-mqtt-honeypot-detect.yaml
+++ b/network/honeypot/dionaea-mqtt-honeypot-detect.yaml
@@ -1,7 +1,7 @@
 id: dionaea-mqtt-honeypot-detect
 
 info:
-  name: Dionaea MQTT Honeypot Detection
+  name: Dionaea MQTT Honeypot - Detect
   author: UnaPibaGeek
   severity: info
   description: |
@@ -11,7 +11,7 @@ info:
     max-request: 2
     vendor: dionaea
     product: mqtt
-  tags: dionaea,mqtt,honeypot
+  tags: dionaea,mqtt,honeypot,ir,cti,network
 
 tcp:
   - host:
diff --git a/network/honeypot/dionaea-mysql-honeypot-detect.yaml b/network/honeypot/dionaea-mysql-honeypot-detect.yaml
index e56bb4ebc2..9598d9b98c 100644
--- a/network/honeypot/dionaea-mysql-honeypot-detect.yaml
+++ b/network/honeypot/dionaea-mysql-honeypot-detect.yaml
@@ -1,7 +1,7 @@
 id: dionaea-mysql-honeypot-detect
 
 info:
-  name: Dionaea MySQL Honeypot Detection
+  name: Dionaea MySQL Honeypot - Detect
   author: UnaPibaGeek
   severity: info
   description: |
@@ -11,7 +11,7 @@ info:
     max-request: 2
     vendor: dionaea
     product: mysql
-  tags: dionaea,mysql,honeypot
+  tags: dionaea,mysql,honeypot,ir,cti,network
 
 tcp:
   - inputs:
diff --git a/network/honeypot/dionaea-smb-honeypot-detect.yaml b/network/honeypot/dionaea-smb-honeypot-detect.yaml
index fbce256d7a..ca7c337997 100644
--- a/network/honeypot/dionaea-smb-honeypot-detect.yaml
+++ b/network/honeypot/dionaea-smb-honeypot-detect.yaml
@@ -1,7 +1,7 @@
 id: dionaea-smb-honeypot-detect
 
 info:
-  name: Dionaea SMB Honeypot Detection
+  name: Dionaea SMB Honeypot - Detect
   author: UnaPibaGeek
   severity: info
   description: |
@@ -11,7 +11,7 @@ info:
     max-request: 2
     vendor: dionaea
     product: dionaea
-  tags: dionaea,smb,honeypot
+  tags: dionaea,smb,honeypot,ir,cti,network
 
 tcp:
   - host:
diff --git a/network/honeypot/gaspot-honeypot-detect.yaml b/network/honeypot/gaspot-honeypot-detect.yaml
index d208fb6dc3..eae24c126b 100644
--- a/network/honeypot/gaspot-honeypot-detect.yaml
+++ b/network/honeypot/gaspot-honeypot-detect.yaml
@@ -1,7 +1,7 @@
 id: gaspot-honeypot-detect
 
 info:
-  name: GasPot Honeypot Detection
+  name: GasPot Honeypot - Detect
   author: UnaPibaGeek
   severity: info
   description: |
@@ -11,7 +11,7 @@ info:
     max-request: 2
     vendor: gaspot
     product: veeder-root
-  tags: gaspot,veeder-root,ics,honeypot
+  tags: gaspot,veeder-root,ics,honeypot,ir,cti,network
 
 tcp:
   - host:
diff --git a/network/honeypot/mailoney-honeypot-detect.yaml b/network/honeypot/mailoney-honeypot-detect.yaml
index 336612351e..9a586073a2 100644
--- a/network/honeypot/mailoney-honeypot-detect.yaml
+++ b/network/honeypot/mailoney-honeypot-detect.yaml
@@ -1,7 +1,7 @@
 id: mailoney-honeypot-detect
 
 info:
-  name: Mailoney Honeypot Detection
+  name: Mailoney Honeypot - Detect
   author: UnaPibaGeek
   severity: info
   description: |
@@ -11,7 +11,7 @@ info:
     max-request: 2
     vendor: mailoney
     product: exim
-  tags: mailoney,exim,smtp,honeypot
+  tags: mailoney,exim,smtp,honeypot,ir,cti,network
 
 tcp:
   - host:
diff --git a/network/honeypot/redis-honeypot-detect.yaml b/network/honeypot/redis-honeypot-detect.yaml
index fefbc7cee7..40a9f57c97 100644
--- a/network/honeypot/redis-honeypot-detect.yaml
+++ b/network/honeypot/redis-honeypot-detect.yaml
@@ -1,7 +1,7 @@
 id: redis-honeypot-detect
 
 info:
-  name: Redis Honeypot Detection
+  name: Redis Honeypot - Detect
   author: UnaPibaGeek
   severity: info
   description: |
@@ -11,7 +11,7 @@ info:
     max-request: 2
     vendor: redis
     product: redis
-  tags: redis,honeypot
+  tags: redis,honeypot,ir,cti,network
 
 tcp:
   - host: