Fixed mixups in table/column names while indexing