diff --git a/plugins/InspectionGadgets/test/com/siyeh/igtest/naming/new_method_naming_convention/InstanceMethodNamingConvention.java b/plugins/InspectionGadgets/test/com/siyeh/igtest/naming/new_method_naming_convention/InstanceMethodNamingConvention.java
index 8cd5980045a2..fe5f06377f88 100644
--- a/plugins/InspectionGadgets/test/com/siyeh/igtest/naming/new_method_naming_convention/InstanceMethodNamingConvention.java
+++ b/plugins/InspectionGadgets/test/com/siyeh/igtest/naming/new_method_naming_convention/InstanceMethodNamingConvention.java
@@ -2,7 +2,7 @@ package com.siyeh.igtest.naming.instance_method_naming_convention;
 
 public class InstanceMethodNamingConvention implements Runnable
 {
-    public void <warning descr="Instance method name 'UpperaseMethod' doesn't match regex '[a-z][A-Za-z\d]*'">UpperaseMethod</warning>()
+    public void <warning descr="Instance name 'UpperaseMethod' doesn't match regex '[a-z][A-Za-z\d]*'">UpperaseMethod</warning>()
     {
 
     }
@@ -12,12 +12,12 @@ public class InstanceMethodNamingConvention implements Runnable
 
     }
 
-    public void <warning descr="Instance method name 'foo' is too short (3 < 4)">foo</warning>()
+    public void <warning descr="Instance name 'foo' is too short (3 < 4)">foo</warning>()
     {
 
     }
 
-    public void <warning descr="Instance method name 'methodNameTooLoooooooooooooooooooooooooooooooooooooooooooooong' is too long (62 > 32)">methodNameTooLoooooooooooooooooooooooooooooooooooooooooooooong</warning>()
+    public void <warning descr="Instance name 'methodNameTooLoooooooooooooooooooooooooooooooooooooooooooooong' is too long (62 > 32)">methodNameTooLoooooooooooooooooooooooooooooooooooooooooooooong</warning>()
     {
 
     }
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igtest/naming/new_method_naming_convention/JUnit3MethodNamingConvention.java b/plugins/InspectionGadgets/test/com/siyeh/igtest/naming/new_method_naming_convention/JUnit3MethodNamingConvention.java
index fbe2e70e0945..7dffd83849a9 100644
--- a/plugins/InspectionGadgets/test/com/siyeh/igtest/naming/new_method_naming_convention/JUnit3MethodNamingConvention.java
+++ b/plugins/InspectionGadgets/test/com/siyeh/igtest/naming/new_method_naming_convention/JUnit3MethodNamingConvention.java
@@ -1,10 +1,10 @@
 public class JUnit3MethodNamingConvention extends junit.framework.TestCase {
 
-  public void <warning descr="JUnit 3 test method name 'testA' is too short (5 < 8)">testA</warning>() {}
+  public void <warning descr="JUnit 3 test name 'testA' is too short (5 < 8)">testA</warning>() {}
 
-  public void <warning descr="JUnit 3 test method name 'testAbcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz' is too long (82 > 64)">testAbcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz</warning>() {}
+  public void <warning descr="JUnit 3 test name 'testAbcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz' is too long (82 > 64)">testAbcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz</warning>() {}
 
-  public void <warning descr="JUnit 3 test method name 'testGiveMeMore$$$' doesn't match regex 'test[A-Za-z_\d]*'">testGiveMeMore$$$</warning>() {}
+  public void <warning descr="JUnit 3 test name 'testGiveMeMore$$$' doesn't match regex 'test[A-Za-z_\d]*'">testGiveMeMore$$$</warning>() {}
 
   public void test_me_properly() {}
 }
