So if I understand correctly here are the steps I need to take.
Replace hardware in Airwave.
Then go into the controller and Name the AP and assign it to the correct AP group?
This seems like a huge step backwards when before all i had to do was replace hardware in Airwave and it would also rename the AP and assign correct AP group