rename file and do some fixes