Get the renames right