Final correction about the configuration keys name change

Change-Id: If4736303767a2a0650ebfd46a4ef36b28768d140