adjust namings for solver