Merge "Use renamed APIs" into main