Fixed argument names in contexts