From e21781df2ef6bfdb1a650bab5298b0261c8f7d3c Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Tue, 26 Feb 2013 23:48:35 -0600
Subject: Update package names and fix library FTBFS

---
 clients/tde/debian/control                         |   2 +-
 lib/libtdekrb/configure.in.in                      |  10 ++
 lib/libtdekrb/src/Makefile.am                      |   2 +-
 lib/libtqtrla/configure.in.in                      |   9 ++
 lib/libtqtrla/debian/rules                         |   3 +
 lib/libtqtrla/src/Makefile.am                      |   2 +-
 servers/admin_sys_ctl_server_lin/debian/changelog  |   2 +-
 servers/admin_sys_ctl_server_lin/debian/control    |  12 +--
 .../debian/remotefpga-adminsysctlserver.init       | 108 ---------------------
 .../debian/ulab-adminsysctlserver.init             | 108 +++++++++++++++++++++
 servers/admin_sys_ctl_server_lin/src/main.cpp      |   4 +-
 .../admin_user_mgmt_server_lin/debian/changelog    |   2 +-
 servers/admin_user_mgmt_server_lin/debian/control  |  12 +--
 .../debian/remotefpga-adminusermgmtserver.init     | 108 ---------------------
 .../debian/ulab-adminusermgmtserver.init           | 108 +++++++++++++++++++++
 servers/admin_user_mgmt_server_lin/src/main.cpp    |   4 +-
 servers/auth_server_lin/debian/changelog           |   2 +-
 servers/auth_server_lin/debian/control             |  10 +-
 .../debian/remotefpga-authserver.init              | 108 ---------------------
 .../auth_server_lin/debian/ulab-authserver.init    | 108 +++++++++++++++++++++
 servers/auth_server_lin/src/main.cpp               |   4 +-
 .../fpga_programming_server_lin/debian/changelog   |   2 +-
 servers/fpga_programming_server_lin/debian/control |  10 +-
 .../debian/remotefpga-fpgaprogserver.init          | 108 ---------------------
 .../debian/ulab-fpgaprogserver.init                | 108 +++++++++++++++++++++
 servers/fpga_programming_server_lin/src/main.cpp   |   4 +-
 servers/fpga_server_lin/debian/changelog           |   2 +-
 servers/fpga_server_lin/debian/control             |  10 +-
 .../debian/remotefpga-fpgaserver.init              | 108 ---------------------
 .../fpga_server_lin/debian/ulab-fpgaserver.init    | 108 +++++++++++++++++++++
 servers/fpga_server_lin/src/main.cpp               |   4 +-
 servers/gpib_server_lin/debian/changelog           |   2 +-
 servers/gpib_server_lin/debian/control             |  10 +-
 .../debian/remotefpga-gpibserver.init              | 108 ---------------------
 .../gpib_server_lin/debian/ulab-gpibserver.init    | 108 +++++++++++++++++++++
 servers/gpib_server_lin/src/main.cpp               |   4 +-
 servers/gpib_server_lin/src/main_server_lin.cpp    |   2 +-
 servers/sensor_monitor_server_lin/debian/changelog |   2 +-
 servers/sensor_monitor_server_lin/debian/control   |  10 +-
 .../debian/remotefpga-sensormonserver.init         | 108 ---------------------
 .../debian/ulab-sensormonserver.init               | 108 +++++++++++++++++++++
 servers/sensor_monitor_server_lin/src/main.cpp     |   4 +-
 42 files changed, 840 insertions(+), 818 deletions(-)
 delete mode 100644 servers/admin_sys_ctl_server_lin/debian/remotefpga-adminsysctlserver.init
 create mode 100644 servers/admin_sys_ctl_server_lin/debian/ulab-adminsysctlserver.init
 delete mode 100644 servers/admin_user_mgmt_server_lin/debian/remotefpga-adminusermgmtserver.init
 create mode 100644 servers/admin_user_mgmt_server_lin/debian/ulab-adminusermgmtserver.init
 delete mode 100644 servers/auth_server_lin/debian/remotefpga-authserver.init
 create mode 100644 servers/auth_server_lin/debian/ulab-authserver.init
 delete mode 100644 servers/fpga_programming_server_lin/debian/remotefpga-fpgaprogserver.init
 create mode 100644 servers/fpga_programming_server_lin/debian/ulab-fpgaprogserver.init
 delete mode 100644 servers/fpga_server_lin/debian/remotefpga-fpgaserver.init
 create mode 100644 servers/fpga_server_lin/debian/ulab-fpgaserver.init
 delete mode 100644 servers/gpib_server_lin/debian/remotefpga-gpibserver.init
 create mode 100644 servers/gpib_server_lin/debian/ulab-gpibserver.init
 delete mode 100644 servers/sensor_monitor_server_lin/debian/remotefpga-sensormonserver.init
 create mode 100644 servers/sensor_monitor_server_lin/debian/ulab-sensormonserver.init

diff --git a/clients/tde/debian/control b/clients/tde/debian/control
index 96a4b62..20ded07 100644
--- a/clients/tde/debian/control
+++ b/clients/tde/debian/control
@@ -3,7 +3,7 @@ Section: kde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 Standards-Version: 3.8.4
-Build-Depends: debhelper (>= 5.0), cdbs, tdelibs4-trinity-dev, libtqtrla, libtdekrb-trinity, xutils, chrpath, gettext, quilt (>= 0.40), automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5.0), cdbs, tdelibs4-trinity-dev, libtqtrla-dev, libtdekrb-trinity-dev, xutils, chrpath, gettext, quilt (>= 0.40), automake, autoconf, libtool, libltdl-dev
 Homepage: http://remotefpga.pearsoncomputing.net/
 
 Package: remote-laboratory-client-trinity
diff --git a/lib/libtdekrb/configure.in.in b/lib/libtdekrb/configure.in.in
index aa370f6..a0b1602 100644
--- a/lib/libtdekrb/configure.in.in
+++ b/lib/libtdekrb/configure.in.in
@@ -4,4 +4,14 @@ AM_INIT_AUTOMAKE(autostart, 0.1)
 AC_C_BIGENDIAN
 AC_CHECK_KDEMAXPATHLEN
 
+# These numbers should be tweaked on every release. Read carefully:
+# http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
+# http://sourceware.org/autobook/autobook/autobook_91.html
+lt_current="1"
+lt_revision="0"
+lt_age="0"
+AC_SUBST(lt_current)
+AC_SUBST(lt_revision)
+AC_SUBST(lt_age)
+
 CXXFLAGS="-DQT_CLEAN_NAMESPACE $CXXFLAGS"
diff --git a/lib/libtdekrb/src/Makefile.am b/lib/libtdekrb/src/Makefile.am
index 7bcac6e..8ff3463 100644
--- a/lib/libtdekrb/src/Makefile.am
+++ b/lib/libtdekrb/src/Makefile.am
@@ -9,4 +9,4 @@ include_HEADERS = tdekrbclientsocket.h tdekrbserversocket.h
 
 libtdekrbsocket_la_SOURCES = tdekrbclientsocket.cpp tdekrbserversocket.cpp
 libtdekrbsocket_la_LIBADD = $(LIB_KIO) $(LIB_TDEUI) -lsasl2
-libtdekrbsocket_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries)
+libtdekrbsocket_la_LDFLAGS = -module -version-info $(lt_current):$(lt_revision):$(lt_age) -no-undefined $(all_libraries)
diff --git a/lib/libtqtrla/configure.in.in b/lib/libtqtrla/configure.in.in
index 18b1486..3b3f6bf 100644
--- a/lib/libtqtrla/configure.in.in
+++ b/lib/libtqtrla/configure.in.in
@@ -4,3 +4,12 @@ AM_INIT_AUTOMAKE(autostart, 0.1)
 AC_C_BIGENDIAN
 AC_CHECK_KDEMAXPATHLEN
 
+# These numbers should be tweaked on every release. Read carefully:
+# http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
+# http://sourceware.org/autobook/autobook/autobook_91.html
+lt_current="1"
+lt_revision="0"
+lt_age="0"
+AC_SUBST(lt_current)
+AC_SUBST(lt_revision)
+AC_SUBST(lt_age)
diff --git a/lib/libtqtrla/debian/rules b/lib/libtqtrla/debian/rules
index 242fb2c..9bed17b 100755
--- a/lib/libtqtrla/debian/rules
+++ b/lib/libtqtrla/debian/rules
@@ -11,6 +11,9 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
 
 cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
+DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
+                               && echo xz || echo bzip2)
+
 post-patches:: debian/stamp-bootstrap
 
 debian/stamp-bootstrap:
diff --git a/lib/libtqtrla/src/Makefile.am b/lib/libtqtrla/src/Makefile.am
index eba0d61..e9c85f0 100644
--- a/lib/libtqtrla/src/Makefile.am
+++ b/lib/libtqtrla/src/Makefile.am
@@ -8,4 +8,4 @@ include_HEADERS = tqtrla.h
 
 libtqtrla_la_SOURCES = tqtrla.cpp
 libtqtrla_la_LIBADD = $(LIB_KIO) $(LIB_TDEUI)
-libtqtrla_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries) $(LIB_KPARTS) -ltdekrbsocket
+libtqtrla_la_LDFLAGS = -module -version-info $(lt_current):$(lt_revision):$(lt_age) -no-undefined $(all_libraries) $(LIB_KPARTS) -ltdekrbsocket
diff --git a/servers/admin_sys_ctl_server_lin/debian/changelog b/servers/admin_sys_ctl_server_lin/debian/changelog
index 3b91574..f1de5f2 100644
--- a/servers/admin_sys_ctl_server_lin/debian/changelog
+++ b/servers/admin_sys_ctl_server_lin/debian/changelog
@@ -1,4 +1,4 @@
-remotefpga-adminsysctlserver (0.5-0ubuntu0) karmic; urgency=low
+ulab-adminsysctlserver (0.5-0ubuntu0) karmic; urgency=low
 
   * Karmic rebuild
 
diff --git a/servers/admin_sys_ctl_server_lin/debian/control b/servers/admin_sys_ctl_server_lin/debian/control
index fc7149a..bdef1d4 100644
--- a/servers/admin_sys_ctl_server_lin/debian/control
+++ b/servers/admin_sys_ctl_server_lin/debian/control
@@ -1,15 +1,15 @@
-Source: remotefpga-adminsysctlserver
+Source: ulab-adminsysctlserver
 Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: debhelper (>= 5), cdbs, tdelibs4-trinity-dev, libldap2-dev, libtdekrb-trinity, libtqtrla, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5), cdbs, tdelibs4-trinity-dev, libldap2-dev, libtdekrb-trinity-dev, libtqtrla-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
