Added packages to various related-entity-name attributes, for consistency and more reliable operation a lot more of this needs to be done