Namelessify

Change-Id: I5a31a93320979bc2afa8b72f31e5d10e0c6b0fca