diff --git a/core/org.eclipse.cdt.ui.tests/resources/refactoring/ImplementMethod.rts b/core/org.eclipse.cdt.ui.tests/resources/refactoring/ImplementMethod.rts
index 3f1718df93f..0f93171e49e 100644
--- a/core/org.eclipse.cdt.ui.tests/resources/refactoring/ImplementMethod.rts
+++ b/core/org.eclipse.cdt.ui.tests/resources/refactoring/ImplementMethod.rts
@@ -747,3 +747,67 @@ inline void nspace::TestClass::testMethod()
 
 #endif /* TESTCLASS_H_ */
 
+//!Bug 290110 Source-> Implement Method
+//#org.eclipse.cdt.ui.tests.refactoring.implementmethod.ImplementMethodRefactoringTest
+//@.config
+filename=A.h
+//@A.h
+#ifndef A_H_
+#define A_H_
+
+namespace n1 {
+namespace n2 {
+
+class A {
+public:
+	A();
+	~A();
+	void testmethod(int x);
+protected:
+	class B {
+	public:
+		void /*$*/testmethod2()/*$$*/;
+	};
+};
+
+}
+}
+
+
+#endif /* A_H_ */
+//@A.cpp
+#include "A.h"
+
+namespace n1 {
+namespace n2 {
+
+A::A() {
+}
+
+A::~A() {
+}
+
+}
+}
+
+//=
+#include "A.h"
+
+namespace n1 {
+namespace n2 {
+
+A::A() {
+}
+
+A::~A() {
+}
+
+}
+}
+
+void n1::n2::A::B::testmethod2()
+{
+}
+
+
+
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/implementmethod/ImplementMethodRefactoring.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/implementmethod/ImplementMethodRefactoring.java
index 6045d1ee80a..ae67ef1730c 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/implementmethod/ImplementMethodRefactoring.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/implementmethod/ImplementMethodRefactoring.java
@@ -244,7 +244,7 @@ public class ImplementMethodRefactoring extends CRefactoring {
 	private ICPPASTQualifiedName createQualifiedNameFor(IASTFunctionDeclarator functionDeclarator, IASTNode declarationParent) 
 		throws CoreException {
 		int insertOffset = insertLocation.getInsertPosition();
-		return NameHelper.createQualifiedNameFor(functionDeclarator.getName(), file, region.getOffset(), insertLocation.getInsertFile(), insertOffset);
+		return NameHelper.createQualifiedNameFor(functionDeclarator.getName(), file, functionDeclarator.getFileLocation().getNodeOffset(), insertLocation.getInsertFile(), insertOffset);
 	}
 	
 	public ImplementMethodData getRefactoringData() {
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/RenameCSourceFolderChange.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/RenameCSourceFolderChange.java
index c90a88df72e..9b93207ab81 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/RenameCSourceFolderChange.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/RenameCSourceFolderChange.java
@@ -97,7 +97,7 @@ public class RenameCSourceFolderChange extends Change {
 			entries = renameEntry(entries);
 			cfg.setSourceEntries(entries);
 		}
-		CCorePlugin.getDefault().setProjectDescription(project, des, false, new NullProgressMonitor());//TODO Add PM
+		CCorePlugin.getDefault().setProjectDescription(project, des, false, new NullProgressMonitor());
 	}
 	
 	private ICSourceEntry[] renameEntry(ICSourceEntry[] entries){