Doctype and Media renames

Renaming media and doctypes.