API change: Rename xkb_map_* and group -> layout