Do not trip over missing NameID
Update package name