[#69330084] Better naming and scoping for configuration