changed tracking from internal to both
changed category names so they follow our convention
changed category name so it follows our convention
Merge branch 'consumer-sprint41-CON-44' into consumer-collections