-Package: remotefpga-adminsysctlserver
+Package: ulab-adminsysctlserver
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: RemoteFPGA System Administration Control Server
- RemoteFPGA System Administration Control Server
+Description: uLab System Administration Control Server
+ uLab System Administration Control Server
  This allows an administrator to manage various aspects
- of an active RemoteFPGA system, including viewing and 
+ of an active uLab system, including viewing and 
  terminating user sessions.
diff --git a/servers/admin_sys_ctl_server_lin/debian/remotefpga-adminsysctlserver.init b/servers/admin_sys_ctl_server_lin/debian/remotefpga-adminsysctlserver.init
deleted file mode 100644
index 7be0baa..0000000
--- a/servers/admin_sys_ctl_server_lin/debian/remotefpga-adminsysctlserver.init
+++ /dev/null
@@ -1,108 +0,0 @@
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides:          remotefpga-adminsysctlserver
-# Required-Start:    $local_fs $remote_fs
-# Required-Stop:     $local_fs $remote_fs
-# Should-Start:      console-screen kbd acpid hal krb5-kdc nis
-# Should-Stop:       console-screen kbd
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: RemoteFPGA System Administration Control Server
-# Description:       RemoteFPGA System Administration Control Server
-### END INIT INFO
-# /etc/init.d/remotefpga-adminsysctlserver: start or stop the RemoteFPGA System Administration Control Server
-#
-# description: RemoteFPGA System Administration Control Server
-#
-
-. /lib/lsb/init-functions
-
-set -e
-
-PATH=/opt/trinity/bin:/usr/bin:/sbin:/usr/sbin
-DAEMON=/opt/trinity/bin/remotefpga_adminsysctlserver
-PIDFILE=/var/run/remotefpga_authserver.pid
-UPGRADEFILE=/var/run/remotefpga_authserver.upgrade
-
-DESC="RemoteFPGA System Administration Control Server"
-
-# If we upgraded the daemon, we can't use the --exec argument to
-# start-stop-daemon since the inode will have changed.  The risk here is that
-# in a situation where the daemon died, its pidfile was not cleaned up, and
-# some other process is now running under that pid, start-stop-daemon will send
-# signals to an innocent process.  However, this seems like a corner case.
-# C'est la vie!
-if [ -e $UPGRADEFILE ]; then
-  SSD_ARGS="--pidfile $PIDFILE --startas $DAEMON"
-else
-  SSD_ARGS="--pidfile $PIDFILE --exec $DAEMON"
-fi
-
-stillrunning () {
-  if expr "$(cat /proc/$DAEMONPID/cmdline 2> /dev/null)" : "$DAEMON" > /dev/null 2>&1; then
-    true
-  else
-    # if the daemon does not remove its own pidfile, we will
-    rm -f $PIDFILE $UPGRADEFILE
-    false
-  fi;
-}
-
-case "$1" in
-  start)
-    log_action_begin_msg "Starting $DESC"
-    if start-stop-daemon --background --start --make-pidfile --quiet $SSD_ARGS -- $ARG; then
-      log_action_end_msg 0
-    else
-      log_warning_msg "already running"
-      log_action_end_msg 0
-    fi
-  ;;
-
-  restart)
-    /etc/init.d/remotefpga-adminsysctlserver stop
-    if [ -f $PIDFILE ]; then
-      if stillrunning; then
-        exit 1
-      fi
-    fi
-    /etc/init.d/remotefpga-adminsysctlserver start
-  ;;
-
-  reload)
-    log_action_begin_msg "Reloading $DESC"
-    if start-stop-daemon --stop --signal 1 --quiet $SSD_ARGS; then
-      log_action_end_msg 0
-    else
-      log_failure_msg "not running"
-      log_action_end_msg 1
-    fi
-  ;;
-
-  force-reload)
-    /etc/init.d/remotefpga-adminsysctlserver reload
-  ;;
-
-  stop)
-    log_action_begin_msg "Stopping $DESC"
-    if [ ! -f $PIDFILE ]; then
-      log_failure_msg "Not running ($PIDFILE not found)"
-      log_action_end_msg 0
-      exit 0
-    else
-      if start-stop-daemon --stop --quiet $SSD_ARGS; then
-        log_action_end_msg 0
-      else
-        log_failure_msg "not running"
-        log_action_end_msg 1
-      fi
-    fi
-  ;;
-
-  *)
-    echo "Usage: /etc/init.d/remotefpga-adminsysctlserver {start|stop|restart|reload|force-reload}"
-    exit 1
-    ;;
-esac
-
-exit 0
diff --git a/servers/admin_sys_ctl_server_lin/debian/ulab-adminsysctlserver.init b/servers/admin_sys_ctl_server_lin/debian/ulab-adminsysctlserver.init
new file mode 100644
index 0000000..87124e2
--- /dev/null
+++ b/servers/admin_sys_ctl_server_lin/debian/ulab-adminsysctlserver.init
@@ -0,0 +1,108 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides:          ulab-adminsysctlserver
+# Required-Start:    $local_fs $remote_fs
+# Required-Stop:     $local_fs $remote_fs
+# Should-Start:      console-screen kbd acpid hal krb5-kdc nis
+# Should-Stop:       console-screen kbd
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: uLab System Administration Control Server
+# Description:       uLab System Administration Control Server
+### END INIT INFO
+# /etc/init.d/ulab-adminsysctlserver: start or stop the uLab System Administration Control Server
+#
+# description: uLab System Administration Control Server
+#
+
+. /lib/lsb/init-functions
+
+set -e
+
+PATH=/opt/trinity/bin:/usr/bin:/sbin:/usr/sbin
+DAEMON=/opt/trinity/bin/remotefpga_adminsysctlserver
+PIDFILE=/var/run/remotefpga_authserver.pid
+UPGRADEFILE=/var/run/remotefpga_authserver.upgrade
+
+DESC="uLab System Administration Control Server"
+
+# If we upgraded the daemon, we can't use the --exec argument to
+# start-stop-daemon since the inode will have changed.  The risk here is that
+# in a situation where the daemon died, its pidfile was not cleaned up, and
+# some other process is now running under that pid, start-stop-daemon will send
+# signals to an innocent process.  However, this seems like a corner case.
+# C'est la vie!
+if [ -e $UPGRADEFILE ]; then
+  SSD_ARGS="--pidfile $PIDFILE --startas $DAEMON"
+else
+  SSD_ARGS="--pidfile $PIDFILE --exec $DAEMON"
+fi
+
+stillrunning () {
+  if expr "$(cat /proc/$DAEMONPID/cmdline 2> /dev/null)" : "$DAEMON" > /dev/null 2>&1; then
+    true
+  else
+    # if the daemon does not remove its own pidfile, we will
+    rm -f $PIDFILE $UPGRADEFILE
+    false
+  fi;
+}
+
+case "$1" in
+  start)
+    log_action_begin_msg "Starting $DESC"
+    if start-stop-daemon --background --start --make-pidfile --quiet $SSD_ARGS -- $ARG; then
+      log_action_end_msg 0
+    else
+      log_warning_msg "already running"
+      log_action_end_msg 0
+    fi
+  ;;
+
+  restart)
+    /etc/init.d/ulab-adminsysctlserver stop
+    if [ -f $PIDFILE ]; then
+      if stillrunning; then
+        exit 1
+      fi
+    fi
+    /etc/init.d/ulab-adminsysctlserver start
+  ;;
+
+  reload)
+    log_action_begin_msg "Reloading $DESC"
+    if start-stop-daemon --stop --signal 1 --quiet $SSD_ARGS; then
+      log_action_end_msg 0
+    else
+      log_failure_msg "not running"
+      log_action_end_msg 1
+    fi
+  ;;
+
+  force-reload)
+    /etc/init.d/ulab-adminsysctlserver reload
+  ;;
+
+  stop)
+    log_action_begin_msg "Stopping $DESC"
+    if [ ! -f $PIDFILE ]; then
+      log_failure_msg "Not running ($PIDFILE not found)"
+      log_action_end_msg 0
+      exit 0
+    else
+      if start-stop-daemon --stop --quiet $SSD_ARGS; then
+        log_action_end_msg 0
+      else
+        log_failure_msg "not running"
+        log_action_end_msg 1
+      fi
+    fi
+  ;;
+
+  *)
+    echo "Usage: /etc/init.d/ulab-adminsysctlserver {start|stop|restart|reload|force-reload}"
+    exit 1
+    ;;
+esac
+
+exit 0
diff --git a/servers/admin_sys_ctl_server_lin/src/main.cpp b/servers/admin_sys_ctl_server_lin/src/main.cpp
index e8c7184..e074a14 100644
--- a/servers/admin_sys_ctl_server_lin/src/main.cpp
+++ b/servers/admin_sys_ctl_server_lin/src/main.cpp
@@ -39,13 +39,13 @@
 
 #include "admin_sys_ctl.h"
 
