Refactored rename for upload with demo