CFY-588 fix hard coded names