Give cf_parser functions better naming