[OE-4727] Use reversed name format.