diff --git a/python/src/com/jetbrains/python/run/AbstractPyCommonOptionsForm.java b/python/src/com/jetbrains/python/run/AbstractPyCommonOptionsForm.java
index ec967f54b346..8f700b8f9520 100644
--- a/python/src/com/jetbrains/python/run/AbstractPyCommonOptionsForm.java
+++ b/python/src/com/jetbrains/python/run/AbstractPyCommonOptionsForm.java
@@ -1,12 +1,12 @@
 package com.jetbrains.python.run;
 
-import com.intellij.ui.ComponentWithAnchor;
+import com.intellij.ui.PanelWithAnchor;
 
 import javax.swing.*;
 
 /**
  * @author yole
  */
-public interface AbstractPyCommonOptionsForm extends AbstractPythonRunConfigurationParams, ComponentWithAnchor {
+public interface AbstractPyCommonOptionsForm extends AbstractPythonRunConfigurationParams, PanelWithAnchor {
   JComponent getMainPanel();
 }
diff --git a/python/src/com/jetbrains/python/run/PythonRunConfigurationForm.java b/python/src/com/jetbrains/python/run/PythonRunConfigurationForm.java
index d20512529a09..b72b83ff3553 100644
--- a/python/src/com/jetbrains/python/run/PythonRunConfigurationForm.java
+++ b/python/src/com/jetbrains/python/run/PythonRunConfigurationForm.java
@@ -8,7 +8,7 @@ import com.intellij.openapi.ui.TextFieldWithBrowseButton;
 import com.intellij.openapi.util.Comparing;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.ui.ComponentWithAnchor;
+import com.intellij.ui.PanelWithAnchor;
 import com.intellij.ui.RawCommandLineEditor;
 import com.intellij.ui.components.JBLabel;
 
@@ -18,7 +18,7 @@ import java.awt.*;
 /**
  * @author yole
  */
-public class PythonRunConfigurationForm implements PythonRunConfigurationParams, ComponentWithAnchor {
+public class PythonRunConfigurationForm implements PythonRunConfigurationParams, PanelWithAnchor {
   private JPanel myRootPanel;
   private TextFieldWithBrowseButton myScriptTextField;
   private RawCommandLineEditor myScriptParametersTextField;
diff --git a/python/src/com/jetbrains/python/testing/PythonTestRunConfigurationForm.java b/python/src/com/jetbrains/python/testing/PythonTestRunConfigurationForm.java
index 742f18a17138..974a3a82739f 100644
--- a/python/src/com/jetbrains/python/testing/PythonTestRunConfigurationForm.java
+++ b/python/src/com/jetbrains/python/testing/PythonTestRunConfigurationForm.java
@@ -5,7 +5,7 @@ import com.intellij.openapi.ui.LabeledComponent;
 import com.intellij.openapi.ui.TextFieldWithBrowseButton;
 import com.intellij.openapi.util.Ref;
 import com.intellij.openapi.util.io.FileUtil;
-import com.intellij.ui.ComponentWithAnchor;
+import com.intellij.ui.PanelWithAnchor;
 import com.intellij.ui.components.JBLabel;
 import com.jetbrains.python.PyBundle;
 import com.jetbrains.python.run.AbstractPyCommonOptionsForm;
@@ -24,7 +24,7 @@ import static com.jetbrains.python.testing.unittest.PythonUnitTestRunConfigurati
 /**
  * @author Leonid Shalupov
  */
-public class PythonTestRunConfigurationForm implements AbstractPythonTestRunConfigurationParams, ComponentWithAnchor {
+public class PythonTestRunConfigurationForm implements AbstractPythonTestRunConfigurationParams, PanelWithAnchor {
   private JPanel myRootPanel;
   private LabeledComponent myTestClassComponent;
   private LabeledComponent myTestMethodComponent;
diff --git a/python/src/com/jetbrains/python/testing/pytest/PyTestConfigurationEditor.java b/python/src/com/jetbrains/python/testing/pytest/PyTestConfigurationEditor.java
index b9afaa31afa6..513f8f78ce57 100644
--- a/python/src/com/jetbrains/python/testing/pytest/PyTestConfigurationEditor.java
+++ b/python/src/com/jetbrains/python/testing/pytest/PyTestConfigurationEditor.java
@@ -6,7 +6,7 @@ import com.intellij.openapi.options.ConfigurationException;
 import com.intellij.openapi.options.SettingsEditor;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.TextFieldWithBrowseButton;
-import com.intellij.ui.ComponentWithAnchor;
+import com.intellij.ui.PanelWithAnchor;
 import com.intellij.ui.components.JBLabel;
 import com.jetbrains.python.PyBundle;
 import com.jetbrains.python.run.AbstractPyCommonOptionsForm;
@@ -19,7 +19,7 @@ import javax.swing.*;
 /**
  * @author yole
  */
-public class PyTestConfigurationEditor extends SettingsEditor<PyTestRunConfiguration> implements ComponentWithAnchor {
+public class PyTestConfigurationEditor extends SettingsEditor<PyTestRunConfiguration> implements PanelWithAnchor {
   private JPanel myMainPanel;
   private JPanel myCommonOptionsPlaceholder;
   private JTextField myKeywordsTextField;