5 files changed, 14 insertions, 14 deletions
diff --git a/src/event/app.rs b/src/event/app.rs
index 8661c90..447a98f 100644
--- a/src/event/app.rs
+++ b/src/event/app.rs
@@ -8,9 +8,9 @@ use sqlx::sqlite::SqlitePool;
 use super::{Event, Sequence, Sequenced, broadcaster::Broadcaster};
 use crate::{
     channel::{self, repo::Provider as _},
-    login::{self, repo::Provider as _},
     message::{self, repo::Provider as _},
     name,
+    user::{self, repo::Provider as _},
 };
 
 pub struct Events<'a> {
@@ -33,10 +33,10 @@ impl<'a> Events<'a> {
 
         let mut tx = self.db.begin().await?;
 
-        let logins = tx.logins().replay(resume_at).await?;
+        let logins = tx.users().replay(resume_at).await?;
         let login_events = logins
             .iter()
-            .map(login::History::events)
+            .map(user::History::events)
             .kmerge_by(Sequence::merge)
             .filter(Sequence::after(resume_at))
             .map(Event::from);
@@ -88,9 +88,9 @@ pub enum Error {
     Name(#[from] name::Error),
 }
 
-impl From<login::repo::LoadError> for Error {
-    fn from(error: login::repo::LoadError) -> Self {
-        use login::repo::LoadError;
+impl From<user::repo::LoadError> for Error {
+    fn from(error: user::repo::LoadError) -> Self {
+        use user::repo::LoadError;
         match error {
             LoadError::Database(error) => error.into(),
             LoadError::Name(error) => error.into(),
diff --git a/src/event/mod.rs b/src/event/mod.rs
index 9996916..773adc3 100644
--- a/src/event/mod.rs
+++ b/src/event/mod.rs
@@ -1,4 +1,4 @@
-use crate::{channel, login, message};
+use crate::{channel, message, user};
 
 pub mod app;
 mod broadcaster;
@@ -16,7 +16,7 @@ pub use self::{
 #[derive(Clone, Debug, Eq, PartialEq, serde::Serialize)]
 #[serde(tag = "type", rename_all = "snake_case")]
 pub enum Event {
-    Login(login::Event),
+    Login(user::Event),
     Channel(channel::Event),
     Message(message::Event),
 }
@@ -31,8 +31,8 @@ impl Sequenced for Event {
     }
 }
 
-impl From<login::Event> for Event {
-    fn from(event: login::Event) -> Self {
+impl From<user::Event> for Event {
+    fn from(event: user::Event) -> Self {
         Self::Login(event)
     }
 }
diff --git a/src/event/routes/test/invite.rs b/src/event/routes/test/invite.rs
index 73af62d..80b4291 100644
--- a/src/event/routes/test/invite.rs
+++ b/src/event/routes/test/invite.rs
@@ -42,7 +42,7 @@ async fn accepting_invite() {
     let _ = events
         .filter_map(fixtures::event::login)
         .filter_map(fixtures::event::login::created)
-        .filter(|event| future::ready(event.login == joiner))
+        .filter(|event| future::ready(event.user == joiner))
         .next()
         .expect_some("a login created event is sent")
         .await;
@@ -83,7 +83,7 @@ async fn previously_accepted_invite() {
     let _ = events
         .filter_map(fixtures::event::login)
         .filter_map(fixtures::event::login::created)
-        .filter(|event| future::ready(event.login == joiner))
+        .filter(|event| future::ready(event.user == joiner))
         .next()
         .expect_some("a login created event is sent")
         .await;
diff --git a/src/event/routes/test/setup.rs b/src/event/routes/test/setup.rs
index 26b7ea7..345018e 100644
--- a/src/event/routes/test/setup.rs
+++ b/src/event/routes/test/setup.rs
@@ -43,7 +43,7 @@ async fn previously_completed() {
     let _ = events
         .filter_map(fixtures::event::login)
         .filter_map(fixtures::event::login::created)
-        .filter(|event| future::ready(event.login == owner))
+        .filter(|event| future::ready(event.user == owner))
         .next()
         .expect_some("a login created event is sent")
         .await;
diff --git a/src/event/routes/test/token.rs b/src/event/routes/test/token.rs
index fa76865..d2232a4 100644
--- a/src/event/routes/test/token.rs
+++ b/src/event/routes/test/token.rs
@@ -129,7 +129,7 @@ async fn terminates_on_password_change() {
     let (_, password) = creds;
     let to = fixtures::login::propose_password();
     app.tokens()
-        .change_password(&subscriber.login, &password, &to, &fixtures::now())
+        .change_password(&subscriber.user, &password, &to, &fixtures::now())
         .await
         .expect("expiring tokens succeeds");