UF-135

standardize naming of content_type to uf_content_type