Syntax cleanup + Removal of `ContentType` alias

The syntax changes made don't change anything. The only significant change is the removal of the aliases in `ContentType`, this is unneeded