Changed name-data placement of upload