Remove use of Name where possibly empty