Update DiskWave for new naming conventions
Merge pull request #1558 from Cottser/diskwave

Update DiskWave for new naming conventions