Remove old version
Change file names