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 bb9b1c7a8eb..f5b94402f32 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
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html  
  * 
  * Contributors: 
- * Institute for Software (IFS)- initial API and implementation 
+ *     Institute for Software (IFS)- initial API and implementation 
  ******************************************************************************/
 package org.eclipse.cdt.internal.ui.refactoring.rename;
 
@@ -94,14 +94,14 @@ public class RenameCSourceFolderChange extends Change {
 	}
 	
 	private ICSourceEntry[] renameEntry(ICSourceEntry[] entries){
-		Set<ICSourceEntry> set = new HashSet<ICSourceEntry>();
+		Set<ICSourceEntry> set = new HashSet<>();
 		for (ICSourceEntry se : entries){
 			String seLocation = se.getName();
-			if(seLocation.equals(oldName.toPortableString())) {
+			if (seLocation.equals(oldName.toPortableString())) {
 				ICSourceEntry newSE = new CSourceEntry(newName, se.getExclusionPatterns(), se.getFlags());
 				set.add(newSE);
 			} else {
-				Set<IPath> exPatters = new HashSet<IPath>();
+				Set<IPath> exPatters = new HashSet<>();
 				for (IPath filter : se.getExclusionPatterns()) {
 					IPath oldSegments = oldName.removeFirstSegments(oldName.segmentCount() -1);
 					if (filter.equals(oldSegments)) {
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/RenameLinkedMode.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/RenameLinkedMode.java
index 0559998b204..5f7bbc7c6a0 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/RenameLinkedMode.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/RenameLinkedMode.java
@@ -514,7 +514,7 @@ public class RenameLinkedMode {
 	}
 
 	private AbstractCLikeLanguage getLanguage() {
-		ITranslationUnit tu = (ITranslationUnit) fEditor.getInputCElement();
+		ITranslationUnit tu = fEditor.getInputCElement();
 		ILanguage language = null;
 		try {
 			language = tu.getLanguage();
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/RenameSourceFolder.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/RenameSourceFolder.java
index a2ebb02a7c8..f7ea3a0be0b 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/RenameSourceFolder.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/RenameSourceFolder.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html  
  * 
  * Contributors: 
- * Institute for Software (IFS)- initial API and implementation 
+ *     Institute for Software (IFS)- initial API and implementation 
  ******************************************************************************/
 package org.eclipse.cdt.internal.ui.refactoring.rename;
 
@@ -27,7 +27,6 @@ import org.eclipse.ltk.core.refactoring.participants.RenameParticipant;
  * @author Emanuel Graf IFS
  */
 public class RenameSourceFolder extends RenameParticipant {
-
 	private IFolder oldFolder;
 	private String newName;