Renamed some strings to have better names. Part of #850