Renaming things to get rid of underscores in names