Update uid to avoid clashes