rename upload-photo -> photo-upload everywhere