Improve naming in the query models project.