diff --git a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/domsourceindexer/DOMSourceIndexer.java b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/domsourceindexer/DOMSourceIndexer.java
index 69fdc69f069..8ed72b43a7d 100644
--- a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/domsourceindexer/DOMSourceIndexer.java
+++ b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/domsourceindexer/DOMSourceIndexer.java
@@ -21,6 +21,8 @@ import org.eclipse.core.runtime.IPath;
 
 public class DOMSourceIndexer extends SourceIndexer {
 
+    public static String ID = CCorePlugin.PLUGIN_ID + ".domsourceindexer"; //$NON-NLS-1$
+    
     public DOMSourceIndexer() {
         super();
     }
diff --git a/core/org.eclipse.cdt.core/plugin.properties b/core/org.eclipse.cdt.core/plugin.properties
index cedf9712349..9ab692aca88 100644
--- a/core/org.eclipse.cdt.core/plugin.properties
+++ b/core/org.eclipse.cdt.core/plugin.properties
@@ -69,8 +69,3 @@ cxxHeaderName=C++ Header File
 asmSourceName=Assembly Source File
 
 cdt_pathentry_var.description=CDT PathEntry Variable
-
-CDTIndexer.originalsourceindexer=Original C/C++ Indexer
-CDTIndexer.domsourceindexer=DOM AST C/C++ Indexer
-CDTIndexer.ctagsindexer=CTags Indexer
-CDTIndexer.nullindexer=No Indexer
\ No newline at end of file
diff --git a/core/org.eclipse.cdt.core/plugin.xml b/core/org.eclipse.cdt.core/plugin.xml
index 693f8833bbd..1ccfebb6050 100644
--- a/core/org.eclipse.cdt.core/plugin.xml
+++ b/core/org.eclipse.cdt.core/plugin.xml
@@ -550,16 +550,6 @@
    <extension point="org.eclipse.core.runtime.preferences">
       <initializer class="org.eclipse.cdt.internal.core.CCorePreferenceInitializer"/>
    </extension>
-  <extension
-   		 name="%CDTIndexer.originalsourceindexer"
-         id="originalsourceindexer"
-         point="org.eclipse.cdt.core.CIndexer">
-      <cextension>
-         <run 
-               class="org.eclipse.cdt.internal.core.index.sourceindexer.SourceIndexer">
-         </run>
-      </cextension>
-   </extension>
    <extension
          name="%CDTIndexer.domsourceindexer"
          id="domsourceindexer"
@@ -570,18 +560,6 @@
          </run>
       </cextension>
    </extension>
-
-<!-- =================================================================================== -->
-<!-- Dynamic Variables                                                          -->	
-<!-- =================================================================================== -->
-   <extension
-         point="org.eclipse.core.variables.dynamicVariables">
-      <variable
-            name="cdt_pathentry_var"
-            resolver="org.eclipse.cdt.internal.core.PathEntryVariableResolver"
-            description="%cdt_pathentry_var.description">
-      </variable>
-   </extension>
    <extension
          id="ctagsindexer"
          name="%CDTIndexer.ctagsindexer"
@@ -602,5 +580,27 @@
          </run>
       </cextension>
    </extension>
+  <extension
+   		 name="%CDTIndexer.originalsourceindexer"
+         id="originalsourceindexer"
+         point="org.eclipse.cdt.core.CIndexer">
+      <cextension>
+         <run 
+               class="org.eclipse.cdt.internal.core.index.sourceindexer.SourceIndexer">
+         </run>
+      </cextension>
+   </extension>
+   <extension
+         point="org.eclipse.core.variables.dynamicVariables">
+      <variable
+            name="cdt_pathentry_var"
+            resolver="org.eclipse.cdt.internal.core.PathEntryVariableResolver"
+            description="%cdt_pathentry_var.description">
+      </variable>
+   </extension>
+
+<!-- =================================================================================== -->
+<!-- Dynamic Variables                                                          -->	
+<!-- =================================================================================== -->
 
 </plugin>
diff --git a/core/org.eclipse.cdt.ui/plugin.properties b/core/org.eclipse.cdt.ui/plugin.properties
index a7d33d452af..b517b2c5b41 100644
--- a/core/org.eclipse.cdt.ui/plugin.properties
+++ b/core/org.eclipse.cdt.ui/plugin.properties
@@ -318,6 +318,6 @@ indexerPrefName=Indexer
 
 # indexer names
 CDTIndexer.originalsourceindexer=Original C/C++ Indexer
-CDTIndexer.domsourceindexer=DOM AST C/C++ Indexer
-CDTIndexer.ctagsindexer=CTags Indexer
-CDTIndexer.nullindexer=No Indexer
+CDTIndexer.domsourceindexer=Full C/C++ Indexer (declarations and cross references)
+CDTIndexer.ctagsindexer=CTags Indexer (declarations only)
+CDTIndexer.nullindexer=No Indexer (search-based features will not work correctly)
diff --git a/core/org.eclipse.cdt.ui/plugin.xml b/core/org.eclipse.cdt.ui/plugin.xml
index 916fc50db43..30918d81915 100644
--- a/core/org.eclipse.cdt.ui/plugin.xml
+++ b/core/org.eclipse.cdt.ui/plugin.xml
@@ -1339,22 +1339,16 @@
    </extension>
    <extension
          point="org.eclipse.cdt.ui.IndexerPage">
-      <indexerUI
-            class="org.eclipse.cdt.ui.dialogs.SourceIndexerBlock"
-            indexerID="org.eclipse.cdt.core.originalsourceindexer"
-            name="%CDTIndexer.originalsourceindexer"
-            id="org.eclipse.cdt.ui.originalSourceIndexerUI"/>
       <indexerUI
             class="org.eclipse.cdt.ui.dialogs.NullIndexerBlock"
             indexerID="org.eclipse.cdt.core.nullindexer"
             name="%CDTIndexer.nullindexer"
             id="org.eclipse.cdt.ui.nullindexerUI"/>
-<!--TODO reverse this <indexerUI
-            class="org.eclipse.cdt.ui.dialogs.NullIndexerBlock"
-            id="org.eclipse.cdt.ui.DOMASTSourceIndexerUI"
-            indexerID="org.eclipse.cdt.core.domsourceindexer"
-            name="%CDTIndexer.domsourceindexer"/>
--->
+      <indexerUI
+            class="org.eclipse.cdt.ui.dialogs.SourceIndexerBlock"
+            indexerID="org.eclipse.cdt.core.originalsourceindexer"
+            name="%CDTIndexer.originalsourceindexer"
+            id="org.eclipse.cdt.ui.originalSourceIndexerUI"/>
  	  <indexerUI
             class="org.eclipse.cdt.ui.dialogs.SourceIndexerBlock"
             id="org.eclipse.cdt.ui.DOMASTSourceIndexerUI"
@@ -1365,6 +1359,12 @@
             indexerID="org.eclipse.cdt.core.ctagsindexer"
             name="%CDTIndexer.ctagsindexer"
             id="org.eclipse.cdt.ui.ctagsIndexerUI"/>
+<!--TODO reverse this <indexerUI
+            class="org.eclipse.cdt.ui.dialogs.NullIndexerBlock"
+            id="org.eclipse.cdt.ui.DOMASTSourceIndexerUI"
+            indexerID="org.eclipse.cdt.core.domsourceindexer"
+            name="%CDTIndexer.domsourceindexer"/>
+-->
    </extension>
 	<extension
          point="org.eclipse.cdt.ui.completionContributors">
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/IndexerBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/IndexerBlock.java
index 25f0b6c02e3..bde98348b30 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/IndexerBlock.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/IndexerBlock.java
@@ -18,6 +18,7 @@ import java.util.List;
 import org.eclipse.cdt.core.CCorePlugin;
 import org.eclipse.cdt.core.ICDescriptor;
 import org.eclipse.cdt.core.ICDescriptorOperation;
+import org.eclipse.cdt.internal.core.index.domsourceindexer.DOMSourceIndexer;
 import org.eclipse.cdt.internal.ui.CUIMessages;
 import org.eclipse.cdt.ui.CUIPlugin;
 import org.eclipse.cdt.ui.index.AbstractIndexerPage;
@@ -229,7 +230,7 @@ public class IndexerBlock extends AbstractCOptionPage {
 		String indexerId=prefStore.getString(CCorePlugin.PREF_INDEXER);
 		String preferredIndexer=null;
 		if (indexerId.equals("")) { //$NON-NLS-1$
-			preferredIndexer=getIndexerPageName("org.eclipse.cdt.core.nullindexer"); //$NON-NLS-1$
+			preferredIndexer=getIndexerPageName(DOMSourceIndexer.ID);
 		} else {
 			preferredIndexer=getIndexerPageName(indexerId);
 		}
@@ -237,7 +238,7 @@ public class IndexerBlock extends AbstractCOptionPage {
         String[] indexerList = indexersComboBox.getItems();
         int selectedIndex = 0;
         for (int i=0; i<indexerList.length; i++){
-        	if (indexerList[i].equals(preferredIndexer)) //$NON-NLS-1$
+        	if (indexerList[i].equals(preferredIndexer))
         		selectedIndex = i;
         }