Revert "Revert "minor fix""

This reverts commit 94ec7c7acbf96130e0495b0c4afc6793728a6693.
Revert "Revert "Revert "minor fix"""

This reverts commit f64b6c521f2f4b7117aefc88d84800e4368b599f.
minor config renamings