Changed 'SBChoosy' to 'Choosy', other updates
Merge pull request #11318 from gamenerds/master

Changed 'SBChoosy' to 'Choosy', other updates