added name mappings provided by @BrianHayden: thanks Brian!