Rename thisArg to context