Mass refactor for type parameter renaming
Merge pull request #6 from traitorous/type_parameters

Mass refactor for type parameter renaming