diff --git a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoSymbolModel2.java b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoSymbolModel2.java
index 376febce1227..f7244901207d 100644
--- a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoSymbolModel2.java
+++ b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoSymbolModel2.java
@@ -70,11 +70,11 @@ public class GotoSymbolModel2 extends ContributorsBasedGotoByModel {
 
   @NotNull
   public String[] getSeparators() {
-    return new String[] {".", ":"};
+    return new String[] {"."};
   }
 
   @Override
   public String getHelpId() {
     return "procedures.navigating.goto.class";
   }
-}
\ No newline at end of file
+}
diff --git a/platform/util/src/com/intellij/psi/codeStyle/NameUtil.java b/platform/util/src/com/intellij/psi/codeStyle/NameUtil.java
index bcc8d62e5524..05e1ac36c5f9 100644
--- a/platform/util/src/com/intellij/psi/codeStyle/NameUtil.java
+++ b/platform/util/src/com/intellij/psi/codeStyle/NameUtil.java
@@ -198,7 +198,7 @@ public class NameUtil {
         firstIdentifierLetter = true;
       }
       else {
-        if (prevIsUppercase) {
+        if (c == ':' || prevIsUppercase) {
           buffer.append("[A-Za-z\\s0-9\\$]*");
         }