Bunch of renames to remove underscores