diff --git a/macros/src/lib.rs b/macros/src/lib.rs
index e6ae2c8..b47d71e 100644
--- a/macros/src/lib.rs
+++ b/macros/src/lib.rs
@@ -134,7 +134,7 @@ pub(crate) fn parse_name(input: &ParseStream) -> parse::Result<(syn::Ident, Stri
         .map(|s| s.to_string())
         .collect::<Vec<_>>()
         .join(".");
-    let static_name = syn::Ident::new(&name.replace('.', "__"), name_span);
+    let static_name = syn::Ident::new(&strip_dots(&name), name_span);
 
     Ok((static_name, name, name_span))
 }
@@ -148,7 +148,7 @@ pub(crate) fn parse_expr_str(
     let expression_string: parse::Result<syn::LitStr> = input.parse();
 
     match (comma, expression_string) {
-        (Ok(_), Ok(expr)) => Ok(syn::LitStr::new(&strip_dots(&expr.value()), name_span)),
+        (Ok(_), Ok(expr)) => Ok(syn::LitStr::new(&expr.value(), name_span)),
         (Ok(_), Err(e)) => Err(e),
         (Err(_), _) => Ok(syn::LitStr::new(&strip_dots(name), name_span)),
     }
diff --git a/macros/src/metric.rs b/macros/src/metric.rs
index 903f864..8e9cc33 100644
--- a/macros/src/metric.rs
+++ b/macros/src/metric.rs
@@ -33,7 +33,7 @@ pub(crate) fn metric_helper(args: Args) -> TokenStream {
             #[unsafe(export_name = #sym_name)]
             #[allow(non_upper_case_globals)]
             static mut #static_name: (#ty, bool) =
-                (0, false);
+                (0 as _, false);
 
             #[allow(unsafe_code)]
             let used = unsafe { #static_name.1 };
diff --git a/macros/src/setting.rs b/macros/src/setting.rs
index ed88241..5209a66 100644
--- a/macros/src/setting.rs
+++ b/macros/src/setting.rs
@@ -30,7 +30,7 @@ pub(crate) fn make_setting(args: TokenStream) -> TokenStream {
             #[unsafe(export_name = #sym_name)]
             #[allow(non_upper_case_globals)]
             static mut #static_name: (#ty, bool) =
-                (0, false);
+                (0 as _, false);
 
             #[allow(unsafe_code)]
             let used = unsafe { #static_name.1 };