fix/mod. formatting/config setting variable names.

Change-Id: I13e1dfce1fbfe9aa9b192374d2feae8b27937e24