Rename file and some improvements