diff --git a/samples/core/dymaptic.GeoBlazor.Core.Sample.Shared/Pages/CSVLayers.razor b/samples/core/dymaptic.GeoBlazor.Core.Sample.Shared/Pages/CSVLayers.razor
index 690bcb8..8d5110f 100644
--- a/samples/core/dymaptic.GeoBlazor.Core.Sample.Shared/Pages/CSVLayers.razor
+++ b/samples/core/dymaptic.GeoBlazor.Core.Sample.Shared/Pages/CSVLayers.razor
@@ -28,7 +28,7 @@
                     <FieldInfo FieldName="wmo_wind" Label="Wind Speed (mph)"/>
                 </FieldsContent>
                 <FieldInfo FieldName="ISO_time">
-                    <FieldInfoFormat DateFormat="FieldInfoFormatDateFormat.ShortDateShortTime"/>
+                    <FieldInfoFormat DateFormat="DateFormat.ShortDateShortTime"/>
                 </FieldInfo>
             </PopupTemplate>
             <UniqueValueRenderer Field="Category">
diff --git a/samples/core/dymaptic.GeoBlazor.Core.Sample.Shared/Pages/GeoJSONLayers.razor b/samples/core/dymaptic.GeoBlazor.Core.Sample.Shared/Pages/GeoJSONLayers.razor
index ae4874e..68c813f 100644
--- a/samples/core/dymaptic.GeoBlazor.Core.Sample.Shared/Pages/GeoJSONLayers.razor
+++ b/samples/core/dymaptic.GeoBlazor.Core.Sample.Shared/Pages/GeoJSONLayers.razor
@@ -52,7 +52,7 @@
                         <FieldInfo FieldName="type" Label="Type" />
                         <FieldInfo FieldName="place" Label="Location" />
                         <FieldInfo FieldName="time" Label="Time">
-                            <FieldInfoFormat DateFormat="@FieldInfoFormatDateFormat.ShortDateShortTime" />
+                            <FieldInfoFormat DateFormat="@DateFormat.ShortDateShortTime" />
                         </FieldInfo>
                     </FieldsContent>               
                 </PopupTemplate>
diff --git a/samples/core/dymaptic.GeoBlazor.Core.Sample.Shared/Pages/Popups.razor b/samples/core/dymaptic.GeoBlazor.Core.Sample.Shared/Pages/Popups.razor
index 2b0139b..f501137 100644
--- a/samples/core/dymaptic.GeoBlazor.Core.Sample.Shared/Pages/Popups.razor
+++ b/samples/core/dymaptic.GeoBlazor.Core.Sample.Shared/Pages/Popups.razor
@@ -58,13 +58,13 @@
                 <PopupTemplate Title="{PARK_NAME}">
                     <FieldsContent>
                         <FieldInfo FieldName="AGNCY_NAME" Label="Agency" IsEditable="true" Tooltip="" Visible="true"
-                                   StringFieldOption="FieldInfoStringFieldOption.TextBox" />
+                                   StringFieldOption="StringFieldOption.TextBox" />
                         <FieldInfo FieldName="TYPE" Label="Type" IsEditable="true" Tooltip="" Visible="true"
-                                   StringFieldOption="FieldInfoStringFieldOption.TextBox" />
+                                   StringFieldOption="StringFieldOption.TextBox" />
                         <FieldInfo FieldName="ACCESS_TYP" Label="Access" IsEditable="true" Tooltip="" Visible="true"
-                                   StringFieldOption="FieldInfoStringFieldOption.TextBox" />
+                                   StringFieldOption="StringFieldOption.TextBox" />
                         <FieldInfo FieldName="GIS_ACRES" Label="Acres" IsEditable="true" Tooltip="" Visible="true"
-                                   StringFieldOption="FieldInfoStringFieldOption.TextBox">
+                                   StringFieldOption="StringFieldOption.TextBox">
                             <FieldInfoFormat Places="2" DigitSeparator="true" />
                         </FieldInfo>
                     </FieldsContent>
