Enhance name sanitizer