CFY-1433 code cleanup
CFY-1433 refactor/rename in preperation for impl