Index: trunk/packages/sipb-xen-remctl-auto/sipb-xen-remctl-auto/files/etc/remctl/conf.d/sipb-xen-web
===================================================================
--- trunk/packages/sipb-xen-remctl-auto/sipb-xen-remctl-auto/files/etc/remctl/conf.d/sipb-xen-web	(revision 197)
+++ trunk/packages/sipb-xen-remctl-auto/sipb-xen-remctl-auto/files/etc/remctl/conf.d/sipb-xen-web	(revision 198)
@@ -3,8 +3,8 @@
 web lvrename /usr/sbin/sipb-xen-lvm /etc/remctl/acl/web
 web lvresize /usr/sbin/sipb-xen-lvm /etc/remctl/acl/web
-web vmboot /usr/sbin/sipb-xen-boot /etc/remctl/acl/web
-web register /usr/sbin/remctl-update.sh /etc/remctl/acl/web
-web moveregister /usr/sbin/remctl-update.sh /etc/remctl/acl/web
-web unregister /usr/sbin/remctl-update.sh /etc/remctl/acl/web
-web remctl-moira-update /usr/sbin/remctl-update.sh /etc/remctl/acl/web
+web vmboot /usr/sbin/sipb-xen-vmcontrol /etc/remctl/acl/web
+web register /usr/sbin/sipb-xen-remctl-update /etc/remctl/acl/web
+web moveregister /usr/sbin/sipb-xen-remctl-update /etc/remctl/acl/web
+web unregister /usr/sbin/sipb-xen-remctl-update /etc/remctl/acl/web
+web remctl-moira-update /usr/sbin/sipb-xen-remctl-update /etc/remctl/acl/web
 web listvms /usr/sbin/sipb-xen-listvms /etc/remctl/acl/web
Index: trunk/packages/sipb-xen-remctl-auto/sipb-xen-remctl-auto/files/etc/remctl/sipb-xen-auto/README
===================================================================
--- trunk/packages/sipb-xen-remctl-auto/sipb-xen-remctl-auto/files/etc/remctl/sipb-xen-auto/README	(revision 197)
+++ trunk/packages/sipb-xen-remctl-auto/sipb-xen-remctl-auto/files/etc/remctl/sipb-xen-auto/README	(revision 198)
@@ -2,5 +2,5 @@
 configuration.
 
-/usr/sbin/remctl-update.sh is the magic script.  Run
+/usr/sbin/sipb-xen-remctl-update is the magic script.  Run
 it with "all" as an argument, and it will update everything.
 
@@ -19,5 +19,5 @@
 and then run
 
-/usr/sbin/remctl-update.sh all
+/usr/sbin/sipb-xen-remctl-update all
 
 Everything else is autogenerated from that information.
@@ -42,10 +42,10 @@
 This package also includes a crontab to run
 
-/usr/sbin/remctl-update.sh all
+/usr/sbin/sipb-xen-remctl-update all
 
 every 15 minutes or so to keep our Moira mapping up to date.  One can
 request an update of our Moira mapping for group X by running
 
-/usr/sbin/remctl-update.sh moiragroup X
+/usr/sbin/sipb-xen-remctl-update moiragroup X
 
 The web interface should probably run this when it adds a group.  We
@@ -55,5 +55,5 @@
 the command:
 
-/usr/sbin/remctl-update.sh all
+/usr/sbin/sipb-xen-remctl-update all
 
 using the following command from your favorite machine with remctl:
Index: trunk/packages/sipb-xen-remctl-auto/sipb-xen-remctl-auto/files/etc/remctl/sipb-xen-auto/conf.template
===================================================================
--- trunk/packages/sipb-xen-remctl-auto/sipb-xen-remctl-auto/files/etc/remctl/sipb-xen-auto/conf.template	(revision 197)
+++ trunk/packages/sipb-xen-remctl-auto/sipb-xen-remctl-auto/files/etc/remctl/sipb-xen-auto/conf.template	(revision 198)
@@ -1,9 +1,1 @@
-create #MACHINENAME# #BINDIR#/dispatch.create.sh /etc/remctl/sipb-xen-auto/acl/#MACHINENAME#
-reboot #MACHINENAME# #BINDIR#/dispatch.reboot.sh /etc/remctl/sipb-xen-auto/acl/#MACHINENAME#
-destroy #MACHINENAME# #BINDIR#/dispatch.destroy.sh /etc/remctl/sipb-xen-auto/acl/#MACHINENAME#
-list #MACHINENAME# #BINDIR#/dispatch.list.sh /etc/remctl/sipb-xen-auto/acl/#MACHINENAME#
-shutdown #MACHINENAME# #BINDIR#/dispatch.shutdown.sh /etc/remctl/sipb-xen-auto/acl/#MACHINENAME#
-list-long #MACHINENAME# #BINDIR#/dispatch.list-long.sh /etc/remctl/sipb-xen-auto/acl/#MACHINENAME#
-vcpu-list #MACHINENAME# #BINDIR#/dispatch.vcpu-list.sh /etc/remctl/sipb-xen-auto/acl/#MACHINENAME#
-uptime #MACHINENAME# #BINDIR#/dispatch.uptime.sh /etc/remctl/sipb-xen-auto/acl/#MACHINENAME#
-vnc_get_port_auth #MACHINENAME# #BINDIR#/get_port /etc/remctl/acl/vnc
+control #MACHINENAME# #BINDIR#/sipb-xen-vmcontrol /etc/remctl/sipb-xen-auto/acl/#MACHINENAME#