Found better name for config properties

Change-Id: Ia7b20bd9836e3c421407c18c1e7016f8ad03ec30
Merge "Found better name for config properties"