I've always felt that "Jedi Knights" as a general reference should refer to both Knights and Masters. Maybe even the padawans too in a sense. But as a rank Knight is the place we find Anakin at the beginning of ROTS, or Obi-Wan at the end of TPM, when each is neither a padawan nor a Master.