context name schema fix