Remove hard-coded reference to context name