-static const char description[] = I18N_NOOP("RemoteFPGA System Administration Control Server");
+static const char description[] = I18N_NOOP("uLab System Administration Control Server");
 
 static const char version[] = "v0.0.1";
 
 int main(int argc, char *argv[])
 {
-	TDEAboutData aboutData( "remotefpga_admin_sys_ctl_server", I18N_NOOP("RemoteFPGA System Administration Control Server"),
+	TDEAboutData aboutData( "remotefpga_admin_sys_ctl_server", I18N_NOOP("uLab System Administration Control Server"),
 		version, description, TDEAboutData::License_GPL,
 		"(c) 2012, Timothy Pearson");
 		aboutData.addAuthor("Timothy Pearson",0, "kb9vqf@pearsoncomputing.net");
diff --git a/servers/admin_user_mgmt_server_lin/debian/changelog b/servers/admin_user_mgmt_server_lin/debian/changelog
index e21047a..ce6ccf5 100644
--- a/servers/admin_user_mgmt_server_lin/debian/changelog
+++ b/servers/admin_user_mgmt_server_lin/debian/changelog
@@ -1,4 +1,4 @@
-remotefpga-adminusermgmtserver (0.5-0ubuntu0) karmic; urgency=low
+ulab-adminusermgmtserver (0.5-0ubuntu0) karmic; urgency=low
 
   * Karmic rebuild
 
diff --git a/servers/admin_user_mgmt_server_lin/debian/control b/servers/admin_user_mgmt_server_lin/debian/control
index a5e14a8..52f0952 100644
--- a/servers/admin_user_mgmt_server_lin/debian/control
+++ b/servers/admin_user_mgmt_server_lin/debian/control
@@ -1,14 +1,14 @@
-Source: remotefpga-adminusermgmtserver
+Source: ulab-adminusermgmtserver
 Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: debhelper (>= 5), cdbs, tdelibs4-trinity-dev, libldap2-dev, libtdekrb-trinity, libtqtrla, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5), cdbs, tdelibs4-trinity-dev, libldap2-dev, libtdekrb-trinity-dev, libtqtrla-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
-Package: remotefpga-adminusermgmtserver
+Package: ulab-adminusermgmtserver
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: RemoteFPGA System Administration User Management Server
- RemoteFPGA System Administration User Management Server
+Description: uLab System Administration User Management Server
+ uLab System Administration User Management Server
  This allows an administrator to manage user access and
- permissions of an active RemoteFPGA system.
+ permissions of an active uLab system.
diff --git a/servers/admin_user_mgmt_server_lin/debian/remotefpga-adminusermgmtserver.init b/servers/admin_user_mgmt_server_lin/debian/remotefpga-adminusermgmtserver.init
deleted file mode 100644
index 12de058..0000000
--- a/servers/admin_user_mgmt_server_lin/debian/remotefpga-adminusermgmtserver.init
+++ /dev/null
@@ -1,108 +0,0 @@
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides:          remotefpga-adminusermgmtserver
-# Required-Start:    $local_fs $remote_fs
-# Required-Stop:     $local_fs $remote_fs
-# Should-Start:      console-screen kbd acpid hal krb5-kdc nis
-# Should-Stop:       console-screen kbd
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: RemoteFPGA System Administration User Management Server
-# Description:       RemoteFPGA System Administration User Management Server
-### END INIT INFO
-# /etc/init.d/remotefpga-adminusermgmtserver: start or stop the RemoteFPGA System Administration User Management Server
-#
-# description: RemoteFPGA System Administration User Management Server
-#
-
-. /lib/lsb/init-functions
-
-set -e
-
-PATH=/opt/trinity/bin:/usr/bin:/sbin:/usr/sbin
-DAEMON=/opt/trinity/bin/remotefpga_adminsysctlserver
-PIDFILE=/var/run/remotefpga_authserver.pid
-UPGRADEFILE=/var/run/remotefpga_authserver.upgrade
-
-DESC="RemoteFPGA System Administration User Management Server"
-
-# If we upgraded the daemon, we can't use the --exec argument to
-# start-stop-daemon since the inode will have changed.  The risk here is that
-# in a situation where the daemon died, its pidfile was not cleaned up, and
-# some other process is now running under that pid, start-stop-daemon will send
-# signals to an innocent process.  However, this seems like a corner case.
-# C'est la vie!
-if [ -e $UPGRADEFILE ]; then
-  SSD_ARGS="--pidfile $PIDFILE --startas $DAEMON"
-else
-  SSD_ARGS="--pidfile $PIDFILE --exec $DAEMON"
-fi
-
-stillrunning () {
-  if expr "$(cat /proc/$DAEMONPID/cmdline 2> /dev/null)" : "$DAEMON" > /dev/null 2>&1; then
-    true
-  else
-    # if the daemon does not remove its own pidfile, we will
-    rm -f $PIDFILE $UPGRADEFILE
-    false
-  fi;
-}
-
-case "$1" in
-  start)
-    log_action_begin_msg "Starting $DESC"
-    if start-stop-daemon --background --start --make-pidfile --quiet $SSD_ARGS -- $ARG; then
-      log_action_end_msg 0
-    else
-      log_warning_msg "already running"
-      log_action_end_msg 0
-    fi
-  ;;
-
-  restart)
-    /etc/init.d/remotefpga-adminusermgmtserver stop
-    if [ -f $PIDFILE ]; then
-      if stillrunning; then
-        exit 1
-      fi
-    fi
-    /etc/init.d/remotefpga-adminusermgmtserver start
-  ;;
-
-  reload)
-    log_action_begin_msg "Reloading $DESC"
-    if start-stop-daemon --stop --signal 1 --quiet $SSD_ARGS; then
-      log_action_end_msg 0
-    else
-      log_failure_msg "not running"
-      log_action_end_msg 1
-    fi
-  ;;
-
-  force-reload)
-    /etc/init.d/remotefpga-adminusermgmtserver reload
-  ;;
-
-  stop)
-    log_action_begin_msg "Stopping $DESC"
-    if [ ! -f $PIDFILE ]; then
-      log_failure_msg "Not running ($PIDFILE not found)"
-      log_action_end_msg 0
-      exit 0
-    else
-      if start-stop-daemon --stop --quiet $SSD_ARGS; then
-        log_action_end_msg 0
-      else
-        log_failure_msg "not running"
-        log_action_end_msg 1
-      fi
-    fi
-  ;;
-
-  *)
-    echo "Usage: /etc/init.d/remotefpga-adminusermgmtserver {start|stop|restart|reload|force-reload}"
-    exit 1
-    ;;
-esac
-
-exit 0
diff --git a/servers/admin_user_mgmt_server_lin/debian/ulab-adminusermgmtserver.init b/servers/admin_user_mgmt_server_lin/debian/ulab-adminusermgmtserver.init
new file mode 100644
index 0000000..45f26c4
--- /dev/null
+++ b/servers/admin_user_mgmt_server_lin/debian/ulab-adminusermgmtserver.init
@@ -0,0 +1,108 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides:          ulab-adminusermgmtserver
+# Required-Start:    $local_fs $remote_fs
+# Required-Stop:     $local_fs $remote_fs
+# Should-Start:      console-screen kbd acpid hal krb5-kdc nis
+# Should-Stop:       console-screen kbd
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: uLab System Administration User Management Server
+# Description:       uLab System Administration User Management Server
+### END INIT INFO
+# /etc/init.d/ulab-adminusermgmtserver: start or stop the uLab System Administration User Management Server
+#
+# description: uLab System Administration User Management Server
+#
+
+. /lib/lsb/init-functions
+
+set -e
+
+PATH=/opt/trinity/bin:/usr/bin:/sbin:/usr/sbin
+DAEMON=/opt/trinity/bin/remotefpga_adminsysctlserver
+PIDFILE=/var/run/remotefpga_authserver.pid
+UPGRADEFILE=/var/run/remotefpga_authserver.upgrade
+
+DESC="uLab System Administration User Management Server"
+
+# If we upgraded the daemon, we can't use the --exec argument to
+# start-stop-daemon since the inode will have changed.  The risk here is that
+# in a situation where the daemon died, its pidfile was not cleaned up, and
+# some other process is now running under that pid, start-stop-daemon will send
+# signals to an innocent process.  However, this seems like a corner case.
+# C'est la vie!
+if [ -e $UPGRADEFILE ]; then
+  SSD_ARGS="--pidfile $PIDFILE --startas $DAEMON"
+else
+  SSD_ARGS="--pidfile $PIDFILE --exec $DAEMON"
+fi
+
+stillrunning () {
+  if expr "$(cat /proc/$DAEMONPID/cmdline 2> /dev/null)" : "$DAEMON" > /dev/null 2>&1; then
+    true
+  else
+    # if the daemon does not remove its own pidfile, we will
+    rm -f $PIDFILE $UPGRADEFILE
+    false
+  fi;
+}
+
+case "$1" in
+  start)
+    log_action_begin_msg "Starting $DESC"
+    if start-stop-daemon --background --start --make-pidfile --quiet $SSD_ARGS -- $ARG; then
+      log_action_end_msg 0
+    else
+      log_warning_msg "already running"
+      log_action_end_msg 0
+    fi
+  ;;
+
+  restart)
+    /etc/init.d/ulab-adminusermgmtserver stop
+    if [ -f $PIDFILE ]; then
+      if stillrunning; then
+        exit 1
+      fi
+    fi
+    /etc/init.d/ulab-adminusermgmtserver start
+  ;;
+
+  reload)
+    log_action_begin_msg "Reloading $DESC"
+    if start-stop-daemon --stop --signal 1 --quiet $SSD_ARGS; then
+      log_action_end_msg 0
+    else
+      log_failure_msg "not running"
+      log_action_end_msg 1
+    fi
+  ;;
+
+  force-reload)
+    /etc/init.d/ulab-adminusermgmtserver reload
+  ;;
+
+  stop)
+    log_action_begin_msg "Stopping $DESC"
+    if [ ! -f $PIDFILE ]; then
+      log_failure_msg "Not running ($PIDFILE not found)"
+      log_action_end_msg 0
+      exit 0
+    else
+      if start-stop-daemon --stop --quiet $SSD_ARGS; then
+        log_action_end_msg 0
+      else
+        log_failure_msg "not running"
+        log_action_end_msg 1
+      fi
+    fi
+  ;;
+
+  *)
+    echo "Usage: /etc/init.d/ulab-adminusermgmtserver {start|stop|restart|reload|force-reload}"
+    exit 1
+    ;;
+esac
+
+exit 0
diff --git a/servers/admin_user_mgmt_server_lin/src/main.cpp b/servers/admin_user_mgmt_server_lin/src/main.cpp
index fa28c29..f17a433 100644
--- a/servers/admin_user_mgmt_server_lin/src/main.cpp
+++ b/servers/admin_user_mgmt_server_lin/src/main.cpp
@@ -39,13 +39,13 @@
 
 #include "admin_user_mgmt.h"
 
