Add some additional name mappings
Merge pull request #22 from RobLoach/master

Add some additional name mappings