Namelessify

Change-Id: I5774b76e7b6bdc9a1de6117f4f8e1fd8050f31d2