A much easier-to-understand naming scheme

Also, it doesn't clash with that of Solver