Fix the automatic patch name generation for the pick command