Merge "Check setName() for null string + typo fixes."