Some changes to allow you to rename whenever