diff --git a/build.rs b/build.rs
index accf469..6fca13e 100644
--- a/build.rs
+++ b/build.rs
@@ -21,8 +21,10 @@ fn setup_tracepoints() {
     // drawing events
     draw_class.instantiate("draw_entry");
     draw_class.instantiate("draw_exit");
-    draw_class.instantiate("draw_days_entry");
-    draw_class.instantiate("draw_days_exit");
+    draw_class.instantiate("draw_calendar_entry");
+    draw_class.instantiate("draw_calendar_exit");
+    draw_class.instantiate("draw_events_entry");
+    draw_class.instantiate("draw_events_exit");
 
     // class for application events
     let app_class = provider.create_class("app");
diff --git a/src/ui/calendar.rs b/src/ui/calendar.rs
index ecc9626..cf03ad0 100644
--- a/src/ui/calendar.rs
+++ b/src/ui/calendar.rs
@@ -123,7 +123,7 @@ fn render_events_in_row<Renderer>(
     }
 
     #[cfg(feature = "tracing")]
-    tracepoints::calendar::draw_days_entry(row_bounds.width as i32, row_bounds.height as i32);
+    tracepoints::calendar::draw_events_entry(row_bounds.width as i32, row_bounds.height as i32);
 
     #[derive(Debug)]
     struct EventBar<'a> {
@@ -244,7 +244,7 @@ fn render_events_in_row<Renderer>(
         }
     }
     #[cfg(feature = "tracing")]
-    tracepoints::calendar::draw_days_exit(row_bounds.width as i32, row_bounds.height as i32);
+    tracepoints::calendar::draw_events_exit(row_bounds.width as i32, row_bounds.height as i32);
 }
 
 
@@ -649,6 +649,9 @@ where
         let bounds = layout.bounds();
         let margin: f32 = 20.0;
 
+	    #[cfg(feature = "tracing")]
+	    tracepoints::calendar::draw_calendar_entry(bounds.width as i32, bounds.height as i32);
+
         // side column only visible if there is enough space
         let sidebar_width = self.get_sidebar_width(renderer, bounds.size());
 
@@ -697,6 +700,8 @@ where
                 height,
             },
         );
+    #[cfg(feature = "tracing")]
+    tracepoints::calendar::draw_calendar_exit(bounds.width as i32, bounds.height as i32);
     }
 }