rename user fields to use old style naming convention