CFY-1318 change interface mappings