diff --git a/compiler/frontend/src/org/jetbrains/jet/JetNodeTypes.java b/compiler/frontend/src/org/jetbrains/jet/JetNodeTypes.java
index c841dfd70af..dfa53d07b08 100644
--- a/compiler/frontend/src/org/jetbrains/jet/JetNodeTypes.java
+++ b/compiler/frontend/src/org/jetbrains/jet/JetNodeTypes.java
@@ -108,7 +108,6 @@ public interface JetNodeTypes {
     JetNodeType FOR                       = new JetNodeType("FOR", JetForExpression.class);
     JetNodeType WHILE                     = new JetNodeType("WHILE", JetWhileExpression.class);
     JetNodeType DO_WHILE                  = new JetNodeType("DO_WHILE", JetDoWhileExpression.class);
-    JetNodeType LOOP_PARAMETER            = new JetNodeType("LOOP_PARAMETER", JetParameter.class); // TODO: Do we need separate type?
     JetNodeType LOOP_RANGE                = new JetNodeType("LOOP_RANGE", JetContainerNode.class);
     JetNodeType BODY                      = new JetNodeType("BODY", JetContainerNode.class);
     JetNodeType BLOCK                     = new JetNodeType("BLOCK", JetBlockExpression.class);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetExpressionParsing.java b/compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetExpressionParsing.java
index 654d93e4ac8..6025a7041f2 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetExpressionParsing.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetExpressionParsing.java
@@ -1374,7 +1374,7 @@ public class JetExpressionParsing extends AbstractJetParsing {
                 advance(); // COLON
                 myJetParsing.parseTypeRef(TokenSet.create(IN_KEYWORD));
             }
-            parameter.done(LOOP_PARAMETER);
+            parameter.done(VALUE_PARAMETER);
         }
 
         expect(IN_KEYWORD, "Expecting 'in'", TokenSet.create(LPAR, LBRACE));
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetForExpression.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetForExpression.java
index 9b38f2fc360..821bcbffc62 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetForExpression.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetForExpression.java
@@ -34,7 +34,7 @@ public class JetForExpression extends JetLoopExpression {
 
     @Nullable
     public JetParameter getLoopParameter() {
-        return (JetParameter) findChildByType(JetNodeTypes.LOOP_PARAMETER);
+        return (JetParameter) findChildByType(JetNodeTypes.VALUE_PARAMETER);
     }
 
     @Nullable
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetParameter.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetParameter.java
index d6f82ec8f4a..87a9df9e45d 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetParameter.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetParameter.java
@@ -108,4 +108,8 @@ public class JetParameter extends JetNamedDeclarationStub<PsiJetParameterStub> {
     public ItemPresentation getPresentation() {
         return ItemPresentationProviders.getItemPresentation(this);
     }
+
+    public boolean isLoopParameter() {
+        return getParent() instanceof JetForExpression;
+    }
 }
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetParameterElementType.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetParameterElementType.java
index 74009e0ea26..e5ff873c699 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetParameterElementType.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetParameterElementType.java
@@ -17,6 +17,7 @@
 package org.jetbrains.jet.lang.psi.stubs.elements;
 
 import com.intellij.lang.ASTNode;
+import com.intellij.psi.PsiElement;
 import com.intellij.psi.stubs.IndexSink;
 import com.intellij.psi.stubs.StubElement;
 import com.intellij.psi.stubs.StubInputStream;
@@ -60,7 +61,11 @@ public class JetParameterElementType extends JetStubElementType<PsiJetParameterS
 
     @Override
     public boolean shouldCreateStub(ASTNode node) {
-        return node.getElementType() == JetStubElementTypes.VALUE_PARAMETER;
+        if (!super.shouldCreateStub(node)) {
+            return false;
+        }
+        PsiElement psi = node.getPsi();
+        return psi instanceof JetParameter && !((JetParameter) psi).isLoopParameter();
     }
 
     @Override
diff --git a/compiler/testData/psi/ControlStructures.txt b/compiler/testData/psi/ControlStructures.txt
index 5df35ab1add..b53adf31922 100644
--- a/compiler/testData/psi/ControlStructures.txt
+++ b/compiler/testData/psi/ControlStructures.txt
@@ -453,7 +453,7 @@ JetFile: ControlStructures.kt
         PsiElement(for)('for')
         PsiWhiteSpace(' ')
         PsiElement(LPAR)('(')
-        LOOP_PARAMETER
+        VALUE_PARAMETER
           PsiElement(val)('val')
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('x')
@@ -473,7 +473,7 @@ JetFile: ControlStructures.kt
         PsiElement(for)('for')
         PsiWhiteSpace(' ')
         PsiElement(LPAR)('(')
-        LOOP_PARAMETER
+        VALUE_PARAMETER
           PsiElement(IDENTIFIER)('x')
         PsiWhiteSpace(' ')
         PsiElement(in)('in')
@@ -491,7 +491,7 @@ JetFile: ControlStructures.kt
         PsiElement(for)('for')
         PsiWhiteSpace(' ')
         PsiElement(LPAR)('(')
-        LOOP_PARAMETER
+        VALUE_PARAMETER
           PsiElement(val)('val')
           PsiWhiteSpace(' ')
           PsiElement(IDENTIFIER)('x')
@@ -518,7 +518,7 @@ JetFile: ControlStructures.kt
         PsiElement(for)('for')
         PsiWhiteSpace(' ')
         PsiElement(LPAR)('(')
-        LOOP_PARAMETER
+        VALUE_PARAMETER
           PsiElement(IDENTIFIER)('x')
           PsiWhiteSpace(' ')
           PsiElement(COLON)(':')
@@ -588,7 +588,7 @@ JetFile: ControlStructures.kt
         PsiElement(for)('for')
         PsiWhiteSpace(' ')
         PsiElement(LPAR)('(')
-        LOOP_PARAMETER
+        VALUE_PARAMETER
           PsiElement(IDENTIFIER)('a')
         PsiWhiteSpace(' ')
         PsiElement(in)('in')
@@ -606,7 +606,7 @@ JetFile: ControlStructures.kt
         PsiElement(for)('for')
         PsiWhiteSpace(' ')
         PsiElement(LPAR)('(')
-        LOOP_PARAMETER
+        VALUE_PARAMETER
           PsiElement(IDENTIFIER)('a')
         PsiWhiteSpace(' ')
         PsiElement(in)('in')
@@ -625,7 +625,7 @@ JetFile: ControlStructures.kt
         PsiElement(for)('for')
         PsiWhiteSpace(' ')
         PsiElement(LPAR)('(')
-        LOOP_PARAMETER
+        VALUE_PARAMETER
           PsiElement(IDENTIFIER)('a')
         PsiWhiteSpace(' ')
         PsiElement(in)('in')
@@ -648,7 +648,7 @@ JetFile: ControlStructures.kt
         PsiElement(for)('for')
         PsiWhiteSpace(' ')
         PsiElement(LPAR)('(')
-        LOOP_PARAMETER
+        VALUE_PARAMETER
           PsiElement(IDENTIFIER)('a')
         PsiWhiteSpace(' ')
         PsiElement(in)('in')
diff --git a/compiler/testData/psi/examples/PolymorphicClassObjects.txt b/compiler/testData/psi/examples/PolymorphicClassObjects.txt
index eea22e954a5..ff6acf9640e 100644
--- a/compiler/testData/psi/examples/PolymorphicClassObjects.txt
+++ b/compiler/testData/psi/examples/PolymorphicClassObjects.txt
@@ -356,7 +356,7 @@ JetFile: PolymorphicClassObjects.kt
             PsiElement(for)('for')
             PsiWhiteSpace(' ')
             PsiElement(LPAR)('(')
-            LOOP_PARAMETER
+            VALUE_PARAMETER
               PsiElement(IDENTIFIER)('e')
             PsiWhiteSpace(' ')
             PsiElement(in)('in')
diff --git a/compiler/testData/psi/examples/collections/ArrayList.txt b/compiler/testData/psi/examples/collections/ArrayList.txt
index fde5b4f3311..966edc00995 100644
--- a/compiler/testData/psi/examples/collections/ArrayList.txt
+++ b/compiler/testData/psi/examples/collections/ArrayList.txt
@@ -724,7 +724,7 @@ JetFile: ArrayList.kt
                       PsiElement(for)('for')
                       PsiWhiteSpace(' ')
                       PsiElement(LPAR)('(')
-                      LOOP_PARAMETER
+                      VALUE_PARAMETER
                         PsiElement(IDENTIFIER)('i')
                       PsiWhiteSpace(' ')
                       PsiElement(in)('in')
@@ -845,7 +845,7 @@ JetFile: ArrayList.kt
             PsiElement(for)('for')
             PsiWhiteSpace(' ')
             PsiElement(LPAR)('(')
-            LOOP_PARAMETER
+            VALUE_PARAMETER
               PsiElement(IDENTIFIER)('i')
             PsiWhiteSpace(' ')
             PsiElement(in)('in')
diff --git a/compiler/testData/psi/examples/collections/IIterator.txt b/compiler/testData/psi/examples/collections/IIterator.txt
index a5ad9553908..8b09d8fb4ad 100644
--- a/compiler/testData/psi/examples/collections/IIterator.txt
+++ b/compiler/testData/psi/examples/collections/IIterator.txt
@@ -306,7 +306,7 @@ JetFile: IIterator.kt
             PsiElement(for)('for')
             PsiWhiteSpace(' ')
             PsiElement(LPAR)('(')
-            LOOP_PARAMETER
+            VALUE_PARAMETER
               PsiElement(IDENTIFIER)('i')
             PsiWhiteSpace(' ')
             PsiElement(in)('in')
diff --git a/compiler/testData/psi/examples/collections/LinkedList.txt b/compiler/testData/psi/examples/collections/LinkedList.txt
index bf534007c70..3980bf250c8 100644
--- a/compiler/testData/psi/examples/collections/LinkedList.txt
+++ b/compiler/testData/psi/examples/collections/LinkedList.txt
@@ -823,7 +823,7 @@ JetFile: LinkedList.kt
             PsiElement(for)('for')
             PsiWhiteSpace(' ')
             PsiElement(LPAR)('(')
-            LOOP_PARAMETER
+            VALUE_PARAMETER
               PsiElement(IDENTIFIER)('i')
             PsiWhiteSpace(' ')
             PsiElement(in)('in')
diff --git a/compiler/testData/psi/examples/io/IOSamples.txt b/compiler/testData/psi/examples/io/IOSamples.txt
index 6d00f8b9944..c7a8b006008 100644
--- a/compiler/testData/psi/examples/io/IOSamples.txt
+++ b/compiler/testData/psi/examples/io/IOSamples.txt
@@ -167,7 +167,7 @@ JetFile: IOSamples.kt
         PsiElement(for)('for')
         PsiWhiteSpace(' ')
         PsiElement(LPAR)('(')
-        LOOP_PARAMETER
+        VALUE_PARAMETER
           PsiElement(IDENTIFIER)('item')
         PsiWhiteSpace(' ')
         PsiElement(in)('in')
diff --git a/compiler/testData/psi/recovery/ForRecovery.txt b/compiler/testData/psi/recovery/ForRecovery.txt
index 83a91ae53aa..5f29531331b 100644
--- a/compiler/testData/psi/recovery/ForRecovery.txt
+++ b/compiler/testData/psi/recovery/ForRecovery.txt
@@ -16,7 +16,7 @@ JetFile: ForRecovery.kt
         PsiElement(for)('for')
         PsiWhiteSpace(' ')
         PsiElement(LPAR)('(')
-        LOOP_PARAMETER
+        VALUE_PARAMETER
           PsiElement(IDENTIFIER)('v')
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
diff --git a/compiler/testData/psi/recovery/SameLineStatementRecovery.txt b/compiler/testData/psi/recovery/SameLineStatementRecovery.txt
index 0382c28f80a..a89cbf6b29a 100644
--- a/compiler/testData/psi/recovery/SameLineStatementRecovery.txt
+++ b/compiler/testData/psi/recovery/SameLineStatementRecovery.txt
@@ -75,7 +75,7 @@ JetFile: SameLineStatementRecovery.kt
         PsiElement(for)('for')
         PsiWhiteSpace(' ')
         PsiElement(LPAR)('(')
-        LOOP_PARAMETER
+        VALUE_PARAMETER
           PsiElement(IDENTIFIER)('a')
         PsiWhiteSpace(' ')
         PsiElement(in)('in')
diff --git a/compiler/testData/psi/script/ComplexScript.txt b/compiler/testData/psi/script/ComplexScript.txt
index 50bee38ee68..22bd52a6ce9 100644
--- a/compiler/testData/psi/script/ComplexScript.txt
+++ b/compiler/testData/psi/script/ComplexScript.txt
@@ -99,7 +99,7 @@ JetFile: ComplexScript.ktscript
         PsiElement(for)('for')
         PsiWhiteSpace(' ')
         PsiElement(LPAR)('(')
-        LOOP_PARAMETER
+        VALUE_PARAMETER
           PsiElement(IDENTIFIER)('arg')
         PsiWhiteSpace(' ')
         PsiElement(in)('in')
diff --git a/idea/src/org/jetbrains/jet/plugin/formatter/kotlinSpacingRules.kt b/idea/src/org/jetbrains/jet/plugin/formatter/kotlinSpacingRules.kt
index 4ac914bef7e..6a4f16c0188 100644
--- a/idea/src/org/jetbrains/jet/plugin/formatter/kotlinSpacingRules.kt
+++ b/idea/src/org/jetbrains/jet/plugin/formatter/kotlinSpacingRules.kt
@@ -81,8 +81,6 @@ fun createSpacingBuilder(settings: CodeStyleSettings): KotlinSpacingBuilder {
             afterInside(COLON, VALUE_PARAMETER).spaceIf(jetSettings.SPACE_AFTER_TYPE_COLON)
             beforeInside(COLON, MULTI_VARIABLE_DECLARATION_ENTRY).spaceIf(jetSettings.SPACE_BEFORE_TYPE_COLON)
             afterInside(COLON, MULTI_VARIABLE_DECLARATION_ENTRY).spaceIf(jetSettings.SPACE_AFTER_TYPE_COLON)
-            beforeInside(COLON, LOOP_PARAMETER).spaceIf(jetSettings.SPACE_BEFORE_TYPE_COLON)
-            afterInside(COLON, LOOP_PARAMETER).spaceIf(jetSettings.SPACE_AFTER_TYPE_COLON)
             beforeInside(COLON, FUNCTION_LITERAL).spaceIf(jetSettings.SPACE_BEFORE_TYPE_COLON)
             afterInside(COLON, FUNCTION_LITERAL).spaceIf(jetSettings.SPACE_AFTER_TYPE_COLON)
 
diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/SpecifyTypeExplicitlyAction.java b/idea/src/org/jetbrains/jet/plugin/intentions/SpecifyTypeExplicitlyAction.java
index 9ad8961a89e..f834f515bf8 100644
--- a/idea/src/org/jetbrains/jet/plugin/intentions/SpecifyTypeExplicitlyAction.java
+++ b/idea/src/org/jetbrains/jet/plugin/intentions/SpecifyTypeExplicitlyAction.java
@@ -122,7 +122,7 @@ public class SpecifyTypeExplicitlyAction extends PsiElementBaseIntentionAction {
                  && !((JetNamedFunction) declaration).hasBlockBody()) {
             setText(JetBundle.message("specify.type.explicitly.add.return.type.action.name"));
         }
-        else if (declaration instanceof JetParameter && JetNodeTypes.LOOP_PARAMETER == declaration.getNode().getElementType()) {
+        else if (declaration instanceof JetParameter && ((JetParameter) declaration).isLoopParameter()) {
             if (((JetParameter) declaration).getTypeReference() != null) {
                 setText(JetBundle.message("specify.type.explicitly.remove.action.name"));
                 return true;