Renamed convert to solve, and made equation names clearer