Renamed stuff

Closes https://github.com/PistonDevelopers/piston/issues/625