diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/CompleteParser2Tests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/CompleteParser2Tests.java
index f79a56c9cd1..86c82b081a2 100644
--- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/CompleteParser2Tests.java
+++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/CompleteParser2Tests.java
@@ -2452,7 +2452,7 @@ public class CompleteParser2Tests extends BaseTestCase {
 
     public void test158192_declspec_on_class() throws Exception {
     	if (!Platform.getOS().equals(Platform.OS_WIN32))
-    		return; // XXX: see GPPParserExtensionConfiguration.supportDeclspecSpecifiers()
+    		return; // TODO: see GPPParserExtensionConfiguration.supportDeclspecSpecifiers()
 
     	Writer writer = new StringWriter();
     	writer.write("class __declspec(foobar) Foo1 {};\n");
@@ -2479,7 +2479,7 @@ public class CompleteParser2Tests extends BaseTestCase {
 
     public void test158192_declspec_on_variable() throws Exception {
     	if (!Platform.getOS().equals(Platform.OS_WIN32))
-    		return; // XXX: see GPPParserExtensionConfiguration.supportDeclspecSpecifiers()
+    		return; // TODO: see GPPParserExtensionConfiguration.supportDeclspecSpecifiers()
 
     	Writer writer = new StringWriter();
     	writer.write("__declspec(foobar) class Foo {} bar;\n");
@@ -2500,7 +2500,7 @@ public class CompleteParser2Tests extends BaseTestCase {
     // see https://bugs.eclipse.org/bugs/show_bug.cgi?id=158192
     public void test158192_declspec_in_declarator() throws Exception {
     	if (!Platform.getOS().equals(Platform.OS_WIN32))
-    		return; // XXX: see GPPParserExtensionConfiguration.supportDeclspecSpecifiers()
+    		return; // TODO: see GPPParserExtensionConfiguration.supportDeclspecSpecifiers()
 
     	Writer writer = new StringWriter();
 
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTNameBase.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTNameBase.java
index 9ffaff5e451..6dd24d7d8c4 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTNameBase.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTNameBase.java
@@ -55,7 +55,7 @@ public abstract class CPPASTNameBase extends ASTNode implements ICPPASTName {
 		// exceeds MAX_RESOLUTION_DEPTH. If the resolution depth exceeds
 		// MAX_RESOLUTION_DEPTH + 1, it means that attempting to create the
 		// recursion resolving binding has led us back to trying to resolve
-		// the bidning for this name again, so the recursion isn't broken. 
+		// the binding for this name again, so the recursion isn't broken. 
 		// This can happen because the constructor of RecursionResolvingBinding 
 		// calls ProblemBinding.getMessage(), which can try to do name 
 		// resolution to build an argument string if one wasn't provided in the
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/DefaultCCommentAutoEditStrategyTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/DefaultCCommentAutoEditStrategyTest.java
index cac270f78cb..e7217d073bc 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/DefaultCCommentAutoEditStrategyTest.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/DefaultCCommentAutoEditStrategyTest.java
@@ -437,7 +437,7 @@ public class DefaultCCommentAutoEditStrategyTest extends AbstractAutoEditTest {
 	//  void foo()X{}
 	//  void bar(int x);
 	//  };
-	public void _testFollowingDeclaration4b() { // XXX - this is likely invalid anyhow
+	public void _testFollowingDeclaration4b() { // TODO - this is likely invalid anyhow
 		assertDeclarationFollowingX("void foo(){}"); // (X is just the cursor position)
 	}
 	
@@ -449,7 +449,7 @@ public class DefaultCCommentAutoEditStrategyTest extends AbstractAutoEditTest {
 	//  }
 	//  void bar(int x);
 	//  };
-	public void _testFollowingDeclaration4c() { // XXX - this is likely invalid anyhow
+	public void _testFollowingDeclaration4c() { // TODO - this is likely invalid anyhow
 		assertDeclarationFollowingX("void foo()\n  {\n     int x;\n  }\n"); // (X is just the cursor position)
 	}
 	
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/PartitionTokenScannerTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/PartitionTokenScannerTest.java
index c0a8701317a..a609e5fad1c 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/PartitionTokenScannerTest.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/PartitionTokenScannerTest.java
@@ -20,7 +20,6 @@ import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 
-import org.eclipse.cdt.internal.ui.text.FastCPartitionScanner;
 import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.Document;
 import org.eclipse.jface.text.IDocument;
@@ -28,6 +27,8 @@ import org.eclipse.jface.text.IRegion;
 import org.eclipse.jface.text.rules.IPartitionTokenScanner;
 import org.eclipse.jface.text.rules.IToken;
 
+import org.eclipse.cdt.internal.ui.text.FastCPartitionScanner;
+
 /**
  * Compares two <code>IParitionTokenScanner</code>s for performance.
  */
@@ -141,7 +142,7 @@ public class PartitionTokenScannerTest extends TestCase {
 
 			int offsetIndex= offset - region.getOffset();
 
-			// XXX kludge
+			// TODO kludge
 			if (offsetIndex > line.length())
 				offsetIndex= line.length();
 
@@ -150,7 +151,6 @@ public class PartitionTokenScannerTest extends TestCase {
 			buffer.append("<POS>");
 			buffer.append(line.substring(offsetIndex));
 			buffer.append(']');
-
 		} catch (BadLocationException e) {
 		}