Adjusting delegate to follow Apple's recommended naming conventions