Pull request/93cd41a7

Some small fixes and file name changes to allow correct testing by PackageEval