diff --git a/Script/CastorScript.py b/Script/CastorScript.py
index 984cec986c593dc2ea6e87f47caf47ec049b0a97..1e16f9ee266bef81c6c14ac2f4632b248630a464 100755
--- a/Script/CastorScript.py
+++ b/Script/CastorScript.py
@@ -96,7 +96,7 @@ def main(conf):
     logger.addHandler(mainLog)
 
     ##### Setup ERS #####
-    if conf.ERS_enabled:
+    if conf.ERSenabled:
         try:
             import ers
             from ispy import IPCPartition
@@ -113,7 +113,7 @@ def main(conf):
                          % str(ex),extra=logInfo)
 
     ##### Start looking for the partition #####
-    if conf.ERS_enabled:
+    if conf.ERSenabled:
         check = CheckThread(conf, manager, copy, delete, event, logger, ERS_handler)
 
 
@@ -192,7 +192,7 @@ def main(conf):
     manager.start()
     copy.start()
     delete.start()
-    if conf.ERS_enabled:
+    if conf.ERSenabled:
         check.start()
     logInfo = {'file':logger.findCaller()[0],'line':logger.findCaller()[1]}
     logger.info('Manager,Copy, Delete and Check Threads started',extra = logInfo)
@@ -257,14 +257,14 @@ def main(conf):
     manager.managerExit()
     copy.copyExit()
     delete.deleteExit()
-    if conf.ERS_enabled:
+    if conf.ERSenabled:
         check.checkExit()
 
     ##### Wait for the threads to finish and then stop #####
     manager.join()
     copy.join()
     delete.join()
-    if conf.ERS_enabled:
+    if conf.ERSenabled:
         check.join()
     logInfo = {'file':logger.findCaller()[0],'line':logger.findCaller()[1]}
     logger.info('Manager,Copy, Delete and Check Threads joined the main thread',extra = logInfo) 
diff --git a/Script/CheckThread.py b/Script/CheckThread.py
index 9384b16dd4b9c2207ef24b27142a46535388693b..f7317eeb4c60fa6cd56025300fc61b2f2a51cd0d 100644
--- a/Script/CheckThread.py
+++ b/Script/CheckThread.py
@@ -31,7 +31,7 @@ class CheckThread(threading.Thread):
         self.CheckTimeout = self.conf.CheckTimeout
         self.ERSLogLevel = self.conf.ERSLogLevel
         self.LogDir = self.conf.LogDir
-        self.ERS_enabled = self.conf.ERS_enabled
+        self.ERSenabled = self.conf.ERSenabled
         self.partition = self.conf.partition
         self.LogLevel = self.conf.LogLevel
         self.ERSTimeout = self.conf.ERSTimeout
@@ -49,7 +49,7 @@ class CheckThread(threading.Thread):
         self.check_logger.addHandler(self.CheckLog)
 
         ##### Add ERS handler #####
-        if self.ERS_enabled:
+        if self.ERSenabled:
             try:
                 self.check_ERS_handler=ers.LoggingHandler()
                 set_log_level(self.ERSLogLevel,self.check_ERS_handler)
diff --git a/Script/Conf.cfg b/Script/Conf.cfg
index 01e5a5661b9b0807b2706f0f99bb289792e419ab..0fdb357a7684f199ef33bf8e8a68f578b25a6dc5 100755
--- a/Script/Conf.cfg
+++ b/Script/Conf.cfg
@@ -13,7 +13,7 @@ LogLevel: 'debug'
 ERSLogLevel: 'info'
 
 # On / Off switch for ERS
-ERS_enabled: True
+ERSenabled: True
 
 # Email list which will receive error messages (list of strings)
 mailList: []
diff --git a/Script/Conf.py b/Script/Conf.py
index 654a4bc3f1a92f41d7bf24bb32edf9376a78572c..01d7bdae994e646feb5a8f6271eadd8ac5270d33 100755
--- a/Script/Conf.py
+++ b/Script/Conf.py
@@ -37,7 +37,7 @@ class Conf:
         self.ERSLogLevel = cfg.ERSLogLevel
 
         # On / Off switch for ERS
-        self.ERS_enabled = cfg.ERS_enabled
+        self.ERSenabled = cfg.ERSenabled
 
         # Email list which will receive error messages (list of strings)
         self.mailList = cfg.mailList
