Escape property names

Change-Id: If20587ea02a510e4bbbad91a412c430423a15d29