diff --git a/src/sugar/activity/activityfactory.py b/src/sugar/activity/activityfactory.py
index 6bd661f0..a206d159 100644
--- a/src/sugar/activity/activityfactory.py
+++ b/src/sugar/activity/activityfactory.py
@@ -58,7 +58,7 @@ def _close_fds():
     for i in xrange(3, MAXFD):
         try:
             os.close(i)
-        # pylint: disable-msg=W0704
+        # pylint: disable=W0704
         except Exception:
             pass
 
@@ -284,7 +284,7 @@ class ActivityCreationHandler(gobject.GObject):
             self._handle.activity_id, self._service_name)
 
     def _create_error_handler(self, err):
-        logging.error('Couldn't create activity %s (%s): %s',
+        logging.error("Couldn't create activity %s (%s): %s",
             self._handle.activity_id, self._service_name, err)
         self._shell.NotifyLaunchFailure(
             self._handle.activity_id, reply_handler=self._no_reply_handler,
diff --git a/src/sugar/presence/tubeconn.py b/src/sugar/presence/tubeconn.py
index 88cc7292..1014a46e 100644
--- a/src/sugar/presence/tubeconn.py
+++ b/src/sugar/presence/tubeconn.py
@@ -36,7 +36,7 @@ class TubeConnection(Connection):
 
     def __new__(cls, conn, tubes_iface, tube_id, address=None,
                 group_iface=None, mainloop=None):
-        # pylint: disable-msg=W0212
+        # pylint: disable=W0212
         # Confused by __new__
         if address is None:
             address = tubes_iface.GetDBusTubeAddress(tube_id)
@@ -59,7 +59,7 @@ class TubeConnection(Connection):
         return self
 
     def _on_get_self_handle_reply(self, handle):
-        # pylint: disable-msg=W0201
+        # pylint: disable=W0201
         # Confused by __new__
         self.self_handle = handle
         match = self._tubes_iface.connect_to_signal('DBusNamesChanged',
diff --git a/src/sugar/util.py b/src/sugar/util.py
index 083a46be..b2ff439f 100644
--- a/src/sugar/util.py
+++ b/src/sugar/util.py
@@ -133,7 +133,7 @@ class LRU:
     """
 
     def __init__(self, count, pairs=[]):
-        # pylint: disable-msg=W0102,W0612
+        # pylint: disable=W0102,W0612
         self.count = max(count, 1)
         self.d = {}
         self.first = None