Property name mapping

Change-Id: I8c30b4443b7ff9ed70e4cb4ebaa0be60455774df