rename fields to match Singularity