diff --git a/client/src/pages/[subsystem]/[entity]/edit/[id].vue b/client/src/pages/[subsystem]/[entity]/edit/[id].vue
index 864859d..39bb1ff 100644
--- a/client/src/pages/[subsystem]/[entity]/edit/[id].vue
+++ b/client/src/pages/[subsystem]/[entity]/edit/[id].vue
@@ -14,9 +14,9 @@ async function load(){
   loading = true;
   let res: any;
   if (editTypes[subsystem][entity].idType == 'Number') {
-    res = await apiCall(`${editTypes[subsystem].name }.get_${ editTypes[subsystem][entity].name}`, {id: id as number - 0});
+    res = await apiCall(`${editTypes[subsystem].name }.${ editTypes[subsystem][entity].name}.get`, {id: id as number - 0});
   } else {
-    res = await apiCall(`${editTypes[subsystem].name }.get_${ editTypes[subsystem][entity].name}`, {id: id});
+    res = await apiCall(`${editTypes[subsystem].name }.${ editTypes[subsystem][entity].name}.get`, {id: id});
   }
 
   if (res.Error === null) {
@@ -30,7 +30,7 @@ async function load(){
 
 async function update(value: any) {
   console.debug('value', value);
-  let res = await apiCall(`${editTypes[subsystem].name }.update_${ editTypes[subsystem][entity].name}`, value);
+  let res = await apiCall(`${editTypes[subsystem].name }.${ editTypes[subsystem][entity].name}.update`, value);
   if (res.Error === null) {
     p.toast.success(`Updated ${  editTypes[subsystem][entity].name}`);
     p.router.go(-1);
diff --git a/client/src/pages/[subsystem]/[entity]/edit/index.vue b/client/src/pages/[subsystem]/[entity]/edit/index.vue
index 8f6ba41..fd206c3 100644
--- a/client/src/pages/[subsystem]/[entity]/edit/index.vue
+++ b/client/src/pages/[subsystem]/[entity]/edit/index.vue
@@ -9,7 +9,7 @@ const { subsystem, entity } = $(props);
 
 async function create(value: any) {
   console.debug('value', value);
-  let res = await apiCall(`${editTypes[subsystem].name }.create_${ editTypes[subsystem][entity].name}`, value);
+  let res = await apiCall(`${editTypes[subsystem].name }.${ editTypes[subsystem][entity].name}.create`, value);
   if (res.Error === null) {
     p.toast.success(`Created ${  editTypes[subsystem][entity].name}`);
     p.router.go(-1);
diff --git a/client/src/pages/config/config.vue b/client/src/pages/config/config.vue
index 94005f2..a97bbce 100644
--- a/client/src/pages/config/config.vue
+++ b/client/src/pages/config/config.vue
@@ -28,7 +28,7 @@ const displayData = $computed(() => {
 
 async function load(){
   loading = true;
-  let res = await apiCall('config.get_pending_changelog', {});
+  let res = await apiCall('config.pending_changes.log', {});
   if (res.Error === null) {
     console.debug('changelog', res.Data);
     changelog = res.Data;
@@ -39,7 +39,7 @@ async function load(){
 }
 
 async function apply(){
-  let res = await apiCall('config.apply_pending_changes', {});
+  let res = await apiCall('config.pending_changes.apply', {});
   if (res.Error === null) {
     console.debug('apply');
     p.toast.success('Applied Pending Config');
@@ -50,7 +50,7 @@ async function apply(){
 }
 
 async function discard(){
-  let res = await apiCall('config.discard_pending_changes', {});
+  let res = await apiCall('config.pending_changes.discard', {});
   if (res.Error === null) {
     console.debug('discard');
     p.toast.success('Discarded Pending Config');
diff --git a/client/src/pages/firewall/DestinationNATRules.vue b/client/src/pages/firewall/destination_nat_rules.vue
similarity index 79%
rename from client/src/pages/firewall/DestinationNATRules.vue
rename to client/src/pages/firewall/destination_nat_rules.vue
index e756dd8..ab26420 100644
--- a/client/src/pages/firewall/DestinationNATRules.vue
+++ b/client/src/pages/firewall/destination_nat_rules.vue
@@ -19,7 +19,7 @@ const columns = [
 ];
 
 async function load(){
-  let res = await apiCall('firewall.get_destination_nat_rules', {});
+  let res = await apiCall('firewall.destination_nat_rules.list', {});
   if (res.Error === null) {
     rules = res.Data;
     console.debug('rules', rules);
@@ -29,7 +29,7 @@ async function load(){
 }
 
 async function deleteRule(){
-  let res = await apiCall('firewall.delete_destination_nat_rule', {index: selection[0]});
+  let res = await apiCall('firewall.destination_nat_rules.delete', {id: selection[0]});
   if (res.Error === null) {
     console.debug('deleted rule');
     p.toast.success('Deleted Rule');
@@ -41,7 +41,7 @@ async function deleteRule(){
 
 async function draggedRow(draggedRow: number, draggedOverRow: number) {
   console.log('dragged', draggedRow, draggedOverRow);
-  let res = await apiCall('firewall.move_destination_nat_rule', {index: draggedRow, to_index: draggedOverRow});
+  let res = await apiCall('firewall.destination_nat_rules.move', {index: draggedRow, to_index: draggedOverRow});
   if (res.Error === null) {
     console.debug('moved rule');
     p.toast.success('Moved Rule');
@@ -61,8 +61,8 @@ onMounted(async() => {
   <div>
     <TableView title="DNAT Rules" :columns="columns" :loading="loading" @draggedRow="draggedRow" v-model:selection="selection" v-model:data="rules" :table-props="{sort:true, sortSelf: true, draggable: true}">
       <button @click="load">Refresh</button>
-      <router-link class="button" to="/firewall/destinationnatrules/edit">Create</router-link>
-      <router-link class="button" :class="{ disabled: selection.length != 1 }" :to="'/firewall/destinationnatrules/edit/' + selection[0]">Edit</router-link>
+      <router-link class="button" to="/firewall/destination_nat_rules/edit">Create</router-link>
+      <router-link class="button" :class="{ disabled: selection.length != 1 }" :to="'/firewall/destination_nat_rules/edit/' + selection[0]">Edit</router-link>
       <button @click="deleteRule" :disabled="selection.length != 1">Delete</button>
     </TableView>
   </div>
diff --git a/client/src/pages/firewall/ForwardRules.vue b/client/src/pages/firewall/forward_rules.vue
similarity index 80%
rename from client/src/pages/firewall/ForwardRules.vue
rename to client/src/pages/firewall/forward_rules.vue
index 5930899..ba89dee 100644
--- a/client/src/pages/firewall/ForwardRules.vue
+++ b/client/src/pages/firewall/forward_rules.vue
@@ -18,7 +18,7 @@ const columns = [
 ];
 
 async function load(){
-  let res = await apiCall('firewall.get_forward_rules', {});
+  let res = await apiCall('firewall.forward_rules.list', {});
   if (res.Error === null) {
     rules = res.Data;
     console.debug('rules', rules);
@@ -28,7 +28,7 @@ async function load(){
 }
 
 async function deleteRule(){
-  let res = await apiCall('firewall.delete_forward_rule', {index: selection[0]});
+  let res = await apiCall('firewall.forward_rules.delete', {id: selection[0]});
   if (res.Error === null) {
     console.debug('deleted rule');
     p.toast.success('Deleted Rule');
@@ -40,7 +40,7 @@ async function deleteRule(){
 
 async function draggedRow(draggedRow: number, draggedOverRow: number) {
   console.log('dragged', draggedRow, draggedOverRow);
-  let res = await apiCall('firewall.move_forward_rule', {index: draggedRow, to_index: draggedOverRow});
+  let res = await apiCall('firewall.forward_rules.move', {index: draggedRow, to_index: draggedOverRow});
   if (res.Error === null) {
     console.debug('moved rule');
     p.toast.success('Moved Rule');
@@ -60,8 +60,8 @@ onMounted(async() => {
   <div>
     <TableView title="Forward Rules" :columns="columns" :loading="loading" @draggedRow="draggedRow" v-model:selection="selection" v-model:data="rules" :table-props="{sort:true, sortSelf: true, draggable: true}">
       <button @click="load">Refresh</button>
-      <router-link class="button" to="/firewall/forwardrules/edit">Create</router-link>
-      <router-link class="button" :class="{ disabled: selection.length != 1 }" :to="'/firewall/forwardrules/edit/' + selection[0]">Edit</router-link>
+      <router-link class="button" to="/firewall/forward_rules/edit">Create</router-link>
+      <router-link class="button" :class="{ disabled: selection.length != 1 }" :to="'/firewall/forward_rules/edit/' + selection[0]">Edit</router-link>
       <button @click="deleteRule" :disabled="selection.length != 1">Delete</button>
     </TableView>
   </div>
diff --git a/client/src/pages/firewall/SourceNATRules.vue b/client/src/pages/firewall/source_nat_rules.vue
similarity index 80%
rename from client/src/pages/firewall/SourceNATRules.vue
rename to client/src/pages/firewall/source_nat_rules.vue
index f61b43d..891915a 100644
--- a/client/src/pages/firewall/SourceNATRules.vue
+++ b/client/src/pages/firewall/source_nat_rules.vue
@@ -19,7 +19,7 @@ const columns = [
 ];
 
 async function load(){
-  let res = await apiCall('firewall.get_source_nat_rules', {});
+  let res = await apiCall('firewall.source_nat_rules.list', {});
   if (res.Error === null) {
     rules = res.Data;
     console.debug('rules', rules);
@@ -29,7 +29,7 @@ async function load(){
 }
 
 async function deleteRule(){
-  let res = await apiCall('firewall.delete_source_nat:rule', {index: selection[0]});
+  let res = await apiCall('firewall.source_nat_rules.delete', {id: selection[0]});
   if (res.Error === null) {
     console.debug('deleted rule');
     p.toast.success('Deleted Rule');
@@ -41,7 +41,7 @@ async function deleteRule(){
 
 async function draggedRow(draggedRow: number, draggedOverRow: number) {
   console.log('dragged', draggedRow, draggedOverRow);
-  let res = await apiCall('firewall.move_source_nat_rule', {index: draggedRow, to_index: draggedOverRow});
+  let res = await apiCall('firewall.source_nat_rules.move', {index: draggedRow, to_index: draggedOverRow});
   if (res.Error === null) {
     console.debug('moved rule');
     p.toast.success('Moved Rule');
@@ -61,8 +61,8 @@ onMounted(async() => {
   <div>
     <TableView title="SNAT Rules" :columns="columns" :loading="loading" @draggedRow="draggedRow" v-model:selection="selection" v-model:data="rules" :table-props="{sort:true, sortSelf: true, draggable: true}">
       <button @click="load">Refresh</button>
-      <router-link class="button" to="/firewall/sourcenatrules/edit">Create</router-link>
-      <router-link class="button" :class="{ disabled: selection.length != 1 }" :to="'/firewall/sourcenatrules/edit/' + selection[0]">Edit</router-link>
+      <router-link class="button" to="/firewall/source_nat_rules/edit">Create</router-link>
+      <router-link class="button" :class="{ disabled: selection.length != 1 }" :to="'/firewall/source_nat_rules/edit/' + selection[0]">Edit</router-link>
       <button @click="deleteRule" :disabled="selection.length != 1">Delete</button>
     </TableView>
   </div>
diff --git a/client/src/pages/index.vue b/client/src/pages/index.vue
index 2386ca6..7479a6c 100644
--- a/client/src/pages/index.vue
+++ b/client/src/pages/index.vue
@@ -6,7 +6,7 @@ let loading = $ref(false);
 
 async function load(){
   loading = true;
-  let res = await apiCall('network.get_links', {});
+  let res = await apiCall('network.links.get', {});
   if (res.Error === null) {
     console.debug('links', res.Data);
     links = res.Data;
diff --git a/client/src/pages/network/Interfaces.vue b/client/src/pages/network/interfaces.vue
similarity index 92%
rename from client/src/pages/network/Interfaces.vue
rename to client/src/pages/network/interfaces.vue
index 7d31a85..6282523 100644
--- a/client/src/pages/network/Interfaces.vue
+++ b/client/src/pages/network/interfaces.vue
@@ -32,7 +32,7 @@ const displayData = $computed(() => {
 
 async function load(){
   loading = true;
-  let res = await apiCall('network.get_interfaces', {});
+  let res = await apiCall('network.interfaces.list', {});
   if (res.Error === null) {
     console.debug('interfaces', res.Data);
     interfaces = res.Data;
@@ -43,7 +43,7 @@ async function load(){
 }
 
 async function deleteInterface(){
-  let res = await apiCall('network.delete_interface', {name: displayData[selection[0]].name});
+  let res = await apiCall('network.interfaces.delete', {id: displayData[selection[0]].name});
   if (res.Error === null) {
     console.debug('deleted interface');
   } else {
diff --git a/client/src/pages/network/StaticRoutes.vue b/client/src/pages/network/static_routes.vue
similarity index 79%
rename from client/src/pages/network/StaticRoutes.vue
rename to client/src/pages/network/static_routes.vue
index 2ff21f3..b8f452e 100644
--- a/client/src/pages/network/StaticRoutes.vue
+++ b/client/src/pages/network/static_routes.vue
@@ -15,7 +15,7 @@ const columns = [
 
 async function load(){
   loading = true;
-  let res = await apiCall('network.get_static_routes', {});
+  let res = await apiCall('network.static_routes.list', {});
   if (res.Error === null) {
     console.debug('staticRoutes', res.Data);
     staticRoutes = res.Data;
@@ -26,7 +26,7 @@ async function load(){
 }
 
 async function deleteStaticRoutes(){
-  let res = await apiCall('network.delete_static_route', {index: selection[0]});
+  let res = await apiCall('network.static_routes.delete', {id: selection[0]});
   if (res.Error === null) {
     console.debug('deleted static routes');
   } else {
@@ -44,8 +44,8 @@ onMounted(async() => {
 <template>
   <TableView title="Static Routes" :columns="columns" :loading="loading" v-model:selection="selection" v-model:data="staticRoutes" :table-props="{sort:true, sortSelf: true}">
     <button @click="load">Refresh</button>
-    <router-link class="button" to="/network/staticroutes/edit">Create</router-link>
-    <router-link class="button" :class="{ disabled: selection.length != 1 }" :to="'/network/staticroutes/edit/' + selection[0]">Edit</router-link>
+    <router-link class="button" to="/network/static_routes/edit">Create</router-link>
+    <router-link class="button" :class="{ disabled: selection.length != 1 }" :to="'/network/static_routes/edit/' + selection[0]">Edit</router-link>
     <button @click="deleteStaticRoutes" :disabled="selection.length != 1">Delete</button>
   </TableView>
 </template>
\ No newline at end of file
diff --git a/client/src/pages/object/Addresses.vue b/client/src/pages/object/addresses.vue
similarity index 94%
rename from client/src/pages/object/Addresses.vue
rename to client/src/pages/object/addresses.vue
index 130f3e8..1bdc751 100644
--- a/client/src/pages/object/Addresses.vue
+++ b/client/src/pages/object/addresses.vue
@@ -16,7 +16,7 @@ const columns = [
 
 async function load(){
   loading = true;
-  let res = await apiCall('object.get_addresses', {});
+  let res = await apiCall('object.addresses.list', {});
   if (res.Error === null) {
     addresses = res.Data;
     console.debug('addresses', addresses);
@@ -62,7 +62,7 @@ function getAddressValue(s: any): string {
 }
 
 async function deleteAddress(){
-  let res = await apiCall('object.delete_address', {name: displayData[selection[0]].name});
+  let res = await apiCall('object.addresses_delete', {id: displayData[selection[0]].name});
   if (res.Error === null) {
     console.debug('deleted address');
   } else {
diff --git a/client/src/pages/object/Services.vue b/client/src/pages/object/services.vue
similarity index 93%
rename from client/src/pages/object/Services.vue
rename to client/src/pages/object/services.vue
index 6727652..28f9d42 100644
--- a/client/src/pages/object/Services.vue
+++ b/client/src/pages/object/services.vue
@@ -56,7 +56,7 @@ function getServicePortRange(s:any): string {
 
 async function load(){
   loading = true;
-  let res = await apiCall('object.get_services', {});
+  let res = await apiCall('object.services.list', {});
   if (res.Error === null) {
     console.debug('services', res.Data);
     services = res.Data;
@@ -67,7 +67,7 @@ async function load(){
 }
 
 async function deleteService(){
-  let res = await apiCall('object.delete_service', {name: displayData[selection[0]].name});
+  let res = await apiCall('object.services.delete', {name: displayData[selection[0]].name});
   if (res.Error === null) {
     console.debug('deleted service');
   } else {
diff --git a/client/src/pages/service/NTPServers.vue b/client/src/pages/service/NTPServers.vue
index a4e3425..7355121 100644
--- a/client/src/pages/service/NTPServers.vue
+++ b/client/src/pages/service/NTPServers.vue
@@ -13,7 +13,7 @@ const columns = [
 ];
 
 async function load(){
-  let res = await apiCall('service.get_ntp_servers', {});
+  let res = await apiCall('service.ntp_servers.list', {});
   if (res.Error === null) {
     servers = res.Data;
     console.debug('rules', servers);
@@ -23,7 +23,7 @@ async function load(){
 }
 
 async function deleteRule(){
-  let res = await apiCall('service.delete_ntp_server', {index: selection[0]});
+  let res = await apiCall('service.ntp_server.delete', {id: selection[0]});
   if (res.Error === null) {
     console.debug('deleted server');
     p.toast.success('Deleted NTP Server');
@@ -43,8 +43,8 @@ onMounted(async() => {
   <div>
     <TableView title="NTP Servers" :columns="columns" :loading="loading" v-model:selection="selection" v-model:data="servers" :table-props="{sort:true, sortSelf: true}">
       <button @click="load">Refresh</button>
-      <router-link class="button" to="/service/ntpservers/edit">Create</router-link>
-      <router-link class="button" :class="{ disabled: selection.length != 1 }" :to="'/service/ntpservers/edit/' + selection[0]">Edit</router-link>
+      <router-link class="button" to="/service/ntp_servers/edit">Create</router-link>
+      <router-link class="button" :class="{ disabled: selection.length != 1 }" :to="'/service/ntp_servers/edit/' + selection[0]">Edit</router-link>
       <button @click="deleteRule" :disabled="selection.length != 1">Delete</button>
     </TableView>
   </div>
diff --git a/client/src/pages/service/DHCPServers.vue b/client/src/pages/service/dhcp_servers.vue
similarity index 78%
rename from client/src/pages/service/DHCPServers.vue
rename to client/src/pages/service/dhcp_servers.vue
index e27abbc..13d394e 100644
--- a/client/src/pages/service/DHCPServers.vue
+++ b/client/src/pages/service/dhcp_servers.vue
@@ -13,7 +13,7 @@ const columns = [
 ];
 
 async function load(){
-  let res = await apiCall('service.get_dhcp_servers', {});
+  let res = await apiCall('service.dhcp_servers.list', {});
   if (res.Error === null) {
     servers = res.Data;
     console.debug('rules', servers);
@@ -23,7 +23,7 @@ async function load(){
 }
 
 async function deleteRule(){
-  let res = await apiCall('service.delete_dhcp_server', {index: selection[0]});
+  let res = await apiCall('service.dhcp_servers.delete', {index: selection[0]});
   if (res.Error === null) {
     console.debug('deleted server');
     p.toast.success('Deleted DHCP Server');
@@ -43,8 +43,8 @@ onMounted(async() => {
   <div>
     <TableView title="DHCP v4 Servers" :columns="columns" :loading="loading" v-model:selection="selection" v-model:data="servers" :table-props="{sort:true, sortSelf: true}">
       <button @click="load">Refresh</button>
-      <router-link class="button" to="/service/dhcpservers/edit">Create</router-link>
-      <router-link class="button" :class="{ disabled: selection.length != 1 }" :to="'/service/dhcpservers/edit/' + selection[0]">Edit</router-link>
+      <router-link class="button" to="/service/dhcp_servers/edit">Create</router-link>
+      <router-link class="button" :class="{ disabled: selection.length != 1 }" :to="'/service/dhcp_servers/edit/' + selection[0]">Edit</router-link>
       <button @click="deleteRule" :disabled="selection.length != 1">Delete</button>
     </TableView>
   </div>
diff --git a/client/src/pages/service/DNSServers.vue b/client/src/pages/service/dns_servers.vue
similarity index 78%
rename from client/src/pages/service/DNSServers.vue
rename to client/src/pages/service/dns_servers.vue
index ae3f22d..3a94249 100644
--- a/client/src/pages/service/DNSServers.vue
+++ b/client/src/pages/service/dns_servers.vue
@@ -13,7 +13,7 @@ const columns = [
 ];
 
 async function load(){
-  let res = await apiCall('service.get_dns_servers', {});
+  let res = await apiCall('service.dns_servers.list', {});
   if (res.Error === null) {
     servers = res.Data;
     console.debug('rules', servers);
@@ -23,7 +23,7 @@ async function load(){
 }
 
 async function deleteRule(){
-  let res = await apiCall('service.delete_dns_server', {index: selection[0]});
+  let res = await apiCall('service.dns_servers.delete', {index: selection[0]});
   if (res.Error === null) {
     console.debug('deleted server');
     p.toast.success('Deleted DNS Server');
@@ -43,8 +43,8 @@ onMounted(async() => {
   <div>
     <TableView title="DNS Servers" :columns="columns" :loading="loading" v-model:selection="selection" v-model:data="servers" :table-props="{sort:true, sortSelf: true}">
       <button @click="load">Refresh</button>
-      <router-link class="button" to="/service/dnsservers/edit">Create</router-link>
-      <router-link class="button" :class="{ disabled: selection.length != 1 }" :to="'/service/dnsservers/edit/' + selection[0]">Edit</router-link>
+      <router-link class="button" to="/service/dns_servers/edit">Create</router-link>
+      <router-link class="button" :class="{ disabled: selection.length != 1 }" :to="'/service/dns_servers/edit/' + selection[0]">Edit</router-link>
       <button @click="deleteRule" :disabled="selection.length != 1">Delete</button>
     </TableView>
   </div>
diff --git a/client/src/pages/system/Users.vue b/client/src/pages/system/users.vue
similarity index 90%
rename from client/src/pages/system/Users.vue
rename to client/src/pages/system/users.vue
index e51a426..001be1c 100644
--- a/client/src/pages/system/Users.vue
+++ b/client/src/pages/system/users.vue
@@ -14,7 +14,7 @@ const columns = [
 
 async function load(){
   loading = true;
-  let res = await apiCall('system.get_users', {});
+  let res = await apiCall('system.users.list', {});
   if (res.Error === null) {
     users = res.Data;
     console.debug('users', users);
@@ -25,7 +25,7 @@ async function load(){
 }
 
 async function deleteUser(){
-  let res = await apiCall('system.delete_user', {name: users[selection[0]].name});
+  let res = await apiCall('system.users.delete', {name: users[selection[0]].name});
   if (res.Error === null) {
     console.debug('deleted user');
   } else {
diff --git a/client/src/pages/vpn/WireguardInterfaces.vue b/client/src/pages/vpn/wireguard_interfaces.vue
similarity index 82%
rename from client/src/pages/vpn/WireguardInterfaces.vue
rename to client/src/pages/vpn/wireguard_interfaces.vue
index e719415..8b6de3a 100644
--- a/client/src/pages/vpn/WireguardInterfaces.vue
+++ b/client/src/pages/vpn/wireguard_interfaces.vue
@@ -31,7 +31,7 @@ const displayData = $computed(() => {
 
 async function load(){
   loading = true;
-  let res = await apiCall('vpn.wireguard.get_interfaces', {});
+  let res = await apiCall('vpn.wireguard.interfaces.list', {});
   if (res.Error === null) {
     console.debug('interfaces', res.Data);
     interfaces = res.Data;
@@ -42,7 +42,7 @@ async function load(){
 }
 
 async function deleteInterface(){
-  let res = await apiCall('vpn.wireguard_delete_interface', {name: displayData[selection[0]].name});
+  let res = await apiCall('vpn.wireguard.interfaces.delete', {name: displayData[selection[0]].name});
   if (res.Error === null) {
     console.debug('deleted interface');
   } else {
@@ -52,7 +52,7 @@ async function deleteInterface(){
 }
 
 async function editInterface() {
-  p.router.push(`/vpn/wireguardinterfaces/edit/${  displayData[selection[0]].name}`);
+  p.router.push(`/vpn/wireguard_interfaces/edit/${  displayData[selection[0]].name}`);
 }
 
 onMounted(async() => {
@@ -64,7 +64,7 @@ onMounted(async() => {
 <template>
   <TableView title="Wireguard Interfaces" :columns="columns" :loading="loading" v-model:selection="selection" v-model:data="displayData" :table-props="{sort:true, sortSelf: true}">
     <button @click="load">Refresh</button>
-    <router-link class="button" to="/vpn/wireguardinterfaces/edit">Create</router-link>
+    <router-link class="button" to="/vpn/wireguard_interfaces/edit">Create</router-link>
     <button @click="editInterface" :disabled="selection.length != 1">Edit</button>
     <button @click="deleteInterface" :disabled="selection.length != 1">Delete</button>
   </TableView>
diff --git a/client/src/pages/vpn/WireguardPeers.vue b/client/src/pages/vpn/wireguard_peers.vue
similarity index 83%
rename from client/src/pages/vpn/WireguardPeers.vue
rename to client/src/pages/vpn/wireguard_peers.vue
index e07881e..ab9ba09 100644
--- a/client/src/pages/vpn/WireguardPeers.vue
+++ b/client/src/pages/vpn/wireguard_peers.vue
@@ -32,7 +32,7 @@ const displayData = $computed(() => {
 
 async function load(){
   loading = true;
-  let res = await apiCall('vpn.wireguard.get_peers', {});
+  let res = await apiCall('vpn.wireguard.peers.list', {});
   if (res.Error === null) {
     console.debug('peers', res.Data);
     peers = res.Data;
@@ -43,7 +43,7 @@ async function load(){
 }
 
 async function deletePeer(){
-  let res = await apiCall('vpn.wireguard.delete_peer', {name: displayData[selection[0]].name});
+  let res = await apiCall('vpn.wireguard.peers.delete', {name: displayData[selection[0]].name});
   if (res.Error === null) {
     console.debug('deleted peer');
   } else {
@@ -53,7 +53,7 @@ async function deletePeer(){
 }
 
 async function editPeer() {
-  p.router.push(`/vpn/wireguardpeers/edit/${  displayData[selection[0]].name}`);
+  p.router.push(`/vpn/wireguard_peers/edit/${  displayData[selection[0]].name}`);
 }
 
 onMounted(async() => {
@@ -65,7 +65,7 @@ onMounted(async() => {
 <template>
   <TableView title="Peers" :columns="columns" :loading="loading" v-model:selection="selection" v-model:data="displayData" :table-props="{sort:true, sortSelf: true}">
     <button @click="load">Refresh</button>
-    <router-link class="button" to="/vpn/wireguardpeers/edit">Create</router-link>
+    <router-link class="button" to="/vpn/wireguard_peers/edit">Create</router-link>
     <button @click="editPeer" :disabled="selection.length != 1">Edit</button>
     <button @click="deletePeer" :disabled="selection.length != 1">Delete</button>
   </TableView>
diff --git a/client/src/pages/vpn/WireguardStatus.vue b/client/src/pages/vpn/wireguard_status.vue
similarity index 91%
rename from client/src/pages/vpn/WireguardStatus.vue
rename to client/src/pages/vpn/wireguard_status.vue
index dd33aa9..70d5d93 100644
--- a/client/src/pages/vpn/WireguardStatus.vue
+++ b/client/src/pages/vpn/wireguard_status.vue
@@ -6,7 +6,7 @@ let loading = $ref(false);
 
 async function load() {
   loading = true;
-  let res = await apiCall('vpn.wireguard.get_status', {});
+  let res = await apiCall('vpn.wireguard.status', {});
   if (res.Error === null) {
     console.debug('status', res.Data);
     status = res.Data;