[FOLD] tidy up names