3 files changed, 12 insertions, 12 deletions
diff --git a/src/test/verify/identity.rs b/src/test/verify/identity.rs
index 226ee74..8e2d36e 100644
--- a/src/test/verify/identity.rs
+++ b/src/test/verify/identity.rs
@@ -1,9 +1,9 @@
 use crate::{
     app::App,
+    login::Login,
     name::Name,
     test::{fixtures, verify},
     token::{app::ValidateError, extract::IdentityCookie},
-    user::User,
 };
 
 pub async fn valid_for_name(app: &App, identity: &IdentityCookie, name: &Name) {
@@ -13,11 +13,11 @@ pub async fn valid_for_name(app: &App, identity: &IdentityCookie, name: &Name) {
     verify::token::valid_for_name(app, &secret, name).await;
 }
 
-pub async fn valid_for_user(app: &App, identity: &IdentityCookie, user: &User) {
+pub async fn valid_for_login(app: &App, identity: &IdentityCookie, login: &Login) {
     let secret = identity
         .secret()
         .expect("identity cookie must be set to be valid");
-    verify::token::valid_for_user(app, &secret, user).await;
+    verify::token::valid_for_login(app, &secret, login).await;
 }
 
 pub async fn invalid(app: &App, identity: &IdentityCookie) {
diff --git a/src/test/verify/login.rs b/src/test/verify/login.rs
index 3f291a3..ae2e91e 100644
--- a/src/test/verify/login.rs
+++ b/src/test/verify/login.rs
@@ -1,15 +1,15 @@
 use crate::{
     app::App,
+    login::app::LoginError,
     name::Name,
     password::Password,
     test::{fixtures, verify},
-    token::app::LoginError,
 };
 
 pub async fn valid_login(app: &App, name: &Name, password: &Password) {
     let secret = app
-        .tokens()
-        .login(&name, &password, &fixtures::now())
+        .logins()
+        .with_password(name, password, &fixtures::now())
         .await
         .expect("login credentials expected to be valid");
     verify::token::valid_for_name(&app, &secret, &name).await;
@@ -17,8 +17,8 @@ pub async fn valid_login(app: &App, name: &Name, password: &Password) {
 
 pub async fn invalid_login(app: &App, name: &Name, password: &Password) {
     let error = app
-        .tokens()
-        .login(name, password, &fixtures::now())
+        .logins()
+        .with_password(name, password, &fixtures::now())
         .await
         .expect_err("login credentials expected not to be valid");
     assert!(matches!(error, LoginError::Rejected));
diff --git a/src/test/verify/token.rs b/src/test/verify/token.rs
index 99cd31f..adc4397 100644
--- a/src/test/verify/token.rs
+++ b/src/test/verify/token.rs
@@ -1,9 +1,9 @@
 use crate::{
     app::App,
+    login::Login,
     name::Name,
     test::fixtures,
     token::{Secret, app},
-    user::User,
 };
 
 pub async fn valid_for_name(app: &App, secret: &Secret, name: &Name) {
@@ -12,16 +12,16 @@ pub async fn valid_for_name(app: &App, secret: &Secret, name: &Name) {
         .validate(secret, &fixtures::now())
         .await
         .expect("provided secret is valid");
-    assert_eq!(name, &identity.user.name);
+    assert_eq!(name, &identity.login.name);
 }
 
-pub async fn valid_for_user(app: &App, secret: &Secret, user: &User) {
+pub async fn valid_for_login(app: &App, secret: &Secret, login: &Login) {
     let identity = app
         .tokens()
         .validate(secret, &fixtures::now())
         .await
         .expect("provided secret is valid");
-    assert_eq!(user, &identity.user);
+    assert_eq!(login, &identity.login);
 }
 
 pub async fn invalid(app: &App, secret: &Secret) {