--- bacula-2.0.2/src/gnome2-console/gnome-console.conf.in.orig	2007-02-06 13:35:12.000000000 +0100
+++ bacula-2.0.2/src/gnome2-console/gnome-console.conf.in	2007-02-06 13:35:25.000000000 +0100
@@ -3,9 +3,9 @@
 #
 
 Director {
-  Name = @hostname@-dir
+  Name = bacula-dir
   DIRport = @dir_port@
-  address = @hostname@
+  address = server.example.com
   Password = "@dir_password@"
 }
 
--- bacula-2.0.2/src/dird/bacula-dir.conf.in.orig	2007-02-06 13:33:19.000000000 +0100
+++ bacula-2.0.2/src/dird/bacula-dir.conf.in	2007-02-06 13:34:49.000000000 +0100
@@ -13,7 +13,7 @@
 #
 
 Director {                            # define myself
-  Name = @hostname@-dir
+  Name = bacula-dir
   DIRport = @dir_port@                # where we listen for UA connections
   QueryFile = "@scriptdir@/query.sql"
   WorkingDirectory = "@working_dir@"
@@ -27,7 +27,7 @@
   Name = "DefaultJob"
   Type = Backup
   Level = Incremental
-  Client = @hostname@-fd 
+  Client = bacula-fd 
   FileSet = "Full Set"
   Schedule = "WeeklyCycle"
   Storage = File
@@ -48,7 +48,7 @@
 
 #Job {
 #  Name = "Client2"
-#  Client = @hostname@2-fd
+#  Client = bacula2-fd
 #  JobDefs = "DefaultJob"
 #  Write Bootstrap = "@working_dir@/Client2.bsr"
 #}
@@ -75,7 +75,7 @@
 Job {
   Name = "RestoreFiles"
   Type = Restore
-  Client=@hostname@-fd                 
+  Client=bacula-fd                 
   FileSet="Full Set"                  
   Storage = File                      
   Pool = Default
@@ -149,8 +149,8 @@
 
 # Client (File Services) to backup
 Client {
-  Name = @hostname@-fd
-  Address = @hostname@
+  Name = bacula-fd
+  Address = client.example.com
   FDPort = @fd_port@
   Catalog = MyCatalog
   Password = "@fd_password@"          # password for FileDaemon
@@ -164,8 +164,8 @@
 #  You should change Name, Address, and Password before using
 #
 #Client {
-#  Name = @hostname@2-fd                
-#  Address = @hostname@2
+#  Name = bacula2-fd                
+#  Address = client2.example.com
 #  FDPort = @fd_port@
 #  Catalog = MyCatalog
 #  Password = "@fd_password@2"         # password for FileDaemon 2
@@ -179,7 +179,7 @@
 Storage {
   Name = File
 # Do not use "localhost" here    
-  Address = @hostname@                # N.B. Use a fully qualified name here
+  Address = storage.example.com        # N.B. Use a fully qualified name here
   SDPort = @sd_port@
   Password = "@sd_password@"
   Device = FileStorage
@@ -192,7 +192,7 @@
 #Storage {
 #  Name = DDS-4    
 #  Do not use "localhost" here
-#  Address = @hostname@                # N.B. Use a fully qualified name here
+#  Address = storage.example.com       # N.B. Use a fully qualified name here
 #  SDPort = @sd_port@
 #  Password = "@sd_password@"          # password for Storage daemon
 #  Device = DDS-4                      # must be same as Device in Storage daemon
@@ -204,7 +204,7 @@
 #Storage {
 #  Name = "8mmDrive"
 #  Do not use "localhost" here
-#  Address = @hostname@                # N.B. Use a fully qualified name here
+#  Address = storage.example.com       # N.B. Use a fully qualified name here
 #  SDPort = @sd_port@
 #  Password = "@sd_password@"
 #  Device = "Exabyte 8mm"
@@ -215,7 +215,7 @@
 #Storage {
 #  Name = "DVD"
 #  Do not use "localhost" here
-#  Address = @hostname@                # N.B. Use a fully qualified name here
+#  Address = storage.example.com       # N.B. Use a fully qualified name here
 #  SDPort = @sd_port@
 #  Password = "@sd_password@"
 #  Device = "DVD Writer"
@@ -285,7 +285,7 @@
 # Restricted console used by tray-monitor to get the status of the director
 #
 Console {
-  Name = @hostname@-mon
+  Name = bacula-mon
   Password = "@mon_dir_password@"
   CommandACL = status, .status
 }
--- bacula-2.0.2/src/filed/bacula-fd.conf.in.orig	2007-02-06 13:30:59.000000000 +0100
+++ bacula-2.0.2/src/filed/bacula-fd.conf.in	2007-02-06 13:31:25.000000000 +0100
@@ -11,7 +11,7 @@
 # List Directors who are permitted to contact this File daemon
 #
 Director {
-  Name = @hostname@-dir
+  Name = bacula-dir
   Password = "@fd_password@"
 }
 
@@ -20,7 +20,7 @@
 #   status of the file daemon
 #
 Director {
-  Name = @hostname@-mon
+  Name = bacula-mon
   Password = "@mon_fd_password@"
   Monitor = yes
 }
@@ -29,7 +29,7 @@
 # "Global" File daemon configuration specifications
 #
 FileDaemon {                          # this is me
-  Name = @hostname@-fd
+  Name = bacula-fd
   FDport = @fd_port@                  # where we listen for the director
   WorkingDirectory = @working_dir@
   Pid Directory = @piddir@
@@ -39,5 +39,5 @@
 # Send all messages except skipped files back to Director
 Messages {
   Name = Standard
-  director = @hostname@-dir = all, !skipped, !restored
+  director = bacula-dir = all, !skipped, !restored
 }
--- bacula-2.0.2/src/console/bconsole.conf.in.orig	2007-02-06 13:32:30.000000000 +0100
+++ bacula-2.0.2/src/console/bconsole.conf.in	2007-02-06 13:33:06.000000000 +0100
@@ -3,8 +3,8 @@
 #
 
 Director {
-  Name = @hostname@-dir
+  Name = bacula-dir
   DIRport = @dir_port@
-  address = @hostname@
+  address = server.example.com
   Password = "@dir_password@"
 }
--- bacula-2.0.2/src/stored/bacula-sd.conf.in.orig	2007-02-06 13:31:56.000000000 +0100
+++ bacula-2.0.2/src/stored/bacula-sd.conf.in	2007-02-06 13:32:15.000000000 +0100
@@ -11,7 +11,7 @@
 #
 
 Storage {                             # definition of myself
-  Name = @hostname@-sd
+  Name = bacula-sd
   SDPort = @sd_port@                  # Director's port      
   WorkingDirectory = "@working_dir@"
   Pid Directory = "@piddir@"
@@ -22,7 +22,7 @@
 # List Directors who are permitted to contact Storage daemon
 #
 Director {
-  Name = @hostname@-dir
+  Name = bacula-dir
   Password = "@sd_password@"
 }
 
@@ -31,7 +31,7 @@
 #   status of the storage daemon
 #
 Director {
-  Name = @hostname@-mon
+  Name = bacula-mon
   Password = "@mon_sd_password@"
   Monitor = yes
 }
@@ -204,5 +204,5 @@
 #
 Messages {
   Name = Standard
-  director = @hostname@-dir = all
+  director = bacula-dir = all
 }
--- bacula-2.0.2/src/wx-console/wx-console.conf.in.orig	2007-02-06 13:37:12.000000000 +0100
+++ bacula-2.0.2/src/wx-console/wx-console.conf.in	2007-02-06 13:47:02.000000000 +0100
@@ -3,8 +3,8 @@
 #
 
 Director {
-  Name = @hostname@-dir
+  Name = bacula-dir
   DIRport = @dir_port@
-  address = @hostname@
+  address = server.example.com
   Password = "@dir_password@"
 }
--- bacula-2.0.2/src/tray-monitor/tray-monitor.conf.in.orig	2007-02-06 13:47:13.000000000 +0100
+++ bacula-2.0.2/src/tray-monitor/tray-monitor.conf.in	2007-02-06 13:47:55.000000000 +0100
@@ -3,27 +3,27 @@
 #
 
 Monitor {
-  Name = @hostname@-mon
+  Name = bacula-mon
   Password = "@mon_dir_password@"         # password for the Directors   
   RefreshInterval = 5 seconds
 }
    
 Client {
-  Name = @hostname@-fd
-  Address = @hostname@
+  Name = bacula-fd
+  Address = client.example.com
   FDPort = @fd_port@
   Password = "@mon_fd_password@"          # password for FileDaemon
 }
 
 Storage {
-  Name = @hostname@-sd
-  Address = @hostname@
+  Name = bacula-sd
+  Address = storage.example.com
   SDPort = @sd_port@
   Password = "@mon_sd_password@"          # password for StorageDaemon
 }
 
 Director {
-  Name = @hostname@-dir
+  Name = bacula-dir
   DIRport = @dir_port@
-  address = @hostname@
-}
\ No newline at end of file
+  address = server.example.com
+}