diff --git a/scripts/masstransit b/scripts/masstransit
index d5e0375b..4953aee4 100755
--- a/scripts/masstransit
+++ b/scripts/masstransit
@@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 """
 
-from weboob.frontends.masstransit import Travel
+from weboob.frontends.masstransit import Masstransit
 
 if __name__ == '__main__':
-    Travel.run()
+    Masstransit.run()
diff --git a/weboob/frontends/masstransit/__init__.py b/weboob/frontends/masstransit/__init__.py
index 18cf137f..73e6c625 100644
--- a/weboob/frontends/masstransit/__init__.py
+++ b/weboob/frontends/masstransit/__init__.py
@@ -19,4 +19,4 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 """
 
-from .application import Travel
+from .application import Masstransit
diff --git a/weboob/frontends/masstransit/application.py b/weboob/frontends/masstransit/application.py
index 17ea4cf2..6a718df6 100644
--- a/weboob/frontends/masstransit/application.py
+++ b/weboob/frontends/masstransit/application.py
@@ -20,15 +20,17 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 from weboob.capabilities.travel import ICapTravel
 from weboob.tools.application import BaseApplication
-from logging import debug
 
-import hildon
 import conic
 import gtk
+import hildon
+from logging import debug
 
 
+__all__ = ['Masstransit']
 
-class Masstransit():
+
+class MasstransitHildon():
     "hildon interface"
 
     def connect_event(self, connection, event=None, c=None, d=None):
@@ -226,7 +228,7 @@ class Masstransit():
         self.refresh_in_progress = False
 
 
-class Travel(BaseApplication):
+class Masstransit(BaseApplication):
     "Application Class"
     APPNAME = 'masstransit'
     VERSION = '1.0'
@@ -235,5 +237,5 @@ class Travel(BaseApplication):
     def main(self, argv):
         "main fonction"
         self.load_modules(ICapTravel)
-        Masstransit(self.weboob)
+        MasstransitHildon(self.weboob)
         gtk.main()