diff --git a/mithril-common/src/logging.rs b/mithril-common/src/logging.rs
index 60fc5a7a08..fad33124a5 100644
--- a/mithril-common/src/logging.rs
+++ b/mithril-common/src/logging.rs
@@ -23,7 +23,14 @@ impl LoggerExtensions for Logger {
 
 fn component_name<T>() -> &'static str {
     let complete_name = std::any::type_name::<T>();
-    complete_name.split("::").last().unwrap_or(complete_name)
+    let without_generic = {
+        if complete_name.contains('<') {
+            complete_name.split('<').next().unwrap_or("")
+        } else {
+            complete_name
+        }
+    };
+    without_generic.split("::").last().unwrap_or(complete_name)
 }
 
 #[cfg(test)]
@@ -38,6 +45,10 @@ mod tests {
     struct TestStructWithLifetime<'a>(&'a str);
     enum TestEnum {}
 
+    struct TestStructWithGeneric<T> {
+        _phantom: std::marker::PhantomData<T>,
+    }
+
     mod test_mod {
         pub struct ScopedTestStruct;
         pub enum ScopedTestEnum {}
@@ -66,6 +77,14 @@ mod tests {
             component_name::<TestStructWithLifetime>(),
             "TestStructWithLifetime"
         );
+        assert_eq!(
+            component_name::<TestStructWithGeneric<test_mod::ScopedTestStruct>>(),
+            "TestStructWithGeneric"
+        );
+        assert_eq!(
+            component_name::<TestStructWithGeneric<&str>>(),
+            "TestStructWithGeneric"
+        );
     }
 
     #[test]