Fixed accidental removal of name normalizer, plus cleaned it up a bit.