Fixing context name