Rename of the files for easy access. Closes #349