Replaced get_x_names by get_x almost everywhere in order to keep constraint generation code more clear and uniform (before half the time we had objects themselves, half of the time their names).