diff --git a/python/src/com/jetbrains/python/hierarchy/PyTypeHierachyProvider.java b/python/src/com/jetbrains/python/hierarchy/PyTypeHierachyProvider.java
index e626be7250b2..d0b2c53ab138 100644
--- a/python/src/com/jetbrains/python/hierarchy/PyTypeHierachyProvider.java
+++ b/python/src/com/jetbrains/python/hierarchy/PyTypeHierachyProvider.java
@@ -27,7 +27,7 @@ public class PyTypeHierachyProvider implements HierarchyProvider {
     PsiElement element = CommonDataKeys.PSI_ELEMENT.getData(dataContext);
     if (element == null) {
       final Editor editor = CommonDataKeys.EDITOR.getData(dataContext);
-      final PsiFile file = LangDataKeys.PSI_FILE.getData(dataContext);
+      final PsiFile file = CommonDataKeys.PSI_FILE.getData(dataContext);
       if (editor != null && file != null) {
         element = file.findElementAt(editor.getCaretModel().getOffset());
       }
diff --git a/python/src/com/jetbrains/python/refactoring/classes/PyClassRefactoringHandler.java b/python/src/com/jetbrains/python/refactoring/classes/PyClassRefactoringHandler.java
index ed0fadc79945..6c13447b5115 100644
--- a/python/src/com/jetbrains/python/refactoring/classes/PyClassRefactoringHandler.java
+++ b/python/src/com/jetbrains/python/refactoring/classes/PyClassRefactoringHandler.java
@@ -48,7 +48,7 @@ public abstract class PyClassRefactoringHandler implements RefactoringActionHand
   }
 
   public void invoke(@NotNull Project project, @NotNull PsiElement[] elements, DataContext dataContext) {
-    final PsiFile file = LangDataKeys.PSI_FILE.getData(dataContext);
+    final PsiFile file = CommonDataKeys.PSI_FILE.getData(dataContext);
     final Editor editor = CommonDataKeys.EDITOR.getData(dataContext);
     doRefactor(project, elements[0], elements[elements.length - 1], editor, file, dataContext);
   }