Index: Evidence/Alarm.cc
===================================================================
--- Evidence/Alarm.cc	(revision 178)
+++ Evidence/Alarm.cc	(revision 181)
@@ -57,5 +57,5 @@
 
   // Copy original list of servers to observe
-  char *ServerNames = GetConfig(SERVER_NAME " servers");
+  char *ServerNames = GetConfig("servers");
   ServerList = new char [strlen(ServerNames)+1];
   strcpy(ServerList, ServerNames);
@@ -162,5 +162,5 @@
     
     Alarm.UpdateAlarmSummary();
-    sleep(atoi(Alarm.GetConfig(SERVER_NAME " period")));
+    sleep(atoi(Alarm.GetConfig("period")));
   }
 }
Index: Evidence/DColl.cc
===================================================================
--- Evidence/DColl.cc	(revision 178)
+++ Evidence/DColl.cc	(revision 181)
@@ -105,10 +105,10 @@
 
   // Request configuration data
-  DataDir = GetConfig(SERVER_NAME " datadir");
-  SizeUpdateDelay = atoi(GetConfig(SERVER_NAME " sizeupdate"));
-  HistDir = GetConfig(SERVER_NAME " histdir");
+  DataDir = GetConfig("datadir");
+  SizeUpdateDelay = atoi(GetConfig("sizeupdate"));
+  HistDir = GetConfig("histdir");
    
   // Open log file
-  char *Logname = GetConfig(SERVER_NAME " logfile");
+  char *Logname = GetConfig("logfile");
   if ((LogFile = fopen(Logname, "a")) == NULL) {
     State(FATAL, "Could not open log file '%s' (%s)", Logname, strerror(errno));
@@ -128,5 +128,5 @@
 
   // Count how many minimum change value regular expressions are present
-  char *Change = GetConfig(SERVER_NAME " items");
+  char *Change = GetConfig("items");
   RegExCount = 0;
   char *Token = strtok(Change, "\t ");