Huehuehue
Revert "Better name highlighting"

This reverts commit 3fcfda7086821d4c9b85032115212d461b45e41a.
Revert "Huehuehue"

This reverts commit b246004f250bbd9a3beaa65ebeca8e96ce31cf4e.