fix poor table naming