Fixed underscores and whatnots.