BZ-1051225 - Minor spelling mistakes - remaining changes