-static const char description[] = I18N_NOOP("RemoteFPGA System Administration User Management Server");
+static const char description[] = I18N_NOOP("uLab System Administration User Management Server");
 
 static const char version[] = "v0.0.1";
 
 int main(int argc, char *argv[])
 {
-	TDEAboutData aboutData( "remotefpga_admin_sys_ctl_server", I18N_NOOP("RemoteFPGA System Administration User Management Server"),
+	TDEAboutData aboutData( "remotefpga_admin_sys_ctl_server", I18N_NOOP("uLab System Administration User Management Server"),
 		version, description, TDEAboutData::License_GPL,
 		"(c) 2013, Timothy Pearson");
 		aboutData.addAuthor("Timothy Pearson",0, "kb9vqf@pearsoncomputing.net");
diff --git a/servers/auth_server_lin/debian/changelog b/servers/auth_server_lin/debian/changelog
index eeaccb1..9302e69 100644
--- a/servers/auth_server_lin/debian/changelog
+++ b/servers/auth_server_lin/debian/changelog
@@ -1,4 +1,4 @@
-remotefpga-authserver (0.5-0ubuntu0) karmic; urgency=low
+ulab-authserver (0.5-0ubuntu0) karmic; urgency=low
 
   * Karmic rebuild
 
diff --git a/servers/auth_server_lin/debian/control b/servers/auth_server_lin/debian/control
index 7d604b9..894a4dd 100644
--- a/servers/auth_server_lin/debian/control
+++ b/servers/auth_server_lin/debian/control
@@ -1,12 +1,12 @@
-Source: remotefpga-authserver
+Source: ulab-authserver
 Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: debhelper (>= 5), cdbs, tdelibs4-trinity-dev, libldap2-dev, libtdekrb-trinity, libtqtrla, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5), cdbs, tdelibs4-trinity-dev, libldap2-dev, libtdekrb-trinity-dev, libtqtrla-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
-Package: remotefpga-authserver
+Package: ulab-authserver
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: RemoteFPGA Authentication Server
- RemoteFPGA Authentication Server
+Description: uLab Authentication Server
+ uLab Authentication Server
diff --git a/servers/auth_server_lin/debian/remotefpga-authserver.init b/servers/auth_server_lin/debian/remotefpga-authserver.init
deleted file mode 100644
index d691efb..0000000
--- a/servers/auth_server_lin/debian/remotefpga-authserver.init
+++ /dev/null
@@ -1,108 +0,0 @@
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides:          remotefpga-authserver
-# Required-Start:    $local_fs $remote_fs
-# Required-Stop:     $local_fs $remote_fs
-# Should-Start:      console-screen kbd acpid hal krb5-kdc nis
-# Should-Stop:       console-screen kbd
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: RemoteFPGA Authentication Server
-# Description:       RemoteFPGA Authentication Server
-### END INIT INFO
-# /etc/init.d/remotefpga-authserver: start or stop the RemoteFPGA Authentication Server
-#
-# description: RemoteFPGA Authentication Server
-#
-
-. /lib/lsb/init-functions
-
-set -e
-
-PATH=/opt/trinity/bin:/usr/bin:/sbin:/usr/sbin
-DAEMON=/opt/trinity/bin/remotefpga_authserver
-PIDFILE=/var/run/remotefpga_authserver.pid
-UPGRADEFILE=/var/run/remotefpga_authserver.upgrade
-
-DESC="RemoteFPGA Authentication Server"
-
-# If we upgraded the daemon, we can't use the --exec argument to
-# start-stop-daemon since the inode will have changed.  The risk here is that
-# in a situation where the daemon died, its pidfile was not cleaned up, and
-# some other process is now running under that pid, start-stop-daemon will send
-# signals to an innocent process.  However, this seems like a corner case.
-# C'est la vie!
-if [ -e $UPGRADEFILE ]; then
-  SSD_ARGS="--pidfile $PIDFILE --startas $DAEMON"
-else
-  SSD_ARGS="--pidfile $PIDFILE --exec $DAEMON"
-fi
-
-stillrunning () {
-  if expr "$(cat /proc/$DAEMONPID/cmdline 2> /dev/null)" : "$DAEMON" > /dev/null 2>&1; then
-    true
-  else
-    # if the daemon does not remove its own pidfile, we will
-    rm -f $PIDFILE $UPGRADEFILE
-    false
-  fi;
-}
-
-case "$1" in
-  start)
-    log_action_begin_msg "Starting $DESC"
-    if start-stop-daemon --background --start --make-pidfile --quiet $SSD_ARGS -- $ARG; then
-      log_action_end_msg 0
-    else
-      log_warning_msg "already running"
-      log_action_end_msg 0
-    fi
-  ;;
-
-  restart)
-    /etc/init.d/remotefpga-authserver stop
-    if [ -f $PIDFILE ]; then
-      if stillrunning; then
-        exit 1
-      fi
-    fi
-    /etc/init.d/remotefpga-authserver start
-  ;;
-
-  reload)
-    log_action_begin_msg "Reloading $DESC"
-    if start-stop-daemon --stop --signal 1 --quiet $SSD_ARGS; then
-      log_action_end_msg 0
-    else
-      log_failure_msg "not running"
-      log_action_end_msg 1
-    fi
-  ;;
-
-  force-reload)
-    /etc/init.d/remotefpga-authserver reload
-  ;;
-
-  stop)
-    log_action_begin_msg "Stopping $DESC"
-    if [ ! -f $PIDFILE ]; then
-      log_failure_msg "Not running ($PIDFILE not found)"
-      log_action_end_msg 0
-      exit 0
-    else
-      if start-stop-daemon --stop --quiet $SSD_ARGS; then
-        log_action_end_msg 0
-      else
-        log_failure_msg "not running"
-        log_action_end_msg 1
-      fi
-    fi
-  ;;
-
-  *)
-    echo "Usage: /etc/init.d/remotefpga-authserver {start|stop|restart|reload|force-reload}"
-    exit 1
-    ;;
-esac
-
-exit 0
diff --git a/servers/auth_server_lin/debian/ulab-authserver.init b/servers/auth_server_lin/debian/ulab-authserver.init
new file mode 100644
index 0000000..61f0b33
--- /dev/null
+++ b/servers/auth_server_lin/debian/ulab-authserver.init
@@ -0,0 +1,108 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides:          ulab-authserver
+# Required-Start:    $local_fs $remote_fs
+# Required-Stop:     $local_fs $remote_fs
+# Should-Start:      console-screen kbd acpid hal krb5-kdc nis
+# Should-Stop:       console-screen kbd
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: uLab Authentication Server
+# Description:       uLab Authentication Server
+### END INIT INFO
+# /etc/init.d/ulab-authserver: start or stop the uLab Authentication Server
+#
+# description: uLab Authentication Server
+#
+
+. /lib/lsb/init-functions
+
+set -e
+
+PATH=/opt/trinity/bin:/usr/bin:/sbin:/usr/sbin
+DAEMON=/opt/trinity/bin/remotefpga_authserver
+PIDFILE=/var/run/remotefpga_authserver.pid
+UPGRADEFILE=/var/run/remotefpga_authserver.upgrade
+
+DESC="uLab Authentication Server"
+
+# If we upgraded the daemon, we can't use the --exec argument to
+# start-stop-daemon since the inode will have changed.  The risk here is that
+# in a situation where the daemon died, its pidfile was not cleaned up, and
+# some other process is now running under that pid, start-stop-daemon will send
+# signals to an innocent process.  However, this seems like a corner case.
+# C'est la vie!
+if [ -e $UPGRADEFILE ]; then
+  SSD_ARGS="--pidfile $PIDFILE --startas $DAEMON"
+else
+  SSD_ARGS="--pidfile $PIDFILE --exec $DAEMON"
+fi
+
+stillrunning () {
+  if expr "$(cat /proc/$DAEMONPID/cmdline 2> /dev/null)" : "$DAEMON" > /dev/null 2>&1; then
+    true
+  else
+    # if the daemon does not remove its own pidfile, we will
+    rm -f $PIDFILE $UPGRADEFILE
+    false
+  fi;
+}
+
+case "$1" in
+  start)
+    log_action_begin_msg "Starting $DESC"
+    if start-stop-daemon --background --start --make-pidfile --quiet $SSD_ARGS -- $ARG; then
+      log_action_end_msg 0
+    else
+      log_warning_msg "already running"
+      log_action_end_msg 0
+    fi
+  ;;
+
+  restart)
+    /etc/init.d/ulab-authserver stop
+    if [ -f $PIDFILE ]; then
+      if stillrunning; then
+        exit 1
+      fi
+    fi
+    /etc/init.d/ulab-authserver start
+  ;;
+
+  reload)
+    log_action_begin_msg "Reloading $DESC"
+    if start-stop-daemon --stop --signal 1 --quiet $SSD_ARGS; then
+      log_action_end_msg 0
+    else
+      log_failure_msg "not running"
+      log_action_end_msg 1
+    fi
+  ;;
+
+  force-reload)
+    /etc/init.d/ulab-authserver reload
+  ;;
+
+  stop)
+    log_action_begin_msg "Stopping $DESC"
+    if [ ! -f $PIDFILE ]; then
+      log_failure_msg "Not running ($PIDFILE not found)"
+      log_action_end_msg 0
+      exit 0
+    else
+      if start-stop-daemon --stop --quiet $SSD_ARGS; then
+        log_action_end_msg 0
+      else
+        log_failure_msg "not running"
+        log_action_end_msg 1
+      fi
+    fi
+  ;;
+
+  *)
+    echo "Usage: /etc/init.d/ulab-authserver {start|stop|restart|reload|force-reload}"
+    exit 1
+    ;;
+esac
+
+exit 0
diff --git a/servers/auth_server_lin/src/main.cpp b/servers/auth_server_lin/src/main.cpp
index e0183ee..33b6ccd 100644
--- a/servers/auth_server_lin/src/main.cpp
+++ b/servers/auth_server_lin/src/main.cpp
@@ -45,13 +45,13 @@ static const TDECmdLineOptions options[] =
 	{ 0, 0, 0 }
 };
 
