NXP-14278: introduce State class for Map, and do renaming to be clearer