In my thesis I have the following sentence:
One can construct a new query by replacing all the variables in Q with their equivalence classes.
I doubt that this sentence is grammatically correct, for the following reason. Every variable is replaced by just one equivalence class, since there is only one equivalence class for every variable in Q. At the same time, there are multiple variables in Q. So should it be "equivalence class" or "equivalence classes"?