Cleaned up and fixed renaming whoopsies