Update XtraFinder for new naming conventions
Merge pull request #1650 from Cottser/xtrafinder

Update XtraFinder for new naming conventions