Refactor names because uploader makes more sense