Renaming more strings. Part of #850