Renamed things properly and removed -y from one script since it breaks on Mint 15.