Revert "No more namelessness"

This reverts commit 949bcd915fc45b6d9a268b0e4433a65b131e04de.