More naming consistency, without-qs -> minus-qs