diff --git a/samples/core/dymaptic.GeoBlazor.Core.Sample.Shared/Pages/WCSLayers.razor b/samples/core/dymaptic.GeoBlazor.Core.Sample.Shared/Pages/WCSLayers.razor
index f470599..ca6a2a5 100644
--- a/samples/core/dymaptic.GeoBlazor.Core.Sample.Shared/Pages/WCSLayers.razor
+++ b/samples/core/dymaptic.GeoBlazor.Core.Sample.Shared/Pages/WCSLayers.razor
@@ -33,13 +33,13 @@
                            NumberOfStandardDeviations="3"
                            CustomStatistics="@([_wcsLayerStatistics])">
         <MultipartColorRamp>
-            <AlgorithmicColorRamp Algorithm="ColorRampAlgorithm.Hsv" 
+            <AlgorithmicColorRamp Algorithm="Algorithm.Hsv" 
                                   FromColor="@(new MapColor(0, 0, 255))" 
                                   ToColor="@(new MapColor(0, 255, 255))" />
-            <AlgorithmicColorRamp Algorithm="ColorRampAlgorithm.Hsv" 
+            <AlgorithmicColorRamp Algorithm="Algorithm.Hsv" 
                                   FromColor="@(new MapColor(0, 255, 255))" 
                                   ToColor="@(new MapColor(255, 255, 0))" />
-            <AlgorithmicColorRamp Algorithm="ColorRampAlgorithm.Hsv" 
+            <AlgorithmicColorRamp Algorithm="Algorithm.Hsv" 
                                   FromColor="@(new MapColor(255, 255, 0))" 
                                   ToColor="@(new MapColor(255, 0, 0))" />
         </MultipartColorRamp>
