Refactoring - matching name changes in JsonConfig

Change-Id: Ie82e44875669453a0e3df37f5769a5b296260885