Update NetSpot for new naming conventions
Merge pull request #1589 from Cottser/netspot

Update NetSpot for new naming conventions