diff --git a/samples/pro/dymaptic.GeoBlazor.Pro.Sample.Shared/Pages/ApplyEdits.razor b/samples/pro/dymaptic.GeoBlazor.Pro.Sample.Shared/Pages/ApplyEdits.razor
index b6144ef..0fb8747 100644
--- a/samples/pro/dymaptic.GeoBlazor.Pro.Sample.Shared/Pages/ApplyEdits.razor
+++ b/samples/pro/dymaptic.GeoBlazor.Pro.Sample.Shared/Pages/ApplyEdits.razor
@@ -21,7 +21,7 @@
     @if (_featureLayer is not null)
     {
         <FeatureFormWidget @ref="_form" LayerId="@_featureLayer!.Id"
-                           GroupDisplay="FeatureFormGroupDisplay.Sequential" ContainerId="formDiv"
+                           GroupDisplay="GroupDisplay.Sequential" ContainerId="formDiv"
                            OnSubmit="OnFormSubmit">
             <FormTemplate Title="Enter the incident number">
                 <FieldElement FieldName="IncidentType" Label="Choose incident type" />
diff --git a/samples/pro/dymaptic.GeoBlazor.Pro.Sample.Shared/Pages/Binning.razor b/samples/pro/dymaptic.GeoBlazor.Pro.Sample.Shared/Pages/Binning.razor
index 1d11201..48c70ba 100644
--- a/samples/pro/dymaptic.GeoBlazor.Pro.Sample.Shared/Pages/Binning.razor
+++ b/samples/pro/dymaptic.GeoBlazor.Pro.Sample.Shared/Pages/Binning.razor
@@ -25,7 +25,7 @@
                       DefinitionExpression="@($"CRASH_DATE > Date '12-31-{_year - 1}' AND CRASH_DATE < Date '01-01-{_year + 1}'")">
             <PopupTemplate Title="Crash location">
                 <FieldInfo FieldName="CRASH_DATE" Label="Date">
-                    <FieldInfoFormat DateFormat="FieldInfoFormatDateFormat.DayShortMonthYearLongTime" />
+                    <FieldInfoFormat DateFormat="DateFormat.DayShortMonthYearLongTime" />
                 </FieldInfo>
                 <FieldInfo FieldName="NUMBER_OF_PERSONS_KILLED" Label="Fatalities" />
                 <FieldInfo FieldName="NUMBER_OF_PERSONS_INJURED" Label="Injuries" />
diff --git a/samples/pro/dymaptic.GeoBlazor.Pro.Sample.Shared/Pages/Clustering.razor b/samples/pro/dymaptic.GeoBlazor.Pro.Sample.Shared/Pages/Clustering.razor
index eb03854..23d53ec 100644
--- a/samples/pro/dymaptic.GeoBlazor.Pro.Sample.Shared/Pages/Clustering.razor
+++ b/samples/pro/dymaptic.GeoBlazor.Pro.Sample.Shared/Pages/Clustering.razor
@@ -25,7 +25,7 @@
             <PopupTemplate Title="Magnitude {mag} {type}"
                            StringContent="Magnitude {mag} {type} hit {place} on {time}">
                 <FieldInfo FieldName="time">
-                    <FieldInfoFormat DateFormat="FieldInfoFormatDateFormat.ShortDateShortTime"/>
+                    <FieldInfoFormat DateFormat="DateFormat.ShortDateShortTime"/>
                 </FieldInfo>
             </PopupTemplate>
             <SimpleRenderer>
diff --git a/samples/pro/dymaptic.GeoBlazor.Pro.Sample.Shared/Pages/HighlightFeaturesByGeometry.razor b/samples/pro/dymaptic.GeoBlazor.Pro.Sample.Shared/Pages/HighlightFeaturesByGeometry.razor
index bcb7359..af1ac61 100644
--- a/samples/pro/dymaptic.GeoBlazor.Pro.Sample.Shared/Pages/HighlightFeaturesByGeometry.razor
+++ b/samples/pro/dymaptic.GeoBlazor.Pro.Sample.Shared/Pages/HighlightFeaturesByGeometry.razor
@@ -46,7 +46,7 @@
                   Layer="@_polygonGraphicsLayer"
                   AvailableCreateTools="@([AvailableCreateTool.Rectangle])"
                   UpdateOnGraphicClick="false"
-                  CreationMode="SketchCreationMode.Single"
+                  CreationMode="CreationMode.Single"
                   OnCreate="OnSketchCreate"
                   HideSelectionToolsLassoSelection="true"
                   HideSelectionToolsRectangleSelection="true"
diff --git a/samples/pro/dymaptic.GeoBlazor.Pro.Sample.Shared/Pages/ImageryGroupBlend.razor b/samples/pro/dymaptic.GeoBlazor.Pro.Sample.Shared/Pages/ImageryGroupBlend.razor
index b5009c3..d21cdc4 100644
--- a/samples/pro/dymaptic.GeoBlazor.Pro.Sample.Shared/Pages/ImageryGroupBlend.razor
+++ b/samples/pro/dymaptic.GeoBlazor.Pro.Sample.Shared/Pages/ImageryGroupBlend.razor
@@ -123,7 +123,7 @@
             && _layer!.Renderer == null && !_rendererAdded)
         {
             _rendererAdded = true;
-            await _layer.SetRenderer(new RasterStretchRenderer(new AlgorithmicColorRamp(ColorRampAlgorithm.CieLab,
+            await _layer.SetRenderer(new RasterStretchRenderer(new AlgorithmicColorRamp(Algorithm.CieLab,
                 new MapColor(0, 0, 0, 0), new MapColor(0, 0, 0, 1)),
                 stretchType: _stretchType, 
                 customStatistics: [new RasterBandStatistics(Min: 120, Max: 3068, Avg: 400, Stddev: 700)]));
@@ -140,14 +140,14 @@
         switch (_stretchType)
         {
             case RendererStretchType.MinMax:
-                newRenderer = new RasterStretchRenderer(new AlgorithmicColorRamp(ColorRampAlgorithm.CieLab,
+                newRenderer = new RasterStretchRenderer(new AlgorithmicColorRamp(Algorithm.CieLab,
                         new MapColor(0, 0, 0, 0), new MapColor(0, 0, 0, 1)),
                     stretchType: _stretchType, 
                     customStatistics: [new RasterBandStatistics(Avg: bandStat.Avg, Max: values[1], Min: values[0], Stddev: bandStat.Stddev)]);
 
                 break;
             default:
-                newRenderer = new RasterStretchRenderer(new AlgorithmicColorRamp(ColorRampAlgorithm.CieLab,
+                newRenderer = new RasterStretchRenderer(new AlgorithmicColorRamp(Algorithm.CieLab,
                         new MapColor(0, 0, 0, 0), new MapColor(0, 0, 0, 1)),
                     stretchType: _stretchType, 
                     customStatistics: [new RasterBandStatistics(Avg: bandStat.Avg, Max: bandStat.Max, Min: bandStat.Min, 
diff --git a/samples/pro/dymaptic.GeoBlazor.Pro.Sample.Shared/Pages/LengthAndArea.razor b/samples/pro/dymaptic.GeoBlazor.Pro.Sample.Shared/Pages/LengthAndArea.razor
index 317679b..ce8e065 100644
--- a/samples/pro/dymaptic.GeoBlazor.Pro.Sample.Shared/Pages/LengthAndArea.razor
+++ b/samples/pro/dymaptic.GeoBlazor.Pro.Sample.Shared/Pages/LengthAndArea.razor
@@ -44,7 +44,7 @@
                   OnCreate="OnSketchCreate"
                   OnUpdate="OnSketchUpdate"
                   AvailableCreateTools="@([AvailableCreateTool.Polyline, AvailableCreateTool.Polygon, AvailableCreateTool.Rectangle])"
-                  CreationMode="SketchCreationMode.Update" UpdateOnGraphicClick="true"
+                  CreationMode="CreationMode.Update" UpdateOnGraphicClick="true"
                   Layer="_graphicsLayer"
                   HideSettingsMenu="true"
                   HideUndoRedoMenu="true"
diff --git a/samples/pro/dymaptic.GeoBlazor.Pro.Sample.Shared/Pages/SearchCustomSource.razor b/samples/pro/dymaptic.GeoBlazor.Pro.Sample.Shared/Pages/SearchCustomSource.razor
index 67dd684..a1ac0b3 100644
--- a/samples/pro/dymaptic.GeoBlazor.Pro.Sample.Shared/Pages/SearchCustomSource.razor
+++ b/samples/pro/dymaptic.GeoBlazor.Pro.Sample.Shared/Pages/SearchCustomSource.razor
@@ -69,7 +69,7 @@
                 { "lat", _center.Latitude },
                 { "lon", _center.Longitude }
             },
-            ResponseType = RequestOptionsResponseType.Json
+            ResponseType = ResponseType.Json
         });
       
         return response.Data?.Features
@@ -101,7 +101,7 @@
         RequestResponse<QueryData> response = await Rest.Request<QueryData>(url, new RequestOptions
         {
             Query = query,
-            ResponseType = RequestOptionsResponseType.Json
+            ResponseType = ResponseType.Json
         });
 
         List<SearchResult> results = [];
diff --git a/samples/pro/dymaptic.GeoBlazor.Pro.Sample.Shared/Pages/SketchQuery.razor b/samples/pro/dymaptic.GeoBlazor.Pro.Sample.Shared/Pages/SketchQuery.razor
index 0947510..1df4e9f 100644
--- a/samples/pro/dymaptic.GeoBlazor.Pro.Sample.Shared/Pages/SketchQuery.razor
+++ b/samples/pro/dymaptic.GeoBlazor.Pro.Sample.Shared/Pages/SketchQuery.razor
@@ -27,7 +27,7 @@
         <GraphicsLayer @ref="_graphicsLayer" />
     </Map>
     <SketchWidget OnCreate="OnSketchCreate" OnUpdate="OnSketchUpdate" Position="OverlayPosition.TopRight"
-                  CreationMode="SketchCreationMode.Update"
+                  CreationMode="CreationMode.Update"
                   Layer="_graphicsLayer"
                   EventRateLimitInMilliseconds="1000"/>
 </MapView>
diff --git a/samples/pro/dymaptic.GeoBlazor.Pro.Sample.Shared/Pages/UpdateFeatureAttributes.razor b/samples/pro/dymaptic.GeoBlazor.Pro.Sample.Shared/Pages/UpdateFeatureAttributes.razor
index 5fff9d5..b509753 100644
--- a/samples/pro/dymaptic.GeoBlazor.Pro.Sample.Shared/Pages/UpdateFeatureAttributes.razor
+++ b/samples/pro/dymaptic.GeoBlazor.Pro.Sample.Shared/Pages/UpdateFeatureAttributes.razor
@@ -49,7 +49,7 @@
     {
         <FeatureFormWidget @ref="_form" 
                            LayerId="@_featureLayer!.Id" 
-                           GroupDisplay="FeatureFormGroupDisplay.Sequential" 
+                           GroupDisplay="GroupDisplay.Sequential" 
                            ContainerId="form"
                            OnSubmit="OnFormSubmit"
                            OnValueChange="OnValueChange" />