diff --git a/src/MAUI/Maui.Samples/Samples/Layers/AddDynamicEntityLayer/AddDynamicEntityLayer.xaml.cs b/src/MAUI/Maui.Samples/Samples/Layers/AddDynamicEntityLayer/AddDynamicEntityLayer.xaml.cs
index 4a34e08002..15ca82aa0a 100644
--- a/src/MAUI/Maui.Samples/Samples/Layers/AddDynamicEntityLayer/AddDynamicEntityLayer.xaml.cs
+++ b/src/MAUI/Maui.Samples/Samples/Layers/AddDynamicEntityLayer/AddDynamicEntityLayer.xaml.cs
@@ -28,7 +28,7 @@ namespace ArcGIS.Samples.AddDynamicEntityLayer
         tags: new[] { "data", "dynamic", "entity", "live", "purge", "real-time", "service", "stream", "track" })]
     public partial class AddDynamicEntityLayer
     {
-        // This envelope is a limited region around Sandy, Utah. It will be the extent used by the `DynamicEntityFilter`.
+        // This envelope is a limited region around Sandy, Utah. It will be the extent used by the ArcGISStreamServiceFilter.
         private Envelope _utahSandyEnvelope = new Envelope(new MapPoint(-112.110052, 40.718083, SpatialReferences.Wgs84), new MapPoint(-111.814782, 40.535247, SpatialReferences.Wgs84));
 
         private ArcGISStreamService _dynamicEntityDataSource;
diff --git a/src/MAUI/Maui.Samples/Samples/Layers/AddDynamicEntityLayer/readme.md b/src/MAUI/Maui.Samples/Samples/Layers/AddDynamicEntityLayer/readme.md
index f21117b4ca..ec8696ee20 100644
--- a/src/MAUI/Maui.Samples/Samples/Layers/AddDynamicEntityLayer/readme.md
+++ b/src/MAUI/Maui.Samples/Samples/Layers/AddDynamicEntityLayer/readme.md
@@ -26,9 +26,9 @@ Use the controls to connect to or disconnect from the stream service, modify dis
 ## Relevant API
 
 * ArcGISStreamService
+* ArcGISStreamServiceFilter
 * ConnectionStatus
 * DynamicEntity
-* DynamicEntityFilter
 * DynamicEntityLayer
 * DynamicEntityPurgeOptions
 * TrackDisplayProperties
diff --git a/src/MAUI/Maui.Samples/Samples/Layers/AddDynamicEntityLayer/readme.metadata.json b/src/MAUI/Maui.Samples/Samples/Layers/AddDynamicEntityLayer/readme.metadata.json
index b1e7354e8f..b3e8029e52 100644
--- a/src/MAUI/Maui.Samples/Samples/Layers/AddDynamicEntityLayer/readme.metadata.json
+++ b/src/MAUI/Maui.Samples/Samples/Layers/AddDynamicEntityLayer/readme.metadata.json
@@ -23,9 +23,9 @@
     ],
     "relevant_apis": [
         "ArcGISStreamService",
+        "ArcGISStreamServiceFilter",
         "ConnectionStatus",
         "DynamicEntity",
-        "DynamicEntityFilter",
         "DynamicEntityLayer",
         "DynamicEntityPurgeOptions",
         "TrackDisplayProperties"
diff --git a/src/WPF/WPF.Viewer/Samples/Layers/AddDynamicEntityLayer/AddDynamicEntityLayer.xaml.cs b/src/WPF/WPF.Viewer/Samples/Layers/AddDynamicEntityLayer/AddDynamicEntityLayer.xaml.cs
index 208b3049a5..9a3ad3f997 100644
--- a/src/WPF/WPF.Viewer/Samples/Layers/AddDynamicEntityLayer/AddDynamicEntityLayer.xaml.cs
+++ b/src/WPF/WPF.Viewer/Samples/Layers/AddDynamicEntityLayer/AddDynamicEntityLayer.xaml.cs
@@ -27,7 +27,7 @@ namespace ArcGIS.WPF.Samples.AddDynamicEntityLayer
         tags: new[] { "data", "dynamic", "entity", "live", "purge", "real-time", "service", "stream", "track" })]
     public partial class AddDynamicEntityLayer
     {
-        // This envelope is a limited region around Sandy, Utah. It will be the extent used by the `DynamicEntityFilter`.
+        // This envelope is a limited region around Sandy, Utah. It will be the extent used by the ArcGISStreamServiceFilter.
         private Envelope _utahSandyEnvelope = new Envelope(new MapPoint(-112.110052, 40.718083, SpatialReferences.Wgs84), new MapPoint(-111.814782, 40.535247, SpatialReferences.Wgs84));
 
         private ArcGISStreamService _dynamicEntityDataSource;
diff --git a/src/WPF/WPF.Viewer/Samples/Layers/AddDynamicEntityLayer/readme.md b/src/WPF/WPF.Viewer/Samples/Layers/AddDynamicEntityLayer/readme.md
index 126ffe385f..455bb6b7c6 100644
--- a/src/WPF/WPF.Viewer/Samples/Layers/AddDynamicEntityLayer/readme.md
+++ b/src/WPF/WPF.Viewer/Samples/Layers/AddDynamicEntityLayer/readme.md
@@ -26,9 +26,9 @@ Use the controls to connect to or disconnect from the stream service, modify dis
 ## Relevant API
 
 * ArcGISStreamService
+* ArcGISStreamServiceFilter
 * ConnectionStatus
 * DynamicEntity
-* DynamicEntityFilter
 * DynamicEntityLayer
 * DynamicEntityPurgeOptions
 * TrackDisplayProperties
diff --git a/src/WPF/WPF.Viewer/Samples/Layers/AddDynamicEntityLayer/readme.metadata.json b/src/WPF/WPF.Viewer/Samples/Layers/AddDynamicEntityLayer/readme.metadata.json
index b3e1d88ea1..37dd01c2ce 100644
--- a/src/WPF/WPF.Viewer/Samples/Layers/AddDynamicEntityLayer/readme.metadata.json
+++ b/src/WPF/WPF.Viewer/Samples/Layers/AddDynamicEntityLayer/readme.metadata.json
@@ -23,9 +23,9 @@
     ],
     "relevant_apis": [
         "ArcGISStreamService",
+        "ArcGISStreamServiceFilter",
         "ConnectionStatus",
         "DynamicEntity",
-        "DynamicEntityFilter",
         "DynamicEntityLayer",
         "DynamicEntityPurgeOptions",
         "TrackDisplayProperties"
diff --git a/src/WinUI/ArcGIS.WinUI.Viewer/Samples/Layers/AddDynamicEntityLayer/AddDynamicEntityLayer.xaml.cs b/src/WinUI/ArcGIS.WinUI.Viewer/Samples/Layers/AddDynamicEntityLayer/AddDynamicEntityLayer.xaml.cs
index 9393626a0d..af420c02a3 100644
--- a/src/WinUI/ArcGIS.WinUI.Viewer/Samples/Layers/AddDynamicEntityLayer/AddDynamicEntityLayer.xaml.cs
+++ b/src/WinUI/ArcGIS.WinUI.Viewer/Samples/Layers/AddDynamicEntityLayer/AddDynamicEntityLayer.xaml.cs
@@ -28,7 +28,7 @@ namespace ArcGIS.WinUI.Samples.AddDynamicEntityLayer
         tags: new[] { "data", "dynamic", "entity", "live", "purge", "real-time", "service", "stream", "track" })]
     public partial class AddDynamicEntityLayer
     {
-        // This envelope is a limited region around Sandy, Utah. It will be the extent used by the `DynamicEntityFilter`.
+        // This envelope is a limited region around Sandy, Utah. It will be the extent used by the ArcGISStreamServiceFilter.
         private Envelope _utahSandyEnvelope = new Envelope(new MapPoint(-112.110052, 40.718083, SpatialReferences.Wgs84), new MapPoint(-111.814782, 40.535247, SpatialReferences.Wgs84));
 
         private ArcGISStreamService _dynamicEntityDataSource;
diff --git a/src/WinUI/ArcGIS.WinUI.Viewer/Samples/Layers/AddDynamicEntityLayer/readme.md b/src/WinUI/ArcGIS.WinUI.Viewer/Samples/Layers/AddDynamicEntityLayer/readme.md
index 126ffe385f..455bb6b7c6 100644
--- a/src/WinUI/ArcGIS.WinUI.Viewer/Samples/Layers/AddDynamicEntityLayer/readme.md
+++ b/src/WinUI/ArcGIS.WinUI.Viewer/Samples/Layers/AddDynamicEntityLayer/readme.md
@@ -26,9 +26,9 @@ Use the controls to connect to or disconnect from the stream service, modify dis
 ## Relevant API
 
 * ArcGISStreamService
+* ArcGISStreamServiceFilter
 * ConnectionStatus
 * DynamicEntity
-* DynamicEntityFilter
 * DynamicEntityLayer
 * DynamicEntityPurgeOptions
 * TrackDisplayProperties
diff --git a/src/WinUI/ArcGIS.WinUI.Viewer/Samples/Layers/AddDynamicEntityLayer/readme.metadata.json b/src/WinUI/ArcGIS.WinUI.Viewer/Samples/Layers/AddDynamicEntityLayer/readme.metadata.json
index af8ba2d76c..0f5f6c541f 100644
--- a/src/WinUI/ArcGIS.WinUI.Viewer/Samples/Layers/AddDynamicEntityLayer/readme.metadata.json
+++ b/src/WinUI/ArcGIS.WinUI.Viewer/Samples/Layers/AddDynamicEntityLayer/readme.metadata.json
@@ -23,9 +23,9 @@
     ],
     "relevant_apis": [
         "ArcGISStreamService",
+        "ArcGISStreamServiceFilter",
         "ConnectionStatus",
         "DynamicEntity",
-        "DynamicEntityFilter",
         "DynamicEntityLayer",
         "DynamicEntityPurgeOptions",
         "TrackDisplayProperties"