Changed swid tag import to allow entity name update