gmap namespace refactor