add main branch changes and rename some props

Issue-ID: TEST-165
Change-Id: I4040eea88cd5263fe0ebb7828fea3f55097f3e8a
Signed-off-by: DR695H <dr695h@att.com>
3 files changed