diff --git a/build/org.eclipse.cdt.make.ui/plugin.properties b/build/org.eclipse.cdt.make.ui/plugin.properties
index a4f95fbf113..11676eb9b1f 100644
--- a/build/org.eclipse.cdt.make.ui/plugin.properties
+++ b/build/org.eclipse.cdt.make.ui/plugin.properties
@@ -36,13 +36,13 @@ CommandTargetCreate.description=Create a new make build target for the selected
 LastTargetBuild.name=Rebuild Last Target
 LastTargetBuild.description=Rebuild the last make target for the selected container or project.
 
-# Build Settings Preference page
-PreferenceBuildSettings.name=Build Settings
+# Build Preference page
+PreferenceBuildSettings.name=Build
 ErrorParsersTab.name=Error Parsers
 ErrorParsersTab.tooltip=Error Parsers scan build output and report errors in Problems view
 
 PreferenceMakeProject.name=New Make Projects
-PreferenceMake.name=Make
+PreferenceMake.name=Make Targets
 PreferenceMakefileEditor.name=Makefile Editor
 PreferenceMakefileSettings.name= Settings
 
diff --git a/build/org.eclipse.cdt.make.ui/plugin.xml b/build/org.eclipse.cdt.make.ui/plugin.xml
index 922143d68be..eadee29f70a 100644
--- a/build/org.eclipse.cdt.make.ui/plugin.xml
+++ b/build/org.eclipse.cdt.make.ui/plugin.xml
@@ -208,19 +208,13 @@
       </page>
       <page
             name="%PreferenceMake.name"
-            category="org.eclipse.cdt.ui.preferences.CPluginPreferencePage"
+            category="org.eclipse.cdt.make.ui.preferences.BuildSettings"
             class="org.eclipse.cdt.make.internal.ui.preferences.MakePreferencePage"
             id="org.eclipse.cdt.make.ui.preferences.MakePreferencePage">
       </page>
-      <!--page
-            name="%PreferenceMakeProject.name"
-            category="org.eclipse.cdt.make.ui.preferences.MakePreferencePage"
-            class="org.eclipse.cdt.make.internal.ui.preferences.NewMakeProjectPreferencePage"
-            id="org.eclipse.cdt.make.ui.preferences.MakeProjectPreferencePage">
-      </page-->
       <page
             name="%PreferenceMakefileEditor.name"
-            category="org.eclipse.cdt.make.ui.preferences.MakePreferencePage"
+            category="org.eclipse.cdt.make.ui.preferences.BuildSettings"
             class="org.eclipse.cdt.make.internal.ui.preferences.MakefileEditorPreferencePage"
             id="org.eclipse.cdt.make.ui.preferences.MakeFileEditorPreferencePage">
       </page>
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml b/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml
index aa9c34b4888..b8198152f25 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml
+++ b/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml
@@ -38,12 +38,12 @@
             class="org.eclipse.cdt.managedbuilder.ui.preferences.PrefPage_NewCDTWizard"
             id="org.eclipse.cdt.managedbuilder.ui.preferences.PrefPage_NewCDTWizard"/>
       <page
-            category="org.eclipse.cdt.ui.preferences.CPluginPreferencePage"
+            category="org.eclipse.cdt.make.ui.preferences.BuildSettings"
             class="org.eclipse.cdt.managedbuilder.ui.preferences.PrefPage_Env"
             id="org.eclipse.cdt.managedbuilder.ui.preferences.PrefPage_Env"
             name="%envPrefName"/>
       <page
-            category="org.eclipse.cdt.ui.preferences.CPluginPreferencePage"
+            category="org.eclipse.cdt.make.ui.preferences.BuildSettings"
             class="org.eclipse.cdt.managedbuilder.ui.preferences.PrefPage_Vars"
             id="org.eclipse.cdt.managedbuilder.ui.preferences.PrefPage_Vars"
             name="%varsPrefName"/>
diff --git a/core/org.eclipse.cdt.ui/plugin.properties b/core/org.eclipse.cdt.ui/plugin.properties
index 4918dcb60fa..0e7c811cde0 100644
--- a/core/org.eclipse.cdt.ui/plugin.properties
+++ b/core/org.eclipse.cdt.ui/plugin.properties
@@ -179,7 +179,7 @@ CEditor.name=C/C++ Editor
 CPluginPreferencePage.name=C/C++
 CPluginEditorPreferencePage.name=Editor
 CPluginTemplatePreferencePage.name=Templates
-CPluginBuildConsolePreferencePage.name=Build Console
+CPluginBuildConsolePreferencePage.name=Console
 CPluginFileTypesPreferencePage.name=File Types
 CodeFormatterPreferencePage.name=Code Style
 codeTemplatePreferencePage.name=Code Templates
diff --git a/core/org.eclipse.cdt.ui/plugin.xml b/core/org.eclipse.cdt.ui/plugin.xml
index a67a1b86810..4c7f8ec7664 100644
--- a/core/org.eclipse.cdt.ui/plugin.xml
+++ b/core/org.eclipse.cdt.ui/plugin.xml
@@ -656,9 +656,10 @@
           <keywordReference id="org.eclipse.cdt.ui.codestyle"/>
           <keywordReference id="org.eclipse.cdt.ui.common"/>
       </page>
+      <!-- Note that build console should be eventually moved to build plugin -->
       <page
             name="%CPluginBuildConsolePreferencePage.name"
-            category="org.eclipse.cdt.ui.preferences.CPluginPreferencePage"
+            category="org.eclipse.cdt.make.ui.preferences.BuildSettings"
             class="org.eclipse.cdt.internal.ui.preferences.BuildConsolePreferencePage"
             id="org.eclipse.cdt.ui.preferneces.CBuildConsolePreferernces">
           <keywordReference id="org.eclipse.cdt.ui.common"/>