diff --git a/cms/djangoapps/contentstore/views/__init__.py b/cms/djangoapps/contentstore/views/__init__.py
index d55180eaf5..48ff107f11 100644
--- a/cms/djangoapps/contentstore/views/__init__.py
+++ b/cms/djangoapps/contentstore/views/__init__.py
@@ -1,4 +1,4 @@
-# pylint: disable=wildcard-import, W0511
+# pylint: disable=wildcard-import, fixme
 
 "All view functions for contentstore, broken out into submodules"
 
diff --git a/common/djangoapps/student/models.py b/common/djangoapps/student/models.py
index 08d5c0ffb7..2a373afb68 100644
--- a/common/djangoapps/student/models.py
+++ b/common/djangoapps/student/models.py
@@ -1164,7 +1164,7 @@ class CourseEnrollment(models.Model):
         if GeneratedCertificate.certificate_for_student(self.user, self.course_id) is not None:
             return False
 
-        #TODO - When Course administrators to define a refund period for paid courses then refundable will be supported. # pylint: disable=W0511
+        #TODO - When Course administrators to define a refund period for paid courses then refundable will be supported. # pylint: disable=fixme
 
         course_mode = CourseMode.mode_for_course(self.course_id, 'verified')
         if course_mode is None:
diff --git a/common/djangoapps/student/tests/tests.py b/common/djangoapps/student/tests/tests.py
index 3bf2fde715..4c4177d18b 100644
--- a/common/djangoapps/student/tests/tests.py
+++ b/common/djangoapps/student/tests/tests.py
@@ -322,7 +322,7 @@ class DashboardTest(ModuleStoreTestCase):
         )
         enrollment = CourseEnrollment.enroll(self.user, self.course.id, mode='honor')
 
-        # TODO: Until we can allow course administrators to define a refund period for paid for courses show_refund_option should be False. # pylint: disable=W0511
+        # TODO: Until we can allow course administrators to define a refund period for paid for courses show_refund_option should be False. # pylint: disable=fixme
         self.assertFalse(enrollment.refundable())
 
         resp = self.client.post(reverse('student.views.dashboard', args=[]))
diff --git a/common/djangoapps/user_api/api/course_tag.py b/common/djangoapps/user_api/api/course_tag.py
index 43907fbe72..89e7f49b85 100644
--- a/common/djangoapps/user_api/api/course_tag.py
+++ b/common/djangoapps/user_api/api/course_tag.py
@@ -53,7 +53,7 @@ def set_course_tag(user, course_id, key, value):
         key: arbitrary (<=255 char string)
         value: arbitrary string
     """
-    # pylint: disable=W0511
+    # pylint: disable=fixme
     # TODO: There is a risk of IntegrityErrors being thrown here given
     # simultaneous calls from many processes. Handle by retrying after
     # a short delay?