diff --git a/common/djangoapps/embargo/forms.py b/common/djangoapps/embargo/forms.py
index 27e49eb8dba15a92210d46d855cc22202ca0bbe9..11632e4db8f21e878a2ea5b36993274f3b7fbe6f 100644
--- a/common/djangoapps/embargo/forms.py
+++ b/common/djangoapps/embargo/forms.py
@@ -55,7 +55,7 @@ class RestrictedCourseForm(forms.ModelForm):
         return course_key
 
 
-class IPFilterForm(forms.ModelForm):  # pylint: disable=incomplete-protocol
+class IPFilterForm(forms.ModelForm):
     """Form validating entry of IP addresses"""
 
     class Meta:  # pylint: disable=missing-docstring
diff --git a/common/djangoapps/student/views.py b/common/djangoapps/student/views.py
index ef895c56a20284589416084f767a67444c5f97a0..365edc47a4013a1bcf3d1e3c431a05adaf6dd236 100644
--- a/common/djangoapps/student/views.py
+++ b/common/djangoapps/student/views.py
@@ -1043,7 +1043,7 @@ def accounts_login(request):
 
 # Need different levels of logging
 @ensure_csrf_cookie
-def login_user(request, error=""):  # pylint: disable-msg=too-many-statements,unused-argument
+def login_user(request, error=""):  # pylint: disable=too-many-statements,unused-argument
     """AJAX request to log in the user."""
 
     backend_name = None
diff --git a/common/djangoapps/third_party_auth/pipeline.py b/common/djangoapps/third_party_auth/pipeline.py
index 74dd7780a2eec5982bb88a3227a8e597786afab4..866f66e4f33d1880e055217c2f33738cae50f4de 100644
--- a/common/djangoapps/third_party_auth/pipeline.py
+++ b/common/djangoapps/third_party_auth/pipeline.py
@@ -58,7 +58,7 @@ See http://psa.matiasaguirre.net/docs/pipeline.html for more docs.
 """
 
 import random
-import string  # pylint: disable-msg=deprecated-module
+import string  # pylint: disable=deprecated-module
 from collections import OrderedDict
 import urllib
 import analytics
@@ -431,7 +431,7 @@ def running(request):
 # Pipeline functions.
 # Signatures are set by python-social-auth; prepending 'unused_' causes
 # TypeError on dispatch to the auth backend's authenticate().
-# pylint: disable-msg=unused-argument
+# pylint: disable=unused-argument
 
 
 def parse_query_params(strategy, response, *args, **kwargs):
diff --git a/common/djangoapps/third_party_auth/tests/test_pipeline.py b/common/djangoapps/third_party_auth/tests/test_pipeline.py
index 7bbd5cf1861ef444e67480ba1d43170b74011de1..18c4458545229718d3991b9e70551ca5881f03db 100644
--- a/common/djangoapps/third_party_auth/tests/test_pipeline.py
+++ b/common/djangoapps/third_party_auth/tests/test_pipeline.py
@@ -7,8 +7,8 @@ from third_party_auth.tests import testutil
 import unittest
 
 
-# Allow tests access to protected methods (or module-protected methods) under
-# test. pylint: disable-msg=protected-access
+# Allow tests access to protected methods (or module-protected methods) under test.
+# pylint: disable=protected-access
 
 
 class MakeRandomPasswordTest(testutil.TestCase):
diff --git a/common/djangoapps/third_party_auth/tests/test_pipeline_integration.py b/common/djangoapps/third_party_auth/tests/test_pipeline_integration.py
index d21d834c93224e4130745dc754228b59fbbc1767..66294a5caea015ec8c37e2d21ddfef2e0777787b 100644
--- a/common/djangoapps/third_party_auth/tests/test_pipeline_integration.py
+++ b/common/djangoapps/third_party_auth/tests/test_pipeline_integration.py
@@ -13,7 +13,7 @@ from social.apps.django_app.default import models as social_models
 
 # Get Django User model by reference from python-social-auth. Not a type
 # constant, pylint.
-User = social_models.DjangoStorage.user.user_model()  # pylint: disable-msg=invalid-name
+User = social_models.DjangoStorage.user.user_model()  # pylint: disable=invalid-name
 
 
 class TestCase(testutil.TestCase, test.TestCase):
diff --git a/common/djangoapps/third_party_auth/tests/test_settings.py b/common/djangoapps/third_party_auth/tests/test_settings.py
index 1c1229190ec679727d23135bf12ea6e98fd724ea..9108ce9c66212d22ff2901bd0793925dfacd8222 100644
--- a/common/djangoapps/third_party_auth/tests/test_settings.py
+++ b/common/djangoapps/third_party_auth/tests/test_settings.py
@@ -21,10 +21,10 @@ _SETTINGS_MAP = {
 class SettingsUnitTest(testutil.TestCase):
     """Unit tests for settings management code."""
 
-    # Allow access to protected methods (or module-protected methods) under
-    # test. pylint: disable-msg=protected-access
+    # Allow access to protected methods (or module-protected methods) under test.
+    # pylint: disable=protected-access
     # Suppress sprurious no-member warning on fakes.
-    # pylint: disable-msg=no-member
+    # pylint: disable=no-member
 
     def setUp(self):
         super(SettingsUnitTest, self).setUp()
diff --git a/lms/lib/xblock/test/test_mixin.py b/lms/lib/xblock/test/test_mixin.py
index e5077fc4cac9561cfba701e787f39f9c5c33d8b9..a519181249364be87cb021c650221f88f325b1d3 100644
--- a/lms/lib/xblock/test/test_mixin.py
+++ b/lms/lib/xblock/test/test_mixin.py
@@ -230,7 +230,7 @@ class XBlockGetParentTest(LmsXBlockMixinTestCase):
                 )
 
 
-class RenamedTuple(tuple):  # pylint: disable=incomplete-protocol
+class RenamedTuple(tuple):
     """
     This class is only used to allow overriding __name__ on the tuples passed
     through ddt, in order to have the generated test names make sense.
