diff --git a/python/python-psi-impl/resources/messages/PyPsiBundle.properties b/python/python-psi-impl/resources/messages/PyPsiBundle.properties
index ce115de9ac46..c38c2df06311 100644
--- a/python/python-psi-impl/resources/messages/PyPsiBundle.properties
+++ b/python/python-psi-impl/resources/messages/PyPsiBundle.properties
@@ -407,6 +407,8 @@ INSP.compatibility.check.for.compatibility.with.python.versions=Check for compat
 INSP.abstract.class.set.as.metaclass=Set ''{0}'' as metaclass
 INSP.abstract.class.add.to.superclasses=Add ''{0}'' to superclasses
 INSP.pep8.naming=PEP 8 naming convention violation
+INSP.pep8.naming.excluded.base.classes=Excluded base classes
+INSP.pep8.naming.ignored.errors=Ignored errors
 INSP.shadowing.builtins=Shadowing built-ins
 INSP.calling.non.callable=Trying to call a non-callable object
 INSP.dataclass.definition.and.usages=Dataclass definition and usages
@@ -794,6 +796,3 @@ python.find.usages.usage.in.superclass.list=Usage in superclass list
 python.find.usages.usage.in.isinstance=Usage in isinstance()
 python.find.usages.untyped.probable.usage=Untyped (probable) usage
 python.find.usages.usage.in.import.statement=Usage in import statement
-
-excluded.base.classes=Excluded base classes
-ignored.errors=Ignored errors
diff --git a/python/python-psi-impl/src/com/jetbrains/python/inspections/PyPep8NamingInspection.java b/python/python-psi-impl/src/com/jetbrains/python/inspections/PyPep8NamingInspection.java
index 468fa8df4729..fca8128d1745 100644
--- a/python/python-psi-impl/src/com/jetbrains/python/inspections/PyPep8NamingInspection.java
+++ b/python/python-psi-impl/src/com/jetbrains/python/inspections/PyPep8NamingInspection.java
@@ -73,8 +73,8 @@ public class PyPep8NamingInspection extends PyInspection {
       rootPanel.add(checkBox, BorderLayout.NORTH);
     }
 
-    JComponent classes = PythonUiService.getInstance().createListEditForm(PyPsiBundle.message("excluded.base.classes"), ignoredBaseClasses);
-    JComponent errors = PythonUiService.getInstance().createListEditForm(PyPsiBundle.message("ignored.errors"), ignoredErrors);
+    JComponent classes = PythonUiService.getInstance().createListEditForm(PyPsiBundle.message("INSP.pep8.naming.excluded.base.classes"), ignoredBaseClasses);
+    JComponent errors = PythonUiService.getInstance().createListEditForm(PyPsiBundle.message("INSP.pep8.naming.ignored.errors"), ignoredErrors);
 
     if (classes != null && errors != null) {
       JComponent splitter = PythonUiService.getInstance().onePixelSplitter(false, classes, errors);