Changed ABBREV_MAP back to a constant