Scala clients: Add more explicit qouting of variable names that are keywords (e.g. type)