diff --git a/pavelib/acceptance_test.py b/pavelib/acceptance_test.py
index 31ac46c954a799a8936c515781c9676abcac6f20..4da81515b1dfd62c5701e5e619d60817587994a7 100644
--- a/pavelib/acceptance_test.py
+++ b/pavelib/acceptance_test.py
@@ -8,7 +8,7 @@ from optparse import make_option
 try:
     from pygments.console import colorize
 except ImportError:
-    colorize = lambda color, text: text  # pylint: disable-msg=invalid-name
+    colorize = lambda color, text: text  # pylint: disable=invalid-name
 
 __test__ = False  # do not collect
 
diff --git a/pavelib/bok_choy.py b/pavelib/bok_choy.py
index 8fcab25e21d65b01a6a35bb3c9e179b24e10c523..808fc410a1a9939965c7f920cc3045e54ca0083a 100644
--- a/pavelib/bok_choy.py
+++ b/pavelib/bok_choy.py
@@ -12,7 +12,7 @@ import os
 try:
     from pygments.console import colorize
 except ImportError:
-    colorize = lambda color, text: text  # pylint: disable-msg=invalid-name
+    colorize = lambda color, text: text  # pylint: disable=invalid-name
 
 __test__ = False  # do not collect
 
diff --git a/pavelib/i18n.py b/pavelib/i18n.py
index b4a68359a54cfecb6454174db760c907f19dc219..a6a67fcdeb998952cb5dae5519e25c640dd52c70 100644
--- a/pavelib/i18n.py
+++ b/pavelib/i18n.py
@@ -9,7 +9,7 @@ from paver.easy import task, cmdopts, needs, sh
 try:
     from pygments.console import colorize
 except ImportError:
-    colorize = lambda color, text: text  # pylint: disable-msg=invalid-name
+    colorize = lambda color, text: text  # pylint: disable=invalid-name
 
 
 @task
diff --git a/pavelib/tests.py b/pavelib/tests.py
index 1d4cc1b224812d313b49ca4309c511bfdf795d55..1b8fda1a3ea684dd840b26b3a58fb91f9a7ed903 100644
--- a/pavelib/tests.py
+++ b/pavelib/tests.py
@@ -11,7 +11,7 @@ from optparse import make_option
 try:
     from pygments.console import colorize
 except ImportError:
-    colorize = lambda color, text: text  # pylint: disable-msg=invalid-name
+    colorize = lambda color, text: text  # pylint: disable=invalid-name
 
 __test__ = False  # do not collect
 
diff --git a/pavelib/utils/test/bokchoy_utils.py b/pavelib/utils/test/bokchoy_utils.py
index 686bc515fc909b299b8ac452d754cb1fbf5d016b..237621a9f0d353517bfd3230cc9276def49ccfd8 100644
--- a/pavelib/utils/test/bokchoy_utils.py
+++ b/pavelib/utils/test/bokchoy_utils.py
@@ -13,7 +13,7 @@ from pavelib.utils.process import run_background_process
 try:
     from pygments.console import colorize
 except ImportError:
-    colorize = lambda color, text: text  # pylint: disable-msg=invalid-name
+    colorize = lambda color, text: text  # pylint: disable=invalid-name
 
 __test__ = False  # do not collect
 
@@ -80,7 +80,7 @@ def wait_for_server(server, port):
             if int(response.status) == 200:
                 server_ok = True
                 break
-        except:  # pylint: disable-msg=bare-except
+        except:  # pylint: disable=bare-except
             pass
 
         attempts += 1
diff --git a/pavelib/utils/test/suites/bokchoy_suite.py b/pavelib/utils/test/suites/bokchoy_suite.py
index 1301368436f3b59eb369ff5a59f782e01d0e2f68..0328ad758a97c88d7e32b46f809c6a7b336ce1d0 100644
--- a/pavelib/utils/test/suites/bokchoy_suite.py
+++ b/pavelib/utils/test/suites/bokchoy_suite.py
@@ -12,7 +12,7 @@ from pavelib.utils.test import utils as test_utils
 try:
     from pygments.console import colorize
 except ImportError:
-    colorize = lambda color, text: text  # pylint: disable-msg=invalid-name
+    colorize = lambda color, text: text  # pylint: disable=invalid-name
 
 __test__ = False  # do not collect
 
diff --git a/pavelib/utils/test/suites/suite.py b/pavelib/utils/test/suites/suite.py
index bfe83d076621ad523e6999ccd6bb905c1c0adda9..58b1f841e943ee5256938a1549f1467354b660e4 100644
--- a/pavelib/utils/test/suites/suite.py
+++ b/pavelib/utils/test/suites/suite.py
@@ -10,7 +10,7 @@ from pavelib.utils.process import kill_process
 try:
     from pygments.console import colorize
 except ImportError:
-    colorize = lambda color, text: text  # pylint: disable-msg=invalid-name
+    colorize = lambda color, text: text  # pylint: disable=invalid-name
 
 __test__ = False  # do not collect