Adding context name changes