Changed a few names to consistently use underscores.