Sync default values of setting

Fix regression of b94a7149c3bc784d7d7e45d45ba6b9932f363431.

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Rename variable name to avoid confusion

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>