More work on updating applications, now waiting for duplicate names to fail