If using CCP you can use the IR database navigator and manually replace the commands so you don't have to redo the macros.