Refactored out namePlural from content type model; fixed misc