-static const char description[] = I18N_NOOP("RemoteFPGA Kerberos Authentication Server");
+static const char description[] = I18N_NOOP("uLab Kerberos Authentication Server");
 
 static const char version[] = "v0.0.1";
 
 int main(int argc, char *argv[])
 {
-	TDEAboutData aboutData( "remotefpga_auth_server", I18N_NOOP("RemoteFPGA AuthServer"),
+	TDEAboutData aboutData( "remotefpga_auth_server", I18N_NOOP("uLab AuthServer"),
 		version, description, TDEAboutData::License_GPL,
 		"(c) 2012-2013, Timothy Pearson");
 		aboutData.addAuthor("Timothy Pearson",0, "kb9vqf@pearsoncomputing.net");
diff --git a/servers/fpga_programming_server_lin/debian/changelog b/servers/fpga_programming_server_lin/debian/changelog
index be07630..a3866b6 100644
--- a/servers/fpga_programming_server_lin/debian/changelog
+++ b/servers/fpga_programming_server_lin/debian/changelog
@@ -1,4 +1,4 @@
-remotefpga-fpgaprogserver (0.5-0ubuntu0) karmic; urgency=low
+ulab-fpgaprogserver (0.5-0ubuntu0) karmic; urgency=low
 
   * Karmic rebuild
 
diff --git a/servers/fpga_programming_server_lin/debian/control b/servers/fpga_programming_server_lin/debian/control
index 3cc3564..0d5735b 100644
--- a/servers/fpga_programming_server_lin/debian/control
+++ b/servers/fpga_programming_server_lin/debian/control
@@ -1,12 +1,12 @@
-Source: remotefpga-fpgaprogserver
+Source: ulab-fpgaprogserver
 Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: debhelper (>= 5), cdbs, tdelibs4-trinity-dev, libldap2-dev, libtdekrb-trinity, libtqtrla, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5), cdbs, tdelibs4-trinity-dev, libldap2-dev, libtdekrb-trinity-dev, libtqtrla-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
-Package: remotefpga-fpgaprogserver
+Package: ulab-fpgaprogserver
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: RemoteFPGA FPGA Programming Server
- RemoteFPGA FPGA Programming Server
+Description: uLab FPGA Programming Server
+ uLab FPGA Programming Server
diff --git a/servers/fpga_programming_server_lin/debian/remotefpga-fpgaprogserver.init b/servers/fpga_programming_server_lin/debian/remotefpga-fpgaprogserver.init
deleted file mode 100644
index e529183..0000000
--- a/servers/fpga_programming_server_lin/debian/remotefpga-fpgaprogserver.init
+++ /dev/null
@@ -1,108 +0,0 @@
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides:          remotefpga-fpgaprogserver
-# Required-Start:    $local_fs $remote_fs
-# Required-Stop:     $local_fs $remote_fs
-# Should-Start:      console-screen kbd acpid hal krb5-kdc nis
-# Should-Stop:       console-screen kbd
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: RemoteFPGA FPGA Programming Server
-# Description:       RemoteFPGA FPGA Programming Server
-### END INIT INFO
-# /etc/init.d/remotefpga-fpgaprogserver: start or stop the RemoteFPGA FPGA Programming Server
-#
-# description: RemoteFPGA FPGA Programming Server
-#
-
-. /lib/lsb/init-functions
-
-set -e
-
-PATH=/opt/trinity/bin:/usr/bin:/sbin:/usr/sbin
-DAEMON=/opt/trinity/bin/remotefpga_fpgaprogserver
-PIDFILE=/var/run/remotefpga_authserver.pid
-UPGRADEFILE=/var/run/remotefpga_authserver.upgrade
-
-DESC="RemoteFPGA FPGA Programming Server"
-
-# If we upgraded the daemon, we can't use the --exec argument to
-# start-stop-daemon since the inode will have changed.  The risk here is that
-# in a situation where the daemon died, its pidfile was not cleaned up, and
-# some other process is now running under that pid, start-stop-daemon will send
-# signals to an innocent process.  However, this seems like a corner case.
-# C'est la vie!
-if [ -e $UPGRADEFILE ]; then
-  SSD_ARGS="--pidfile $PIDFILE --startas $DAEMON"
-else
-  SSD_ARGS="--pidfile $PIDFILE --exec $DAEMON"
-fi
-
-stillrunning () {
-  if expr "$(cat /proc/$DAEMONPID/cmdline 2> /dev/null)" : "$DAEMON" > /dev/null 2>&1; then
-    true
-  else
-    # if the daemon does not remove its own pidfile, we will
-    rm -f $PIDFILE $UPGRADEFILE
-    false
-  fi;
-}
-
-case "$1" in
-  start)
-    log_action_begin_msg "Starting $DESC"
-    if start-stop-daemon --background --start --make-pidfile --quiet $SSD_ARGS -- $ARG; then
-      log_action_end_msg 0
-    else
-      log_warning_msg "already running"
-      log_action_end_msg 0
-    fi
-  ;;
-
-  restart)
-    /etc/init.d/remotefpga-fpgaprogserver stop
-    if [ -f $PIDFILE ]; then
-      if stillrunning; then
-        exit 1
-      fi
-    fi
-    /etc/init.d/remotefpga-fpgaprogserver start
-  ;;
-
-  reload)
-    log_action_begin_msg "Reloading $DESC"
-    if start-stop-daemon --stop --signal 1 --quiet $SSD_ARGS; then
-      log_action_end_msg 0
-    else
-      log_failure_msg "not running"
-      log_action_end_msg 1
-    fi
-  ;;
-
-  force-reload)
-    /etc/init.d/remotefpga-fpgaprogserver reload
-  ;;
-
-  stop)
-    log_action_begin_msg "Stopping $DESC"
-    if [ ! -f $PIDFILE ]; then
-      log_failure_msg "Not running ($PIDFILE not found)"
-      log_action_end_msg 0
-      exit 0
-    else
-      if start-stop-daemon --stop --quiet $SSD_ARGS; then
-        log_action_end_msg 0
-      else
-        log_failure_msg "not running"
-        log_action_end_msg 1
-      fi
-    fi
-  ;;
-
-  *)
-    echo "Usage: /etc/init.d/remotefpga-fpgaprogserver {start|stop|restart|reload|force-reload}"
-    exit 1
-    ;;
-esac
-
-exit 0
diff --git a/servers/fpga_programming_server_lin/debian/ulab-fpgaprogserver.init b/servers/fpga_programming_server_lin/debian/ulab-fpgaprogserver.init
new file mode 100644
index 0000000..f6eaa31
--- /dev/null
+++ b/servers/fpga_programming_server_lin/debian/ulab-fpgaprogserver.init
@@ -0,0 +1,108 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides:          ulab-fpgaprogserver
+# Required-Start:    $local_fs $remote_fs
+# Required-Stop:     $local_fs $remote_fs
+# Should-Start:      console-screen kbd acpid hal krb5-kdc nis
+# Should-Stop:       console-screen kbd
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: uLab FPGA Programming Server
+# Description:       uLab FPGA Programming Server
+### END INIT INFO
+# /etc/init.d/ulab-fpgaprogserver: start or stop the uLab FPGA Programming Server
+#
+# description: uLab FPGA Programming Server
+#
+
+. /lib/lsb/init-functions
+
+set -e
+
+PATH=/opt/trinity/bin:/usr/bin:/sbin:/usr/sbin
+DAEMON=/opt/trinity/bin/remotefpga_fpgaprogserver
+PIDFILE=/var/run/remotefpga_authserver.pid
+UPGRADEFILE=/var/run/remotefpga_authserver.upgrade
+
+DESC="uLab FPGA Programming Server"
+
+# If we upgraded the daemon, we can't use the --exec argument to
+# start-stop-daemon since the inode will have changed.  The risk here is that
+# in a situation where the daemon died, its pidfile was not cleaned up, and
+# some other process is now running under that pid, start-stop-daemon will send
+# signals to an innocent process.  However, this seems like a corner case.
+# C'est la vie!
+if [ -e $UPGRADEFILE ]; then
+  SSD_ARGS="--pidfile $PIDFILE --startas $DAEMON"
+else
+  SSD_ARGS="--pidfile $PIDFILE --exec $DAEMON"
+fi
+
+stillrunning () {
+  if expr "$(cat /proc/$DAEMONPID/cmdline 2> /dev/null)" : "$DAEMON" > /dev/null 2>&1; then
+    true
+  else
+    # if the daemon does not remove its own pidfile, we will
+    rm -f $PIDFILE $UPGRADEFILE
+    false
+  fi;
+}
+
+case "$1" in
+  start)
+    log_action_begin_msg "Starting $DESC"
+    if start-stop-daemon --background --start --make-pidfile --quiet $SSD_ARGS -- $ARG; then
+      log_action_end_msg 0
+    else
+      log_warning_msg "already running"
+      log_action_end_msg 0
+    fi
+  ;;
+
+  restart)
+    /etc/init.d/ulab-fpgaprogserver stop
+    if [ -f $PIDFILE ]; then
+      if stillrunning; then
+        exit 1
+      fi
+    fi
+    /etc/init.d/ulab-fpgaprogserver start
+  ;;
+
+  reload)
+    log_action_begin_msg "Reloading $DESC"
+    if start-stop-daemon --stop --signal 1 --quiet $SSD_ARGS; then
+      log_action_end_msg 0
+    else
+      log_failure_msg "not running"
+      log_action_end_msg 1
+    fi
+  ;;
+
+  force-reload)
+    /etc/init.d/ulab-fpgaprogserver reload
+  ;;
+
+  stop)
+    log_action_begin_msg "Stopping $DESC"
+    if [ ! -f $PIDFILE ]; then
+      log_failure_msg "Not running ($PIDFILE not found)"
+      log_action_end_msg 0
+      exit 0
+    else
+      if start-stop-daemon --stop --quiet $SSD_ARGS; then
+        log_action_end_msg 0
+      else
+        log_failure_msg "not running"
+        log_action_end_msg 1
+      fi
+    fi
+  ;;
+
+  *)
+    echo "Usage: /etc/init.d/ulab-fpgaprogserver {start|stop|restart|reload|force-reload}"
+    exit 1
+    ;;
+esac
+
+exit 0
diff --git a/servers/fpga_programming_server_lin/src/main.cpp b/servers/fpga_programming_server_lin/src/main.cpp
index c9b1b69..f3422de 100644
--- a/servers/fpga_programming_server_lin/src/main.cpp
+++ b/servers/fpga_programming_server_lin/src/main.cpp
@@ -39,13 +39,13 @@
 
 #include "fpga_conn.h"
 
