Move renaming in to api