Renames

compiler/frontend/src/org/jetbrains/kotlin/diagnostics/PositioningStrategies.kt

@@ -322,13 +322,13 @@ public object PositioningStrategies {
 
     public val ELSE_ENTRY: PositioningStrategy<JetWhenEntry> = object : PositioningStrategy<JetWhenEntry>() {
         override fun mark(element: JetWhenEntry): List<TextRange> {
-            return markElement(element.getElseKeywordElement()!!)
+            return markElement(element.getElseKeyword()!!)
         }
     }
 
     public val WHEN_EXPRESSION: PositioningStrategy<JetWhenExpression> = object : PositioningStrategy<JetWhenExpression>() {
         override fun mark(element: JetWhenExpression): List<TextRange> {
-            return markElement(element.getWhenKeywordElement())
+            return markElement(element.getWhenKeyword())
         }
     }
 

compiler/frontend/src/org/jetbrains/kotlin/psi/JetDoWhileExpression.java

@@ -34,7 +34,7 @@ public class JetDoWhileExpression extends JetWhileExpressionBase {
 
     @Nullable
     @IfNotParsed
-    public PsiElement getWhileKeywordElement() {
+    public PsiElement getWhileKeyword() {
         //noinspection ConstantConditions
         return findChildByType(JetTokens.WHILE_KEYWORD);
     }

compiler/frontend/src/org/jetbrains/kotlin/psi/JetWhenEntry.java

@@ -28,11 +28,11 @@ public class JetWhenEntry extends JetElementImpl {
     }
 
     public boolean isElse() {
-        return getElseKeywordElement() != null;
+        return getElseKeyword() != null;
     }
 
     @Nullable
-    public PsiElement getElseKeywordElement() {
+    public PsiElement getElseKeyword() {
         return findChildByType(JetTokens.ELSE_KEYWORD);
     }
 

compiler/frontend/src/org/jetbrains/kotlin/psi/JetWhenExpression.java

@@ -46,7 +46,7 @@ public class JetWhenExpression extends JetExpressionImpl {
     }
 
     @NotNull
-    public PsiElement getWhenKeywordElement() {
+    public PsiElement getWhenKeyword() {
         //noinspection ConstantConditions
         return findChildByType(JetTokens.WHEN_KEYWORD);
     }