For posterity, we decided on "username".  We also decided to change the user model to reflect this, substituting `username` for `subdomain`