Renames/relocates type converters to better names