Merge "Use the renamed APIs" into main