Kimi and Leclerc to swap seats