update the zpp map
update for 's' in 7
small map fix and suitable namings
fix clang 3.5 support