rename elements to eliminate name conflict on SoaS