diff --git a/salt/firewall/defaults.yaml b/salt/firewall/defaults.yaml
index c31fd7ee5..3a6dbf18d 100644
--- a/salt/firewall/defaults.yaml
+++ b/salt/firewall/defaults.yaml
@@ -7,9 +7,9 @@ firewall:
       eval: []
       idh: []
       manager: []
-      heavynode: []
-      searchnode: []
-      receiver: []
+      heavynodes: []
+      searchnodes: []
+      receivers: []
 
     portgroups:
       standalone:
diff --git a/salt/firewall/soc_firewall.yaml b/salt/firewall/soc_firewall.yaml
index eda5c9a5e..0e9baffa7 100644
--- a/salt/firewall/soc_firewall.yaml
+++ b/salt/firewall/soc_firewall.yaml
@@ -19,12 +19,12 @@ firewall:
       manager: 
         description: List of IP Addresses or CIDR blocks to allow manager connections.
         global: True
-      heavynode: 
+      heavynodes: 
         description: List of IP Addresses or CIDR blocks to allow heavynode connections.
         global: True
-      searchnode: 
+      searchnodes: 
         description: List of IP Addresses or CIDR blocks to allow searchnode connections.
         global: True
-      receiver: 
+      receivers: 
         description: List of IP Addresses or CIDR blocks to allow receiver connections.
         global: True