diff --git a/platform/platform-tests/testSrc/com/intellij/psi/util/NameUtilTest.java b/platform/platform-tests/testSrc/com/intellij/psi/util/NameUtilTest.java
index 7c126eed137a..57902dbd3a6a 100644
--- a/platform/platform-tests/testSrc/com/intellij/psi/util/NameUtilTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/psi/util/NameUtilTest.java
@@ -372,11 +372,12 @@ public class NameUtilTest extends UsefulTestCase {
   }
 
   public void testMinusculeFirstLetter() {
-    assertTrue(new MinusculeMatcher("WebLogic", NameUtil.MatchingCaseSensitivity.FIRST_LETTER).matches("WebLogic"));
-    assertFalse(new MinusculeMatcher("webLogic", NameUtil.MatchingCaseSensitivity.FIRST_LETTER).matches("WebLogic"));
-    assertTrue(new MinusculeMatcher("cL", NameUtil.MatchingCaseSensitivity.FIRST_LETTER).matches("class"));
-    assertTrue(new MinusculeMatcher("CL", NameUtil.MatchingCaseSensitivity.FIRST_LETTER).matches("Class"));
-    assertFalse(new MinusculeMatcher("abc", NameUtil.MatchingCaseSensitivity.FIRST_LETTER).matches("_abc"));
+    assertTrue(firstLetterMatcher("WebLogic").matches("WebLogic"));
+    assertFalse(firstLetterMatcher("webLogic").matches("WebLogic"));
+    assertTrue(firstLetterMatcher("cL").matches("class"));
+    assertTrue(firstLetterMatcher("CL").matches("Class"));
+    assertTrue(firstLetterMatcher("Cl").matches("CoreLoader"));
+    assertFalse(firstLetterMatcher("abc").matches("_abc"));
   }
 
   public void testMinusculeAllImportant() {
diff --git a/platform/util/src/com/intellij/psi/codeStyle/MinusculeMatcher.java b/platform/util/src/com/intellij/psi/codeStyle/MinusculeMatcher.java
index c45f3a1e26ce..4c306a3b605b 100644
--- a/platform/util/src/com/intellij/psi/codeStyle/MinusculeMatcher.java
+++ b/platform/util/src/com/intellij/psi/codeStyle/MinusculeMatcher.java
@@ -40,7 +40,7 @@ public class MinusculeMatcher implements Matcher {
     myPattern = StringUtil.trimEnd(pattern, "* ").toCharArray();
     for (int i = 0; i < myPattern.length; i++) {
       char c = myPattern[i];
-      if (Character.isUpperCase(c)) {
+      if (Character.isUpperCase(c) && (i > 0 || myOptions != FIRST_LETTER)) {
         myHasHumps = true;
         return;
       }