Small bug. Renamed was called too late.

Called the rename addition after setting a new name... D'oh! Need to have a look at this issue!