When did Emirates sign the naming rights deal? If it hasn't been renegotiated since the original deal, it will be way less than they could get now. I do agree that we are probably looking at 20-30m for total deal.
However, you have to factor in that we now have actual corporate hospitality...