CFY-1373 rename common context class