-static const char description[] = I18N_NOOP("RemoteFPGA FPGA Programming Server");
+static const char description[] = I18N_NOOP("uLab FPGA Programming Server");
 
 static const char version[] = "v0.0.1";
 
 int main(int argc, char *argv[])
 {
-	TDEAboutData aboutData( "remotefpga_fpgaprog_server", I18N_NOOP("RemoteFPGA FPGA Programming Server"),
+	TDEAboutData aboutData( "remotefpga_fpgaprog_server", I18N_NOOP("uLab FPGA Programming Server"),
 		version, description, TDEAboutData::License_GPL,
 		"(c) 2012, Timothy Pearson");
 		aboutData.addAuthor("Timothy Pearson",0, "kb9vqf@pearsoncomputing.net");
diff --git a/servers/fpga_server_lin/debian/changelog b/servers/fpga_server_lin/debian/changelog
index 970a552..0f5ac05 100644
--- a/servers/fpga_server_lin/debian/changelog
+++ b/servers/fpga_server_lin/debian/changelog
@@ -1,4 +1,4 @@
-remotefpga-fpgaserver (0.5-0ubuntu0) karmic; urgency=low
+ulab-fpgaserver (0.5-0ubuntu0) karmic; urgency=low
 
   * Karmic rebuild
 
diff --git a/servers/fpga_server_lin/debian/control b/servers/fpga_server_lin/debian/control
index a63a277..e7f58ed 100644
--- a/servers/fpga_server_lin/debian/control
+++ b/servers/fpga_server_lin/debian/control
@@ -1,12 +1,12 @@
-Source: remotefpga-fpgaserver
+Source: ulab-fpgaserver
 Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: debhelper (>= 5), cdbs, tdelibs4-trinity-dev, libldap2-dev, libtdekrb-trinity, libtqtrla, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5), cdbs, tdelibs4-trinity-dev, libldap2-dev, libtdekrb-trinity-dev, libtqtrla-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
-Package: remotefpga-fpgaserver
+Package: ulab-fpgaserver
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: RemoteFPGA FPGA Server
- RemoteFPGA FPGA Server
+Description: uLab FPGA Server
+ uLab FPGA Server
diff --git a/servers/fpga_server_lin/debian/remotefpga-fpgaserver.init b/servers/fpga_server_lin/debian/remotefpga-fpgaserver.init
deleted file mode 100644
index a55b341..0000000
--- a/servers/fpga_server_lin/debian/remotefpga-fpgaserver.init
+++ /dev/null
@@ -1,108 +0,0 @@
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides:          remotefpga-fpgaserver
-# Required-Start:    $local_fs $remote_fs
-# Required-Stop:     $local_fs $remote_fs
-# Should-Start:      console-screen kbd acpid hal krb5-kdc nis
-# Should-Stop:       console-screen kbd
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: RemoteFPGA FPGA Server
-# Description:       RemoteFPGA FPGA Server
-### END INIT INFO
-# /etc/init.d/remotefpga-fpgaserver: start or stop the RemoteFPGA FPGA Server
-#
-# description: RemoteFPGA FPGA Server
-#
-
-. /lib/lsb/init-functions
-
-set -e
-
-PATH=/opt/trinity/bin:/usr/bin:/sbin:/usr/sbin
-DAEMON=/opt/trinity/bin/remotefpga_fpgaserver
-PIDFILE=/var/run/remotefpga_authserver.pid
-UPGRADEFILE=/var/run/remotefpga_authserver.upgrade
-
-DESC="RemoteFPGA FPGA Server"
-
-# If we upgraded the daemon, we can't use the --exec argument to
-# start-stop-daemon since the inode will have changed.  The risk here is that
-# in a situation where the daemon died, its pidfile was not cleaned up, and
-# some other process is now running under that pid, start-stop-daemon will send
-# signals to an innocent process.  However, this seems like a corner case.
-# C'est la vie!
-if [ -e $UPGRADEFILE ]; then
-  SSD_ARGS="--pidfile $PIDFILE --startas $DAEMON"
-else
-  SSD_ARGS="--pidfile $PIDFILE --exec $DAEMON"
-fi
-
-stillrunning () {
-  if expr "$(cat /proc/$DAEMONPID/cmdline 2> /dev/null)" : "$DAEMON" > /dev/null 2>&1; then
-    true
-  else
-    # if the daemon does not remove its own pidfile, we will
-    rm -f $PIDFILE $UPGRADEFILE
-    false
-  fi;
-}
-
-case "$1" in
-  start)
-    log_action_begin_msg "Starting $DESC"
-    if start-stop-daemon --background --start --make-pidfile --quiet $SSD_ARGS -- $ARG; then
-      log_action_end_msg 0
-    else
-      log_warning_msg "already running"
-      log_action_end_msg 0
-    fi
-  ;;
-
-  restart)
-    /etc/init.d/remotefpga-fpgaserver stop
-    if [ -f $PIDFILE ]; then
-      if stillrunning; then
-        exit 1
-      fi
-    fi
-    /etc/init.d/remotefpga-fpgaserver start
-  ;;
-
-  reload)
-    log_action_begin_msg "Reloading $DESC"
-    if start-stop-daemon --stop --signal 1 --quiet $SSD_ARGS; then
-      log_action_end_msg 0
-    else
-      log_failure_msg "not running"
-      log_action_end_msg 1
-    fi
-  ;;
-
-  force-reload)
-    /etc/init.d/remotefpga-fpgaserver reload
-  ;;
-
-  stop)
-    log_action_begin_msg "Stopping $DESC"
-    if [ ! -f $PIDFILE ]; then
-      log_failure_msg "Not running ($PIDFILE not found)"
-      log_action_end_msg 0
-      exit 0
-    else
-      if start-stop-daemon --stop --quiet $SSD_ARGS; then
-        log_action_end_msg 0
-      else
-        log_failure_msg "not running"
-        log_action_end_msg 1
-      fi
-    fi
-  ;;
-
-  *)
-    echo "Usage: /etc/init.d/remotefpga-fpgaserver {start|stop|restart|reload|force-reload}"
-    exit 1
-    ;;
-esac
-
-exit 0
diff --git a/servers/fpga_server_lin/debian/ulab-fpgaserver.init b/servers/fpga_server_lin/debian/ulab-fpgaserver.init
new file mode 100644
index 0000000..0ac88dc
--- /dev/null
+++ b/servers/fpga_server_lin/debian/ulab-fpgaserver.init
@@ -0,0 +1,108 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides:          ulab-fpgaserver
+# Required-Start:    $local_fs $remote_fs
+# Required-Stop:     $local_fs $remote_fs
+# Should-Start:      console-screen kbd acpid hal krb5-kdc nis
+# Should-Stop:       console-screen kbd
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: uLab FPGA Server
+# Description:       uLab FPGA Server
+### END INIT INFO
+# /etc/init.d/ulab-fpgaserver: start or stop the uLab FPGA Server
+#
+# description: uLab FPGA Server
+#
+
+. /lib/lsb/init-functions
+
+set -e
+
+PATH=/opt/trinity/bin:/usr/bin:/sbin:/usr/sbin
+DAEMON=/opt/trinity/bin/remotefpga_fpgaserver
+PIDFILE=/var/run/remotefpga_authserver.pid
+UPGRADEFILE=/var/run/remotefpga_authserver.upgrade
+
+DESC="uLab FPGA Server"
+
+# If we upgraded the daemon, we can't use the --exec argument to
+# start-stop-daemon since the inode will have changed.  The risk here is that
+# in a situation where the daemon died, its pidfile was not cleaned up, and
+# some other process is now running under that pid, start-stop-daemon will send
+# signals to an innocent process.  However, this seems like a corner case.
+# C'est la vie!
+if [ -e $UPGRADEFILE ]; then
+  SSD_ARGS="--pidfile $PIDFILE --startas $DAEMON"
+else
+  SSD_ARGS="--pidfile $PIDFILE --exec $DAEMON"
+fi
+
+stillrunning () {
+  if expr "$(cat /proc/$DAEMONPID/cmdline 2> /dev/null)" : "$DAEMON" > /dev/null 2>&1; then
+    true
+  else
+    # if the daemon does not remove its own pidfile, we will
+    rm -f $PIDFILE $UPGRADEFILE
+    false
+  fi;
+}
+
+case "$1" in
+  start)
+    log_action_begin_msg "Starting $DESC"
+    if start-stop-daemon --background --start --make-pidfile --quiet $SSD_ARGS -- $ARG; then
+      log_action_end_msg 0
+    else
+      log_warning_msg "already running"
+      log_action_end_msg 0
+    fi
+  ;;
+
+  restart)
+    /etc/init.d/ulab-fpgaserver stop
+    if [ -f $PIDFILE ]; then
+      if stillrunning; then
+        exit 1
+      fi
+    fi
+    /etc/init.d/ulab-fpgaserver start
+  ;;
+
+  reload)
+    log_action_begin_msg "Reloading $DESC"
+    if start-stop-daemon --stop --signal 1 --quiet $SSD_ARGS; then
+      log_action_end_msg 0
+    else
+      log_failure_msg "not running"
+      log_action_end_msg 1
+    fi
+  ;;
+
+  force-reload)
+    /etc/init.d/ulab-fpgaserver reload
+  ;;
+
+  stop)
+    log_action_begin_msg "Stopping $DESC"
+    if [ ! -f $PIDFILE ]; then
+      log_failure_msg "Not running ($PIDFILE not found)"
+      log_action_end_msg 0
+      exit 0
+    else
+      if start-stop-daemon --stop --quiet $SSD_ARGS; then
+        log_action_end_msg 0
+      else
+        log_failure_msg "not running"
+        log_action_end_msg 1
+      fi
+    fi
+  ;;
+
+  *)
+    echo "Usage: /etc/init.d/ulab-fpgaserver {start|stop|restart|reload|force-reload}"
+    exit 1
+    ;;
+esac
+
+exit 0
diff --git a/servers/fpga_server_lin/src/main.cpp b/servers/fpga_server_lin/src/main.cpp
index 4722404..0097c24 100644
--- a/servers/fpga_server_lin/src/main.cpp
+++ b/servers/fpga_server_lin/src/main.cpp
@@ -39,13 +39,13 @@
 
 #include "fpga_conn.h"
 
