Fix mappings

Change-Id: I0a69ca224f7221e091085dd69dd0b18d1945a8cf