diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/extractfunction/ExtractFunctionRefactoringTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/extractfunction/ExtractFunctionRefactoringTest.java
index 4fac779c9d1..ad5832fec45 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/extractfunction/ExtractFunctionRefactoringTest.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/extractfunction/ExtractFunctionRefactoringTest.java
@@ -73,7 +73,7 @@ public class ExtractFunctionRefactoringTest extends RefactoringTest {
 		info.setReplaceDuplicates(replaceDuplicates);
 		if(info.getInScopeDeclaredVariable() == null){
 			if(returnValue) {
-				info.setReturnVariable(info.getAllAfterUsedNames().elementAt(returnParameterIndex));
+				info.setReturnVariable(info.getAllAfterUsedNames().get(returnParameterIndex));
 			}
 		} else {
 			info.setReturnVariable( info.getInScopeDeclaredVariable() );
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/CRefactoring.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/CRefactoring.java
index cefd29e0702..26d60dddb1d 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/CRefactoring.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/CRefactoring.java
@@ -11,7 +11,7 @@
  *******************************************************************************/
 package org.eclipse.cdt.internal.ui.refactoring;
 
-import java.util.Vector;
+import java.util.ArrayList;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IResource;
@@ -326,8 +326,8 @@ public abstract class CRefactoring extends Refactoring {
 		return fIndex;
 	}
 	
-	protected Vector<IASTName> findAllMarkedNames() {
-		final Vector<IASTName> namesVector = new Vector<IASTName>();
+	protected ArrayList<IASTName> findAllMarkedNames() {
+		final ArrayList<IASTName> namesVector = new ArrayList<IASTName>();
 
 		unit.accept(new CPPASTVisitor() {
 
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/gettersandsetters/GenerateGettersAndSettersRefactoring.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/gettersandsetters/GenerateGettersAndSettersRefactoring.java
index d6f10a31693..fe622fd0e3e 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/gettersandsetters/GenerateGettersAndSettersRefactoring.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/gettersandsetters/GenerateGettersAndSettersRefactoring.java
@@ -12,7 +12,6 @@
 package org.eclipse.cdt.internal.ui.refactoring.gettersandsetters;
 
 import java.util.ArrayList;
-import java.util.Vector;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.runtime.CoreException;
@@ -73,11 +72,11 @@ public class GenerateGettersAndSettersRefactoring extends CRefactoring {
 	}
 	
 	private IASTName getSelectedName() {
-		Vector<IASTName> names = findAllMarkedNames();
+		ArrayList<IASTName> names = findAllMarkedNames();
 		if (names.size() < 1) {
 			return null;
 		}
-		return names.lastElement();
+		return names.get(names.size()-1);
 	}
 
 	protected void findDeclarations() {
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/hidemethod/HideMethodRefactoring.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/hidemethod/HideMethodRefactoring.java
index 8026f8e3314..f2b4d3fdb01 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/hidemethod/HideMethodRefactoring.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/hidemethod/HideMethodRefactoring.java
@@ -11,7 +11,7 @@
  *******************************************************************************/
 package org.eclipse.cdt.internal.ui.refactoring.hidemethod;
 
-import java.util.Vector;
+import java.util.ArrayList;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.runtime.CoreException;
@@ -78,15 +78,12 @@ public class HideMethodRefactoring extends CRefactoring {
 		if(isProgressMonitorCanceld(sm, initStatus)) return initStatus;
 		
 		IASTName name;
-		Vector<IASTName> names = findAllMarkedNames();
-		if(names.size() > 1) {
-			name = names.lastElement();
-		} else if (names.size() < 1) {
+		ArrayList<IASTName> names = findAllMarkedNames();
+		if (names.size() < 1) {
 			initStatus.addFatalError(Messages.HideMethodRefactoring_NoNameSelected);  
 			return initStatus;
-		}else {
-			name = names.get(0);
 		}
+		name = names.get(names.size()-1);
 		sm.worked(1);
 		if(isProgressMonitorCanceld(sm, initStatus)) return initStatus;
 		
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/implementmethod/MethodDefinitionInsertLocationFinder.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/implementmethod/MethodDefinitionInsertLocationFinder.java
index 497871f3335..dbe6a8b3a23 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/implementmethod/MethodDefinitionInsertLocationFinder.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/implementmethod/MethodDefinitionInsertLocationFinder.java
@@ -12,8 +12,8 @@
 
 package org.eclipse.cdt.internal.ui.refactoring.implementmethod;
 
+import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Vector;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.ResourcesPlugin;
@@ -105,20 +105,20 @@ public class MethodDefinitionInsertLocationFinder {
 	 * @return all declarations, sorted in reverse order
 	 */
 	private static Collection<IASTSimpleDeclaration> getAllPreviousIASTSimpleDeclarationsFromClassInReverseOrder(IASTDeclaration[] declarations, IASTFileLocation methodPosition) {
-		Vector<IASTSimpleDeclaration> allIASTSimpleDeclarations = new Vector<IASTSimpleDeclaration>();
+		ArrayList<IASTSimpleDeclaration> allIASTSimpleDeclarations = new ArrayList<IASTSimpleDeclaration>();
 		for (IASTDeclaration decl : declarations) {
 			if (decl.getFileLocation().getStartingLineNumber() >= methodPosition.getStartingLineNumber()) {
 				return allIASTSimpleDeclarations;
 			}
 			if (isMemberFunctionDeclaration(decl)) {
-				allIASTSimpleDeclarations.insertElementAt((IASTSimpleDeclaration) decl, 0);
+				allIASTSimpleDeclarations.add(0, (IASTSimpleDeclaration) decl);
 			}
 		}
 		return allIASTSimpleDeclarations;
 	}
 
 	private static Collection<IASTSimpleDeclaration> getAllFollowingIASTSimpleDeclarationsFromClass(IASTDeclaration[] declarations, IASTFileLocation methodPosition) {
-		Vector<IASTSimpleDeclaration> allIASTSimpleDeclarations = new Vector<IASTSimpleDeclaration>();
+		ArrayList<IASTSimpleDeclaration> allIASTSimpleDeclarations = new ArrayList<IASTSimpleDeclaration>();
 
 		for (IASTDeclaration decl : declarations) {
 			if (isMemberFunctionDeclaration(decl) && decl.getFileLocation().getStartingLineNumber() > methodPosition.getStartingLineNumber() ) {
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/NodeHelper.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/NodeHelper.java
index 59d9e4195cc..dcf8454590e 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/NodeHelper.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/NodeHelper.java
@@ -128,7 +128,7 @@ public class NodeHelper {
 		 return context;
 	}
 	
-	public static IASTCompoundStatement findCompoundStatementInParent(IASTNode node) {
+	public static IASTCompoundStatement findCompoundStatementInAncestors(IASTNode node) {
 		while(node != null){
 			if (node instanceof IASTCompoundStatement) {
 				return (IASTCompoundStatement) node;
@@ -138,7 +138,7 @@ public class NodeHelper {
 		return null;
 	}
 	
-	public static IASTCompositeTypeSpecifier findEnclosingClass(IASTNode node) {
+	public static IASTCompositeTypeSpecifier findClassInAncestors(IASTNode node) {
 		while(!(node instanceof IASTCompositeTypeSpecifier)){
 			if(node instanceof IASTTranslationUnit) {
 				return null;
@@ -148,7 +148,7 @@ public class NodeHelper {
 		return (IASTCompositeTypeSpecifier) node;
 	}
 
-	public static IASTFunctionDefinition findFunctionDefinition(IASTNode node) {
+	public static IASTFunctionDefinition findFunctionDefinitionInAncestors(IASTNode node) {
 		while(node != null){
 			if (node instanceof IASTFunctionDefinition) {
 				return (IASTFunctionDefinition) node;
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/PseudoNameGenerator.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/PseudoNameGenerator.java
index 883f959face..de0ec5888bd 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/PseudoNameGenerator.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/PseudoNameGenerator.java
@@ -15,7 +15,7 @@ import java.util.HashSet;
 import java.util.Set;
 
 /**
- * Helps to generate new unsused names.
+ * Helps to generate new unused names.
  * 
  * @author Mirko Stocker
  *
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/SelectionHelper.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/SelectionHelper.java
index a45eb0bad6b..10909da2d19 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/SelectionHelper.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/utils/SelectionHelper.java
@@ -31,7 +31,7 @@ import org.eclipse.cdt.core.dom.ast.cpp.CPPASTVisitor;
 import org.eclipse.cdt.internal.ui.refactoring.Container;
 
 /**
- * Helper class to suport operations conserning a selection.
+ * Helper class to support operations concerning a selection.
  * 
  * @author Mirko Stocker, Lukas Felber
  *