Fix on nameChanged event