diff --git a/client/src/pages/firewall/destination_nat_rules.vue b/client/src/pages/firewall/destination_nat_rules.vue
index 1698d95..99995ce 100644
--- a/client/src/pages/firewall/destination_nat_rules.vue
+++ b/client/src/pages/firewall/destination_nat_rules.vue
@@ -9,11 +9,11 @@ let selection = $ref([] as number[]);
 
 const columns = [
   {heading: 'Name', path: 'name'},
-  {heading: 'Source', path: 'match.source_addresses'},
-  {heading: 'Destination', path: 'match.destination_addresses'},
-  {heading: 'Service', path: 'match.services'},
-  {heading: 'Translated Address', path: 'address'},
-  {heading: 'Translated Service', path: 'service'},
+  {heading: 'Source', path: 'source_addresses'},
+  {heading: 'Destination', path: 'destination_addresses'},
+  {heading: 'Service', path: 'services'},
+  {heading: 'Translated Address', path: 'dnat_address'},
+  {heading: 'Translated Service', path: 'dnat_service'},
   {heading: 'Counter', path: 'counter'},
   {heading: 'Comment', path: 'comment'},
 ];
diff --git a/client/src/pages/firewall/forward_rules.vue b/client/src/pages/firewall/forward_rules.vue
index 2ba6ea1..b5a19ac 100644
--- a/client/src/pages/firewall/forward_rules.vue
+++ b/client/src/pages/firewall/forward_rules.vue
@@ -9,9 +9,9 @@ let selection = $ref([] as number[]);
 
 const columns = [
   {heading: 'Name', path: 'name'},
-  {heading: 'Source', path: 'match.source_addresses'},
-  {heading: 'Destination', path: 'match.destination_addresses'},
-  {heading: 'Service', path: 'match.services'},
+  {heading: 'Source', path: 'source_addresses'},
+  {heading: 'Destination', path: 'destination_addresses'},
+  {heading: 'Service', path: 'services'},
   {heading: 'Verdict', path: 'verdict'},
   {heading: 'Counter', path: 'counter'},
   {heading: 'Comment', path: 'comment'},
diff --git a/client/src/pages/firewall/source_nat_rules.vue b/client/src/pages/firewall/source_nat_rules.vue
index b2dfa5e..b54b52c 100644
--- a/client/src/pages/firewall/source_nat_rules.vue
+++ b/client/src/pages/firewall/source_nat_rules.vue
@@ -9,11 +9,11 @@ let selection = $ref([] as number[]);
 
 const columns = [
   {heading: 'Name', path: 'name'},
-  {heading: 'Source', path: 'match.source_addresses'},
-  {heading: 'Destination', path: 'match.destination_addresses'},
-  {heading: 'Service', path: 'match.services'},
-  {heading: 'Translated Address', path: 'address'},
-  {heading: 'Translated Service', path: 'service'},
+  {heading: 'Source', path: 'source_addresses'},
+  {heading: 'Destination', path: 'destination_addresses'},
+  {heading: 'Service', path: 'services'},
+  {heading: 'Translated Address', path: 'snat_type.snat.address'},
+  {heading: 'Translated Service', path: 'snat_type.snat.service'},
   {heading: 'Counter', path: 'counter'},
   {heading: 'Comment', path: 'comment'},
 ];