fixed occurences of outdatd table fied names