Fixed name conflicts between capture and upload of buddy picture.