Prevent name spaces from clashing.

We might really have a username "add", for example.

Change-Id: I172f35680296d94f1155dbfcb65dcd9336f14a99
Remove obsolete reference to user.

Change-Id: Icb47a3da3fb5eb1c1854cf965b495549873f84e2