clean up map marker logic/names

use semantic terms instead of color-coded names

[#68208820]