Another tweak to name cleanup.