diff --git a/crates/tuono/src/source_builder.rs b/crates/tuono/src/source_builder.rs
index 25d09472..195a5295 100644
--- a/crates/tuono/src/source_builder.rs
+++ b/crates/tuono/src/source_builder.rs
@@ -85,17 +85,17 @@ fn create_routes_declaration(routes: &HashMap<String, Route>) -> String {
 
             if !route.is_api() {
                 route_declarations.push_str(&format!(
-                    r#".route("{axum_route}", get({module_import}::tuono__internal__route))"#
+                    r#".route("{axum_route}", get({module_import}::tuono_internal_route))"#
                 ));
 
                 route_declarations.push_str(&format!(
-                    r#".route("/__tuono/data{axum_route}", get({module_import}::tuono__internal__api))"#
+                    r#".route("/__tuono/data{axum_route}", get({module_import}::tuono_internal_api))"#
                 ));
             } else {
                 for method in route.api_data.as_ref().unwrap().methods.clone() {
                     let method = method.to_string().to_lowercase();
                     route_declarations.push_str(&format!(
-                        r#".route("{axum_route}", {method}({module_import}::{method}__tuono_internal_api))"#
+                        r#".route("{axum_route}", {method}({module_import}::{method}_tuono_internal_api))"#
                     ));
                 }
             }
diff --git a/crates/tuono/tests/cli_build.rs b/crates/tuono/tests/cli_build.rs
index 9b18b4ae..92e4a70d 100644
--- a/crates/tuono/tests/cli_build.rs
+++ b/crates/tuono/tests/cli_build.rs
@@ -36,7 +36,7 @@ fn it_successfully_create_the_index_route() {
     assert!(temp_main_rs_content.contains("mod index;"));
 
     assert!(temp_main_rs_content
-        .contains(r#".route("/", get(index::tuono__internal__route)).route("/__tuono/data/", get(index::tuono__internal__api))"#));
+        .contains(r#".route("/", get(index::tuono_internal_route)).route("/__tuono/data/", get(index::tuono_internal_api))"#));
 }
 
 #[test]
@@ -64,7 +64,7 @@ fn it_successfully_create_an_api_route() {
     assert!(temp_main_rs_content.contains("mod api_health_check;"));
 
     assert!(temp_main_rs_content.contains(
-        r#".route("/api/health_check", post(api_health_check::post__tuono_internal_api))"#
+        r#".route("/api/health_check", post(api_health_check::post_tuono_internal_api))"#
     ));
 }
 
@@ -94,11 +94,10 @@ fn it_successfully_create_multiple_api_for_the_same_file() {
     assert!(temp_main_rs_content.contains("mod api_health_check;"));
 
     assert!(temp_main_rs_content.contains(
-        r#".route("/api/health_check", post(api_health_check::post__tuono_internal_api))"#
-    ));
-    assert!(temp_main_rs_content.contains(
-        r#".route("/api/health_check", get(api_health_check::get__tuono_internal_api))"#
+        r#".route("/api/health_check", post(api_health_check::post_tuono_internal_api))"#
     ));
+    assert!(temp_main_rs_content
+        .contains(r#".route("/api/health_check", get(api_health_check::get_tuono_internal_api))"#));
 }
 
 #[test]
@@ -129,19 +128,20 @@ fn it_successfully_create_catch_all_routes() {
     assert!(temp_main_rs_content.contains("mod dyn_catch_all_all_routes;"));
 
     assert!(temp_main_rs_content.contains(
-        r#".route("/api/*all_apis", post(api_dyn_catch_all_all_apis::post__tuono_internal_api))"#
+        r#".route("/api/*all_apis", post(api_dyn_catch_all_all_apis::post_tuono_internal_api))"#
     ));
 
     assert!(temp_main_rs_content.contains(
-        r#".route("/*all_routes", get(dyn_catch_all_all_routes::tuono__internal__route))"#
+        r#".route("/*all_routes", get(dyn_catch_all_all_routes::tuono_internal_route))"#
     ));
 
     assert!(temp_main_rs_content.contains(
-        r#".route("/*all_routes", get(dyn_catch_all_all_routes::tuono__internal__route))"#
+        r#".route("/*all_routes", get(dyn_catch_all_all_routes::tuono_internal_route))"#
     ));
 
-    assert!(temp_main_rs_content
-        .contains(r#".route("/__tuono/data/*all_routes", get(dyn_catch_all_all_routes::tuono__internal__api))"#));
+    assert!(temp_main_rs_content.contains(
+        r#".route("/__tuono/data/*all_routes", get(dyn_catch_all_all_routes::tuono_internal_api))"#
+    ));
 }
 
 #[test]
diff --git a/crates/tuono_lib/tests/utils/utils.rs b/crates/tuono_lib/tests/utils/utils.rs
index 2a78fd64..7f7a7872 100644
--- a/crates/tuono_lib/tests/utils/utils.rs
+++ b/crates/tuono_lib/tests/utils/utils.rs
@@ -7,9 +7,9 @@ use tempfile::{tempdir, TempDir};
 use tuono_lib::axum::routing::get;
 use tuono_lib::{axum::Router, tuono_internal_init_v8_platform, Mode, Server};
 
-use crate::utils::health_check::get__tuono_internal_api as health_check;
+use crate::utils::health_check::get_tuono_internal_api as health_check;
 use crate::utils::route as html_route;
-use crate::utils::route::tuono__internal__api as route_api;
+use crate::utils::route::tuono_internal_api as route_api;
 
 use std::sync::Once;
 
@@ -74,8 +74,8 @@ impl MockTuonoServer {
         );
 
         let router = Router::new()
-            .route("/", get(html_route::tuono__internal__route))
-            .route("/tuono/data", get(html_route::tuono__internal__api))
+            .route("/", get(html_route::tuono_internal_route))
+            .route("/tuono/data", get(html_route::tuono_internal_api))
             .route("/health_check", get(health_check))
             .route("/route-api", get(route_api));
 
diff --git a/crates/tuono_lib_macros/src/api.rs b/crates/tuono_lib_macros/src/api.rs
index 4ba987ec..b2acb63a 100644
--- a/crates/tuono_lib_macros/src/api.rs
+++ b/crates/tuono_lib_macros/src/api.rs
@@ -15,7 +15,7 @@ pub fn api_core(attrs: TokenStream, item: TokenStream) -> TokenStream {
         .to_lowercase();
 
     let api_fn_name = Ident::new(
-        &format!("{}__tuono_internal_api", http_method),
+        &format!("{}_tuono_internal_api", http_method),
         Span::call_site().into(),
     );
 
diff --git a/crates/tuono_lib_macros/src/handler.rs b/crates/tuono_lib_macros/src/handler.rs
index e253727a..5db5afb3 100644
--- a/crates/tuono_lib_macros/src/handler.rs
+++ b/crates/tuono_lib_macros/src/handler.rs
@@ -45,7 +45,7 @@ pub fn handler_core(_args: TokenStream, item: TokenStream) -> TokenStream {
 
         #item
 
-        pub async fn tuono__internal__route(
+        pub async fn tuono_internal_route(
             #axum_arguments
         ) -> impl tuono_lib::axum::response::IntoResponse {
 
@@ -59,7 +59,7 @@ pub fn handler_core(_args: TokenStream, item: TokenStream) -> TokenStream {
            #fn_name(req.clone(), #argument_names).await.render_to_string(req)
         }
 
-        pub async fn tuono__internal__api(
+        pub async fn tuono_internal_api(
             #axum_arguments
         ) -> impl tuono_lib::axum::response::IntoResponse {