Update nvALT for new naming conventions
Merge pull request #1542 from Cottser/master

Update nvALT for new naming conventions