New content type constants, and modified content type names.