magma abi naming cleanup

MA-156

Change-Id: I07a070e0926946d6ae68c377936a1312b94e2c6d
5 files changed