Rename Trial to Upload and Device to Trial
Renaming merge