\ No newline at end of file
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igtest/naming/new_method_naming_convention/JUnit4MethodNamingConvention.java b/plugins/InspectionGadgets/test/com/siyeh/igtest/naming/new_method_naming_convention/JUnit4MethodNamingConvention.java
index 4f23a659ba16..4cab81207728 100644
--- a/plugins/InspectionGadgets/test/com/siyeh/igtest/naming/new_method_naming_convention/JUnit4MethodNamingConvention.java
+++ b/plugins/InspectionGadgets/test/com/siyeh/igtest/naming/new_method_naming_convention/JUnit4MethodNamingConvention.java
@@ -3,13 +3,13 @@ import org.junit.Test;
 public class JUnit4MethodNamingConvention {
 
   @Test
-  public void <warning descr="JUnit 4+ test method name 'a' is too short (1 < 4)">a</warning>() {}
+  public void <warning descr="JUnit 4+ test name 'a' is too short (1 < 4)">a</warning>() {}
 
   @Test
-  public void <warning descr="JUnit 4+ test method name 'abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz' is too long (78 > 64)">abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz</warning>() {}
+  public void <warning descr="JUnit 4+ test name 'abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz' is too long (78 > 64)">abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz</warning>() {}
 
   @Test
-  public void <warning descr="JUnit 4+ test method name 'more$$$' doesn't match regex '[a-z][A-Za-z_\d]*'">more$$$</warning>() {}
+  public void <warning descr="JUnit 4+ test name 'more$$$' doesn't match regex '[a-z][A-Za-z_\d]*'">more$$$</warning>() {}
 
   @Test
   public void assure_foo_is_never_null() {}
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igtest/naming/new_method_naming_convention/NativeMethodNamingConvention.java b/plugins/InspectionGadgets/test/com/siyeh/igtest/naming/new_method_naming_convention/NativeMethodNamingConvention.java
index 4e7728d060c3..3366e43cdf49 100644
--- a/plugins/InspectionGadgets/test/com/siyeh/igtest/naming/new_method_naming_convention/NativeMethodNamingConvention.java
+++ b/plugins/InspectionGadgets/test/com/siyeh/igtest/naming/new_method_naming_convention/NativeMethodNamingConvention.java
@@ -17,17 +17,17 @@ package com.siyeh.igtest.naming.native_method_naming_convention;
 
 public class NativeMethodNamingConvention implements Runnable
 {
-    public native void <warning descr="'native' method name 'UpperaseMethod' doesn't match regex '[a-z][A-Za-z\d]*'">UpperaseMethod</warning>();
+    public native void <warning descr="'native' name 'UpperaseMethod' doesn't match regex '[a-z][A-Za-z\d]*'">UpperaseMethod</warning>();
 
     public native void methodNameEndingIn2();
 
-    public native void <warning descr="'native' method name 'foo' is too short (3 < 4)">foo</warning>();
+    public native void <warning descr="'native' name 'foo' is too short (3 < 4)">foo</warning>();
 
-    public native void <warning descr="'native' method name 'methodNameTooLoooooooooooooooooooooooooooooooooooooooooooooong' is too long (62 > 32)">methodNameTooLoooooooooooooooooooooooooooooooooooooooooooooong</warning>();
+    public native void <warning descr="'native' name 'methodNameTooLoooooooooooooooooooooooooooooooooooooooooooooong' is too long (62 > 32)">methodNameTooLoooooooooooooooooooooooooooooooooooooooooooooong</warning>();
 
     public native void run();
 
     private void a() {}
 
-    public static native void <warning descr="'native' method name 'b' is too short (1 < 4)">b</warning>();
+    public static native void <warning descr="'native' name 'b' is too short (1 < 4)">b</warning>();
 }
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igtest/naming/new_method_naming_convention/StaticMethodNamingConvention.java b/plugins/InspectionGadgets/test/com/siyeh/igtest/naming/new_method_naming_convention/StaticMethodNamingConvention.java
index 8c20a5669327..ed38019d3320 100644
--- a/plugins/InspectionGadgets/test/com/siyeh/igtest/naming/new_method_naming_convention/StaticMethodNamingConvention.java
+++ b/plugins/InspectionGadgets/test/com/siyeh/igtest/naming/new_method_naming_convention/StaticMethodNamingConvention.java
@@ -2,7 +2,7 @@ package com.siyeh.igtest.naming.static_method_naming_convention;
 
 public class StaticMethodNamingConvention
 {
-    public static void <warning descr="'static' method name 'UpperaseMethod' doesn't match regex '[a-z][A-Za-z\d]*'">UpperaseMethod</warning>()
+    public static void <warning descr="'static' name 'UpperaseMethod' doesn't match regex '[a-z][A-Za-z\d]*'">UpperaseMethod</warning>()
     {
 
     }
@@ -12,12 +12,12 @@ public class StaticMethodNamingConvention
 
     }
 
-    public static void <warning descr="'static' method name 'foo' is too short (3 < 4)">foo</warning>()
+    public static void <warning descr="'static' name 'foo' is too short (3 < 4)">foo</warning>()
     {
 
     }
 
-    public static void <warning descr="'static' method name 'methodNameTooLoooooooooooooooooooooooooooooooooooooooooooooong' is too long (62 > 32)">methodNameTooLoooooooooooooooooooooooooooooooooooooooooooooong</warning>()
+    public static void <warning descr="'static' name 'methodNameTooLoooooooooooooooooooooooooooooooooooooooooooooong' is too long (62 > 32)">methodNameTooLoooooooooooooooooooooooooooooooooooooooooooooong</warning>()
     {
 
     }