standardize var names and end user text  #2761