Renamed a couple more files and added all the appropriate aliases to my profile.