Merge "Removing 'delegate' from constant names"