diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AlternativeSignatureParsing.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AlternativeSignatureParsing.java
index 7d99babeb51..70d1a533a12 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AlternativeSignatureParsing.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AlternativeSignatureParsing.java
@@ -177,7 +177,7 @@ class AlternativeSignatureParsing {
     private static JetTypeConstraint findTypeParameterConstraint(@NotNull JetFunction function, @NotNull Name typeParameterName, int index) {
         if (index != 0) {
             int currentIndex = 0;
-            for (JetTypeConstraint constraint : function.getTypeConstaints()) {
+            for (JetTypeConstraint constraint : function.getTypeConstraints()) {
                 if (typeParameterName.equals(constraint.getSubjectTypeParameterName().getReferencedNameAsName())) {
                     currentIndex++;
                 }
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeParameterListOwner.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeParameterListOwner.java
index 9517cd08884..96058c30ede 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeParameterListOwner.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeParameterListOwner.java
@@ -43,7 +43,7 @@ public class JetTypeParameterListOwner extends JetNamedDeclaration {
     }
 
     @NotNull
-    public List<JetTypeConstraint> getTypeConstaints() {
+    public List<JetTypeConstraint> getTypeConstraints() {
         JetTypeConstraintList typeConstraintList = getTypeConstraintList();
         if (typeConstraintList == null) {
             return Collections.emptyList();
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java
index 655b3cf00a1..b1f3194a769 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java
@@ -376,7 +376,7 @@ public class DescriptorResolver {
                 deferredUpperBoundCheckerTasks.add(new UpperBoundCheckerTask(extendsBound, type, false));
             }
         }
-        for (JetTypeConstraint constraint : declaration.getTypeConstaints()) {
+        for (JetTypeConstraint constraint : declaration.getTypeConstraints()) {
             JetSimpleNameExpression subjectTypeParameterName = constraint.getSubjectTypeParameterName();
             if (subjectTypeParameterName == null) {
                 continue;
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeHierarchyResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeHierarchyResolver.java
index 26f6f94d0f9..8c80530ff5d 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeHierarchyResolver.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeHierarchyResolver.java
@@ -613,7 +613,7 @@ public class TypeHierarchyResolver {
                 }
             }
 
-            for (JetTypeConstraint constraint : jetClass.getTypeConstaints()) {
+            for (JetTypeConstraint constraint : jetClass.getTypeConstraints()) {
                 JetTypeReference extendsBound = constraint.getBoundTypeReference();
                 if (extendsBound != null) {
                     JetType type = trace.getBindingContext().get(TYPE, extendsBound);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyTypeParameterDescriptor.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyTypeParameterDescriptor.java
index cd95eff6e45..7543fb27a2f 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyTypeParameterDescriptor.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyTypeParameterDescriptor.java
@@ -112,7 +112,7 @@ public class LazyTypeParameterDescriptor implements TypeParameterDescriptor {
         JetClassOrObject classOrObject = PsiTreeUtil.getParentOfType(jetTypeParameter, JetClassOrObject.class);
         if (classOrObject instanceof JetClass) {
             JetClass jetClass = (JetClass) classOrObject;
-            for (JetTypeConstraint jetTypeConstraint : jetClass.getTypeConstaints()) {
+            for (JetTypeConstraint jetTypeConstraint : jetClass.getTypeConstraints()) {
                 if (jetTypeConstraint.isClassObjectContraint() != forClassObject) continue;
 
                 JetSimpleNameExpression constrainedParameterName = jetTypeConstraint.getSubjectTypeParameterName();
diff --git a/idea/src/org/jetbrains/jet/plugin/highlighter/JetLineMarkerProvider.java b/idea/src/org/jetbrains/jet/plugin/highlighter/JetLineMarkerProvider.java
index 383a3306f33..69162b164d6 100644
--- a/idea/src/org/jetbrains/jet/plugin/highlighter/JetLineMarkerProvider.java
+++ b/idea/src/org/jetbrains/jet/plugin/highlighter/JetLineMarkerProvider.java
@@ -129,7 +129,7 @@ public class JetLineMarkerProvider implements LineMarkerProvider {
                 new Function<PsiElement, String>() {
                     @Override
                     public String fun(PsiElement element) {
-                        return countTooltipString(element);
+                        return calculateTooltipString(element);
                     }
                 },
                 new GutterIconNavigationHandler<PsiElement>() {
@@ -184,7 +184,7 @@ public class JetLineMarkerProvider implements LineMarkerProvider {
         }
     }
 
-    private static String countTooltipString(PsiElement element) {
+    private static String calculateTooltipString(PsiElement element) {
         JetFile file = (JetFile)element.getContainingFile();
         if (file == null) return "";