Rename s3-uploader to uploader