diff --git a/platform/lang-impl/src/com/intellij/execution/ExecutionTargetManagerImpl.java b/platform/lang-impl/src/com/intellij/execution/ExecutionTargetManagerImpl.java
index c4e2de4ea241..bd72ec8d9ce8 100644
--- a/platform/lang-impl/src/com/intellij/execution/ExecutionTargetManagerImpl.java
+++ b/platform/lang-impl/src/com/intellij/execution/ExecutionTargetManagerImpl.java
@@ -30,7 +30,7 @@ import java.util.Collections;
 import java.util.List;
 
 
-@State(name = "XcodeMetaData", storages = {@Storage(file = StoragePathMacros.WORKSPACE_FILE, scheme = StorageScheme.DEFAULT)})
+@State(name = "ExecutionTargetManager", storages = {@Storage(file = StoragePathMacros.WORKSPACE_FILE, scheme = StorageScheme.DEFAULT)})
 public class ExecutionTargetManagerImpl extends ExecutionTargetManager implements ProjectComponent, PersistentStateComponent<Element> {
   @NotNull private final Project myProject;
   @NotNull private final Object myActiveTargetLock = new Object();
diff --git a/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/ComponentStoreImpl.java b/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/ComponentStoreImpl.java
index fdcbddded929..24b7e61451e2 100644
--- a/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/ComponentStoreImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/ComponentStoreImpl.java
@@ -160,7 +160,7 @@ abstract class ComponentStoreImpl implements IComponentStore {
   private String initJdomExternalizable(@NotNull JDOMExternalizable component) {
     final String componentName = ComponentManagerImpl.getComponentName(component);
 
-    myComponents.put(componentName, component);
+    doAddComponent(componentName, component);
 
     if (optimizeTestLoading()) return componentName;
 
@@ -188,6 +188,14 @@ abstract class ComponentStoreImpl implements IComponentStore {
     return componentName;
   }
 
+  private void doAddComponent(String componentName, Object component) {
+    if (myComponents.containsKey(componentName)) {
+      LOG.error("Conflicting component name '" + componentName  + "': "
+                + myComponents.get(componentName).getClass() + " and " + component.getClass());
+    }
+    myComponents.put(componentName, component);
+  }
+
   private void loadJdomDefaults(@NotNull final Object component, final String componentName) {
     try {
       StateStorage defaultsStorage = getDefaultsStorage();
@@ -250,7 +258,7 @@ abstract class ComponentStoreImpl implements IComponentStore {
       roamingManager.setRoamingType(name, roamingTypeFromComponent);
     }
 
-    myComponents.put(name, component);
+    doAddComponent(name, component);
     if (optimizeTestLoading()) return name;
 
     Class<T> stateClass = getComponentStateClass(component);