diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ProjectStructureConfigurable.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ProjectStructureConfigurable.java
index a35e4ad7e44f..d4d47895b2c7 100644
--- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ProjectStructureConfigurable.java
+++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ProjectStructureConfigurable.java
@@ -519,9 +519,9 @@ public class ProjectStructureConfigurable extends BaseConfigurable implements Se
 
     @Nullable
     public Object getData(@NonNls final String dataId) {
-      if (KEY.getName().equals(dataId)) {
+      if (KEY.is(dataId)) {
         return ProjectStructureConfigurable.this;
-      } else if (History.KEY.getName().equals(dataId)) {
+      } else if (History.KEY.is(dataId)) {
         return getHistory();
       } else {
         return null;
diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ModuleStructureConfigurable.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ModuleStructureConfigurable.java
index e16206025cdc..c1c07dd69cc2 100644
--- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ModuleStructureConfigurable.java
+++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ModuleStructureConfigurable.java
@@ -546,7 +546,7 @@ public class ModuleStructureConfigurable extends BaseStructureConfigurable imple
 
     @Nullable
     public Object getData(@NonNls String dataId) {
-      if (DataKeys.MODULE_CONTEXT_ARRAY.getName().equals(dataId)){
+      if (DataKeys.MODULE_CONTEXT_ARRAY.is(dataId)){
         final TreePath[] paths = myTree.getSelectionPaths();
         if (paths != null) {
           ArrayList<Module> modules = new ArrayList<Module>();
@@ -562,7 +562,7 @@ public class ModuleStructureConfigurable extends BaseStructureConfigurable imple
           return !modules.isEmpty() ? modules.toArray(new Module[modules.size()]) : null;
         }
       }
-      if (DataKeys.MODULE_CONTEXT.getName().equals(dataId)){
+      if (DataKeys.MODULE_CONTEXT.is(dataId)){
         return getSelectedModule();
       }
       if (DataConstantsEx.MODIFIABLE_MODULE_MODEL.equals(dataId)){
diff --git a/platform/lang-api/src/com/intellij/execution/ui/RunContentDescriptor.java b/platform/lang-api/src/com/intellij/execution/ui/RunContentDescriptor.java
index 52a6176dc1cb..1ae6900a9356 100644
--- a/platform/lang-api/src/com/intellij/execution/ui/RunContentDescriptor.java
+++ b/platform/lang-api/src/com/intellij/execution/ui/RunContentDescriptor.java
@@ -52,7 +52,7 @@ public class RunContentDescriptor {
     myComponent.putClientProperty(DataManager.CLIENT_PROPERTY_DATA_PROVIDER, new DataProvider() {
 
       public Object getData(@NonNls final String dataId) {
-        if (RunContentManager.RUN_CONTENT_DESCRIPTOR.getName().equals(dataId)) {
+        if (RunContentManager.RUN_CONTENT_DESCRIPTOR.is(dataId)) {
           return RunContentDescriptor.this;
         }
         return null;
diff --git a/platform/lang-impl/src/com/intellij/execution/ui/layout/impl/GridCellImpl.java b/platform/lang-impl/src/com/intellij/execution/ui/layout/impl/GridCellImpl.java
index 77089d104736..8991ebba2615 100644
--- a/platform/lang-impl/src/com/intellij/execution/ui/layout/impl/GridCellImpl.java
+++ b/platform/lang-impl/src/com/intellij/execution/ui/layout/impl/GridCellImpl.java
@@ -75,13 +75,13 @@ public class GridCellImpl implements GridCell, Disposable {
     myTabs = new JBTabsImpl(myContext.getProject(), myContext.getActionManager(), myContext.getFocusManager(), container).setDataProvider(new DataProvider() {
       @Nullable
       public Object getData(@NonNls final String dataId) {
-        if (ViewContext.CONTENT_KEY.getName().equals(dataId)) {
+        if (ViewContext.CONTENT_KEY.is(dataId)) {
           TabInfo target = myTabs.getTargetInfo();
           if (target != null) {
             return new Content[]{getContentFor(target)};
           }
         }
-        else if (ViewContext.CONTEXT_KEY.getName().equals(dataId)) {
+        else if (ViewContext.CONTEXT_KEY.is(dataId)) {
           return myContext;
         }
 
@@ -250,10 +250,10 @@ public class GridCellImpl implements GridCell, Disposable {
 
     @Nullable
     public Object getData(@NonNls final String dataId) {
-      if (ViewContext.CONTENT_KEY.getName().equals(dataId)) {
+      if (ViewContext.CONTENT_KEY.is(dataId)) {
         return new Content[]{myContent};
       }
-      else if (ViewContext.CONTEXT_KEY.getName().equals(dataId)) {
+      else if (ViewContext.CONTEXT_KEY.is(dataId)) {
         return myContext;
       }
       return null;
diff --git a/platform/lang-impl/src/com/intellij/execution/ui/layout/impl/GridImpl.java b/platform/lang-impl/src/com/intellij/execution/ui/layout/impl/GridImpl.java
index fb2bc768630f..5fcbaf9cd669 100644
--- a/platform/lang-impl/src/com/intellij/execution/ui/layout/impl/GridImpl.java
+++ b/platform/lang-impl/src/com/intellij/execution/ui/layout/impl/GridImpl.java
@@ -387,9 +387,9 @@ public class GridImpl extends Wrapper implements Grid, Disposable, CellTransform
 
   @Nullable
   public Object getData(@NonNls final String dataId) {
-    if (ViewContext.CONTEXT_KEY.getName().equals(dataId)) {
+    if (ViewContext.CONTEXT_KEY.is(dataId)) {
       return myViewContext;
-    } else if (ViewContext.CONTENT_KEY.getName().equals(dataId)) {
+    } else if (ViewContext.CONTENT_KEY.is(dataId)) {
       List<Content> contents = getContents();
       return contents.toArray(new Content[contents.size()]);
     }
diff --git a/platform/lang-impl/src/com/intellij/execution/ui/layout/impl/RunnerContentUi.java b/platform/lang-impl/src/com/intellij/execution/ui/layout/impl/RunnerContentUi.java
index ad66e54f6c09..7b5ff3e65b38 100644
--- a/platform/lang-impl/src/com/intellij/execution/ui/layout/impl/RunnerContentUi.java
+++ b/platform/lang-impl/src/com/intellij/execution/ui/layout/impl/RunnerContentUi.java
@@ -144,13 +144,13 @@ public class RunnerContentUi implements ContentUI, Disposable, CellTransform.Fac
     myTabs = new JBTabsImpl(myProject, myActionManager, myFocusManager, this)
         .setDataProvider(new DataProvider() {
           public Object getData(@NonNls final String dataId) {
-            if (ViewContext.CONTENT_KEY.getName().equals(dataId)) {
+            if (ViewContext.CONTENT_KEY.is(dataId)) {
               TabInfo info = myTabs.getTargetInfo();
               if (info != null) {
                 return getGridFor(info).getData(dataId);
               }
             }
-            else if (ViewContext.CONTEXT_KEY.getName().equals(dataId)) {
+            else if (ViewContext.CONTEXT_KEY.is(dataId)) {
               return RunnerContentUi.this;
             }
             return null;
@@ -720,7 +720,7 @@ public class RunnerContentUi implements ContentUI, Disposable, CellTransform.Fac
 
     @Nullable
     public Object getData(@NonNls final String dataId) {
-      if (KEY.getName().equals(dataId)) {
+      if (KEY.is(dataId)) {
         return RunnerContentUi.this;
       }
       else {
diff --git a/platform/lang-impl/src/com/intellij/find/actions/ShowUsagesAction.java b/platform/lang-impl/src/com/intellij/find/actions/ShowUsagesAction.java
index 884b6c418f9e..e4ae69b75d21 100644
--- a/platform/lang-impl/src/com/intellij/find/actions/ShowUsagesAction.java
+++ b/platform/lang-impl/src/com/intellij/find/actions/ShowUsagesAction.java
@@ -641,7 +641,7 @@ public class ShowUsagesAction extends AnAction {
     }
 
     public Object getData(@NonNls String dataId) {
-      if (LangDataKeys.PSI_ELEMENT.getName().equals(dataId)) {
+      if (LangDataKeys.PSI_ELEMENT.is(dataId)) {
         final int[] selected = getSelectedRows();
         if (selected.length == 1) {
           final Object at = getValueAt(selected[0], 0);
diff --git a/platform/lang-impl/src/com/intellij/ide/util/FileStructureDialog.java b/platform/lang-impl/src/com/intellij/ide/util/FileStructureDialog.java
index 650c7cc05763..a202dc7125fe 100644
--- a/platform/lang-impl/src/com/intellij/ide/util/FileStructureDialog.java
+++ b/platform/lang-impl/src/com/intellij/ide/util/FileStructureDialog.java
@@ -341,7 +341,7 @@ public class FileStructureDialog extends DialogWrapper {
         return selectedElement instanceof Navigatable ? selectedElement : myNavigatable;
       }
 
-      if (OpenFileDescriptor.NAVIGATE_IN_EDITOR.getName().equals(dataId)) return myEditor;
+      if (OpenFileDescriptor.NAVIGATE_IN_EDITOR.is(dataId)) return myEditor;
 
       return getDataImpl(dataId);
     }
diff --git a/platform/lang-impl/src/com/intellij/openapi/fileEditor/impl/text/TextEditorPsiDataProvider.java b/platform/lang-impl/src/com/intellij/openapi/fileEditor/impl/text/TextEditorPsiDataProvider.java
index f1f52896eb9b..3f741c3cbd85 100644
--- a/platform/lang-impl/src/com/intellij/openapi/fileEditor/impl/text/TextEditorPsiDataProvider.java
+++ b/platform/lang-impl/src/com/intellij/openapi/fileEditor/impl/text/TextEditorPsiDataProvider.java
@@ -77,7 +77,7 @@ public class TextEditorPsiDataProvider implements EditorDataProvider {
     if (dataId.equals(DataConstants.PSI_FILE)) {
       return getPsiFile(e, file);
     }
-    if (LangDataKeys.IDE_VIEW.getName().equals(dataId)) {
+    if (LangDataKeys.IDE_VIEW.is(dataId)) {
       final PsiFile psiFile = PsiManager.getInstance(e.getProject()).findFile(file);
       final PsiDirectory psiDirectory = psiFile != null ? psiFile.getParent() : null;
       if (psiDirectory != null && psiDirectory.isPhysical()) {
diff --git a/platform/platform-api/src/com/intellij/ui/tabs/impl/JBTabsImpl.java b/platform/platform-api/src/com/intellij/ui/tabs/impl/JBTabsImpl.java
index 747f8e8e9f1e..604942f9e1e1 100644
--- a/platform/platform-api/src/com/intellij/ui/tabs/impl/JBTabsImpl.java
+++ b/platform/platform-api/src/com/intellij/ui/tabs/impl/JBTabsImpl.java
@@ -2581,7 +2581,7 @@ public class JBTabsImpl extends JComponent
       if (value != null) return value;
     }
 
-    return NAVIGATION_ACTIONS_KEY.getName().equals(dataId) ? this : null;
+    return NAVIGATION_ACTIONS_KEY.is(dataId) ? this : null;
   }
 
 
diff --git a/platform/platform-impl/src/com/intellij/openapi/fileChooser/ex/FileChooserDialogImpl.java b/platform/platform-impl/src/com/intellij/openapi/fileChooser/ex/FileChooserDialogImpl.java
index a4780f156292..c06cd00ccc3b 100644
--- a/platform/platform-impl/src/com/intellij/openapi/fileChooser/ex/FileChooserDialogImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/fileChooser/ex/FileChooserDialogImpl.java
@@ -369,10 +369,10 @@ public class FileChooserDialogImpl extends DialogWrapper implements FileChooserD
     public Object getData(String dataId) {
       if (DataConstants.VIRTUAL_FILE_ARRAY.equals(dataId)) {
         return getSelectedFiles();
-      } else if (KEY.getName().equals(dataId)) {
+      } else if (KEY.is(dataId)) {
         return FileChooserDialogImpl.this;
       }
-      else if (FileSystemTree.DATA_KEY.getName().equals(dataId)) {
+      else if (FileSystemTree.DATA_KEY.is(dataId)) {
         return myFileSystemTree;
       }
       return myChooserDescriptor.getUserData(dataId);
diff --git a/platform/platform-impl/src/com/intellij/openapi/options/newEditor/OptionsEditor.java b/platform/platform-impl/src/com/intellij/openapi/options/newEditor/OptionsEditor.java
index 6e3f5e13076c..0677ad79cd58 100644
--- a/platform/platform-impl/src/com/intellij/openapi/options/newEditor/OptionsEditor.java
+++ b/platform/platform-impl/src/com/intellij/openapi/options/newEditor/OptionsEditor.java
@@ -674,7 +674,7 @@ public class OptionsEditor extends JPanel implements DataProvider, Place.Navigat
     if (dataId.equals(KEY.getName())) {
       return this;
     }
-    return History.KEY.getName().equals(dataId) ? myHistory : null;
+    return History.KEY.is(dataId) ? myHistory : null;
   }
 
   public JTree getPreferredFocusedComponent() {
diff --git a/platform/platform-impl/src/com/intellij/openapi/ui/impl/DialogWrapperPeerImpl.java b/platform/platform-impl/src/com/intellij/openapi/ui/impl/DialogWrapperPeerImpl.java
index fcbfc179b3b6..cf4137b05dd1 100644
--- a/platform/platform-impl/src/com/intellij/openapi/ui/impl/DialogWrapperPeerImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/ui/impl/DialogWrapperPeerImpl.java
@@ -906,7 +906,7 @@ public class DialogWrapperPeerImpl extends DialogWrapperPeer implements FocusTra
 
       public Object getData(@NonNls String dataId) {
         final DialogWrapper wrapper = myDialogWrapper.get();
-        return PlatformDataKeys.UI_DISPOSABLE.getName().equals(dataId) ? wrapper.getDisposable() : null;
+        return PlatformDataKeys.UI_DISPOSABLE.is(dataId) ? wrapper.getDisposable() : null;
       }
     }
 
diff --git a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/ui/SMTRunnerTestTreeView.java b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/ui/SMTRunnerTestTreeView.java
index f600d13868e0..9f2e9391e1a1 100644
--- a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/ui/SMTRunnerTestTreeView.java
+++ b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/ui/SMTRunnerTestTreeView.java
@@ -68,7 +68,7 @@ public class SMTRunnerTestTreeView extends TestTreeView {
 
   @Override
   public Object getData(final String dataId) {
-    if (dataId.equals(SM_TEST_RUNNER_VIEW.getName())) {
+    if (SM_TEST_RUNNER_VIEW.is(dataId)) {
       return this;
     }
     return super.getData(dataId);
diff --git a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/ui/statistics/StatisticsPanel.java b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/ui/statistics/StatisticsPanel.java
index c8c253a90b93..bd0af3597493 100644
--- a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/ui/statistics/StatisticsPanel.java
+++ b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/ui/statistics/StatisticsPanel.java
@@ -158,7 +158,7 @@ public class StatisticsPanel implements DataProvider {
   }
 
   public Object getData(@NonNls final String dataId) {
-    if (SM_TEST_RUNNER_STATISTICS.getName().equals(dataId)) {
+    if (SM_TEST_RUNNER_STATISTICS.is(dataId)) {
       return this;
     }
     return TestsUIUtil.getData(getSelectedItem(), dataId, myFrameworkRunningModel);
diff --git a/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/HeavyIdeaTestFixtureImpl.java b/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/HeavyIdeaTestFixtureImpl.java
index 7a2faa7362a4..51889a5e3a52 100644
--- a/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/HeavyIdeaTestFixtureImpl.java
+++ b/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/HeavyIdeaTestFixtureImpl.java
@@ -189,7 +189,7 @@ class HeavyIdeaTestFixtureImpl extends BaseFixture implements HeavyIdeaTestFixtu
       if (dataId.equals(DataConstants.PROJECT)) {
         return myProject;
       }
-      else if (dataId.equals(DataConstants.EDITOR) || dataId.equals(OpenFileDescriptor.NAVIGATE_IN_EDITOR.getName())) {
+      else if (dataId.equals(DataConstants.EDITOR) || OpenFileDescriptor.NAVIGATE_IN_EDITOR.is(dataId)) {
         return FileEditorManager.getInstance(myProject).getSelectedTextEditor();
       }
       else {
diff --git a/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/LightIdeaTestFixtureImpl.java b/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/LightIdeaTestFixtureImpl.java
index 38a310ad592a..e4bfd9df3d66 100644
--- a/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/LightIdeaTestFixtureImpl.java
+++ b/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/LightIdeaTestFixtureImpl.java
@@ -55,7 +55,7 @@ class LightIdeaTestFixtureImpl extends BaseFixture implements LightIdeaTestFixtu
       if (dataId.equals(DataConstants.PROJECT)) {
         return getProject();
       }
-      else if (dataId.equals(DataConstants.EDITOR) || dataId.equals(OpenFileDescriptor.NAVIGATE_IN_EDITOR.getName())) {
+      else if (dataId.equals(DataConstants.EDITOR) || OpenFileDescriptor.NAVIGATE_IN_EDITOR.is(dataId)) {
         return FileEditorManager.getInstance(getProject()).getSelectedTextEditor();
       }
       else {
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/RepositoryChangesBrowser.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/RepositoryChangesBrowser.java
index 08433ff3f03f..dc2b0cff74a4 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/RepositoryChangesBrowser.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/RepositoryChangesBrowser.java
@@ -82,10 +82,10 @@ public class RepositoryChangesBrowser extends ChangesBrowser implements DataProv
       return myUseCase;
     }
 
-    else if (VcsDataKeys.SELECTED_CHANGES.getName().equals(dataId)) {
+    else if (VcsDataKeys.SELECTED_CHANGES.is(dataId)) {
       final List<Change> list = myViewer.getSelectedChanges();
       return list.toArray(new Change [list.size()]);
-    } else if (VcsDataKeys.CHANGE_LEAD_SELECTION.getName().equals(dataId)) {
+    } else if (VcsDataKeys.CHANGE_LEAD_SELECTION.is(dataId)) {
       final Change highestSelection = myViewer.getHighestLeadSelection();
       return (highestSelection == null) ? new Change[]{} : new Change[] {highestSelection};
     } else {
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangeListViewerDialog.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangeListViewerDialog.java
index fe970812ebe0..cbb9d20fa872 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangeListViewerDialog.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangeListViewerDialog.java
@@ -107,7 +107,7 @@ public class ChangeListViewerDialog extends DialogWrapper implements DataProvide
   }
 
   public Object getData(@NonNls final String dataId) {
-    if (VcsDataKeys.CHANGES.getName().equals(dataId)) {
+    if (VcsDataKeys.CHANGES.is(dataId)) {
       return myChanges;
     }
     return null;
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/history/FileHistoryPanelImpl.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/history/FileHistoryPanelImpl.java
index 47c3cf325f03..35fe17fa2f14 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/history/FileHistoryPanelImpl.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/history/FileHistoryPanelImpl.java
@@ -1107,7 +1107,7 @@ public class FileHistoryPanelImpl<S extends CommittedChangeList, U extends Chang
     else if (VcsDataConstants.VCS_FILE_REVISIONS.equals(dataId)) {
       return getSelectedRevisions();
     }
-    else if (VcsDataKeys.CHANGES.getName().equals(dataId)) {
+    else if (VcsDataKeys.CHANGES.is(dataId)) {
       return getChanges();
     }
     else if (VcsDataConstants.VCS_VIRTUAL_FILE.equals(dataId)) {
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/history/impl/VcsHistoryDialog.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/history/impl/VcsHistoryDialog.java
index 1107fb613eb5..7a7738fbf554 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/history/impl/VcsHistoryDialog.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/history/impl/VcsHistoryDialog.java
@@ -434,11 +434,11 @@ public class VcsHistoryDialog extends DialogWrapper implements DataProvider {
   }
 
   public Object getData(@NonNls String dataId) {
-    if (PlatformDataKeys.PROJECT.getName().equals(dataId)) {
+    if (PlatformDataKeys.PROJECT.is(dataId)) {
       return myProject;
-    } else if (VcsDataKeys.VCS_VIRTUAL_FILE.getName().equals(dataId)) {
+    } else if (VcsDataKeys.VCS_VIRTUAL_FILE.is(dataId)) {
       return myFile;
-    } else if (VcsDataKeys.VCS_FILE_REVISION.getName().equals(dataId)) {
+    } else if (VcsDataKeys.VCS_FILE_REVISION.is(dataId)) {
       return myList.getSelectedObject();
     }
     return null;
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/update/UpdateInfoTree.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/update/UpdateInfoTree.java
index 421a2997dd73..012903df46bc 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/update/UpdateInfoTree.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/update/UpdateInfoTree.java
@@ -238,13 +238,13 @@ public class UpdateInfoTree extends PanelWithActionsAndCloseButton implements Di
       else {
         return myTreeExpander;
       }
-    } else if (VcsDataKeys.UPDATE_VIEW_SELECTED_PATH.getName().equals(dataId)) {
+    } else if (VcsDataKeys.UPDATE_VIEW_SELECTED_PATH.is(dataId)) {
       return mySelectedUrl;
-    } else if (VcsDataKeys.UPDATE_VIEW_FILES_ITERABLE.getName().equals(dataId)) {
+    } else if (VcsDataKeys.UPDATE_VIEW_FILES_ITERABLE.is(dataId)) {
       return myTreeIterable;
-    } else if (VcsDataKeys.LABEL_BEFORE.getName().equals(dataId)) {
+    } else if (VcsDataKeys.LABEL_BEFORE.is(dataId)) {
       return myBefore;
-    }  else if (VcsDataKeys.LABEL_AFTER.getName().equals(dataId)) {
+    }  else if (VcsDataKeys.LABEL_AFTER.is(dataId)) {
       return myAfter;
     }
 
diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/XDebuggerTree.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/XDebuggerTree.java
index 6c97ee2f07dc..b8987856f564 100644
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/XDebuggerTree.java
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/XDebuggerTree.java
@@ -127,7 +127,7 @@ public class XDebuggerTree extends DnDAwareTree implements DataProvider {
 
   @Nullable
   public Object getData(@NonNls final String dataId) {
-    if (XDEBUGGER_TREE_KEY.getName().equals(dataId)) {
+    if (XDEBUGGER_TREE_KEY.is(dataId)) {
       return this;
     }
     return null;
diff --git a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/quickedit/QuickEditEditor.java b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/quickedit/QuickEditEditor.java
index 93b7e5cbd8fa..51b67d9c3fa7 100644
--- a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/quickedit/QuickEditEditor.java
+++ b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/quickedit/QuickEditEditor.java
@@ -87,7 +87,7 @@ public class QuickEditEditor {
     }
 
     public Object getData(String s) {
-      if (LangDataKeys.EDITOR.getName().equals(s)) {
+      if (LangDataKeys.EDITOR.is(s)) {
         return myEditor;
       }
       return null;
diff --git a/plugins/commander/src/com/intellij/ide/commander/Commander.java b/plugins/commander/src/com/intellij/ide/commander/Commander.java
index d500062aa16d..aece2495da50 100644
--- a/plugins/commander/src/com/intellij/ide/commander/Commander.java
+++ b/plugins/commander/src/com/intellij/ide/commander/Commander.java
@@ -482,7 +482,7 @@ public class Commander extends JPanel implements PersistentStateComponent<Elemen
       final Object element = parentElement.getValue();
       return (element instanceof PsiElement) && ((PsiElement)element).isValid()? element : null;
     }
-    else if (CompareFiles.DIFF_REQUEST.getName().equals(dataId)) {
+    else if (CompareFiles.DIFF_REQUEST.is(dataId)) {
       PsiElement primary = getActivePanel().getSelectedElement();
       PsiElement secondary = getInactivePanel().getSelectedElement();
       if (primary != null && secondary != null &&
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/RepositoryBrowserComponent.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/RepositoryBrowserComponent.java
index 665da9b5998a..20f7b136f245 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/RepositoryBrowserComponent.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/RepositoryBrowserComponent.java
@@ -244,14 +244,14 @@ public class RepositoryBrowserComponent extends JPanel implements Disposable, Da
 
   @Nullable
   public Object getData(@NonNls String dataId) {
-    if (PlatformDataKeys.NAVIGATABLE.getName().equals(dataId)) {
+    if (PlatformDataKeys.NAVIGATABLE.is(dataId)) {
       final Project project = myVCS.getProject();
       if (project == null || project.isDefault()) {
         return null;
       }
       final VirtualFile vcsFile = getSelectedVcsFile();
       return vcsFile != null ? new OpenFileDescriptor(project, vcsFile) : null;
-    } else if (PlatformDataKeys.PROJECT.getName().equals(dataId)) {
+    } else if (PlatformDataKeys.PROJECT.is(dataId)) {
       return myVCS.getProject();
     }
     return null;
diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/projectView/FormMergerTreeStructureProvider.java b/plugins/ui-designer/src/com/intellij/uiDesigner/projectView/FormMergerTreeStructureProvider.java
index e410cf085633..a81829539182 100644
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/projectView/FormMergerTreeStructureProvider.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/projectView/FormMergerTreeStructureProvider.java
@@ -92,7 +92,7 @@ public class FormMergerTreeStructureProvider implements TreeStructureProvider {
 
   public Object getData(Collection<AbstractTreeNode> selected, String dataId) {
     if (selected != null) {
-      if (dataId.equals(Form.DATA_KEY.getName())) {
+      if (Form.DATA_KEY.is(dataId)) {
         List<Form> result = new ArrayList<Form>();
         for(AbstractTreeNode node: selected) {
           if (node.getValue() instanceof Form) {
diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/run/HighlightingOutputConsole.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/run/HighlightingOutputConsole.java
index 5d15eb12d453..1ca85c94c48b 100644
--- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/run/HighlightingOutputConsole.java
+++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/run/HighlightingOutputConsole.java
@@ -93,7 +93,7 @@ public class HighlightingOutputConsole extends AdditionalTabComponent implements
 
     @Nullable
     public Object getData(@NonNls String dataId) {
-        if (dataId.equals(LangDataKeys.EDITOR.getName())) {
+        if (LangDataKeys.EDITOR.is(dataId)) {
             return getEditor();
         }
         return null;