rename user fields to use old style naming convention
Merge branch '4767_preprocess_subroutine'