Get rid of more underscores