REWORKED MAP AND BMAP TYPE NAMES