Further improve the naming of components in the querymodels project.