Renaming functions to reflect new design.

Preserving values of selects that are not triggers.