Use caps consistently in mappings