[OE-4165] table name mods