Rename field names in Category model, refactor populate file.