Swapping 19" 2nd gen Sport Wheels for 2019 18" Aero Wheels

Hey guys, I'd like to know if the 18" wheels 1st gen (2018-2020) are the same ones from 2021 onwards? I realised the aero hub caps design changed for the refresh ones (2021+)