Renaming and cleanu on server