diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java
index 9e74e12ad914..02701e94dbba 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java
@@ -2058,7 +2058,7 @@ public class HighlightUtil {
     if (!comment.getText().endsWith("*/")) {
       int start = comment.getTextRange().getEndOffset() - 1;
       int end = start + 1;
-      return HighlightInfo.createHighlightInfo(HighlightInfoType.ERROR, start, end, JavaErrorMessages.message("nonterminated.comment"));
+      return HighlightInfo.createHighlightInfo(HighlightInfoType.ERROR, start, end, JavaErrorMessages.message("unclosed.comment"));
     }
     return null;
   }
diff --git a/java/java-impl/src/com/intellij/psi/impl/source/javadoc/ParamDocTagInfo.java b/java/java-impl/src/com/intellij/psi/impl/source/javadoc/ParamDocTagInfo.java
index bb2ef52a767a..1dfbe582adf8 100644
--- a/java/java-impl/src/com/intellij/psi/impl/source/javadoc/ParamDocTagInfo.java
+++ b/java/java-impl/src/com/intellij/psi/impl/source/javadoc/ParamDocTagInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2012 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -48,7 +48,7 @@ class ParamDocTagInfo implements JavadocTagInfo {
     if (context instanceof PsiTypeParameterListOwner) {
       List<PsiNamedElement> result = new ArrayList<PsiNamedElement>(Arrays.asList(((PsiTypeParameterListOwner)context).getTypeParameters()));
 
-      if ((PsiTypeParameterListOwner)context instanceof PsiMethod) {
+      if (context instanceof PsiMethod) {
         PsiMethod method = (PsiMethod)context;
         ContainerUtil.addAll(result, method.getParameterList().getParameters());
       }
@@ -61,7 +61,7 @@ class ParamDocTagInfo implements JavadocTagInfo {
 
   @Override
   public String checkTagValue(PsiDocTagValue value) {
-    if (value == null) return JavaErrorMessages.message("javadoc.param.tag.paramter.name.expected");
+    if (value == null) return JavaErrorMessages.message("javadoc.param.tag.parameter.name.expected");
     final ASTNode firstChildNode = value.getNode().getFirstChildNode();
     if (firstChildNode != null &&
         firstChildNode.getElementType().equals(JavaDocTokenType.DOC_TAG_VALUE_LT)) {
diff --git a/java/java-psi-impl/src/messages/JavaErrorMessages.properties b/java/java-psi-impl/src/messages/JavaErrorMessages.properties
index b5e60655f463..588603458c1d 100644
--- a/java/java-psi-impl/src/messages/JavaErrorMessages.properties
+++ b/java/java-psi-impl/src/messages/JavaErrorMessages.properties
@@ -226,7 +226,7 @@ illegal.type.void=Illegal type: 'void'
 member.referenced.before.constructor.called=Cannot reference ''{0}'' before supertype constructor has been called
 label.without.statement=Label without statement
 duplicate.label=Label ''{0}'' already in use
-nonterminated.comment=Unclosed comment
+unclosed.comment=Unclosed comment
 assignment.to.itself=Variable is assigned to itself
 assignment.to.declared.variable=Variable ''{0}'' is initialized with self assignment
 exception.already.caught=Exception ''{0}'' has already been caught
@@ -284,7 +284,7 @@ javadoc.exception.tag.exception.class.expected=Exception class expected
 javadoc.exception.tag.wrong.tag.value=Wrong tag value
 javadoc.exception.tag.class.is.not.throwable=Class {0} is not a descendant of Throwable
 javadoc.exception.tag.exception.is.not.thrown={0} is not declared to be thrown by method {1}
-javadoc.param.tag.paramter.name.expected=Parameter name expected
+javadoc.param.tag.parameter.name.expected=Parameter name expected
 javadoc.param.tag.type.parameter.name.expected=Type parameter name expected
 javadoc.param.tag.type.parameter.gt.expected='>' expected
 javadoc.value.tag.jdk15.required=@value tag may not have any arguments when JDK 1.4 or earlier is used