Renamed stuff

Closes https://github.com/PistonDevelopers/piston/issues/625
Merge pull request #627 from bvssvni/master

Renamed stuff