Renaming picking functions to more uniform scheme