Upload return the correct filename (after being cleaned up by class.upload)