Fix bug in variable expansion in the Simple solver
Change naming for TwoContext solver.