2 files changed, 9 insertions, 9 deletions
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(),