Changed the files to a more stable version and naming.