Finished renaming

Please work! :)