diff --git a/analyses/org.eclipse.tracecompass.incubator.tmf.ui.multiview.ui/src/org/eclipse/tracecompass/incubator/internal/tmf/ui/multiview/ui/view/timegraph/AbstractTimeGraphMultiViewer.java b/analyses/org.eclipse.tracecompass.incubator.tmf.ui.multiview.ui/src/org/eclipse/tracecompass/incubator/internal/tmf/ui/multiview/ui/view/timegraph/AbstractTimeGraphMultiViewer.java
index 68682562..86685774 100644
--- a/analyses/org.eclipse.tracecompass.incubator.tmf.ui.multiview.ui/src/org/eclipse/tracecompass/incubator/internal/tmf/ui/multiview/ui/view/timegraph/AbstractTimeGraphMultiViewer.java
+++ b/analyses/org.eclipse.tracecompass.incubator.tmf.ui.multiview.ui/src/org/eclipse/tracecompass/incubator/internal/tmf/ui/multiview/ui/view/timegraph/AbstractTimeGraphMultiViewer.java
@@ -90,8 +90,8 @@
 import org.eclipse.tracecompass.internal.provisional.tmf.core.model.filters.TraceCompassFilter;
 import org.eclipse.tracecompass.internal.tmf.ui.Activator;
 import org.eclipse.tracecompass.internal.tmf.ui.util.TimeGraphStyleUtil;
+import org.eclipse.tracecompass.tmf.core.model.CoreFilterProperty;
 import org.eclipse.tracecompass.tmf.core.model.ICoreElementResolver;
-import org.eclipse.tracecompass.tmf.core.model.timegraph.IFilterProperty;
 import org.eclipse.tracecompass.tmf.core.resources.ITmfMarker;
 import org.eclipse.tracecompass.tmf.core.signal.TmfDataModelSelectedSignal;
 import org.eclipse.tracecompass.tmf.core.signal.TmfMarkerEventSourceUpdatedSignal;
@@ -1904,7 +1904,7 @@ public void doRun() {
                     if (filterDialog.hasActiveSavedFilters()) {
                         computedLinks = Collections.emptyList();
                     } else {
-                        computedLinks.forEach(link -> link.setProperty(IFilterProperty.DIMMED, filterDialog.isFilterActive()));
+                        computedLinks.forEach(link -> link.setProperty(CoreFilterProperty.DIMMED, filterDialog.isFilterActive()));
                     }
                 }
             }
