diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog
index 72f053898b2..069cae7d53e 100644
--- a/core/org.eclipse.cdt.ui/ChangeLog
+++ b/core/org.eclipse.cdt.ui/ChangeLog
@@ -1,3 +1,6 @@
+2004-06-24 Hoda Amer
+	Changing Refactoring name collision from Error to FatalError
+	
 2004-06-25 Chris Wiebe
 	Fix for PR# 49849: [New Class Wizard] Able to add a new C++ Class with the same name (at same location) from  New C++ Class Wizard
 	
diff --git a/core/org.eclipse.cdt.ui/refactor/org/eclipse/cdt/internal/corext/refactoring/rename/RenameElementProcessor.java b/core/org.eclipse.cdt.ui/refactor/org/eclipse/cdt/internal/corext/refactoring/rename/RenameElementProcessor.java
index c4e5a5dc5bb..dc784f48a60 100644
--- a/core/org.eclipse.cdt.ui/refactor/org/eclipse/cdt/internal/corext/refactoring/rename/RenameElementProcessor.java
+++ b/core/org.eclipse.cdt.ui/refactor/org/eclipse/cdt/internal/corext/refactoring/rename/RenameElementProcessor.java
@@ -664,12 +664,12 @@ public class RenameElementProcessor extends RenameProcessor implements IReferenc
 					if(localSiblings){
 						String msg= RefactoringCoreMessages.getFormattedString("RenameTypeRefactoring.member_type_exists", //$NON-NLS-1$
 								new String[]{fNewElementName, fCElement.getParent().getElementName()});
-						result.addError(msg);
+						result.addFatalError(msg);
 						
 					}else {
 						String msg= RefactoringCoreMessages.getFormattedString("RenameTypeRefactoring.global_member_type_exists", //$NON-NLS-1$
 								new String[]{fNewElementName, fCElement.getParent().getElementName()});
-						result.addError(msg);
+						result.addFatalError(msg);
 					}
 				}
 			}
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/LinkToFileGroup.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/LinkToFileGroup.java
index 2fc04c8798c..89bbbe0c09f 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/LinkToFileGroup.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/dialogfields/LinkToFileGroup.java
@@ -103,7 +103,7 @@ public class LinkToFileGroup extends StringButtonDialogField {
 	 * @see DialogField#getNumberOfControls
 	 */		
 	public int getNumberOfControls() {
-		return 5;	
+		return 4;	
 	}
 	
 	public Button getLinkCheckButtonControl(Composite parent){