Tweak function names for internal map functions

Also add @kmsquire's test for #4453.