Naming strategy

Renamed "type =" to "Type = " to match the types having to be written in
camel case. plus couple more naming corrections
Merge pull request #98 from otherWIP/testing

Naming strategy "Type"