Fixed naming issue and alignment on donor codes (#209)