-static const char description[] = I18N_NOOP("RemoteFPGA FPGA Viewer Server");
+static const char description[] = I18N_NOOP("uLab FPGA Viewer Server");
 
 static const char version[] = "v0.0.1";
 
 int main(int argc, char *argv[])
 {
-	TDEAboutData aboutData( "remotefpga_fpga_server", I18N_NOOP("RemoteFPGA FPGA Viewer Server"),
+	TDEAboutData aboutData( "remotefpga_fpga_server", I18N_NOOP("uLab FPGA Viewer Server"),
 		version, description, TDEAboutData::License_GPL,
 		"(c) 2012, Timothy Pearson");
 		aboutData.addAuthor("Timothy Pearson",0, "kb9vqf@pearsoncomputing.net");
diff --git a/servers/gpib_server_lin/debian/changelog b/servers/gpib_server_lin/debian/changelog
index 089c5c3..845dfc0 100644
--- a/servers/gpib_server_lin/debian/changelog
+++ b/servers/gpib_server_lin/debian/changelog
@@ -1,4 +1,4 @@
-remotefpga-gpibserver (0.5-0ubuntu0) karmic; urgency=low
+ulab-gpibserver (0.5-0ubuntu0) karmic; urgency=low
 
   * Karmic rebuild
 
diff --git a/servers/gpib_server_lin/debian/control b/servers/gpib_server_lin/debian/control
index 8c90da9..a7dba49 100644
--- a/servers/gpib_server_lin/debian/control
+++ b/servers/gpib_server_lin/debian/control
@@ -1,12 +1,12 @@
-Source: remotefpga-gpibserver
+Source: ulab-gpibserver
 Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: debhelper (>= 5), cdbs, tdelibs4-trinity-dev, libldap2-dev, libtdekrb-trinity, libtqtrla, libgpib0-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5), cdbs, tdelibs4-trinity-dev, libldap2-dev, libtdekrb-trinity-dev, libtqtrla-dev, libgpib0-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
-Package: remotefpga-gpibserver
+Package: ulab-gpibserver
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: RemoteFPGA GPIB Instrumentation Server
- RemoteFPGA GPIB Instrumentation Server
+Description: uLab GPIB Instrumentation Server
+ uLab GPIB Instrumentation Server
diff --git a/servers/gpib_server_lin/debian/remotefpga-gpibserver.init b/servers/gpib_server_lin/debian/remotefpga-gpibserver.init
deleted file mode 100644
index bc79e75..0000000
--- a/servers/gpib_server_lin/debian/remotefpga-gpibserver.init
+++ /dev/null
@@ -1,108 +0,0 @@
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides:          remotefpga-gpibserver
-# Required-Start:    $local_fs $remote_fs
-# Required-Stop:     $local_fs $remote_fs
-# Should-Start:      console-screen kbd acpid hal krb5-kdc nis
-# Should-Stop:       console-screen kbd
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: RemoteFPGA GPIB Instrumentation Server
-# Description:       RemoteFPGA GPIB Instrumentation Server
-### END INIT INFO
-# /etc/init.d/remotefpga-gpibserver: start or stop the RemoteFPGA GPIB Instrumentation Server
-#
-# description: RemoteFPGA GPIB Instrumentation Server
-#
-
-. /lib/lsb/init-functions
-
-set -e
-
-PATH=/opt/trinity/bin:/usr/bin:/sbin:/usr/sbin
-DAEMON=/opt/trinity/bin/remotefpga_gpibserver
-PIDFILE=/var/run/remotefpga_authserver.pid
-UPGRADEFILE=/var/run/remotefpga_authserver.upgrade
-
-DESC="RemoteFPGA GPIB Instrumentation Server"
-
-# If we upgraded the daemon, we can't use the --exec argument to
-# start-stop-daemon since the inode will have changed.  The risk here is that
-# in a situation where the daemon died, its pidfile was not cleaned up, and
-# some other process is now running under that pid, start-stop-daemon will send
-# signals to an innocent process.  However, this seems like a corner case.
-# C'est la vie!
-if [ -e $UPGRADEFILE ]; then
-  SSD_ARGS="--pidfile $PIDFILE --startas $DAEMON"
-else
-  SSD_ARGS="--pidfile $PIDFILE --exec $DAEMON"
-fi
-
-stillrunning () {
-  if expr "$(cat /proc/$DAEMONPID/cmdline 2> /dev/null)" : "$DAEMON" > /dev/null 2>&1; then
-    true
-  else
-    # if the daemon does not remove its own pidfile, we will
-    rm -f $PIDFILE $UPGRADEFILE
-    false
-  fi;
-}
-
-case "$1" in
-  start)
-    log_action_begin_msg "Starting $DESC"
-    if start-stop-daemon --background --start --make-pidfile --quiet $SSD_ARGS -- $ARG; then
-      log_action_end_msg 0
-    else
-      log_warning_msg "already running"
-      log_action_end_msg 0
-    fi
-  ;;
-
-  restart)
-    /etc/init.d/remotefpga-gpibserver stop
-    if [ -f $PIDFILE ]; then
-      if stillrunning; then
-        exit 1
-      fi
-    fi
-    /etc/init.d/remotefpga-gpibserver start
-  ;;
-
-  reload)
-    log_action_begin_msg "Reloading $DESC"
-    if start-stop-daemon --stop --signal 1 --quiet $SSD_ARGS; then
-      log_action_end_msg 0
-    else
-      log_failure_msg "not running"
-      log_action_end_msg 1
-    fi
-  ;;
-
-  force-reload)
-    /etc/init.d/remotefpga-gpibserver reload
-  ;;
-
-  stop)
-    log_action_begin_msg "Stopping $DESC"
-    if [ ! -f $PIDFILE ]; then
-      log_failure_msg "Not running ($PIDFILE not found)"
-      log_action_end_msg 0
-      exit 0
-    else
-      if start-stop-daemon --stop --quiet $SSD_ARGS; then
-        log_action_end_msg 0
-      else
-        log_failure_msg "not running"
-        log_action_end_msg 1
-      fi
-    fi
-  ;;
-
-  *)
-    echo "Usage: /etc/init.d/remotefpga-gpibserver {start|stop|restart|reload|force-reload}"
-    exit 1
-    ;;
-esac
-
-exit 0
diff --git a/servers/gpib_server_lin/debian/ulab-gpibserver.init b/servers/gpib_server_lin/debian/ulab-gpibserver.init
new file mode 100644
index 0000000..d455d19
--- /dev/null
+++ b/servers/gpib_server_lin/debian/ulab-gpibserver.init
@@ -0,0 +1,108 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides:          ulab-gpibserver
+# Required-Start:    $local_fs $remote_fs
+# Required-Stop:     $local_fs $remote_fs
+# Should-Start:      console-screen kbd acpid hal krb5-kdc nis
+# Should-Stop:       console-screen kbd
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: uLab GPIB Instrumentation Server
+# Description:       uLab GPIB Instrumentation Server
+### END INIT INFO
+# /etc/init.d/ulab-gpibserver: start or stop the uLab GPIB Instrumentation Server
+#
+# description: uLab GPIB Instrumentation Server
+#
+
+. /lib/lsb/init-functions
+
+set -e
+
+PATH=/opt/trinity/bin:/usr/bin:/sbin:/usr/sbin
+DAEMON=/opt/trinity/bin/remotefpga_gpibserver
+PIDFILE=/var/run/remotefpga_authserver.pid
+UPGRADEFILE=/var/run/remotefpga_authserver.upgrade
+
+DESC="uLab GPIB Instrumentation Server"
+
+# If we upgraded the daemon, we can't use the --exec argument to
+# start-stop-daemon since the inode will have changed.  The risk here is that
+# in a situation where the daemon died, its pidfile was not cleaned up, and
+# some other process is now running under that pid, start-stop-daemon will send
+# signals to an innocent process.  However, this seems like a corner case.
+# C'est la vie!
+if [ -e $UPGRADEFILE ]; then
+  SSD_ARGS="--pidfile $PIDFILE --startas $DAEMON"
+else
+  SSD_ARGS="--pidfile $PIDFILE --exec $DAEMON"
+fi
+
+stillrunning () {
+  if expr "$(cat /proc/$DAEMONPID/cmdline 2> /dev/null)" : "$DAEMON" > /dev/null 2>&1; then
+    true
+  else
+    # if the daemon does not remove its own pidfile, we will
+    rm -f $PIDFILE $UPGRADEFILE
+    false
+  fi;
+}
+
+case "$1" in
+  start)
+    log_action_begin_msg "Starting $DESC"
+    if start-stop-daemon --background --start --make-pidfile --quiet $SSD_ARGS -- $ARG; then
+      log_action_end_msg 0
+    else
+      log_warning_msg "already running"
+      log_action_end_msg 0
+    fi
+  ;;
+
+  restart)
+    /etc/init.d/ulab-gpibserver stop
+    if [ -f $PIDFILE ]; then
+      if stillrunning; then
+        exit 1
+      fi
+    fi
+    /etc/init.d/ulab-gpibserver start
+  ;;
+
+  reload)
+    log_action_begin_msg "Reloading $DESC"
+    if start-stop-daemon --stop --signal 1 --quiet $SSD_ARGS; then
+      log_action_end_msg 0
+    else
+      log_failure_msg "not running"
+      log_action_end_msg 1
+    fi
+  ;;
+
+  force-reload)
+    /etc/init.d/ulab-gpibserver reload
+  ;;
+
+  stop)
+    log_action_begin_msg "Stopping $DESC"
+    if [ ! -f $PIDFILE ]; then
+      log_failure_msg "Not running ($PIDFILE not found)"
+      log_action_end_msg 0
+      exit 0
+    else
+      if start-stop-daemon --stop --quiet $SSD_ARGS; then
+        log_action_end_msg 0
+      else
+        log_failure_msg "not running"
+        log_action_end_msg 1
+      fi
+    fi
+  ;;
+
+  *)
+    echo "Usage: /etc/init.d/ulab-gpibserver {start|stop|restart|reload|force-reload}"
+    exit 1
+    ;;
+esac
+
+exit 0
diff --git a/servers/gpib_server_lin/src/main.cpp b/servers/gpib_server_lin/src/main.cpp
index 3ed9d40..89caa8e 100644
--- a/servers/gpib_server_lin/src/main.cpp
+++ b/servers/gpib_server_lin/src/main.cpp
@@ -39,13 +39,13 @@
 
 #include "gpib_conn.h"
 
