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 57902dbd3a6a..92321195a8a3 100644
--- a/platform/platform-tests/testSrc/com/intellij/psi/util/NameUtilTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/psi/util/NameUtilTest.java
@@ -228,7 +228,8 @@ public class NameUtilTest extends UsefulTestCase {
 
   public void testFileStructure() {
     assertDoesntMatch("hint", "height: int");
-    assertDoesntMatch("Hint", "Height:int");
+    assertMatches("Hint", "Height:int");
+    assertDoesntMatch("Hint", "Height: int");
 
     assertMatches("getColor", "getBackground(): Color");
     assertMatches("get color", "getBackground(): Color");
@@ -344,6 +345,8 @@ public class NameUtilTest extends UsefulTestCase {
     assertMatches("WebLOgic", "WebLogic");
     assertMatches("WEbLogic", "WebLogic");
     assertDoesntMatch("WebLogic", "Webologic");
+
+    assertMatches("Wlo", "WebLogic");
   }
 
   public void testFinalSpace() {
diff --git a/platform/util/src/com/intellij/psi/codeStyle/MinusculeMatcher.java b/platform/util/src/com/intellij/psi/codeStyle/MinusculeMatcher.java
index 4c306a3b605b..495cdb7d34fc 100644
--- a/platform/util/src/com/intellij/psi/codeStyle/MinusculeMatcher.java
+++ b/platform/util/src/com/intellij/psi/codeStyle/MinusculeMatcher.java
@@ -38,9 +38,9 @@ public class MinusculeMatcher implements Matcher {
   public MinusculeMatcher(String pattern, NameUtil.MatchingCaseSensitivity options) {
     myOptions = options;
     myPattern = StringUtil.trimEnd(pattern, "* ").toCharArray();
-    for (int i = 0; i < myPattern.length; i++) {
+    for (int i = 1; i < myPattern.length; i++) {
       char c = myPattern[i];
-      if (Character.isUpperCase(c) && (i > 0 || myOptions != FIRST_LETTER)) {
+      if (Character.isUpperCase(c)) {
         myHasHumps = true;
         return;
       }