Fixed the Category name to naming scheme