CFY-1418 renaming/refactoring