[OE-4010] updated table names