added special handling of the name tag