fix variable context and its name