[MARKET-161] - Changed category namespace from global to hierarchical