Fixed up namespace macros.
Swapped HashMap with std::map.