Minor renames of options and configure setting handlings