Make command-line option match environement variable name

When several locations can be provided, the environment variable doesn't match the option name.

In this proposition, we make them match but still allow to spell the option without a 's' in the end.