rename cm-address to cmaddress where needed