Renamed catagories to be more accurate