diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRenameRefactoringInputPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRenameRefactoringInputPage.java
index 971d4ad9d96..b875cf2ecfd 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRenameRefactoringInputPage.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRenameRefactoringInputPage.java
@@ -301,7 +301,6 @@ public class CRenameRefactoringInputPage extends UserInputWizardPage {
         updatePageComplete();
     }
 
-    // overrider
     @Override
 	public void dispose() {
         storePreferences();
@@ -312,14 +311,9 @@ public class CRenameRefactoringInputPage extends UserInputWizardPage {
         CRenameProcessor processor= getRenameProcessor();
         
         if (fWorkspace != null) {
-            int choice;
-            try {
-                choice= fPreferences.getInt(CRenameRefactoringPreferences.KEY_SCOPE);
-            } catch (Exception e) {
-                choice= TextSearchWrapper.SCOPE_RELATED_PROJECTS;
-            }
+            int scope = fPreferences.getScope();
             
-            switch (choice) {
+            switch (scope) {
             case TextSearchWrapper.SCOPE_WORKSPACE:
                 fWorkspace.setSelection(true);
                 break;
@@ -330,13 +324,13 @@ public class CRenameRefactoringInputPage extends UserInputWizardPage {
                 fWorkingSet.setSelection(true);
                 break;
             default:
-                choice= TextSearchWrapper.SCOPE_RELATED_PROJECTS;
+                scope= TextSearchWrapper.SCOPE_RELATED_PROJECTS;
                 fDependent.setSelection(true);
                 break;
             }
-            processor.setScope(choice);
+            processor.setScope(scope);
        
-            String workingSet= fPreferences.get(CRenameRefactoringPreferences.KEY_WORKING_SET_NAME);
+            String workingSet= fPreferences.getWorkingSet();
     	    processor.setWorkingSet(workingSet);  // CRenameProcessor validates the working set name.
             fWorkingSetSpec.setText(processor.getWorkingSet());
         }
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRenameRefactoringPreferences.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRenameRefactoringPreferences.java
index 411fa480c9d..1aa3681f467 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRenameRefactoringPreferences.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/CRenameRefactoringPreferences.java
@@ -41,18 +41,10 @@ public class CRenameRefactoringPreferences {
         }
 	}
 
-	public String get(String key) {
-		return fDialogSettings.get(key);
-	}
-
 	public boolean getBoolean(String key) {
 		return fDialogSettings.getBoolean(key);
 	}
 
-	public int getInt(String key) {
-		return fDialogSettings.getInt(key);
-	}
-
 	public void put(String key, int value) {
 		fDialogSettings.put(key, value);
 	}
@@ -65,6 +57,18 @@ public class CRenameRefactoringPreferences {
 		fDialogSettings.put(key, value);
 	}
 
+	public int getScope() {
+	    try {
+	        return fDialogSettings.getInt(KEY_SCOPE);
+	    } catch (Exception e) {
+	        return TextSearchWrapper.SCOPE_RELATED_PROJECTS;
+	    }
+	}
+
+	public String getWorkingSet() {
+		return fDialogSettings.get(KEY_WORKING_SET_NAME);
+	}
+
 	public int getOptions() {
         int options= 0;
         if (!getBoolean(KEY_IGNORE_VIRTUAL))
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/RenameLinkedMode.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/RenameLinkedMode.java
index 5d8d82ce781..6f7e98f0892 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/RenameLinkedMode.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/RenameLinkedMode.java
@@ -426,8 +426,8 @@ public class RenameLinkedMode {
         processor.setReplacementText(newName);
         CRenameRefactoringPreferences preferences = new CRenameRefactoringPreferences();
         processor.setSelectedOptions(preferences.getOptions());
-        processor.setScope(preferences.getInt(CRenameRefactoringPreferences.KEY_SCOPE));
-        processor.setWorkingSet(preferences.get(CRenameRefactoringPreferences.KEY_WORKING_SET_NAME));
+        processor.setScope(preferences.getScope());
+        processor.setWorkingSet(preferences.getWorkingSet());
 		RenameSupport renameSupport= RenameSupport.create(processor);
 		return renameSupport;
 	}