Convert more names to the underscore naming convention