Update ExpanDrive for new naming conventions
Merge pull request #1560 from Cottser/expandrive

Update ExpanDrive for new naming conventions