diff --git a/Cargo.toml b/Cargo.toml
index a259bc4..6233a1c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -2,7 +2,7 @@
 name = "near-account-id"
 version = "2.5.0"
 authors = ["Near Inc <hello@nearprotocol.com>"]
-edition = "2021"
+edition = "2024"
 description = "This crate contains the Account ID primitive and its validation facilities"
 repository = "https://github.com/near/near-account-id"
 license = "MIT OR Apache-2.0"
diff --git a/src/account_id.rs b/src/account_id.rs
index ec34ffa..035bc52 100644
--- a/src/account_id.rs
+++ b/src/account_id.rs
@@ -350,7 +350,7 @@ impl schemars_v0_8::JsonSchema for AccountId {
         "AccountId".to_string()
     }
 
-    fn json_schema(_: &mut schemars_v0_8::gen::SchemaGenerator) -> schemars_v0_8::schema::Schema {
+    fn json_schema(_: &mut schemars_v0_8::r#gen::SchemaGenerator) -> schemars_v0_8::schema::Schema {
         use schemars_v0_8::schema::{InstanceType, Metadata, Schema, SchemaObject, SingleOrVec};
         Schema::Object(SchemaObject {
             instance_type: Some(SingleOrVec::Single(Box::new(InstanceType::String))),
diff --git a/src/account_id_ref.rs b/src/account_id_ref.rs
index b8a8ace..8006dc4 100644
--- a/src/account_id_ref.rs
+++ b/src/account_id_ref.rs
@@ -486,7 +486,7 @@ impl schemars_v0_8::JsonSchema for AccountIdRef {
         "AccountIdRef".to_string()
     }
 
-    fn json_schema(_: &mut schemars_v0_8::gen::SchemaGenerator) -> schemars_v0_8::schema::Schema {
+    fn json_schema(_: &mut schemars_v0_8::r#gen::SchemaGenerator) -> schemars_v0_8::schema::Schema {
         use schemars_v0_8::schema::{InstanceType, Metadata, Schema, SchemaObject, SingleOrVec};
         Schema::Object(SchemaObject {
             instance_type: Some(SingleOrVec::Single(Box::new(InstanceType::String))),