Fix table naming