CFY-1418 flake8 and name fix