Minor rename
Define MAPI and MAPK for mapping positional and key/values only