Naming and style improvements.