Change public method signatures to not use the word 'pair'