renaming all the crappy names