-static const char description[] = I18N_NOOP("RemoteFPGA GPIB Server");
+static const char description[] = I18N_NOOP("uLab GPIB Server");
 
 static const char version[] = "v0.0.1";
 
 int main(int argc, char *argv[])
 {
-	TDEAboutData aboutData( "remotefpga_gpib_server", I18N_NOOP("RemoteFPGA GPIB Server"),
+	TDEAboutData aboutData( "remotefpga_gpib_server", I18N_NOOP("uLab GPIB Server"),
 		version, description, TDEAboutData::License_GPL,
 		"(c) 2012, Timothy Pearson");
 		aboutData.addAuthor("Timothy Pearson",0, "kb9vqf@pearsoncomputing.net");
diff --git a/servers/gpib_server_lin/src/main_server_lin.cpp b/servers/gpib_server_lin/src/main_server_lin.cpp
index 9788566..589f5d5 100644
--- a/servers/gpib_server_lin/src/main_server_lin.cpp
+++ b/servers/gpib_server_lin/src/main_server_lin.cpp
@@ -1193,7 +1193,7 @@ int main(int argc, char *argv[])
 	// Register signal handler
 	signal(SIGPIPE, signal_handler_IO);
 
-	printf("RemoteFPGA GPIB Server v%s.%s%s\n\r", SERVER_MAJOR, SERVER_MINOR, SERVER_REVISION);
+	printf("uLab GPIB Server v%s.%s%s\n\r", SERVER_MAJOR, SERVER_MINOR, SERVER_REVISION);
 	printf("(c) %s Timothy Pearson\n\r", COPYRIGHT_DATE);
 	printf("(c) %s Remote Laboratory FOSS Contributors\n\r", FOSS_COPYRIGHT_DATE);
 
diff --git a/servers/sensor_monitor_server_lin/debian/changelog b/servers/sensor_monitor_server_lin/debian/changelog
index d56152d..414c08a 100644
--- a/servers/sensor_monitor_server_lin/debian/changelog
+++ b/servers/sensor_monitor_server_lin/debian/changelog
@@ -1,4 +1,4 @@
-remotefpga-sensormonserver (0.5-0ubuntu0) karmic; urgency=low
+ulab-sensormonserver (0.5-0ubuntu0) karmic; urgency=low
 
   * Karmic rebuild
 
diff --git a/servers/sensor_monitor_server_lin/debian/control b/servers/sensor_monitor_server_lin/debian/control
index 8489ac2..e6a72c1 100644
--- a/servers/sensor_monitor_server_lin/debian/control
+++ b/servers/sensor_monitor_server_lin/debian/control
@@ -1,12 +1,12 @@
-Source: remotefpga-sensormonserver
+Source: ulab-sensormonserver
 Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: debhelper (>= 5), cdbs, tdelibs4-trinity-dev, libldap2-dev, libtdekrb-trinity, libtqtrla, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5), cdbs, tdelibs4-trinity-dev, libldap2-dev, libtdekrb-trinity-dev, libtqtrla-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
-Package: remotefpga-sensormonserver
+Package: ulab-sensormonserver
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: RemoteFPGA Sensor Monitor Server
- RemoteFPGA Sensor Monitor Server
+Description: uLab Sensor Monitor Server
+ uLab Sensor Monitor Server
diff --git a/servers/sensor_monitor_server_lin/debian/remotefpga-sensormonserver.init b/servers/sensor_monitor_server_lin/debian/remotefpga-sensormonserver.init
deleted file mode 100644
index 4f7841b..0000000
--- a/servers/sensor_monitor_server_lin/debian/remotefpga-sensormonserver.init
+++ /dev/null
@@ -1,108 +0,0 @@
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides:          remotefpga-sensormonserver
-# Required-Start:    $local_fs $remote_fs
-# Required-Stop:     $local_fs $remote_fs
-# Should-Start:      console-screen kbd acpid hal krb5-kdc nis
-# Should-Stop:       console-screen kbd
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: RemoteFPGA Sensor Monitor Server
-# Description:       RemoteFPGA Sensor Monitor Server
-### END INIT INFO
-# /etc/init.d/remotefpga-sensormonserver: start or stop the RemoteFPGA Sensor Monitor Server
-#
-# description: RemoteFPGA Sensor Monitor Server
-#
-
-. /lib/lsb/init-functions
-
-set -e
-
-PATH=/opt/trinity/bin:/usr/bin:/sbin:/usr/sbin
-DAEMON=/opt/trinity/bin/remotefpga_sensormonserver
-PIDFILE=/var/run/remotefpga_authserver.pid
-UPGRADEFILE=/var/run/remotefpga_authserver.upgrade
-
-DESC="RemoteFPGA Sensor Monitor Server"
-
-# If we upgraded the daemon, we can't use the --exec argument to
-# start-stop-daemon since the inode will have changed.  The risk here is that
-# in a situation where the daemon died, its pidfile was not cleaned up, and
-# some other process is now running under that pid, start-stop-daemon will send
-# signals to an innocent process.  However, this seems like a corner case.
-# C'est la vie!
-if [ -e $UPGRADEFILE ]; then
-  SSD_ARGS="--pidfile $PIDFILE --startas $DAEMON"
-else
-  SSD_ARGS="--pidfile $PIDFILE --exec $DAEMON"
-fi
-
-stillrunning () {
-  if expr "$(cat /proc/$DAEMONPID/cmdline 2> /dev/null)" : "$DAEMON" > /dev/null 2>&1; then
-    true
-  else
-    # if the daemon does not remove its own pidfile, we will
-    rm -f $PIDFILE $UPGRADEFILE
-    false
-  fi;
-}
-
-case "$1" in
-  start)
-    log_action_begin_msg "Starting $DESC"
-    if start-stop-daemon --background --start --make-pidfile --quiet $SSD_ARGS -- $ARG; then
-      log_action_end_msg 0
-    else
-      log_warning_msg "already running"
-      log_action_end_msg 0
-    fi
-  ;;
-
-  restart)
-    /etc/init.d/remotefpga-sensormonserver stop
-    if [ -f $PIDFILE ]; then
-      if stillrunning; then
-        exit 1
-      fi
-    fi
-    /etc/init.d/remotefpga-sensormonserver start
-  ;;
-
-  reload)
-    log_action_begin_msg "Reloading $DESC"
-    if start-stop-daemon --stop --signal 1 --quiet $SSD_ARGS; then
-      log_action_end_msg 0
-    else
-      log_failure_msg "not running"
-      log_action_end_msg 1
-    fi
-  ;;
-
-  force-reload)
-    /etc/init.d/remotefpga-sensormonserver reload
-  ;;
-
-  stop)
-    log_action_begin_msg "Stopping $DESC"
-    if [ ! -f $PIDFILE ]; then
-      log_failure_msg "Not running ($PIDFILE not found)"
-      log_action_end_msg 0
-      exit 0
-    else
-      if start-stop-daemon --stop --quiet $SSD_ARGS; then
-        log_action_end_msg 0
-      else
-        log_failure_msg "not running"
-        log_action_end_msg 1
-      fi
-    fi
-  ;;
-
-  *)
-    echo "Usage: /etc/init.d/remotefpga-sensormonserver {start|stop|restart|reload|force-reload}"
-    exit 1
-    ;;
-esac
-
-exit 0
diff --git a/servers/sensor_monitor_server_lin/debian/ulab-sensormonserver.init b/servers/sensor_monitor_server_lin/debian/ulab-sensormonserver.init
new file mode 100644
index 0000000..94d5258
--- /dev/null
+++ b/servers/sensor_monitor_server_lin/debian/ulab-sensormonserver.init
@@ -0,0 +1,108 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides:          ulab-sensormonserver
+# Required-Start:    $local_fs $remote_fs
+# Required-Stop:     $local_fs $remote_fs
+# Should-Start:      console-screen kbd acpid hal krb5-kdc nis
+# Should-Stop:       console-screen kbd
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: uLab Sensor Monitor Server
+# Description:       uLab Sensor Monitor Server
+### END INIT INFO
+# /etc/init.d/ulab-sensormonserver: start or stop the uLab Sensor Monitor Server
+#
+# description: uLab Sensor Monitor Server
+#
+
+. /lib/lsb/init-functions
+
+set -e
+
+PATH=/opt/trinity/bin:/usr/bin:/sbin:/usr/sbin
+DAEMON=/opt/trinity/bin/remotefpga_sensormonserver
+PIDFILE=/var/run/remotefpga_authserver.pid
+UPGRADEFILE=/var/run/remotefpga_authserver.upgrade
+
+DESC="uLab Sensor Monitor Server"
+
+# If we upgraded the daemon, we can't use the --exec argument to
+# start-stop-daemon since the inode will have changed.  The risk here is that
+# in a situation where the daemon died, its pidfile was not cleaned up, and
+# some other process is now running under that pid, start-stop-daemon will send
+# signals to an innocent process.  However, this seems like a corner case.
+# C'est la vie!
+if [ -e $UPGRADEFILE ]; then
+  SSD_ARGS="--pidfile $PIDFILE --startas $DAEMON"
+else
+  SSD_ARGS="--pidfile $PIDFILE --exec $DAEMON"
+fi
+
+stillrunning () {
+  if expr "$(cat /proc/$DAEMONPID/cmdline 2> /dev/null)" : "$DAEMON" > /dev/null 2>&1; then
+    true
+  else
+    # if the daemon does not remove its own pidfile, we will
+    rm -f $PIDFILE $UPGRADEFILE
+    false
+  fi;
+}
+
+case "$1" in
+  start)
+    log_action_begin_msg "Starting $DESC"
+    if start-stop-daemon --background --start --make-pidfile --quiet $SSD_ARGS -- $ARG; then
+      log_action_end_msg 0
+    else
+      log_warning_msg "already running"
+      log_action_end_msg 0
+    fi
+  ;;
+
+  restart)
+    /etc/init.d/ulab-sensormonserver stop
+    if [ -f $PIDFILE ]; then
+      if stillrunning; then
+        exit 1
+      fi
+    fi
+    /etc/init.d/ulab-sensormonserver start
+  ;;
+
+  reload)
+    log_action_begin_msg "Reloading $DESC"
+    if start-stop-daemon --stop --signal 1 --quiet $SSD_ARGS; then
+      log_action_end_msg 0
+    else
+      log_failure_msg "not running"
+      log_action_end_msg 1
+    fi
+  ;;
+
+  force-reload)
+    /etc/init.d/ulab-sensormonserver reload
+  ;;
+
+  stop)
+    log_action_begin_msg "Stopping $DESC"
+    if [ ! -f $PIDFILE ]; then
+      log_failure_msg "Not running ($PIDFILE not found)"
+      log_action_end_msg 0
+      exit 0
+    else
+      if start-stop-daemon --stop --quiet $SSD_ARGS; then
+        log_action_end_msg 0
+      else
+        log_failure_msg "not running"
+        log_action_end_msg 1
+      fi
+    fi
+  ;;
+
+  *)
+    echo "Usage: /etc/init.d/ulab-sensormonserver {start|stop|restart|reload|force-reload}"
+    exit 1
+    ;;
+esac
+
+exit 0
diff --git a/servers/sensor_monitor_server_lin/src/main.cpp b/servers/sensor_monitor_server_lin/src/main.cpp
index 8174bf7..74421e0 100644
--- a/servers/sensor_monitor_server_lin/src/main.cpp
+++ b/servers/sensor_monitor_server_lin/src/main.cpp
@@ -39,13 +39,13 @@
 
 #include "sensor_conn.h"
 
-static const char description[] = I18N_NOOP("RemoteFPGA Sensor Monitor Server");
+static const char description[] = I18N_NOOP("uLab Sensor Monitor Server");
 
 static const char version[] = "v0.0.1";
 
 int main(int argc, char *argv[])
 {
-	TDEAboutData aboutData( "remotefpga_sensormon_server", I18N_NOOP("RemoteFPGA Sensor Monitor Server"),
+	TDEAboutData aboutData( "remotefpga_sensormon_server", I18N_NOOP("uLab Sensor Monitor Server"),
 		version, description, TDEAboutData::License_GPL,
 		"(c) 2012, Timothy Pearson");
 		aboutData.addAuthor("Timothy Pearson",0, "kb9vqf@pearsoncomputing.net");
-- 
cgit v1.2.3