Rename delegate methods - issue #2.