Use correct variable naming convention.

+ Change camelCase to underscore (s/camel/_/)
+ Add some missing type prefixes