@@ -2043,7 +2043,7 @@ protected void doFilterEvents(TimeGraphEntry entry, List<ITimeEvent> eventList,
 
                     boolean status = value.test(toTest);
                     Integer property = mapEntry.getKey();
-                    if (property == IFilterProperty.DIMMED || property == IFilterProperty.EXCLUDE) {
+                    if (property == CoreFilterProperty.DIMMED || property == CoreFilterProperty.EXCLUDE) {
                         te.setProperty(property, !status);
                     } else {
                         te.setProperty(property, status);
@@ -2070,7 +2070,7 @@ && getTimeEventFilterDialog() != null && getTimeEventFilterDialog().hasActiveSav
             eventList.forEach(te -> {
                 // Keep only the events that do not have the 'exclude' property
                 // activated
-                if (!te.isPropertyActive(IFilterProperty.EXCLUDE)) {
+                if (!te.isPropertyActive(CoreFilterProperty.EXCLUDE)) {
                     filtered.add(te);
                 }
             });
@@ -2082,8 +2082,8 @@ && getTimeEventFilterDialog() != null && getTimeEventFilterDialog().hasActiveSav
             for (ITimeEvent event : filtered) {
                 if (prevTime < event.getTime()) {
                     NullTimeEvent nullTimeEvent = new NullTimeEvent(entry, prevTime, event.getTime() - prevTime);
-                    nullTimeEvent.setProperty(IFilterProperty.DIMMED, true);
-                    nullTimeEvent.setProperty(IFilterProperty.EXCLUDE, true);
+                    nullTimeEvent.setProperty(CoreFilterProperty.DIMMED, true);
+                    nullTimeEvent.setProperty(CoreFilterProperty.EXCLUDE, true);
                     eventList.add(nullTimeEvent);
                 }
                 eventList.add(event);
@@ -2091,8 +2091,8 @@ && getTimeEventFilterDialog() != null && getTimeEventFilterDialog().hasActiveSav
             }
             if (prevTime < endTime) {
                 NullTimeEvent nullTimeEvent = new NullTimeEvent(entry, prevTime, endTime - prevTime);
-                nullTimeEvent.setProperty(IFilterProperty.DIMMED, true);
-                nullTimeEvent.setProperty(IFilterProperty.EXCLUDE, true);
+                nullTimeEvent.setProperty(CoreFilterProperty.DIMMED, true);
+                nullTimeEvent.setProperty(CoreFilterProperty.EXCLUDE, true);
                 eventList.add(nullTimeEvent);
             }
         }
@@ -2390,13 +2390,13 @@ private void createContextMenu() {
         @NonNull
         String dialogRegex = fTimeEventFilterDialog != null ? fTimeEventFilterDialog.getTextBoxRegex() : ""; //$NON-NLS-1$
         if (!dialogRegex.isEmpty()) {
-            regexes.put(IFilterProperty.DIMMED, dialogRegex);
+            regexes.put(CoreFilterProperty.DIMMED, dialogRegex);
         }
 
         Set<@NonNull String> savedFilters = fTimeEventFilterDialog != null ? fTimeEventFilterDialog.getSavedFilters() : Collections.emptySet();
         for (String savedFilter : savedFilters) {
-            regexes.put(IFilterProperty.EXCLUDE, savedFilter);
-            regexes.put(IFilterProperty.DIMMED, savedFilter);
+            regexes.put(CoreFilterProperty.EXCLUDE, savedFilter);
+            regexes.put(CoreFilterProperty.DIMMED, savedFilter);
         }
 
         ITmfTrace trace = fTrace;
@@ -2407,7 +2407,7 @@ private void createContextMenu() {
         if (globalFilter == null) {
             return regexes;
         }
-        regexes.putAll(IFilterProperty.DIMMED, globalFilter.getRegexes());
+        regexes.putAll(CoreFilterProperty.DIMMED, globalFilter.getRegexes());
 
         return regexes;
     }
diff --git a/analyses/org.eclipse.tracecompass.incubator.tmf.ui.multiview.ui/src/org/eclipse/tracecompass/incubator/internal/tmf/ui/multiview/ui/view/timegraph/BaseDataProviderTimeGraphMultiViewer.java b/analyses/org.eclipse.tracecompass.incubator.tmf.ui.multiview.ui/src/org/eclipse/tracecompass/incubator/internal/tmf/ui/multiview/ui/view/timegraph/BaseDataProviderTimeGraphMultiViewer.java
index 7638ed24..83008f19 100644
--- a/analyses/org.eclipse.tracecompass.incubator.tmf.ui.multiview.ui/src/org/eclipse/tracecompass/incubator/internal/tmf/ui/multiview/ui/view/timegraph/BaseDataProviderTimeGraphMultiViewer.java
+++ b/analyses/org.eclipse.tracecompass.incubator.tmf.ui.multiview.ui/src/org/eclipse/tracecompass/incubator/internal/tmf/ui/multiview/ui/view/timegraph/BaseDataProviderTimeGraphMultiViewer.java
@@ -44,13 +44,13 @@
 import org.eclipse.tracecompass.tmf.core.dataprovider.DataProviderManager;
 import org.eclipse.tracecompass.tmf.core.dataprovider.DataProviderParameterUtils;
 import org.eclipse.tracecompass.tmf.core.event.lookup.TmfCallsite;
+import org.eclipse.tracecompass.tmf.core.model.CoreFilterProperty;
 import org.eclipse.tracecompass.tmf.core.model.IOutputElement;
 import org.eclipse.tracecompass.tmf.core.model.annotations.Annotation;
 import org.eclipse.tracecompass.tmf.core.model.annotations.AnnotationCategoriesModel;
 import org.eclipse.tracecompass.tmf.core.model.annotations.AnnotationModel;
-import org.eclipse.tracecompass.tmf.core.model.annotations.IOutputAnnotationProvider;
 import org.eclipse.tracecompass.tmf.core.model.annotations.IAnnotation.AnnotationType;
-import org.eclipse.tracecompass.tmf.core.model.timegraph.IFilterProperty;
+import org.eclipse.tracecompass.tmf.core.model.annotations.IOutputAnnotationProvider;
 import org.eclipse.tracecompass.tmf.core.model.timegraph.ITimeGraphArrow;
 import org.eclipse.tracecompass.tmf.core.model.timegraph.ITimeGraphDataProvider;
 import org.eclipse.tracecompass.tmf.core.model.timegraph.ITimeGraphRowModel;
@@ -489,7 +489,7 @@ protected List<ITimeEvent> createTimeEvents(TimeGraphEntry entry, List<ITimeGrap
                     // fill in the gap.
                     TimeEvent timeEvent = new TimeEvent(entry, prevEnd, event.getTime() - prevEnd);
                     if (getTimeEventFilterDialog() != null && getTimeEventFilterDialog().isFilterActive()) {
-                        timeEvent.setProperty(IFilterProperty.DIMMED, true);
+                        timeEvent.setProperty(CoreFilterProperty.DIMMED, true);
                     }
                     events.add(timeEvent);
                 }
diff --git a/callstack/org.eclipse.tracecompass.incubator.callstack.ui/src/org/eclipse/tracecompass/incubator/internal/callstack/ui/flamegraph/FlameGraphView.java b/callstack/org.eclipse.tracecompass.incubator.callstack.ui/src/org/eclipse/tracecompass/incubator/internal/callstack/ui/flamegraph/FlameGraphView.java
index 8d6a48d0..7daf2c15 100644
--- a/callstack/org.eclipse.tracecompass.incubator.callstack.ui/src/org/eclipse/tracecompass/incubator/internal/callstack/ui/flamegraph/FlameGraphView.java
+++ b/callstack/org.eclipse.tracecompass.incubator.callstack.ui/src/org/eclipse/tracecompass/incubator/internal/callstack/ui/flamegraph/FlameGraphView.java
@@ -87,9 +87,9 @@
 import org.eclipse.tracecompass.tmf.core.analysis.IAnalysisModule;
 import org.eclipse.tracecompass.tmf.core.dataprovider.DataProviderManager;
 import org.eclipse.tracecompass.tmf.core.dataprovider.DataProviderParameterUtils;
+import org.eclipse.tracecompass.tmf.core.model.CoreFilterProperty;
 import org.eclipse.tracecompass.tmf.core.model.IOutputElement;
 import org.eclipse.tracecompass.tmf.core.model.filters.SelectionTimeQueryFilter;
-import org.eclipse.tracecompass.tmf.core.model.timegraph.IFilterProperty;
 import org.eclipse.tracecompass.tmf.core.model.timegraph.ITimeGraphDataProvider;
 import org.eclipse.tracecompass.tmf.core.model.timegraph.ITimeGraphRowModel;
 import org.eclipse.tracecompass.tmf.core.model.timegraph.ITimeGraphState;
@@ -801,7 +801,7 @@ private void zoomEntries(@NonNull Iterable<@NonNull TimeGraphEntry> entries, lon
         if (globalFilter == null) {
             return regexes;
         }
-        regexes.putAll(IFilterProperty.DIMMED, globalFilter.getRegexes());
+        regexes.putAll(CoreFilterProperty.DIMMED, globalFilter.getRegexes());
 
         return regexes;
     }