Rename obvious template type names, for consistency
Merge pull request #37 from flipoutbrian/master

Rename obvious template type names, for consistency