diff -ruN e-smith-samba-2.4.0.old/root/etc/e-smith/db/configuration/migrate/30smbServerName e-smith-samba-2.4.0/root/etc/e-smith/db/configuration/migrate/30smbServerName
--- e-smith-samba-2.4.0.old/root/etc/e-smith/db/configuration/migrate/30smbServerName	2013-01-31 13:31:40.000000000 -0800
+++ e-smith-samba-2.4.0/root/etc/e-smith/db/configuration/migrate/30smbServerName	2013-05-21 21:47:17.000000000 -0700
@@ -1,8 +1,9 @@
 {
+# Set ServerName to SystemName after inital configuration.
     my $smb = $DB->get('smb') || return;
-    my $srvName = $smb->prop('ServerName') || 'e-smith-server';
+    my $srvName = $smb->prop('ServerName') || 'sme-server';
     my $sysName = $DB->get('SystemName') || return;
 
-    return unless $srvName =~ m#mitel-networks|mitel-networks-server|mitel-server|e-smith-server#;
+    return unless $srvName =~ m#sme-server#;
     $smb->set_prop('ServerName', $sysName->value);
 }