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