API fixes to use Legend instead of Label where it makes more sense