[OE-4010] fixed table names