Renaming files general impovements