Update TrailRunner for new naming conventions
Merge pull request #1617 from Cottser/trailrunner

Update TrailRunner for new naming conventions