diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/dialogs/ExtractInputPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/dialogs/ExtractInputPage.java
index 49f03141d8e..fe52f9149b8 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/dialogs/ExtractInputPage.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/dialogs/ExtractInputPage.java
@@ -14,8 +14,8 @@ package org.eclipse.cdt.internal.ui.refactoring.dialogs;
 
 import org.eclipse.ltk.ui.refactoring.UserInputWizardPage;
 import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.events.KeyAdapter;
-import org.eclipse.swt.events.KeyEvent;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.events.MouseAdapter;
 import org.eclipse.swt.events.MouseEvent;
 import org.eclipse.swt.widgets.Button;
@@ -50,10 +50,9 @@ public abstract class ExtractInputPage extends UserInputWizardPage {
 		control = new NameAndVisibilityComposite(parent, label, info.getName());
 		setTitle(getName());
 		setPageComplete(false);
-		control.getConstantNameText().addKeyListener(new KeyAdapter(){
+		control.getConstantNameText().addModifyListener(new ModifyListener() {
 	
-			@Override
-			public void keyReleased(KeyEvent e) {
+			public void modifyText(ModifyEvent e) {
 				info.setName(control.getConstantNameText().getText());
 				checkName();
 			}
@@ -82,6 +81,7 @@ public abstract class ExtractInputPage extends UserInputWizardPage {
 		if(result.isCorrect()){
 			setErrorMessage(null);
 			setPageComplete(true);
+			verifyName(methodName);
 		}
 		else{
 			setErrorMessage(NLS.bind(Messages.ExtractInputPage_CheckName, result.getMessage())); 
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/ExtractFunctionInputPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/ExtractFunctionInputPage.java
index e098a1093b6..d0dc6da41d9 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/ExtractFunctionInputPage.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/ExtractFunctionInputPage.java
@@ -13,10 +13,10 @@
 package org.eclipse.cdt.internal.ui.refactoring.extractfunction;
 
 import org.eclipse.ltk.ui.refactoring.UserInputWizardPage;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.KeyListener;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.MouseAdapter;
 import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.MouseListener;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
@@ -44,11 +44,9 @@ public class ExtractFunctionInputPage extends UserInputWizardPage {
 		
 		setPageComplete(false);
 		
-		comp.getMethodNameText().addKeyListener(new KeyListener(){
+		comp.getMethodNameText().addModifyListener(new ModifyListener() {
 
-			public void keyPressed(KeyEvent e) {}
-
-			public void keyReleased(KeyEvent e) {
+			public void modifyText(ModifyEvent e) {
 				info.setMethodName(comp.getMethodName());	
 				checkName();
 			}
@@ -57,12 +55,9 @@ public class ExtractFunctionInputPage extends UserInputWizardPage {
 		
 		
 		for (Control buttons : comp.getVisibiltyGroup().getChildren()) {
-			buttons.addMouseListener(new MouseListener() {
-	
-				public void mouseDoubleClick(MouseEvent e) {}
-	
-				public void mouseDown(MouseEvent e) {}
-	
+			buttons.addMouseListener(new MouseAdapter() {
+
+				@Override
 				public void mouseUp(MouseEvent e) {
 					String text = ((Button)e.getSource()).getText();
 					visibilityChange(text);
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 cb9a24c6e42..fb968fe67af 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
@@ -7,6 +7,7 @@
  * 
  * Contributors: 
  * Markus Schorn - initial API and implementation 
+ * Emanuel Graf (Institute for Software, HSR Hochschule fuer Technik)
  ******************************************************************************/ 
 package org.eclipse.cdt.internal.ui.refactoring.rename;
 
@@ -16,8 +17,8 @@ import org.eclipse.jface.window.Window;
 import org.eclipse.ltk.ui.refactoring.UserInputWizardPage;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.KeyListener;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.events.SelectionListener;
@@ -218,13 +219,12 @@ public class CRenameRefactoringInputPage extends UserInputWizardPage {
     }
 
     private void hookSelectionListeners() {
-        fNewName.addKeyListener(new KeyListener() {
-            public void keyPressed(KeyEvent e) {
-            }
-            public void keyReleased(KeyEvent e) {
-                onKeyReleaseInNameField();
-            }
-        });
+    	fNewName.addModifyListener(new ModifyListener() {
+    		
+			public void modifyText(ModifyEvent e) {
+				onKeyReleaseInNameField();
+			}
+		});
 
         registerScopeListener(fWorkspace, TextSearchWrapper.SCOPE_WORKSPACE);
         registerScopeListener(fDependent, TextSearchWrapper.SCOPE_RELATED_PROJECTS);