Make naming more consistent with other CSV naming