Revert "better name search"

This reverts commit 779c9ef26d0c4c98364d1eda0b5728e0a43abb3d.
Revert "dammit"

This reverts commit c0d692724a7f174347c5c4e24495626e147a1c57.
Revert "this needs to be here"

This reverts commit 234f14572f4f8ff9def5ffbc5f0f671b9cfa3dfd.