Revert name detection.

This reverts commit 544bb079d747b0fc4286268f8de5a5c9959e3350.
This reverts commit fbeadae931ae4446b3d8c56a1488df7ff6261ce0.
This reverts commit 5de6e809bfc5111cbfcb69add38bb9cf4deb054f.