4 files changed, 19 insertions, 19 deletions
diff --git a/src/setup/app.rs b/src/setup/app.rs
index 9553f40..26eed7a 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,12 +38,12 @@ 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);
+        let user = stored.publish(self.events);
 
-        Ok((login.as_created(), secret))
+        Ok((user.as_created(), secret))
     }
 
     pub async fn completed(&self) -> Result<bool, sqlx::Error> {
@@ -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/repo.rs b/src/setup/repo.rs
index ac01496..c4f5fd8 100644
--- a/src/setup/repo.rs
+++ b/src/setup/repo.rs
@@ -17,7 +17,7 @@ impl Setup<'_> {
         let completed = sqlx::query_scalar!(
             r#"
                 select count(*) > 0 as "completed: bool"
-                from login
+                from user
             "#,
         )
         .fetch_one(&mut *self.0)
diff --git a/src/setup/routes/post.rs b/src/setup/routes/post.rs
index 2a46b04..0ff5d69 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,14 +19,14 @@ pub async fn handler(
     RequestedAt(setup_at): RequestedAt,
     identity: IdentityCookie,
     Json(request): Json<Request>,
-) -> Result<(IdentityCookie, Json<Login>), Error> {
-    let (login, secret) = app
+) -> Result<(IdentityCookie, Json<User>), Error> {
+    let (user, secret) = app
         .setup()
         .initial(&request.name, &request.password, &setup_at)
         .await
         .map_err(Error)?;
     let identity = identity.set(secret);
-    Ok((identity, Json(login)))
+    Ok((identity, Json(user)))
 }
 
 #[derive(serde::Deserialize)]
diff --git a/src/setup/routes/test.rs b/src/setup/routes/test.rs
index 5794b78..e9f5cd6 100644
--- a/src/setup/routes/test.rs
+++ b/src/setup/routes/test.rs
@@ -11,7 +11,7 @@ async fn fresh_instance() {
 
     // Call the endpoint
     let identity = fixtures::cookie::not_logged_in();
-    let (name, password) = fixtures::login::propose();
+    let (name, password) = fixtures::user::propose();
     let request = post::Request {
         name: name.clone(),
         password: password.clone(),
@@ -52,11 +52,11 @@ async fn login_exists() {
     // Set up the environment
 
     let app = fixtures::scratch_app().await;
-    fixtures::login::create(&app, &fixtures::now()).await;
+    fixtures::user::create(&app, &fixtures::now()).await;
 
     // Call the endpoint
     let identity = fixtures::cookie::not_logged_in();
-    let (name, password) = fixtures::login::propose();
+    let (name, password) = fixtures::user::propose();
     let request = post::Request { name, password };
     let post::Error(error) =
         post::handler(State(app.clone()), fixtures::now(), identity, Json(request))
@@ -76,8 +76,8 @@ async fn invalid_name() {
 
     // Call the endpoint
 
-    let name = fixtures::login::propose_invalid_name();
-    let password = fixtures::login::propose_password();
+    let name = fixtures::user::propose_invalid_name();
+    let password = fixtures::user::propose_password();
     let identity = fixtures::cookie::not_logged_in();
     let request = post::Request {
         name: name.clone(),