diff --git a/config/firewall/firewall-lib.pl b/config/firewall/firewall-lib.pl
index f4089a3a0..7d35d5686 100644
--- a/config/firewall/firewall-lib.pl
+++ b/config/firewall/firewall-lib.pl
@@ -466,7 +466,7 @@ sub get_address
 			# Get external interface.
 			my $external_interface = &get_external_interface();
 
-			push(@ret, ["-m set --match-set CC_$value src", "$external_interface"]);
+			push(@ret, ["-m set --match-set $value src", "$external_interface"]);
 		}
 
 	# Handle rule options with a location as target.
@@ -476,7 +476,7 @@ sub get_address
 			# Get external interface.
 			my $external_interface = &get_external_interface();
 
-			push(@ret, ["-m set --match-set CC_$value dst", "$external_interface"]);
+			push(@ret, ["-m set --match-set $value dst", "$external_interface"]);
 		}
 
 	# If nothing was selected, we assume "any".