Fix naming conflict with category object