Fix loop field names

This merge request modifies the loop_XXX fields in evaluator_XXX fields.

This will makes things coherent with regard to the algorithm type naming changes