More renames
Renaming and removing content-type specifier