Renamed content classes to user-friendly names
Merge remote-tracking branch 'origin/develop' into develop