diff --git a/python/src/com/jetbrains/python/inspections/PyDataclassInspection.kt b/python/src/com/jetbrains/python/inspections/PyDataclassInspection.kt
index ca19fb8f64fd..552b39f618db 100644
--- a/python/src/com/jetbrains/python/inspections/PyDataclassInspection.kt
+++ b/python/src/com/jetbrains/python/inspections/PyDataclassInspection.kt
@@ -99,13 +99,13 @@ class PyDataclassInspection : PyInspection() {
             leftDataclassParameters != null &&
             parseDataclassParameters(rightClass, myTypeEvalContext) != null) {
           registerProblem(node.psiOperator,
-                          "${node.referencedName} not supported between instances of '${leftClass.name}' and '${rightClass.name}'",
+                          "'${node.referencedName}' not supported between instances of '${leftClass.name}' and '${rightClass.name}'",
                           ProblemHighlightType.GENERIC_ERROR)
         }
 
         if (leftClass == rightClass && leftDataclassParameters?.order == false) {
           registerProblem(node.psiOperator,
-                          "${node.referencedName} not supported between instances of '${leftClass.name}'",
+                          "'${node.referencedName}' not supported between instances of '${leftClass.name}'",
                           ProblemHighlightType.GENERIC_ERROR)
         }
       }
@@ -166,7 +166,7 @@ class PyDataclassInspection : PyInspection() {
       if (!dataclassParameters.eq && dataclassParameters.order) {
         val eqArgument = dataclassParameters.eqArgument
         if (eqArgument != null) {
-          registerProblem(eqArgument, "eq must be true if order is true", ProblemHighlightType.GENERIC_ERROR)
+          registerProblem(eqArgument, "'eq' must be true if 'order' is true", ProblemHighlightType.GENERIC_ERROR)
         }
       }
     }
@@ -182,7 +182,7 @@ class PyDataclassInspection : PyInspection() {
             valueClass == builtinCache.setType?.pyClass ||
             valueClass == builtinCache.tupleType?.pyClass) {
           registerProblem(value,
-                          "mutable default '${valueClass.name}' is not allowed",
+                          "Mutable default '${valueClass.name}' is not allowed",
                           ProblemHighlightType.GENERIC_ERROR)
         }
       }
