diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeAssistAdvancedPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeAssistAdvancedPreferencePage.java
index 7f3a303f862..9957d22baf8 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeAssistAdvancedPreferencePage.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeAssistAdvancedPreferencePage.java
@@ -45,12 +45,12 @@ public final class CodeAssistAdvancedPreferencePage extends PropertyAndPreferenc
 	}
 
 	@Override
-	protected String getPreferencePageID() {
+	protected String getPreferencePageId() {
 		return "org.eclipse.cdt.ui.preferences.CodeAssistPreferenceAdvanced"; //$NON-NLS-1$
 	}
 
 	@Override
-	protected String getPropertyPageID() {
+	protected String getPropertyPageId() {
 		// no project settings supported
 		return null;
 	}
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeFormatterPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeFormatterPreferencePage.java
index 5f9e6e4a016..b567a2ec209 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeFormatterPreferencePage.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeFormatterPreferencePage.java
@@ -91,7 +91,7 @@ public class CodeFormatterPreferencePage extends PropertyAndPreferencePage {
 	 * @see org.eclipse.cdt.internal.ui.preferences.PropertyAndPreferencePage#getPreferencePageID()
 	 */
 	@Override
-	protected String getPreferencePageID() {
+	protected String getPreferencePageId() {
 		return PREF_ID;
 	}
 	
@@ -99,7 +99,7 @@ public class CodeFormatterPreferencePage extends PropertyAndPreferencePage {
 	 * @see org.eclipse.cdt.internal.ui.preferences.PropertyAndPreferencePage#getPropertyPageID()
 	 */
 	@Override
-	protected String getPropertyPageID() {
+	protected String getPropertyPageId() {
 		return PROP_ID;
 	}
 	
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeStylePreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeStylePreferencePage.java
index 27a47f5947f..4239c59788c 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeStylePreferencePage.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeStylePreferencePage.java
@@ -40,12 +40,12 @@ public class CodeStylePreferencePage extends ConfigurationBlockPropertyAndPrefer
 	}
 
 	@Override
-	protected String getPreferencePageID() {
+	protected String getPreferencePageId() {
 		return PREF_ID;
 	}
 
 	@Override
-	protected String getPropertyPageID() {
+	protected String getPropertyPageId() {
 		return null;
 		// TODO(sprigogin): Project specific settings
 //		return PROP_ID;
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeTemplatePreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeTemplatePreferencePage.java
index e4eb29ab6df..5d39efe9e9b 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeTemplatePreferencePage.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeTemplatePreferencePage.java
@@ -140,7 +140,7 @@ public class CodeTemplatePreferencePage extends PropertyAndPreferencePage {
 	 * @see org.eclipse.cdt.internal.ui.preferences.PropertyAndPreferencePage#getPreferencePageID()
 	 */
 	@Override
-	protected String getPreferencePageID() {
+	protected String getPreferencePageId() {
 		return PREF_ID;
 	}
 	
@@ -148,7 +148,7 @@ public class CodeTemplatePreferencePage extends PropertyAndPreferencePage {
 	 * @see org.eclipse.cdt.internal.ui.preferences.PropertyAndPreferencePage#getPropertyPageID()
 	 */
 	@Override
-	protected String getPropertyPageID() {
+	protected String getPropertyPageId() {
 		return null;
 		// TODO project specific settings
 //		return PROP_ID;
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/NameStylePreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/NameStylePreferencePage.java
index 9be6d2ce1bd..f52398bd5b4 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/NameStylePreferencePage.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/NameStylePreferencePage.java
@@ -40,12 +40,12 @@ public class NameStylePreferencePage extends ConfigurationBlockPropertyAndPrefer
 	}
 
 	@Override
-	protected String getPreferencePageID() {
+	protected String getPreferencePageId() {
 		return PREF_ID;
 	}
 
 	@Override
-	protected String getPropertyPageID() {
+	protected String getPropertyPageId() {
 		return null;
 		// TODO(sprigogin): Project specific settings
 //		return PROP_ID;
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PropertyAndPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PropertyAndPreferencePage.java
index 901a2e2a366..a7777017495 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PropertyAndPreferencePage.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PropertyAndPreferencePage.java
@@ -76,11 +76,11 @@ public abstract class PropertyAndPreferencePage extends PreferencePage implement
 	protected abstract Control createPreferenceContent(Composite composite);
 	protected abstract boolean hasProjectSpecificOptions(IProject project);
 	
-	protected abstract String getPreferencePageID();
-	protected abstract String getPropertyPageID();
+	protected abstract String getPreferencePageId();
+	protected abstract String getPropertyPageId();
 	
 	protected boolean supportsProjectSpecificOptions() {
-		return getPropertyPageID() != null;
+		return getPropertyPageId() != null;
 	}
 	
 	protected boolean offerLink() {
@@ -219,12 +219,12 @@ public abstract class PropertyAndPreferencePage extends PreferencePage implement
 	}
 	
 	protected final void openWorkspacePreferences(Object data) {
-		String id= getPreferencePageID();
+		String id= getPreferencePageId();
 		PreferencesUtil.createPreferenceDialogOn(getShell(), id, new String[] { id }, data).open();
 	}
 	
 	protected final void openProjectProperties(IProject project, Object data) {
-		String id= getPropertyPageID();
+		String id= getPropertyPageId();
 		if (id != null) {
 			PreferencesUtil.createPropertyDialogOn(getShell(), project, id, new String[] { id }, data).open();
 		}
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/TodoTaskPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/TodoTaskPreferencePage.java
index 5e531edc05b..281f49bcbfc 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/TodoTaskPreferencePage.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/TodoTaskPreferencePage.java
@@ -81,7 +81,7 @@ public class TodoTaskPreferencePage extends PropertyAndPreferencePage {
 	 * @see org.eclipse.cdt.internal.ui.preferences.PropertyAndPreferencePage#getPreferencePageID()
 	 */
 	@Override
-	protected String getPreferencePageID() {
+	protected String getPreferencePageId() {
 		return PREF_ID;
 	}
 	
@@ -89,7 +89,7 @@ public class TodoTaskPreferencePage extends PropertyAndPreferencePage {
 	 * @see org.eclipse.cdt.internal.ui.preferences.PropertyAndPreferencePage#getPropertyPageID()
 	 */
 	@Override
-	protected String getPropertyPageID() {
+	protected String getPropertyPageId() {
 	//  TODO: Project specific settings are not supported yet.
 //		return PROP_ID;
 		return null;