I agree that the naming of the different entities is not very clear. That doesn’t imply that each of these entities is a mess though.