fix table naming convention