Added context name editing