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 c41264a4c63..faf4a47a1cd 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
@@ -72,7 +72,7 @@ public class RenameCSourceFolderChange extends Change {
 			return RefactoringStatus.create(Status.OK_STATUS); 
 		} else {
 			return RefactoringStatus.create(new Status(IStatus.ERROR, CUIPlugin.PLUGIN_ID,
-					NLS.bind(RenameMessages.RenameCSourceFolderChange_ErroMsg, folder.getName())));
+					NLS.bind(RenameMessages.RenameCSourceFolderChange_ErrorMsg, folder.getName())));
 		}
 	}
 
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/RenameMessages.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/RenameMessages.java
index 812dc402167..9b83ec268fa 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/RenameMessages.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/RenameMessages.java
@@ -106,7 +106,7 @@ public class RenameMessages extends NLS {
 	public static String CRenameTopProcessor_virtualMethod;
 	public static String CRenameTopProcessor_wizard_backup_title;
 	public static String CRenameTopProcessor_wizard_title;
-	public static String RenameCSourceFolderChange_ErroMsg;
+	public static String RenameCSourceFolderChange_ErrorMsg;
 	public static String RenameCSourceFolderChange_Name0;
 	public static String RenameSourceFolder_0;
 	public static String TextSearch_monitor_categorizeMatches;
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/RenameMessages.properties b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/RenameMessages.properties
index 451334b75cf..be64cea5114 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/RenameMessages.properties
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/RenameMessages.properties
@@ -95,6 +95,6 @@ CRenameTopProcessor_virtualMethod=virtual method
 CRenameTopProcessor_wizard_backup_title=Rename
 CRenameTopProcessor_wizard_title=Rename ''{0}''
 RenameCSourceFolderChange_ErrorMsg=Folder {0} does not exist
-RenameCSourceFolderChange_Name0=Rename source Folder {0} to {1}
-RenameSourceFolder_0=Rename CDT Source Folder
+RenameCSourceFolderChange_Name0=Rename source folder {0} to {1}
+RenameSourceFolder_0=Rename C/C++ Source Folder
 TextSearch_monitor_categorizeMatches=categorizing matches
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/refactoring/actions/CRenameAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/refactoring/actions/CRenameAction.java
index 4e2f9a6b22f..4cacc4ea611 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/refactoring/actions/CRenameAction.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/refactoring/actions/CRenameAction.java
@@ -47,8 +47,7 @@ public class CRenameAction extends RefactoringAction {
     	super.updateSelection(elem);
     	if (elem == null || elem instanceof IInclude || elem instanceof ITranslationUnit) {
     		setEnabled(false);
-    	}
-    	else {
+    	} else {
     		setEnabled(true);
     	}
     }