Change the name of a file

and some changes in the code!