diff --git a/playbooks/mainweb-playbook.yml b/playbooks/mainweb-playbook.yml
index 0c15504..2aa3158 100644
--- a/playbooks/mainweb-playbook.yml
+++ b/playbooks/mainweb-playbook.yml
@@ -1,8 +1,8 @@
 ---
-# Ansible playbook to configure the ONF website
+# Ansible playbook to configure a PHP + mariadb websserver
 
-- name: Configure the main ONF webserver
-  hosts: onfweb
+- name: Configure a general-purpose webserver with PHP and mariadb support
+  hosts: website
   become: true
   roles:
     - users
diff --git a/scripts/pxeconfig.py b/scripts/pxeconfig.py
index 9f77f9e..97aedab 100644
--- a/scripts/pxeconfig.py
+++ b/scripts/pxeconfig.py
@@ -27,14 +27,14 @@
         },
     }
 
-    args = nbhelper.parse_cli_args(extra_args)
-    nbh = nbhelper.NBHelper(args)
+    args = nbhelper.initialize(extra_args)
+    tenant = nbhelper.NBTenant()
 
     yaml_out = {}
     pxeboot_hosts = []
 
-    prefixes = nbh.all_prefixes()
-    devices = nbhelper.NBDevice.all_devs()
+    prefixes = nbhelper.NBPrefix.all_prefixes()
+    devices = nbhelper.NBDevice.all_objects()
 
     for dev_id, device in devices.items():