diff --git a/packages/rtl/classes.pas b/packages/rtl/classes.pas
index 76e94b8..5a01ce6 100644
--- a/packages/rtl/classes.pas
+++ b/packages/rtl/classes.pas
@@ -5199,9 +5199,9 @@ procedure TComponent.InsertComponent(AComponent: TComponent);
 
 begin
   AComponent.ValidateContainer(Self);
+  ValidateRename(AComponent,'',AComponent.FName);
   if AComponent.FOwner <> nil then
     AComponent.FOwner.RemoveComponent(AComponent);
-  ValidateRename(AComponent,'',AComponent.FName);
   Insert(AComponent);
   If csDesigning in FComponentState then
     AComponent.SetDesigning(true);