Updated naming per pull request comments

Hopefully this will also fix AppVeyor's puzzling refusal to build...