CFY-501 change prefix to use underscore instead of hyphen