Naming strategy "Type"

Renamed "type =" to "Type = " to match the types having to be written in
camel case. plus couple more naming corrections