Performing some renaming and reformating