CDB-1306 Normalized all named maps to use symbols, convert to symbols, etc.