2 files changed, 9 insertions, 9 deletions
diff --git a/src/setup/app.rs b/src/setup/app.rs
index 9553f40..9f31c01 100644
--- a/src/setup/app.rs
+++ b/src/setup/app.rs
@@ -4,12 +4,12 @@ use super::repo::Provider as _;
 use crate::{
     clock::DateTime,
     event::Broadcaster,
-    login::{
-        Login, Password,
-        create::{self, Create},
-    },
     name::Name,
     token::{Secret, repo::Provider as _},
+    user::{
+        Password, User,
+        create::{self, Create},
+    },
 };
 
 pub struct Setup<'a> {
@@ -27,7 +27,7 @@ impl<'a> Setup<'a> {
         name: &Name,
         password: &Password,
         created_at: &DateTime,
-    ) -> Result<(Login, Secret), Error> {
+    ) -> Result<(User, Secret), Error> {
         let create = Create::begin(name, password, created_at);
 
         let validated = create.validate()?;
@@ -38,7 +38,7 @@ impl<'a> Setup<'a> {
         } else {
             validated.store(&mut tx).await?
         };
-        let secret = tx.tokens().issue(stored.login(), created_at).await?;
+        let secret = tx.tokens().issue(stored.user(), created_at).await?;
         tx.commit().await?;
 
         let login = stored.publish(self.events);
@@ -59,7 +59,7 @@ impl<'a> Setup<'a> {
 pub enum Error {
     #[error("initial setup previously completed")]
     SetupCompleted,
-    #[error("invalid login name: {0}")]
+    #[error("invalid user name: {0}")]
     InvalidName(Name),
     #[error(transparent)]
     Database(#[from] sqlx::Error),
diff --git a/src/setup/routes/post.rs b/src/setup/routes/post.rs
index 2a46b04..9c6b7a6 100644
--- a/src/setup/routes/post.rs
+++ b/src/setup/routes/post.rs
@@ -8,10 +8,10 @@ use crate::{
     app::App,
     clock::RequestedAt,
     error::Internal,
-    login::{Login, Password},
     name::Name,
     setup::app,
     token::extract::IdentityCookie,
+    user::{Password, User},
 };
 
 pub async fn handler(
@@ -19,7 +19,7 @@ pub async fn handler(
     RequestedAt(setup_at): RequestedAt,
     identity: IdentityCookie,
     Json(request): Json<Request>,
-) -> Result<(IdentityCookie, Json<Login>), Error> {
+) -> Result<(IdentityCookie, Json<User>), Error> {
     let (login, secret) = app
         .setup()
         .initial(&request.name, &request.password, &setup_at)