i am still not a big fan of the "mapped" prefix here ..