maa: change struct names to be more unique and fix allocs