Fixed naming on some packaged
Merge branch 'master' of https://github.com/SkPhilipp/machine