Indeed, we had a similar problem. In some cases the entity Label attribute is enough, but in some user requirements we had to create structures with the desired attribute label for the header. This adds extra work and often ends up in a maintenance problem.