Rename some badly named properties

Change-Id: Ic817b8915000c64da76b42a2ed842a4ef7011365