Use lowercase underscore style and fix here and there.

This is a messy commit.