Use engine label instead of engine location
Merge pull request #181 from JakeChampion/engine_label

Use engine label instead of engine location in file name
Merge branch 'master' into history-mk11