Minor renames in delegate methods.