diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetDeclarationStub.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetDeclarationStub.java
index c370b123d1c..d4cacf3dc63 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetDeclarationStub.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetDeclarationStub.java
@@ -27,7 +27,7 @@ import org.jetbrains.kotlin.kdoc.psi.api.KDoc;
 import org.jetbrains.kotlin.psi.findDocComment.FindDocCommentPackage;
 import org.jetbrains.kotlin.psi.stubs.KotlinClassOrObjectStub;
 
-abstract class JetDeclarationStub<T extends StubElement> extends JetModifierListOwnerStub<T> implements JetDeclaration {
+abstract class JetDeclarationStub<T extends StubElement<?>> extends JetModifierListOwnerStub<T> implements JetDeclaration {
     public JetDeclarationStub(@NotNull T stub, @NotNull IStubElementType nodeType) {
         super(stub, nodeType);
     }
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetElementImplStub.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetElementImplStub.java
index 2385cec8c01..cbbad15182a 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetElementImplStub.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetElementImplStub.java
@@ -30,7 +30,7 @@ import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementType;
 import java.util.Arrays;
 import java.util.List;
 
-public class JetElementImplStub<T extends StubElement> extends StubBasedPsiElementBase<T>
+public class JetElementImplStub<T extends StubElement<?>> extends StubBasedPsiElementBase<T>
         implements JetElement, StubBasedPsiElement<T> {
     public JetElementImplStub(@NotNull T stub, @NotNull IStubElementType nodeType) {
         super(stub, nodeType);
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetExpressionImplStub.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetExpressionImplStub.java
index be48b989f2c..edd49ff8891 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetExpressionImplStub.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetExpressionImplStub.java
@@ -24,7 +24,7 @@ import com.intellij.util.IncorrectOperationException;
 import kotlin.jvm.functions.Function1;
 import org.jetbrains.annotations.NotNull;
 
-public abstract class JetExpressionImplStub<T extends StubElement> extends JetElementImplStub<T> implements JetExpression {
+public abstract class JetExpressionImplStub<T extends StubElement<?>> extends JetElementImplStub<T> implements JetExpression {
     public JetExpressionImplStub(@NotNull T stub, @NotNull IStubElementType nodeType) {
         super(stub, nodeType);
     }
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetModifierListOwnerStub.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetModifierListOwnerStub.java
index 0d04030a266..ce47f39dba0 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetModifierListOwnerStub.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetModifierListOwnerStub.java
@@ -29,7 +29,7 @@ import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes;
 import java.util.Collections;
 import java.util.List;
 
-public class JetModifierListOwnerStub<T extends StubElement> extends JetElementImplStub<T> implements JetModifierListOwner {
+public class JetModifierListOwnerStub<T extends StubElement<?>> extends JetElementImplStub<T> implements JetModifierListOwner {
     public JetModifierListOwnerStub(ASTNode node) {
         super(node);
     }
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetNamedDeclarationStub.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetNamedDeclarationStub.java
index 29fce242176..0a997274b0f 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetNamedDeclarationStub.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetNamedDeclarationStub.java
@@ -33,7 +33,7 @@ import org.jetbrains.kotlin.lexer.JetTokens;
 
 import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;
 
-abstract class JetNamedDeclarationStub<T extends KotlinStubWithFqName> extends JetDeclarationStub<T> implements JetNamedDeclaration {
+abstract class JetNamedDeclarationStub<T extends KotlinStubWithFqName<?>> extends JetDeclarationStub<T> implements JetNamedDeclaration {
     public JetNamedDeclarationStub(@NotNull T stub, @NotNull IStubElementType nodeType) {
         super(stub, nodeType);
     }
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetTypeParameterListOwnerStub.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetTypeParameterListOwnerStub.java
index 3ef71c54e3b..a21d5604ec2 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetTypeParameterListOwnerStub.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetTypeParameterListOwnerStub.java
@@ -26,7 +26,7 @@ import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes;
 import java.util.Collections;
 import java.util.List;
 
-abstract class JetTypeParameterListOwnerStub<T extends KotlinStubWithFqName> extends JetNamedDeclarationStub<T> implements JetTypeParameterListOwner {
+abstract class JetTypeParameterListOwnerStub<T extends KotlinStubWithFqName<?>> extends JetNamedDeclarationStub<T> implements JetTypeParameterListOwner {
     public JetTypeParameterListOwnerStub(@NotNull T stub, @NotNull IStubElementType nodeType) {
         super(stub, nodeType);
     }