Fix a few instances of spaces in class names starting with the NS prefix

Didn't fix the ones spanning across multiple lines yet since they will require a bit more effort in determining optimal placement.