Name refactoring.
Factored code to handle ValueOption (uncomplete).