Fix naming of category and formatting fixes.