esql_model: Fixed property_set & renamed few variables.