Change category names. Fix #9