3 files changed, 6 insertions, 3 deletions
diff --git a/mingling_macros/src/dispatch_tree_gen.rs b/mingling_macros/src/dispatch_tree_gen.rs
index 66fb6e7..6b3efb9 100644
--- a/mingling_macros/src/dispatch_tree_gen.rs
+++ b/mingling_macros/src/dispatch_tree_gen.rs
@@ -1,3 +1,4 @@
+use just_fmt::snake_case;
 use proc_macro2::TokenStream;
 use quote::quote;
 use std::collections::BTreeMap;
@@ -7,7 +8,7 @@ pub fn gen_get_nodes(entries: &[(String, String, String)]) -> TokenStream {
     let mut node_entries = Vec::new();
 
     for (node_name, _disp_type, _entry_name) in entries {
-        let static_name_str = format!("__internal_dispatcher_{}", node_name.replace('.', "_"));
+        let static_name_str = format!("__internal_dispatcher_{}", snake_case!(node_name));
         let static_ident = syn::Ident::new(&static_name_str, proc_macro2::Span::call_site());
 
         let node_display_name = node_name.replace('.', " ");
diff --git a/mingling_macros/src/dispatcher.rs b/mingling_macros/src/dispatcher.rs
index 51dce95..36bdf31 100644
--- a/mingling_macros/src/dispatcher.rs
+++ b/mingling_macros/src/dispatcher.rs
@@ -1,3 +1,5 @@
+#[cfg(feature = "dispatch_tree")]
+use just_fmt::snake_case;
 use proc_macro::TokenStream;
 use proc_macro2::TokenStream as TokenStream2;
 use quote::quote;
@@ -215,7 +217,7 @@ pub fn register_dispatcher(input: TokenStream) -> TokenStream {
     } = syn::parse_macro_input!(input as RegisterDispatcherInput);
 
     let node_name_str = node_name.value();
-    let static_name = format!("__internal_dispatcher_{}", node_name_str.replace('.', "_"));
+    let static_name = format!("__internal_dispatcher_{}", snake_case!(node_name_str.clone()));
     let static_ident = Ident::new(&static_name, proc_macro2::Span::call_site());
 
     // Register node info in the global collection at compile time
diff --git a/mingling_macros/src/lib.rs b/mingling_macros/src/lib.rs
index 2622af0..d08e129 100644
--- a/mingling_macros/src/lib.rs
+++ b/mingling_macros/src/lib.rs
@@ -1458,7 +1458,7 @@ pub fn program_comp_gen(_input: TokenStream) -> TokenStream {
 
     #[cfg(feature = "dispatch_tree")]
     let internal_dispatcher_comp = quote! {
-        use __internal_completion_mod::__internal_dispatcher___comp;
+        use __internal_completion_mod::__internal_dispatcher_comp;
     };
 
     #[cfg(not(feature = "dispatch_tree"))]