diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/ConvertToBasicLatinAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/ConvertToBasicLatinAction.java
index 68129ca7d822..57f73243a283 100644
--- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/ConvertToBasicLatinAction.java
+++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/ConvertToBasicLatinAction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2010 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.
@@ -18,7 +18,7 @@ package com.intellij.codeInsight.intention.impl;
 import com.intellij.codeInsight.CodeInsightBundle;
 import com.intellij.codeInsight.intention.PsiElementBaseIntentionAction;
 import com.intellij.javaee.ExternalResourceManager;
-import com.intellij.lang.StdLanguages;
+import com.intellij.lang.java.JavaLanguage;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.project.Project;
@@ -50,7 +50,7 @@ public class ConvertToBasicLatinAction extends PsiElementBaseIntentionAction {
 
   @Override
   public boolean isAvailable(@NotNull final Project project, final Editor editor, @NotNull final PsiElement element) {
-    if (!element.getLanguage().isKindOf(StdLanguages.JAVA)) return false;
+    if (!element.getLanguage().isKindOf(JavaLanguage.INSTANCE)) return false;
     final Pair<PsiElement, Handler> pair = findHandler(element);
     if (pair == null) return false;
 
diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/intention/ConvertToBasicLatinTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/intention/ConvertToBasicLatinTest.java
index 2fe3054ef8d3..a1b0d3498340 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/intention/ConvertToBasicLatinTest.java
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/intention/ConvertToBasicLatinTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2010 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.
@@ -18,7 +18,7 @@ package com.intellij.codeInsight.intention;
 
 import com.intellij.JavaTestUtil;
 import com.intellij.codeInsight.CodeInsightBundle;
-import com.intellij.openapi.vfs.encoding.EncodingProjectManager;
+import com.intellij.openapi.vfs.encoding.EncodingManager;
 import com.intellij.testFramework.fixtures.CodeInsightTestUtil;
 import com.intellij.testFramework.fixtures.JavaCodeInsightFixtureTestCase;
 
@@ -30,7 +30,7 @@ public class ConvertToBasicLatinTest extends JavaCodeInsightFixtureTestCase {
   public void setUp() throws Exception {
     super.setUp();
     myIntention = CodeInsightBundle.message("intention.convert.to.basic.latin");
-    EncodingProjectManager.getInstance().setDefaultCharsetName("UTF-8");
+    EncodingManager.getInstance().setDefaultCharsetName("UTF-8");
   }
 
   public void testConvertCharLiteral() throws Exception {
diff --git a/java/openapi/src/com/intellij/lang/StdLanguages.java b/java/openapi/src/com/intellij/lang/StdLanguages.java
index 772a88eeb1ed..e03adddd793b 100644
--- a/java/openapi/src/com/intellij/lang/StdLanguages.java
+++ b/java/openapi/src/com/intellij/lang/StdLanguages.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.
@@ -20,12 +20,14 @@ import com.intellij.openapi.fileTypes.FileTypes;
 
 /**
  * Defines the standard languages supported by IDEA.
+ *
  * @author max
  */
 public class StdLanguages {
   /**
    * The definition for the Java language.
-   * @deprecated use JavaLanguage.INSTANCE instead
+   *
+   * @deprecated use {@linkplain com.intellij.lang.java.JavaLanguage#INSTANCE} instead.
    */
   public static Language JAVA = StdFileTypes.JAVA.getLanguage();
 
@@ -80,6 +82,5 @@ public class StdLanguages {
   @Deprecated
   public static Language CSS;
 
-  private StdLanguages() {
-  }
+  private StdLanguages() { }
 }