Revert "Pretty big workaround for name exploit"

This reverts commit 979b64b68539525a3c950784bee65951c2334172.