A big clean-up
Update the delegate method names