updated class and delegate names to match RFC