Update XQuartz for new naming conventions
Merge pull request #1649 from Cottser/xquartz

Update XQuartz for new naming conventions