diff --git a/Script/CopyThread.py b/Script/CopyThread.py
index f006fd32b43afecf0b0c3a67c002a586f2c103e4..44edf5675b938cecf1b1cc3276cbf270ae8cc90d 100755
--- a/Script/CopyThread.py
+++ b/Script/CopyThread.py
@@ -35,7 +35,7 @@ class CopyThread(threading.Thread):
         self.LogDir = self.conf.LogDir
         self.LogLevel = self.conf.LogLevel
         self.ERSLogLevel = self.conf.ERSLogLevel
-        self.ERS_enabled = self.conf.ERS_enabled
+        self.ERSenabled = self.conf.ERSenabled
         
         self.exitFlag = False
         self.CopyList = []
@@ -52,7 +52,7 @@ class CopyThread(threading.Thread):
         self.logger.addHandler(self.CopyLog)
 
         ##### Add ERS handler #####
-        if self.ERS_enabled:
+        if self.ERSenabled:
             try:
                 import ers
                 from ispy import IPCPartition
diff --git a/Script/DeleteThread.py b/Script/DeleteThread.py
index 89746afb68981fcb35de7f32022e45ae6182f506..59348c7db9ab9c6fe3f20d4b7ffeb810a6d3edab 100755
--- a/Script/DeleteThread.py
+++ b/Script/DeleteThread.py
@@ -42,7 +42,7 @@ class DeleteThread(threading.Thread):
         self.LogDir = self.conf.LogDir
         self.LogLevel = self.conf.LogLevel
         self.ERSLogLevel = self.conf.ERSLogLevel
-        self.ERS_enabled = self.conf.ERS_enabled
+        self.ERSenabled = self.conf.ERSenabled
 
         #### Import the function to resolve the merged file names #####
         self.mergedChecker = None
@@ -67,7 +67,7 @@ class DeleteThread(threading.Thread):
         self.logger.addHandler(self.DeleteLog)
 
         ##### Add ERS handler #########
-        if self.ERS_enabled:
+        if self.ERSenabled:
             try:
                 import ers
                 from ispy import IPCPartition
diff --git a/Script/MUCalibNameParser.py b/Script/MUCalibNameParser.py
index 9c6e38fea917a7f89d1840377adcf0dbeaaddba2..2fa1bc2ce4eff705b0447618cb5f03c1baa180a5 100644
--- a/Script/MUCalibNameParser.py
+++ b/Script/MUCalibNameParser.py
@@ -1,5 +1,5 @@
 
-__version__='$Revision:$'
+__version__='$Revision$'
 # $Source$
 
 from BaseFileNameParser import BaseFileNameParser
diff --git a/Script/ManagerThread.py b/Script/ManagerThread.py
index 45314d5fe5bf6e45c30e81fdb8cd38f97b41cc90..a24b3955eb94718dbf50ba8e92ec1349cfd5ef58 100755
--- a/Script/ManagerThread.py
+++ b/Script/ManagerThread.py
@@ -51,7 +51,7 @@ class ManagerThread(threading.Thread):
         self.LogDir = self.conf.LogDir
         self.LogLevel = self.conf.LogLevel
         self.ERSLogLevel = self.conf.ERSLogLevel
-        self.ERS_enabled = self.conf.ERS_enabled
+        self.ERSenabled = self.conf.ERSenabled
                 
         self.CopyFileList = []
         self.ProblDict = {}
@@ -70,7 +70,7 @@ class ManagerThread(threading.Thread):
         self.logger.addHandler(self.ManagerLog)
 
         ##### Add ERS handler #########
-        if self.ERS_enabled:
+        if self.ERSenabled:
             try:
                 import ers
                 from ispy import IPCPartition
diff --git a/Script/SCTFileNameParser.py b/Script/SCTFileNameParser.py
index 6cd7cf8e189d7d47025a3feddccc6354f25e20b9..2ea82f5831349662fb52ec24eb2234eb76ef1df5 100644
--- a/Script/SCTFileNameParser.py
+++ b/Script/SCTFileNameParser.py
@@ -1,5 +1,5 @@
 
-__version__='$Revision:$'
+__version__='$Revision$'
 # $Source$
 
 
diff --git a/Script/SFOFileNameParser.py b/Script/SFOFileNameParser.py
index 4daf680c50ca23c07e6a4dd9262ed6bf3580cf02..76cbad4bbd857f17246f0815638fb473433bfa9f 100644
--- a/Script/SFOFileNameParser.py
+++ b/Script/SFOFileNameParser.py
@@ -1,5 +1,5 @@
 
-__version__='$Revision:$'
+__version__='$Revision$'
 # $Source$
 
 from BaseFileNameParser import BaseFileNameParser