more incremental name sanitizing