Merge "Fix spelling and make category desc consistent"