Rename pid selector to use common namespace

#490