diff --git a/bundles/org.eclipse.wst.wsdl.ui/src-refactor/org/eclipse/wst/wsdl/ui/internal/refactor/actions/RenameComponentAction.java b/bundles/org.eclipse.wst.wsdl.ui/src-refactor/org/eclipse/wst/wsdl/ui/internal/refactor/actions/RenameComponentAction.java
index 543c8c6..0069d28 100644
--- a/bundles/org.eclipse.wst.wsdl.ui/src-refactor/org/eclipse/wst/wsdl/ui/internal/refactor/actions/RenameComponentAction.java
+++ b/bundles/org.eclipse.wst.wsdl.ui/src-refactor/org/eclipse/wst/wsdl/ui/internal/refactor/actions/RenameComponentAction.java
@@ -16,12 +16,14 @@
 import org.eclipse.ltk.core.refactoring.participants.RenameRefactoring;
 import org.eclipse.ltk.ui.refactoring.RefactoringWizard;
 import org.eclipse.ltk.ui.refactoring.RefactoringWizardOpenOperation;
+import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.actions.GlobalBuildAction;
 import org.eclipse.wst.wsdl.Binding;
 import org.eclipse.wst.wsdl.Definition;
 import org.eclipse.wst.wsdl.Message;
 import org.eclipse.wst.wsdl.PortType;
 import org.eclipse.wst.wsdl.WSDLElement;
+import org.eclipse.wst.wsdl.internal.impl.DefinitionImpl;
 import org.eclipse.wst.wsdl.internal.impl.WSDLElementImpl;
 import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
 import org.eclipse.wst.wsdl.ui.internal.util.NodeAssociationManager;
@@ -150,16 +152,38 @@
 					.getString("RenameComponentWizard.defaultPageTitle"), //$NON-NLS-1$ TODO: provide correct strings
 					RefactoringMessages
 					.getString("RenameComponentWizard.inputPage.description"), //$NON-NLS-1$
-					null);
+					null)
+                    {
+                      public boolean performFinish()
+                      {
+                        // TODO Auto-generated method stub
+                        boolean rc = super.performFinish();
+                        //((DefinitionImpl)getDefinition()).reconcileReferences(true);
+                        return rc;
+                      }
+              
+                    };        
 			RefactoringWizardOpenOperation op = new RefactoringWizardOpenOperation(
 					wizard);
 			op.run(WSDLEditorPlugin.getShell(), wizard
 					.getDefaultPageTitle());
 			triggerBuild();
+            
+			Display.getCurrent().asyncExec(new Runnable()
+			{			  
+			  public void run()
+			  {
+			    ((DefinitionImpl)getDefinition()).reconcileReferences(true);
+			  }
+			});  
+            
 		} catch (InterruptedException e) {
 			// do nothing. User action got cancelled
 		}
 		
+		if (getModel() instanceof DefinitionImpl) {
+			((DefinitionImpl) getModel()).reconcileReferences(true);
+		}
 	}
 
 	public static void triggerBuild() {
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src-validation/org/eclipse/wst/wsdl/ui/internal/validation/ValidateWSDLActionDelegate.java b/bundles/org.eclipse.wst.wsdl.ui/src-validation/org/eclipse/wst/wsdl/ui/internal/validation/ValidateWSDLActionDelegate.java
index 0c05a00..d92b39c 100644
--- a/bundles/org.eclipse.wst.wsdl.ui/src-validation/org/eclipse/wst/wsdl/ui/internal/validation/ValidateWSDLActionDelegate.java
+++ b/bundles/org.eclipse.wst.wsdl.ui/src-validation/org/eclipse/wst/wsdl/ui/internal/validation/ValidateWSDLActionDelegate.java
@@ -1,10 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
+ * Copyright (c) 2001, 2005 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src-validation/org/eclipse/wst/wsdl/ui/internal/validation/validatewsdlui.properties b/bundles/org.eclipse.wst.wsdl.ui/src-validation/org/eclipse/wst/wsdl/ui/internal/validation/validatewsdlui.properties
index e8dc95d..ab9e35f 100644
--- a/bundles/org.eclipse.wst.wsdl.ui/src-validation/org/eclipse/wst/wsdl/ui/internal/validation/validatewsdlui.properties
+++ b/bundles/org.eclipse.wst.wsdl.ui/src-validation/org/eclipse/wst/wsdl/ui/internal/validation/validatewsdlui.properties
@@ -1,10 +1,10 @@
 ###############################################################################
-# Copyright (c) 2001, 2004 IBM Corporation and others.
+# Copyright (c) 2001, 2005 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
 # http://www.eclipse.org/legal/epl-v10.html
-# 
+#
 # Contributors:
 #     IBM Corporation - initial API and implementation
 ###############################################################################