@@ -194,7 +194,7 @@ class PyDataclassInspection : PyInspection() {
       if (type is PyClassType && type.classQName == DATACLASSES_INITVAR_TYPE) {
         if (postInit == null) {
           registerProblem(field,
-                          "attribute '${field.name}' is useless until '${DUNDER_POST_INIT}' is declared",
+                          "Attribute '${field.name}' is useless until '${DUNDER_POST_INIT}' is declared",
                           ProblemHighlightType.LIKE_UNUSED_SYMBOL)
         }
 
@@ -209,7 +209,7 @@ class PyDataclassInspection : PyInspection() {
       if (fieldStub != null && fieldStub.hasDefault() && fieldStub.hasDefaultFactory()) {
         val call = field.findAssignedValue() as? PyCallExpression ?: return
 
-        registerProblem(call.argumentList, "cannot specify both default and default_factory", ProblemHighlightType.GENERIC_ERROR)
+        registerProblem(call.argumentList, "Cannot specify both 'default' and 'default_factory'", ProblemHighlightType.GENERIC_ERROR)
       }
     }
 
diff --git a/python/testData/inspections/PyDataclassInspection/comparisonForOrdered.py b/python/testData/inspections/PyDataclassInspection/comparisonForOrdered.py
index f70668c30d87..02cd6501f9c7 100644
--- a/python/testData/inspections/PyDataclassInspection/comparisonForOrdered.py
+++ b/python/testData/inspections/PyDataclassInspection/comparisonForOrdered.py
@@ -16,10 +16,10 @@ print(A1(1) > A1(2))
 print(A1(1) >= A1(2))
 
 
-print(A1(1) <error descr="__lt__ not supported between instances of 'A1' and 'A2'"><</error> A2(2))
-print(A1(1) <error descr="__le__ not supported between instances of 'A1' and 'A2'"><=</error> A2(2))
-print(A1(1) <error descr="__gt__ not supported between instances of 'A1' and 'A2'">></error> A2(2))
-print(A1(1) <error descr="__ge__ not supported between instances of 'A1' and 'A2'">>=</error> A2(2))
+print(A1(1) <error descr="'__lt__' not supported between instances of 'A1' and 'A2'"><</error> A2(2))
+print(A1(1) <error descr="'__le__' not supported between instances of 'A1' and 'A2'"><=</error> A2(2))
+print(A1(1) <error descr="'__gt__' not supported between instances of 'A1' and 'A2'">></error> A2(2))
+print(A1(1) <error descr="'__ge__' not supported between instances of 'A1' and 'A2'">>=</error> A2(2))
 
 
 print(A1 < A1)
diff --git a/python/testData/inspections/PyDataclassInspection/comparisonForOrderedAndUnordered.py b/python/testData/inspections/PyDataclassInspection/comparisonForOrderedAndUnordered.py
index d277648b1460..67b9b07aeac0 100644
--- a/python/testData/inspections/PyDataclassInspection/comparisonForOrderedAndUnordered.py
+++ b/python/testData/inspections/PyDataclassInspection/comparisonForOrderedAndUnordered.py
@@ -10,10 +10,10 @@ class A2:
     y: int = 0
 
 
-print(A1(1) <error descr="__lt__ not supported between instances of 'A1' and 'A2'"><</error> A2(2))
-print(A1(1) <error descr="__le__ not supported between instances of 'A1' and 'A2'"><=</error> A2(2))
-print(A1(1) <error descr="__gt__ not supported between instances of 'A1' and 'A2'">></error> A2(2))
-print(A1(1) <error descr="__ge__ not supported between instances of 'A1' and 'A2'">>=</error> A2(2))
+print(A1(1) <error descr="'__lt__' not supported between instances of 'A1' and 'A2'"><</error> A2(2))
+print(A1(1) <error descr="'__le__' not supported between instances of 'A1' and 'A2'"><=</error> A2(2))
+print(A1(1) <error descr="'__gt__' not supported between instances of 'A1' and 'A2'">></error> A2(2))
+print(A1(1) <error descr="'__ge__' not supported between instances of 'A1' and 'A2'">>=</error> A2(2))
 
 
 print(A1 < A2)
diff --git a/python/testData/inspections/PyDataclassInspection/comparisonForUnordered.py b/python/testData/inspections/PyDataclassInspection/comparisonForUnordered.py
index edf579cbaabf..544f654a6e6b 100644
--- a/python/testData/inspections/PyDataclassInspection/comparisonForUnordered.py
+++ b/python/testData/inspections/PyDataclassInspection/comparisonForUnordered.py
@@ -10,16 +10,16 @@ class A2:
     y: int = 0
 
 
-print(A1(1) <error descr="__lt__ not supported between instances of 'A1'"><</error> A1(2))
-print(A1(1) <error descr="__le__ not supported between instances of 'A1'"><=</error> A1(2))
-print(A1(1) <error descr="__gt__ not supported between instances of 'A1'">></error> A1(2))
-print(A1(1) <error descr="__ge__ not supported between instances of 'A1'">>=</error> A1(2))
+print(A1(1) <error descr="'__lt__' not supported between instances of 'A1'"><</error> A1(2))
+print(A1(1) <error descr="'__le__' not supported between instances of 'A1'"><=</error> A1(2))
+print(A1(1) <error descr="'__gt__' not supported between instances of 'A1'">></error> A1(2))
+print(A1(1) <error descr="'__ge__' not supported between instances of 'A1'">>=</error> A1(2))
 
 
-print(A1(1) <error descr="__lt__ not supported between instances of 'A1' and 'A2'"><</error> A2(2))
-print(A1(1) <error descr="__le__ not supported between instances of 'A1' and 'A2'"><=</error> A2(2))
-print(A1(1) <error descr="__gt__ not supported between instances of 'A1' and 'A2'">></error> A2(2))
-print(A1(1) <error descr="__ge__ not supported between instances of 'A1' and 'A2'">>=</error> A2(2))
+print(A1(1) <error descr="'__lt__' not supported between instances of 'A1' and 'A2'"><</error> A2(2))
+print(A1(1) <error descr="'__le__' not supported between instances of 'A1' and 'A2'"><=</error> A2(2))
+print(A1(1) <error descr="'__gt__' not supported between instances of 'A1' and 'A2'">></error> A2(2))
+print(A1(1) <error descr="'__ge__' not supported between instances of 'A1' and 'A2'">>=</error> A2(2))
 
 
 print(A1 < A1)
diff --git a/python/testData/inspections/PyDataclassInspection/defaultFieldValue.py b/python/testData/inspections/PyDataclassInspection/defaultFieldValue.py
index 447d948ebbb3..f4c61b3e6a37 100644
--- a/python/testData/inspections/PyDataclassInspection/defaultFieldValue.py
+++ b/python/testData/inspections/PyDataclassInspection/defaultFieldValue.py
@@ -4,12 +4,12 @@ from typing import ClassVar, List, Set, Tuple, Type
 
 @dataclasses.dataclass
 class A:
-    a: List[int] = <error descr="mutable default 'list' is not allowed">[]</error>
-    b: List[int] = <error descr="mutable default 'list' is not allowed">list()</error>
-    c: Set[int] = <error descr="mutable default 'set' is not allowed">{1}</error>
-    d: Set[int] = <error descr="mutable default 'set' is not allowed">set()</error>
-    e: Tuple[int, ...] = <error descr="mutable default 'tuple' is not allowed">()</error>
-    f: Tuple[int, ...] = <error descr="mutable default 'tuple' is not allowed">tuple()</error>
+    a: List[int] = <error descr="Mutable default 'list' is not allowed">[]</error>
+    b: List[int] = <error descr="Mutable default 'list' is not allowed">list()</error>
+    c: Set[int] = <error descr="Mutable default 'set' is not allowed">{1}</error>
+    d: Set[int] = <error descr="Mutable default 'set' is not allowed">set()</error>
+    e: Tuple[int, ...] = <error descr="Mutable default 'tuple' is not allowed">()</error>
+    f: Tuple[int, ...] = <error descr="Mutable default 'tuple' is not allowed">tuple()</error>
     g: ClassVar[List[int]] = []
     h: ClassVar = []
     a2: Type[List[int]] = list
diff --git a/python/testData/inspections/PyDataclassInspection/fieldDefaultAndDefaultFactory.py b/python/testData/inspections/PyDataclassInspection/fieldDefaultAndDefaultFactory.py
index e4b41db46488..0f936cd5ecbc 100644
--- a/python/testData/inspections/PyDataclassInspection/fieldDefaultAndDefaultFactory.py
+++ b/python/testData/inspections/PyDataclassInspection/fieldDefaultAndDefaultFactory.py
@@ -4,4 +4,4 @@ import dataclasses
 class E1:
     a: int = dataclasses.field(default=1)
     b: int = dataclasses.field(default_factory=int)
-    c: int = dataclasses.field<error descr="cannot specify both default and default_factory">(default=1, default_factory=int)</error>
\ No newline at end of file
+    c: int = dataclasses.field<error descr="Cannot specify both 'default' and 'default_factory'">(default=1, default_factory=int)</error>
\ No newline at end of file
diff --git a/python/testData/inspections/PyDataclassInspection/orderAndNotEq.py b/python/testData/inspections/PyDataclassInspection/orderAndNotEq.py
index 96bfc7d26a78..11517a16707c 100644
--- a/python/testData/inspections/PyDataclassInspection/orderAndNotEq.py
+++ b/python/testData/inspections/PyDataclassInspection/orderAndNotEq.py
@@ -1,7 +1,7 @@
 import dataclasses
 
 
-@dataclasses.dataclass(<error descr="eq must be true if order is true">eq=False</error>, order=True)
+@dataclasses.dataclass(<error descr="'eq' must be true if 'order' is true">eq=False</error>, order=True)
 class A1:
     x: int
 
diff --git a/python/testData/inspections/PyDataclassInspection/uselessInitVar.py b/python/testData/inspections/PyDataclassInspection/uselessInitVar.py
index 7c1097b226aa..bbd01d3d3a8b 100644
--- a/python/testData/inspections/PyDataclassInspection/uselessInitVar.py
+++ b/python/testData/inspections/PyDataclassInspection/uselessInitVar.py
@@ -3,4 +3,4 @@ import dataclasses
 @dataclasses.dataclass
 class A:
     a: int
-    <warning descr="attribute 'b' is useless until '__post_init__' is declared">b</warning>: dataclasses.InitVar[str]
+    <warning descr="Attribute 'b' is useless until '__post_init__' is declared">b</warning>: dataclasses.InitVar[str]