You could try wrangler, to see if it can handle renaming those fields.