CAAERS-6889 CAAERS-6888 rename elements in E2B consumption