Fix for default handling of option
Improving naming