Update DiskMaker X for new naming conventions
Merge pull request #1632 from Cottser/diskmaker-x

Update DiskMaker X for new naming conventions