Naming consistency, with-qs -> plus-qs