diff --git a/libs/esl/python/ESL.py b/libs/esl/python/ESL.py
new file mode 100644
index 0000000000..cfca291505
--- /dev/null
+++ b/libs/esl/python/ESL.py
@@ -0,0 +1,99 @@
+# This file was automatically generated by SWIG (http://www.swig.org).
+# Version 1.3.35
+#
+# Don't modify this file, modify the SWIG interface instead.
+# This file is compatible with both classic and new-style classes.
+
+import _ESL
+import new
+new_instancemethod = new.instancemethod
+def _swig_setattr_nondynamic(self,class_type,name,value,static=1):
+    if (name == "thisown"): return self.this.own(value)
+    if (name == "this"):
+        if type(value).__name__ == 'PySwigObject':
+            self.__dict__[name] = value
+            return
+    method = class_type.__swig_setmethods__.get(name,None)
+    if method: return method(self,value)
+    if (not static) or hasattr(self,name):
+        self.__dict__[name] = value
+    else:
+        raise AttributeError("You cannot add attributes to %s" % self)
+
+def _swig_setattr(self,class_type,name,value):
+    return _swig_setattr_nondynamic(self,class_type,name,value,0)
+
+def _swig_getattr(self,class_type,name):
+    if (name == "thisown"): return self.this.own()
+    method = class_type.__swig_getmethods__.get(name,None)
+    if method: return method(self)
+    raise AttributeError,name
+
+def _swig_repr(self):
+    try: strthis = "proxy of " + self.this.__repr__()
+    except: strthis = ""
+    return "<%s.%s; %s >" % (self.__class__.__module__, self.__class__.__name__, strthis,)
+
+class ESLevent:
+    __swig_setmethods__ = {}
+    __setattr__ = lambda self, name, value: _swig_setattr(self, ESLevent, name, value)
+    __swig_getmethods__ = {}
+    __getattr__ = lambda self, name: _swig_getattr(self, ESLevent, name)
+    __repr__ = _swig_repr
+    __swig_setmethods__["event"] = _ESL.ESLevent_event_set
+    __swig_getmethods__["event"] = _ESL.ESLevent_event_get
+    __swig_setmethods__["serialized_string"] = _ESL.ESLevent_serialized_string_set
+    __swig_getmethods__["serialized_string"] = _ESL.ESLevent_serialized_string_get
+    __swig_setmethods__["mine"] = _ESL.ESLevent_mine_set
+    __swig_getmethods__["mine"] = _ESL.ESLevent_mine_get
+    def __init__(self, *args): 
+        this = apply(_ESL.new_ESLevent, args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _ESL.delete_ESLevent
+    __del__ = lambda self : None;
+    def serialize(*args): return apply(_ESL.ESLevent_serialize, args)
+    def setPriority(*args): return apply(_ESL.ESLevent_setPriority, args)
+    def getHeader(*args): return apply(_ESL.ESLevent_getHeader, args)
+    def getBody(*args): return apply(_ESL.ESLevent_getBody, args)
+    def getType(*args): return apply(_ESL.ESLevent_getType, args)
+    def addBody(*args): return apply(_ESL.ESLevent_addBody, args)
+    def addHeader(*args): return apply(_ESL.ESLevent_addHeader, args)
+    def delHeader(*args): return apply(_ESL.ESLevent_delHeader, args)
+    def firstHeader(*args): return apply(_ESL.ESLevent_firstHeader, args)
+    def nextHeader(*args): return apply(_ESL.ESLevent_nextHeader, args)
+ESLevent_swigregister = _ESL.ESLevent_swigregister
+ESLevent_swigregister(ESLevent)
+
+class ESLconnection:
+    __swig_setmethods__ = {}
+    __setattr__ = lambda self, name, value: _swig_setattr(self, ESLconnection, name, value)
+    __swig_getmethods__ = {}
+    __getattr__ = lambda self, name: _swig_getattr(self, ESLconnection, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = apply(_ESL.new_ESLconnection, args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _ESL.delete_ESLconnection
+    __del__ = lambda self : None;
+    def connected(*args): return apply(_ESL.ESLconnection_connected, args)
+    def getInfo(*args): return apply(_ESL.ESLconnection_getInfo, args)
+    def send(*args): return apply(_ESL.ESLconnection_send, args)
+    def sendRecv(*args): return apply(_ESL.ESLconnection_sendRecv, args)
+    def api(*args): return apply(_ESL.ESLconnection_api, args)
+    def bgapi(*args): return apply(_ESL.ESLconnection_bgapi, args)
+    def sendEvent(*args): return apply(_ESL.ESLconnection_sendEvent, args)
+    def recvEvent(*args): return apply(_ESL.ESLconnection_recvEvent, args)
+    def recvEventTimed(*args): return apply(_ESL.ESLconnection_recvEventTimed, args)
+    def filter(*args): return apply(_ESL.ESLconnection_filter, args)
+    def events(*args): return apply(_ESL.ESLconnection_events, args)
+    def execute(*args): return apply(_ESL.ESLconnection_execute, args)
+    def setBlockingExecute(*args): return apply(_ESL.ESLconnection_setBlockingExecute, args)
+    def setEventLock(*args): return apply(_ESL.ESLconnection_setEventLock, args)
+ESLconnection_swigregister = _ESL.ESLconnection_swigregister
+ESLconnection_swigregister(ESLconnection)
+
+eslSetLogLevel = _ESL.eslSetLogLevel
+
+
diff --git a/libs/esl/python/Makefile b/libs/esl/python/Makefile
index 85cfe27b84..a231b1e74f 100644
--- a/libs/esl/python/Makefile
+++ b/libs/esl/python/Makefile
@@ -4,7 +4,7 @@ LOCAL_LDFLAGS=-lpython2.4
 all: _ESL.so
 
 esl_wrap.cpp:
-	swig -module _ESL -classic -python -c++ -DMULTIPLICITY -I../src/include -o esl_wrap.cpp ../ESL.i
+	swig -module ESL -classic -python -c++ -DMULTIPLICITY -I../src/include -o esl_wrap.cpp ../ESL.i
 
 esl_wrap.o: esl_wrap.cpp
 	$(CXX) $(CXX_CFLAGS) $(CXXFLAGS) $(LOCAL_CFLAGS) -c esl_wrap.cpp -o esl_wrap.o
diff --git a/libs/esl/python/_ESL.py b/libs/esl/python/_ESL.py
deleted file mode 100644
index 702ef267dd..0000000000
--- a/libs/esl/python/_ESL.py
+++ /dev/null
@@ -1,99 +0,0 @@
-# This file was automatically generated by SWIG (http://www.swig.org).
-# Version 1.3.35
-#
-# Don't modify this file, modify the SWIG interface instead.
-# This file is compatible with both classic and new-style classes.
-
-import __ESL
-import new
-new_instancemethod = new.instancemethod
-def _swig_setattr_nondynamic(self,class_type,name,value,static=1):
-    if (name == "thisown"): return self.this.own(value)
-    if (name == "this"):
-        if type(value).__name__ == 'PySwigObject':
-            self.__dict__[name] = value
-            return
-    method = class_type.__swig_setmethods__.get(name,None)
-    if method: return method(self,value)
-    if (not static) or hasattr(self,name):
-        self.__dict__[name] = value
-    else:
-        raise AttributeError("You cannot add attributes to %s" % self)
-
-def _swig_setattr(self,class_type,name,value):
-    return _swig_setattr_nondynamic(self,class_type,name,value,0)
-
-def _swig_getattr(self,class_type,name):
-    if (name == "thisown"): return self.this.own()
-    method = class_type.__swig_getmethods__.get(name,None)
-    if method: return method(self)
-    raise AttributeError,name
-
-def _swig_repr(self):
-    try: strthis = "proxy of " + self.this.__repr__()
-    except: strthis = ""
-    return "<%s.%s; %s >" % (self.__class__.__module__, self.__class__.__name__, strthis,)
-
-class ESLevent:
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, ESLevent, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, ESLevent, name)
-    __repr__ = _swig_repr
-    __swig_setmethods__["event"] = __ESL.ESLevent_event_set
-    __swig_getmethods__["event"] = __ESL.ESLevent_event_get
-    __swig_setmethods__["serialized_string"] = __ESL.ESLevent_serialized_string_set
-    __swig_getmethods__["serialized_string"] = __ESL.ESLevent_serialized_string_get
-    __swig_setmethods__["mine"] = __ESL.ESLevent_mine_set
-    __swig_getmethods__["mine"] = __ESL.ESLevent_mine_get
-    def __init__(self, *args): 
-        this = apply(__ESL.new_ESLevent, args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = __ESL.delete_ESLevent
-    __del__ = lambda self : None;
-    def serialize(*args): return apply(__ESL.ESLevent_serialize, args)
-    def setPriority(*args): return apply(__ESL.ESLevent_setPriority, args)
-    def getHeader(*args): return apply(__ESL.ESLevent_getHeader, args)
-    def getBody(*args): return apply(__ESL.ESLevent_getBody, args)
-    def getType(*args): return apply(__ESL.ESLevent_getType, args)
-    def addBody(*args): return apply(__ESL.ESLevent_addBody, args)
-    def addHeader(*args): return apply(__ESL.ESLevent_addHeader, args)
-    def delHeader(*args): return apply(__ESL.ESLevent_delHeader, args)
-    def firstHeader(*args): return apply(__ESL.ESLevent_firstHeader, args)
-    def nextHeader(*args): return apply(__ESL.ESLevent_nextHeader, args)
-ESLevent_swigregister = __ESL.ESLevent_swigregister
-ESLevent_swigregister(ESLevent)
-
-class ESLconnection:
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, ESLconnection, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, ESLconnection, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = apply(__ESL.new_ESLconnection, args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = __ESL.delete_ESLconnection
-    __del__ = lambda self : None;
-    def connected(*args): return apply(__ESL.ESLconnection_connected, args)
-    def getInfo(*args): return apply(__ESL.ESLconnection_getInfo, args)
-    def send(*args): return apply(__ESL.ESLconnection_send, args)
-    def sendRecv(*args): return apply(__ESL.ESLconnection_sendRecv, args)
-    def api(*args): return apply(__ESL.ESLconnection_api, args)
-    def bgapi(*args): return apply(__ESL.ESLconnection_bgapi, args)
-    def sendEvent(*args): return apply(__ESL.ESLconnection_sendEvent, args)
-    def recvEvent(*args): return apply(__ESL.ESLconnection_recvEvent, args)
-    def recvEventTimed(*args): return apply(__ESL.ESLconnection_recvEventTimed, args)
-    def filter(*args): return apply(__ESL.ESLconnection_filter, args)
-    def events(*args): return apply(__ESL.ESLconnection_events, args)
-    def execute(*args): return apply(__ESL.ESLconnection_execute, args)
-    def setBlockingExecute(*args): return apply(__ESL.ESLconnection_setBlockingExecute, args)
-    def setEventLock(*args): return apply(__ESL.ESLconnection_setEventLock, args)
-ESLconnection_swigregister = __ESL.ESLconnection_swigregister
-ESLconnection_swigregister(ESLconnection)
-
-eslSetLogLevel = __ESL.eslSetLogLevel
-
-
diff --git a/libs/esl/python/esl_wrap.cpp b/libs/esl/python/esl_wrap.cpp
index a5d56f9b44..6bb5e51ac2 100644
--- a/libs/esl/python/esl_wrap.cpp
+++ b/libs/esl/python/esl_wrap.cpp
@@ -2515,11 +2515,11 @@ static swig_module_info swig_module = {swig_types, 5, 0, 0, 0, 0};
 #endif
 
 /*-----------------------------------------------
-              @(target):= __ESL.so
+              @(target):= _ESL.so
   ------------------------------------------------*/
-#define SWIG_init    init__ESL
+#define SWIG_init    init_ESL
 
-#define SWIG_name    "__ESL"
+#define SWIG_name    "_ESL"
 
 #define SWIGVERSION 0x010335 
 #define SWIG_VERSION SWIGVERSION