Renamings and some struct fields made optional

Change-Id: If05018712bd9df79cffb82e59824ef3c9254c4fa