2 files changed, 12 insertions, 29 deletions

diff --git a/mingling_macros/src/dispatcher.rs b/mingling_macros/src/dispatcher.rs
index 6223a81..3ca5d25 100644
--- a/mingling_macros/src/dispatcher.rs
+++ b/mingling_macros/src/dispatcher.rs
@@ -67,7 +67,7 @@ impl Parse for DispatcherChainInput {
 // Additionally, the token stream generation patterns are nearly identical between
 // the two main functions and could benefit from refactoring.
 
-pub fn dispatcher_chain(input: TokenStream) -> TokenStream {
+pub fn dispatcher(input: TokenStream) -> TokenStream {
     // Parse the input
     let dispatcher_input = syn::parse_macro_input!(input as DispatcherChainInput);
 
@@ -96,46 +96,29 @@ pub fn dispatcher_chain(input: TokenStream) -> TokenStream {
 
     let comp_entry = get_comp_entry(&pack);
 
-    let expanded = if use_default {
-        // For default case, use ThisProgram
-        quote! {
-            #[derive(Debug, Default)]
-            pub struct #command_struct;
-
-            ::mingling::macros::pack!(ThisProgram, #pack = Vec<String>);
-
-            #comp_entry
+    let expanded = {
+        let program_ident = if use_default {
+            Ident::new("ThisProgram", proc_macro2::Span::call_site())
+        } else {
+            group_name.clone()
+        };
 
-            impl ::mingling::Dispatcher<ThisProgram> for #command_struct {
-                fn node(&self) -> ::mingling::Node {
-                    ::mingling::macros::node!(#command_name_str)
-                }
-                fn begin(&self, args: Vec<String>) -> ::mingling::ChainProcess<ThisProgram> {
-                    #pack::new(args).to_chain()
-                }
-                fn clone_dispatcher(&self) -> Box<dyn ::mingling::Dispatcher<ThisProgram>> {
-                    Box::new(#command_struct)
-                }
-            }
-        }
-    } else {
-        // For explicit case, use the provided group_name
         quote! {
             #[derive(Debug, Default)]
             pub struct #command_struct;
 
-            ::mingling::macros::pack!(#group_name, #pack = Vec<String>);
+            ::mingling::macros::pack!(#program_ident, #pack = Vec<String>);
 
             #comp_entry
 
-            impl ::mingling::Dispatcher<#group_name> for #command_struct {
+            impl ::mingling::Dispatcher<#program_ident> for #command_struct {
                 fn node(&self) -> ::mingling::Node {
                     ::mingling::macros::node!(#command_name_str)
                 }
-                fn begin(&self, args: Vec<String>) -> ::mingling::ChainProcess<#group_name> {
+                fn begin(&self, args: Vec<String>) -> ::mingling::ChainProcess<#program_ident> {
                     #pack::new(args).to_chain()
                 }
-                fn clone_dispatcher(&self) -> Box<dyn ::mingling::Dispatcher<#group_name>> {
+                fn clone_dispatcher(&self) -> Box<dyn ::mingling::Dispatcher<#program_ident>> {
                     Box::new(#command_struct)
                 }
             }
diff --git a/mingling_macros/src/lib.rs b/mingling_macros/src/lib.rs
index 5ee53a1..5736578 100644
--- a/mingling_macros/src/lib.rs
+++ b/mingling_macros/src/lib.rs
@@ -55,7 +55,7 @@ pub fn pack(input: TokenStream) -> TokenStream {
 
 #[proc_macro]
 pub fn dispatcher(input: TokenStream) -> TokenStream {
-    dispatcher::dispatcher_chain(input)
+    dispatcher::dispatcher(input)
 }
 
 #[proc_macro]