diff --git a/sdk/monitor/Azure.Monitor.Query/README.md b/sdk/monitor/Azure.Monitor.Query/README.md
index b823b8fb1fc21..889db7e07ff04 100644
--- a/sdk/monitor/Azure.Monitor.Query/README.md
+++ b/sdk/monitor/Azure.Monitor.Query/README.md
@@ -74,7 +74,7 @@ Response<LogsQueryResult> response = await client.QueryAsync(
     "AzureActivity | top 10 by TimeGenerated",
     new DateTimeRange(TimeSpan.FromDays(1)));
 
-LogsQueryResultTable table = response.Value.Table;
+LogsTable table = response.Value.Table;
 
 foreach (var row in table.Rows)
 {
@@ -178,7 +178,7 @@ Response<LogsQueryResult> response = await client.QueryAsync(
     "AzureActivity | top 10 by TimeGenerated",
     new DateTimeRange(TimeSpan.FromDays(1)));
 
-LogsQueryResultTable table = response.Value.Table;
+LogsTable table = response.Value.Table;
 
 foreach (var column in table.Columns)
 {
diff --git a/sdk/monitor/Azure.Monitor.Query/api/Azure.Monitor.Query.netstandard2.0.cs b/sdk/monitor/Azure.Monitor.Query/api/Azure.Monitor.Query.netstandard2.0.cs
index 3c74cfb21005b..af1770e21fdc4 100644
--- a/sdk/monitor/Azure.Monitor.Query/api/Azure.Monitor.Query.netstandard2.0.cs
+++ b/sdk/monitor/Azure.Monitor.Query/api/Azure.Monitor.Query.netstandard2.0.cs
@@ -63,10 +63,10 @@ public partial class MetricsQueryOptions
         public MetricsQueryOptions() { }
         public System.Collections.Generic.IList<Azure.Monitor.Query.Models.MetricAggregationType> Aggregations { get { throw null; } }
         public string Filter { get { throw null; } set { } }
-        public System.TimeSpan? Interval { get { throw null; } set { } }
+        public System.TimeSpan? Granularity { get { throw null; } set { } }
         public string MetricNamespace { get { throw null; } set { } }
         public string OrderBy { get { throw null; } set { } }
-        public Azure.Core.DateTimeRange? TimeSpan { get { throw null; } set { } }
+        public Azure.Core.DateTimeRange? TimeRange { get { throw null; } set { } }
         public int? Top { get { throw null; } set { } }
     }
 }
@@ -114,22 +114,31 @@ internal LogsBatchQueryResults() { }
     public partial class LogsQueryResult
     {
         internal LogsQueryResult() { }
-        public System.Collections.Generic.IReadOnlyList<Azure.Monitor.Query.Models.LogsQueryResultTable> AllTables { get { throw null; } }
+        public System.Collections.Generic.IReadOnlyList<Azure.Monitor.Query.Models.LogsTable> AllTables { get { throw null; } }
         public Azure.Core.ResponseError Error { get { throw null; } }
-        public Azure.Monitor.Query.Models.LogsQueryResultTable Table { get { throw null; } }
+        public Azure.Monitor.Query.Models.LogsTable Table { get { throw null; } }
         public System.BinaryData GetStatistics() { throw null; }
         public System.BinaryData GetVisualization() { throw null; }
     }
-    public partial class LogsQueryResultColumn
+    public partial class LogsTable
     {
-        internal LogsQueryResultColumn() { }
+        internal LogsTable() { }
+        public System.Collections.Generic.IReadOnlyList<Azure.Monitor.Query.Models.LogsTableColumn> Columns { get { throw null; } }
+        public string Name { get { throw null; } }
+        public System.Collections.Generic.IReadOnlyList<Azure.Monitor.Query.Models.LogsTableRow> Rows { get { throw null; } }
+        public System.Collections.Generic.IReadOnlyList<T> Deserialize<T>() { throw null; }
+        public override string ToString() { throw null; }
+    }
+    public partial class LogsTableColumn
+    {
+        internal LogsTableColumn() { }
         public string Name { get { throw null; } }
         public Azure.Monitor.Query.Models.LogsColumnType Type { get { throw null; } }
         public override string ToString() { throw null; }
     }
-    public partial class LogsQueryResultRow
+    public partial class LogsTableRow
     {
-        internal LogsQueryResultRow() { }
+        internal LogsTableRow() { }
         public int Count { get { throw null; } }
         public object this[int index] { get { throw null; } }
         public object this[string name] { get { throw null; } }
@@ -159,26 +168,6 @@ internal LogsQueryResultRow() { }
         public bool IsNull(string name) { throw null; }
         public override string ToString() { throw null; }
     }
-    public partial class LogsQueryResultTable
-    {
-        internal LogsQueryResultTable() { }
-        public System.Collections.Generic.IReadOnlyList<Azure.Monitor.Query.Models.LogsQueryResultColumn> Columns { get { throw null; } }
-        public string Name { get { throw null; } }
-        public System.Collections.Generic.IReadOnlyList<Azure.Monitor.Query.Models.LogsQueryResultRow> Rows { get { throw null; } }
-        public System.Collections.Generic.IReadOnlyList<T> Deserialize<T>() { throw null; }
-        public override string ToString() { throw null; }
-    }
-    public partial class Metric
-    {
-        internal Metric() { }
-        public string DisplayDescription { get { throw null; } }
-        public Azure.Core.ResponseError Error { get { throw null; } }
-        public string Id { get { throw null; } }
-        public string Name { get { throw null; } }
-        public System.Collections.Generic.IReadOnlyList<Azure.Monitor.Query.Models.TimeSeriesElement> TimeSeries { get { throw null; } }
-        public string Type { get { throw null; } }
-        public Azure.Monitor.Query.Models.MetricUnit Unit { get { throw null; } }
-    }
     public enum MetricAggregationType
     {
         None = 0,
@@ -241,12 +230,23 @@ internal MetricNamespace() { }
         public string Name { get { throw null; } }
         public string Type { get { throw null; } }
     }
+    public partial class MetricResult
+    {
+        internal MetricResult() { }
+        public string DisplayDescription { get { throw null; } }
+        public Azure.Core.ResponseError Error { get { throw null; } }
+        public string Id { get { throw null; } }
+        public string Name { get { throw null; } }
+        public System.Collections.Generic.IReadOnlyList<Azure.Monitor.Query.Models.TimeSeriesElement> TimeSeries { get { throw null; } }
+        public string Type { get { throw null; } }
+        public Azure.Monitor.Query.Models.MetricUnit Unit { get { throw null; } }
+    }
     public partial class MetricsQueryResult
     {
         internal MetricsQueryResult() { }
         public int? Cost { get { throw null; } }
         public System.TimeSpan? Interval { get { throw null; } }
-        public System.Collections.Generic.IReadOnlyList<Azure.Monitor.Query.Models.Metric> Metrics { get { throw null; } }
+        public System.Collections.Generic.IReadOnlyList<Azure.Monitor.Query.Models.MetricResult> Metrics { get { throw null; } }
         public string Namespace { get { throw null; } }
         public string ResourceRegion { get { throw null; } }
         public Azure.Core.DateTimeRange TimeSpan { get { throw null; } }
@@ -312,7 +312,7 @@ internal MetricValue() { }
     }
     public static partial class QueryModelFactory
     {
-        public static Azure.Monitor.Query.Models.LogsQueryResultColumn LogsQueryResultColumn(string name = null, Azure.Monitor.Query.Models.LogsColumnType type = default(Azure.Monitor.Query.Models.LogsColumnType)) { throw null; }
+        public static Azure.Monitor.Query.Models.LogsTableColumn LogsTableColumn(string name = null, Azure.Monitor.Query.Models.LogsColumnType type = default(Azure.Monitor.Query.Models.LogsColumnType)) { throw null; }
         public static Azure.Monitor.Query.Models.MetricAvailability MetricAvailability(System.TimeSpan? timeGrain = default(System.TimeSpan?), System.TimeSpan? retention = default(System.TimeSpan?)) { throw null; }
         public static Azure.Monitor.Query.Models.MetricValue MetricValue(System.DateTimeOffset timeStamp = default(System.DateTimeOffset), double? average = default(double?), double? minimum = default(double?), double? maximum = default(double?), double? total = default(double?), double? count = default(double?)) { throw null; }
     }
diff --git a/sdk/monitor/Azure.Monitor.Query/src/Generated/Models/LogsBatchQueryResult.cs b/sdk/monitor/Azure.Monitor.Query/src/Generated/Models/LogsBatchQueryResult.cs
index 080b38896cee8..8a199528e1ff7 100644
--- a/sdk/monitor/Azure.Monitor.Query/src/Generated/Models/LogsBatchQueryResult.cs
+++ b/sdk/monitor/Azure.Monitor.Query/src/Generated/Models/LogsBatchQueryResult.cs
@@ -17,7 +17,7 @@ public partial class LogsBatchQueryResult : LogsQueryResult
         /// <summary> Initializes a new instance of LogsBatchQueryResult. </summary>
         /// <param name="allTables"> The list of tables, columns and rows. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="allTables"/> is null. </exception>
-        internal LogsBatchQueryResult(IEnumerable<LogsQueryResultTable> allTables) : base(allTables)
+        internal LogsBatchQueryResult(IEnumerable<LogsTable> allTables) : base(allTables)
         {
             if (allTables == null)
             {
@@ -30,7 +30,7 @@ internal LogsBatchQueryResult(IEnumerable<LogsQueryResultTable> allTables) : bas
         /// <param name="statistics"> Any object. </param>
         /// <param name="visualization"> Any object. </param>
         /// <param name="error"> Any object. </param>
-        internal LogsBatchQueryResult(IReadOnlyList<LogsQueryResultTable> allTables, JsonElement statistics, JsonElement visualization, JsonElement error) : base(allTables, statistics, visualization, error)
+        internal LogsBatchQueryResult(IReadOnlyList<LogsTable> allTables, JsonElement statistics, JsonElement visualization, JsonElement error) : base(allTables, statistics, visualization, error)
         {
         }
     }
diff --git a/sdk/monitor/Azure.Monitor.Query/src/Generated/Models/LogsQueryResult.Serialization.cs b/sdk/monitor/Azure.Monitor.Query/src/Generated/Models/LogsQueryResult.Serialization.cs
index 7f88c93adb8c0..111a65079f04c 100644
--- a/sdk/monitor/Azure.Monitor.Query/src/Generated/Models/LogsQueryResult.Serialization.cs
+++ b/sdk/monitor/Azure.Monitor.Query/src/Generated/Models/LogsQueryResult.Serialization.cs
@@ -15,7 +15,7 @@ public partial class LogsQueryResult
     {
         internal static LogsQueryResult DeserializeLogsQueryResult(JsonElement element)
         {
-            IReadOnlyList<LogsQueryResultTable> tables = default;
+            IReadOnlyList<LogsTable> tables = default;
             Optional<JsonElement> statistics = default;
             Optional<JsonElement> render = default;
             Optional<JsonElement> error = default;
@@ -23,10 +23,10 @@ internal static LogsQueryResult DeserializeLogsQueryResult(JsonElement element)
             {
                 if (property.NameEquals("tables"))
                 {
-                    List<LogsQueryResultTable> array = new List<LogsQueryResultTable>();
+                    List<LogsTable> array = new List<LogsTable>();
                     foreach (var item in property.Value.EnumerateArray())
                     {
-                        array.Add(LogsQueryResultTable.DeserializeLogsQueryResultTable(item));
+                        array.Add(LogsTable.DeserializeLogsTable(item));
                     }
                     tables = array;
                     continue;
diff --git a/sdk/monitor/Azure.Monitor.Query/src/Generated/Models/LogsQueryResult.cs b/sdk/monitor/Azure.Monitor.Query/src/Generated/Models/LogsQueryResult.cs
index a80785576a7c8..57c78433f1d8a 100644
--- a/sdk/monitor/Azure.Monitor.Query/src/Generated/Models/LogsQueryResult.cs
+++ b/sdk/monitor/Azure.Monitor.Query/src/Generated/Models/LogsQueryResult.cs
@@ -18,7 +18,7 @@ public partial class LogsQueryResult
         /// <summary> Initializes a new instance of LogsQueryResult. </summary>
         /// <param name="allTables"> The list of tables, columns and rows. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="allTables"/> is null. </exception>
-        internal LogsQueryResult(IEnumerable<LogsQueryResultTable> allTables)
+        internal LogsQueryResult(IEnumerable<LogsTable> allTables)
         {
             if (allTables == null)
             {
@@ -33,7 +33,7 @@ internal LogsQueryResult(IEnumerable<LogsQueryResultTable> allTables)
         /// <param name="statistics"> Any object. </param>
         /// <param name="visualization"> Any object. </param>
         /// <param name="error"> Any object. </param>
-        internal LogsQueryResult(IReadOnlyList<LogsQueryResultTable> allTables, JsonElement statistics, JsonElement visualization, JsonElement error)
+        internal LogsQueryResult(IReadOnlyList<LogsTable> allTables, JsonElement statistics, JsonElement visualization, JsonElement error)
         {
             AllTables = allTables;
             _statistics = statistics;
diff --git a/sdk/monitor/Azure.Monitor.Query/src/Generated/Models/LogsQueryResultTable.Serialization.cs b/sdk/monitor/Azure.Monitor.Query/src/Generated/Models/LogsTable.Serialization.cs
similarity index 69%
rename from sdk/monitor/Azure.Monitor.Query/src/Generated/Models/LogsQueryResultTable.Serialization.cs
rename to sdk/monitor/Azure.Monitor.Query/src/Generated/Models/LogsTable.Serialization.cs
index 9e3236e7203d6..1641f701ec6b3 100644
--- a/sdk/monitor/Azure.Monitor.Query/src/Generated/Models/LogsQueryResultTable.Serialization.cs
+++ b/sdk/monitor/Azure.Monitor.Query/src/Generated/Models/LogsTable.Serialization.cs
@@ -11,12 +11,12 @@
 
 namespace Azure.Monitor.Query.Models
 {
-    public partial class LogsQueryResultTable
+    public partial class LogsTable
     {
-        internal static LogsQueryResultTable DeserializeLogsQueryResultTable(JsonElement element)
+        internal static LogsTable DeserializeLogsTable(JsonElement element)
         {
             string name = default;
-            IReadOnlyList<LogsQueryResultColumn> columns = default;
+            IReadOnlyList<LogsTableColumn> columns = default;
             JsonElement rows = default;
             foreach (var property in element.EnumerateObject())
             {
@@ -27,10 +27,10 @@ internal static LogsQueryResultTable DeserializeLogsQueryResultTable(JsonElement
                 }
                 if (property.NameEquals("columns"))
                 {
-                    List<LogsQueryResultColumn> array = new List<LogsQueryResultColumn>();
+                    List<LogsTableColumn> array = new List<LogsTableColumn>();
                     foreach (var item in property.Value.EnumerateArray())
                     {
-                        array.Add(LogsQueryResultColumn.DeserializeLogsQueryResultColumn(item));
+                        array.Add(LogsTableColumn.DeserializeLogsTableColumn(item));
                     }
                     columns = array;
                     continue;
@@ -41,7 +41,7 @@ internal static LogsQueryResultTable DeserializeLogsQueryResultTable(JsonElement
                     continue;
                 }
             }
-            return new LogsQueryResultTable(name, columns, rows);
+            return new LogsTable(name, columns, rows);
         }
     }
 }
diff --git a/sdk/monitor/Azure.Monitor.Query/src/Generated/Models/LogsQueryResultTable.cs b/sdk/monitor/Azure.Monitor.Query/src/Generated/Models/LogsTable.cs
similarity index 75%
rename from sdk/monitor/Azure.Monitor.Query/src/Generated/Models/LogsQueryResultTable.cs
rename to sdk/monitor/Azure.Monitor.Query/src/Generated/Models/LogsTable.cs
index 6861a0f36e559..409043d197749 100644
--- a/sdk/monitor/Azure.Monitor.Query/src/Generated/Models/LogsQueryResultTable.cs
+++ b/sdk/monitor/Azure.Monitor.Query/src/Generated/Models/LogsTable.cs
@@ -13,14 +13,14 @@
 namespace Azure.Monitor.Query.Models
 {
     /// <summary> Contains the columns and rows for one table in a query response. </summary>
-    public partial class LogsQueryResultTable
+    public partial class LogsTable
     {
-        /// <summary> Initializes a new instance of LogsQueryResultTable. </summary>
+        /// <summary> Initializes a new instance of LogsTable. </summary>
         /// <param name="name"> The name of the table. </param>
         /// <param name="columns"> The list of columns in this table. </param>
         /// <param name="internalRows"> The resulting rows from this query. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="name"/> or <paramref name="columns"/> is null. </exception>
-        internal LogsQueryResultTable(string name, IEnumerable<LogsQueryResultColumn> columns, JsonElement internalRows)
+        internal LogsTable(string name, IEnumerable<LogsTableColumn> columns, JsonElement internalRows)
         {
             if (name == null)
             {
@@ -36,11 +36,11 @@ internal LogsQueryResultTable(string name, IEnumerable<LogsQueryResultColumn> co
             InternalRows = internalRows;
         }
 
-        /// <summary> Initializes a new instance of LogsQueryResultTable. </summary>
+        /// <summary> Initializes a new instance of LogsTable. </summary>
         /// <param name="name"> The name of the table. </param>
         /// <param name="columns"> The list of columns in this table. </param>
         /// <param name="internalRows"> The resulting rows from this query. </param>
-        internal LogsQueryResultTable(string name, IReadOnlyList<LogsQueryResultColumn> columns, JsonElement internalRows)
+        internal LogsTable(string name, IReadOnlyList<LogsTableColumn> columns, JsonElement internalRows)
         {
             Name = name;
             Columns = columns;
@@ -50,6 +50,6 @@ internal LogsQueryResultTable(string name, IReadOnlyList<LogsQueryResultColumn>
         /// <summary> The name of the table. </summary>
         public string Name { get; }
         /// <summary> The list of columns in this table. </summary>
-        public IReadOnlyList<LogsQueryResultColumn> Columns { get; }
+        public IReadOnlyList<LogsTableColumn> Columns { get; }
     }
 }
diff --git a/sdk/monitor/Azure.Monitor.Query/src/Generated/Models/LogsQueryResultColumn.Serialization.cs b/sdk/monitor/Azure.Monitor.Query/src/Generated/Models/LogsTableColumn.Serialization.cs
similarity index 79%
rename from sdk/monitor/Azure.Monitor.Query/src/Generated/Models/LogsQueryResultColumn.Serialization.cs
rename to sdk/monitor/Azure.Monitor.Query/src/Generated/Models/LogsTableColumn.Serialization.cs
index 186f482383270..a89d672c21883 100644
--- a/sdk/monitor/Azure.Monitor.Query/src/Generated/Models/LogsQueryResultColumn.Serialization.cs
+++ b/sdk/monitor/Azure.Monitor.Query/src/Generated/Models/LogsTableColumn.Serialization.cs
@@ -10,9 +10,9 @@
 
 namespace Azure.Monitor.Query.Models
 {
-    public partial class LogsQueryResultColumn
+    public partial class LogsTableColumn
     {
-        internal static LogsQueryResultColumn DeserializeLogsQueryResultColumn(JsonElement element)
+        internal static LogsTableColumn DeserializeLogsTableColumn(JsonElement element)
         {
             string name = default;
             LogsColumnType type = default;
@@ -29,7 +29,7 @@ internal static LogsQueryResultColumn DeserializeLogsQueryResultColumn(JsonEleme
                     continue;
                 }
             }
-            return new LogsQueryResultColumn(name, type);
+            return new LogsTableColumn(name, type);
         }
     }
 }
diff --git a/sdk/monitor/Azure.Monitor.Query/src/Generated/Models/LogsQueryResultColumn.cs b/sdk/monitor/Azure.Monitor.Query/src/Generated/Models/LogsTableColumn.cs
similarity index 81%
rename from sdk/monitor/Azure.Monitor.Query/src/Generated/Models/LogsQueryResultColumn.cs
rename to sdk/monitor/Azure.Monitor.Query/src/Generated/Models/LogsTableColumn.cs
index 169c5fd092841..a7f9558177756 100644
--- a/sdk/monitor/Azure.Monitor.Query/src/Generated/Models/LogsQueryResultColumn.cs
+++ b/sdk/monitor/Azure.Monitor.Query/src/Generated/Models/LogsTableColumn.cs
@@ -10,13 +10,13 @@
 namespace Azure.Monitor.Query.Models
 {
     /// <summary> A column in a table. </summary>
-    public partial class LogsQueryResultColumn
+    public partial class LogsTableColumn
     {
-        /// <summary> Initializes a new instance of LogsQueryResultColumn. </summary>
+        /// <summary> Initializes a new instance of LogsTableColumn. </summary>
         /// <param name="name"> The name of this column. </param>
         /// <param name="type"> The data type of this column. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="name"/> is null. </exception>
-        internal LogsQueryResultColumn(string name, LogsColumnType type)
+        internal LogsTableColumn(string name, LogsColumnType type)
         {
             if (name == null)
             {
diff --git a/sdk/monitor/Azure.Monitor.Query/src/Generated/Models/Metric.Serialization.cs b/sdk/monitor/Azure.Monitor.Query/src/Generated/Models/MetricResult.Serialization.cs
similarity index 90%
rename from sdk/monitor/Azure.Monitor.Query/src/Generated/Models/Metric.Serialization.cs
rename to sdk/monitor/Azure.Monitor.Query/src/Generated/Models/MetricResult.Serialization.cs
index 359c4de83c7e5..c18c1773a9d25 100644
--- a/sdk/monitor/Azure.Monitor.Query/src/Generated/Models/Metric.Serialization.cs
+++ b/sdk/monitor/Azure.Monitor.Query/src/Generated/Models/MetricResult.Serialization.cs
@@ -11,9 +11,9 @@
 
 namespace Azure.Monitor.Query.Models
 {
-    public partial class Metric
+    public partial class MetricResult
     {
-        internal static Metric DeserializeMetric(JsonElement element)
+        internal static MetricResult DeserializeMetricResult(JsonElement element)
         {
             string id = default;
             string type = default;
@@ -71,7 +71,7 @@ internal static Metric DeserializeMetric(JsonElement element)
                     continue;
                 }
             }
-            return new Metric(id, type, name, displayDescription.Value, errorCode.Value, errorMessage.Value, unit, timeseries);
+            return new MetricResult(id, type, name, displayDescription.Value, errorCode.Value, errorMessage.Value, unit, timeseries);
         }
     }
 }
diff --git a/sdk/monitor/Azure.Monitor.Query/src/Generated/Models/Metric.cs b/sdk/monitor/Azure.Monitor.Query/src/Generated/Models/MetricResult.cs
similarity index 84%
rename from sdk/monitor/Azure.Monitor.Query/src/Generated/Models/Metric.cs
rename to sdk/monitor/Azure.Monitor.Query/src/Generated/Models/MetricResult.cs
index c644fe047a108..1d582893bc7fa 100644
--- a/sdk/monitor/Azure.Monitor.Query/src/Generated/Models/Metric.cs
+++ b/sdk/monitor/Azure.Monitor.Query/src/Generated/Models/MetricResult.cs
@@ -12,16 +12,16 @@
 namespace Azure.Monitor.Query.Models
 {
     /// <summary> The result data of a query. </summary>
-    public partial class Metric
+    public partial class MetricResult
     {
-        /// <summary> Initializes a new instance of Metric. </summary>
+        /// <summary> Initializes a new instance of MetricResult. </summary>
         /// <param name="id"> the metric Id. </param>
         /// <param name="type"> the resource type of the metric resource. </param>
         /// <param name="localizedName"> the name and the display name of the metric, i.e. it is localizable string. </param>
         /// <param name="unit"> The unit of the metric. </param>
         /// <param name="timeSeries"> the time series returned when a data query is performed. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="id"/>, <paramref name="type"/>, <paramref name="localizedName"/>, or <paramref name="timeSeries"/> is null. </exception>
-        internal Metric(string id, string type, LocalizableString localizedName, MetricUnit unit, IEnumerable<TimeSeriesElement> timeSeries)
+        internal MetricResult(string id, string type, LocalizableString localizedName, MetricUnit unit, IEnumerable<TimeSeriesElement> timeSeries)
         {
             if (id == null)
             {
@@ -47,7 +47,7 @@ internal Metric(string id, string type, LocalizableString localizedName, MetricU
             TimeSeries = timeSeries.ToList();
         }
 
-        /// <summary> Initializes a new instance of Metric. </summary>
+        /// <summary> Initializes a new instance of MetricResult. </summary>
         /// <param name="id"> the metric Id. </param>
         /// <param name="type"> the resource type of the metric resource. </param>
         /// <param name="localizedName"> the name and the display name of the metric, i.e. it is localizable string. </param>
@@ -56,7 +56,7 @@ internal Metric(string id, string type, LocalizableString localizedName, MetricU
         /// <param name="errorMessage"> Error message encountered querying this specific metric. </param>
         /// <param name="unit"> The unit of the metric. </param>
         /// <param name="timeSeries"> the time series returned when a data query is performed. </param>
-        internal Metric(string id, string type, LocalizableString localizedName, string displayDescription, string errorCode, string errorMessage, MetricUnit unit, IReadOnlyList<TimeSeriesElement> timeSeries)
+        internal MetricResult(string id, string type, LocalizableString localizedName, string displayDescription, string errorCode, string errorMessage, MetricUnit unit, IReadOnlyList<TimeSeriesElement> timeSeries)
         {
             Id = id;
             Type = type;
diff --git a/sdk/monitor/Azure.Monitor.Query/src/Generated/Models/MetricsQueryResult.Serialization.cs b/sdk/monitor/Azure.Monitor.Query/src/Generated/Models/MetricsQueryResult.Serialization.cs
index 63a16b06cde51..3ff71589b737b 100644
--- a/sdk/monitor/Azure.Monitor.Query/src/Generated/Models/MetricsQueryResult.Serialization.cs
+++ b/sdk/monitor/Azure.Monitor.Query/src/Generated/Models/MetricsQueryResult.Serialization.cs
@@ -21,7 +21,7 @@ internal static MetricsQueryResult DeserializeMetricsQueryResult(JsonElement ele
             Optional<TimeSpan> interval = default;
             Optional<string> @namespace = default;
             Optional<string> resourceregion = default;
-            IReadOnlyList<Metric> value = default;
+            IReadOnlyList<MetricResult> value = default;
             foreach (var property in element.EnumerateObject())
             {
                 if (property.NameEquals("cost"))
@@ -61,10 +61,10 @@ internal static MetricsQueryResult DeserializeMetricsQueryResult(JsonElement ele
                 }
                 if (property.NameEquals("value"))
                 {
-                    List<Metric> array = new List<Metric>();
+                    List<MetricResult> array = new List<MetricResult>();
                     foreach (var item in property.Value.EnumerateArray())
                     {
-                        array.Add(Metric.DeserializeMetric(item));
+                        array.Add(MetricResult.DeserializeMetricResult(item));
                     }
                     value = array;
                     continue;
diff --git a/sdk/monitor/Azure.Monitor.Query/src/Generated/Models/MetricsQueryResult.cs b/sdk/monitor/Azure.Monitor.Query/src/Generated/Models/MetricsQueryResult.cs
index 2b2c965e32505..f07bffbe44ba4 100644
--- a/sdk/monitor/Azure.Monitor.Query/src/Generated/Models/MetricsQueryResult.cs
+++ b/sdk/monitor/Azure.Monitor.Query/src/Generated/Models/MetricsQueryResult.cs
@@ -18,7 +18,7 @@ public partial class MetricsQueryResult
         /// <param name="timespan"> The timespan for which the data was retrieved. Its value consists of two datetimes concatenated, separated by &apos;/&apos;.  This may be adjusted in the future and returned back from what was originally requested. </param>
         /// <param name="metrics"> the value of the collection. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="timespan"/> or <paramref name="metrics"/> is null. </exception>
-        internal MetricsQueryResult(string timespan, IEnumerable<Metric> metrics)
+        internal MetricsQueryResult(string timespan, IEnumerable<MetricResult> metrics)
         {
             if (timespan == null)
             {
@@ -40,7 +40,7 @@ internal MetricsQueryResult(string timespan, IEnumerable<Metric> metrics)
         /// <param name="namespace"> The namespace of the metrics being queried. </param>
         /// <param name="resourceRegion"> The region of the resource being queried for metrics. </param>
         /// <param name="metrics"> the value of the collection. </param>
-        internal MetricsQueryResult(int? cost, string timespan, TimeSpan? interval, string @namespace, string resourceRegion, IReadOnlyList<Metric> metrics)
+        internal MetricsQueryResult(int? cost, string timespan, TimeSpan? interval, string @namespace, string resourceRegion, IReadOnlyList<MetricResult> metrics)
         {
             Cost = cost;
             _timespan = timespan;
diff --git a/sdk/monitor/Azure.Monitor.Query/src/Generated/QueryModelFactory.cs b/sdk/monitor/Azure.Monitor.Query/src/Generated/QueryModelFactory.cs
index b8b3133515251..cb962391945b3 100644
--- a/sdk/monitor/Azure.Monitor.Query/src/Generated/QueryModelFactory.cs
+++ b/sdk/monitor/Azure.Monitor.Query/src/Generated/QueryModelFactory.cs
@@ -12,13 +12,13 @@ namespace Azure.Monitor.Query.Models
     /// <summary> Model factory for read-only models. </summary>
     public static partial class QueryModelFactory
     {
-        /// <summary> Initializes a new instance of LogsQueryResultColumn. </summary>
+        /// <summary> Initializes a new instance of LogsTableColumn. </summary>
         /// <param name="name"> The name of this column. </param>
         /// <param name="type"> The data type of this column. </param>
-        /// <returns> A new <see cref="Models.LogsQueryResultColumn"/> instance for mocking. </returns>
-        public static LogsQueryResultColumn LogsQueryResultColumn(string name = null, LogsColumnType type = default)
+        /// <returns> A new <see cref="Models.LogsTableColumn"/> instance for mocking. </returns>
+        public static LogsTableColumn LogsTableColumn(string name = null, LogsColumnType type = default)
         {
-            return new LogsQueryResultColumn(name, type);
+            return new LogsTableColumn(name, type);
         }
 
         /// <summary> Initializes a new instance of MetricAvailability. </summary>
diff --git a/sdk/monitor/Azure.Monitor.Query/src/MetricsQueryClient.cs b/sdk/monitor/Azure.Monitor.Query/src/MetricsQueryClient.cs
index 3f0570b51a416..c96f31339ef94 100644
--- a/sdk/monitor/Azure.Monitor.Query/src/MetricsQueryClient.cs
+++ b/sdk/monitor/Azure.Monitor.Query/src/MetricsQueryClient.cs
@@ -115,8 +115,8 @@ public virtual Response<MetricsQueryResult> Query(string resourceId, IEnumerable
             try
             {
                 return _metricsRestClient.List(resourceId,
-                    timespan: options?.TimeSpan?.ToString(),
-                    interval: options?.Interval,
+                    timespan: options?.TimeRange?.ToString(),
+                    interval: options?.Granularity,
                     filter: options?.Filter,
                     top: options?.Top,
                     aggregation: GetAggregation(options),
@@ -177,8 +177,8 @@ public virtual async Task<Response<MetricsQueryResult>> QueryAsync(string resour
             try
             {
                 return await _metricsRestClient.ListAsync(resourceId,
-                    timespan: options?.TimeSpan?.ToString(),
-                    interval: options?.Interval,
+                    timespan: options?.TimeRange?.ToString(),
+                    interval: options?.Granularity,
                     filter: options?.Filter,
                     top: options?.Top,
                     aggregation: GetAggregation(options),
diff --git a/sdk/monitor/Azure.Monitor.Query/src/MetricsQueryOptions.cs b/sdk/monitor/Azure.Monitor.Query/src/MetricsQueryOptions.cs
index 3f4621aa6511b..540aa2070f02b 100644
--- a/sdk/monitor/Azure.Monitor.Query/src/MetricsQueryOptions.cs
+++ b/sdk/monitor/Azure.Monitor.Query/src/MetricsQueryOptions.cs
@@ -16,12 +16,14 @@ public class MetricsQueryOptions
         /// <summary>
         /// Gets or sets the timespan over which the metric will be queried.
         /// </summary>
-        public DateTimeRange? TimeSpan { get; set; }
+        [CodeGenMember("TimeSpan")]
+        public DateTimeRange? TimeRange { get; set; }
 
         /// <summary>
         /// Gets or sets the interval at which to sample metrics.
         /// </summary>
-        public TimeSpan? Interval { get; set; }
+        [CodeGenMember("Interval")]
+        public TimeSpan? Granularity { get; set; }
 
         /// <summary>
         /// Gets the list of metric aggregations to retrieve.
@@ -36,7 +38,7 @@ public class MetricsQueryOptions
         /// <summary>
         /// Gets or sets the filter that is used to refine the set of metric data returned.
         /// <example>
-        /// Metric contains metadata A, B and C.<br/>
+        /// MetricResult contains metadata A, B and C.<br/>
         /// <br/>
         ///     - Return all time series of C where A = a1 and B = b1 or b2:<br/>
         ///         <c>A eq 'a1' and B eq 'b1' or B eq 'b2' and C eq '*'</c><br/>
diff --git a/sdk/monitor/Azure.Monitor.Query/src/Models/LogsBatchQueryResult.cs b/sdk/monitor/Azure.Monitor.Query/src/Models/LogsBatchQueryResult.cs
index 3f7283401834e..3e6171fff2858 100644
--- a/sdk/monitor/Azure.Monitor.Query/src/Models/LogsBatchQueryResult.cs
+++ b/sdk/monitor/Azure.Monitor.Query/src/Models/LogsBatchQueryResult.cs
@@ -24,7 +24,7 @@ public partial class LogsBatchQueryResult: LogsQueryResult
         internal static LogsBatchQueryResult DeserializeLogsBatchQueryResult(JsonElement element)
         {
             Optional<JsonElement> error = default;
-            IReadOnlyList<LogsQueryResultTable> tables = default;
+            IReadOnlyList<LogsTable> tables = default;
             Optional<JsonElement> statistics = default;
             Optional<JsonElement> render = default;
 
@@ -56,10 +56,10 @@ internal static LogsBatchQueryResult DeserializeLogsBatchQueryResult(JsonElement
                 }
                 if (property.NameEquals("tables"))
                 {
-                    List<LogsQueryResultTable> array = new List<LogsQueryResultTable>();
+                    List<LogsTable> array = new List<LogsTable>();
                     foreach (var item in property.Value.EnumerateArray())
                     {
-                        array.Add(LogsQueryResultTable.DeserializeLogsQueryResultTable(item));
+                        array.Add(LogsTable.DeserializeLogsTable(item));
                     }
                     tables = array;
                     continue;
@@ -78,4 +78,4 @@ internal static LogsBatchQueryResult DeserializeLogsBatchQueryResult(JsonElement
             return new LogsBatchQueryResult(tables, statistics, render, error);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/sdk/monitor/Azure.Monitor.Query/src/Models/LogsQueryResults.cs b/sdk/monitor/Azure.Monitor.Query/src/Models/LogsQueryResults.cs
index ca73c51bf9968..80ff830731504 100644
--- a/sdk/monitor/Azure.Monitor.Query/src/Models/LogsQueryResults.cs
+++ b/sdk/monitor/Azure.Monitor.Query/src/Models/LogsQueryResults.cs
@@ -24,7 +24,7 @@ public partial class LogsQueryResult
         /// <summary>
         /// Gets the single table result of the query.
         /// </summary>
-        public LogsQueryResultTable Table
+        public LogsTable Table
         {
             get
             {
@@ -41,7 +41,7 @@ public LogsQueryResultTable Table
         /// Gets the multi-table result of the query.
         /// </summary>
         [CodeGenMember("Tables")]
-        public IReadOnlyList<LogsQueryResultTable> AllTables { get; }
+        public IReadOnlyList<LogsTable> AllTables { get; }
 
         /// <summary>
         /// Returns the query statistics if the <see cref="LogsQueryOptions.IncludeStatistics"/> is set to <c>true</c>. <c>null</c> otherwise.
diff --git a/sdk/monitor/Azure.Monitor.Query/src/Models/LogsQueryResultTable.cs b/sdk/monitor/Azure.Monitor.Query/src/Models/LogsTable.cs
similarity index 76%
rename from sdk/monitor/Azure.Monitor.Query/src/Models/LogsQueryResultTable.cs
rename to sdk/monitor/Azure.Monitor.Query/src/Models/LogsTable.cs
index 6e2b119edb10f..a563dd0d36bd3 100644
--- a/sdk/monitor/Azure.Monitor.Query/src/Models/LogsQueryResultTable.cs
+++ b/sdk/monitor/Azure.Monitor.Query/src/Models/LogsTable.cs
@@ -9,9 +9,9 @@
 namespace Azure.Monitor.Query.Models
 {
     [CodeGenModel("Table")]
-    public partial class LogsQueryResultTable
+    public partial class LogsTable
     {
-        private IReadOnlyList<LogsQueryResultRow> _rows;
+        private IReadOnlyList<LogsTableRow> _rows;
 
         [CodeGenMember("Rows")]
         private JsonElement InternalRows { get; }
@@ -19,9 +19,9 @@ public partial class LogsQueryResultTable
         /// <summary>
         /// Gets the rows of the result table.
         /// </summary>
-        public IReadOnlyList<LogsQueryResultRow> Rows => _rows ??= CreateRows();
+        public IReadOnlyList<LogsTableRow> Rows => _rows ??= CreateRows();
 
-        private IReadOnlyList<LogsQueryResultRow> CreateRows()
+        private IReadOnlyList<LogsTableRow> CreateRows()
         {
             Dictionary<string, int> columnDictionary = new();
 
@@ -30,11 +30,11 @@ private IReadOnlyList<LogsQueryResultRow> CreateRows()
                 columnDictionary[Columns[index].Name] = index;
             }
 
-            List<LogsQueryResultRow> rows = new List<LogsQueryResultRow>();
+            List<LogsTableRow> rows = new List<LogsTableRow>();
 
             foreach (var row in InternalRows.EnumerateArray())
             {
-                rows.Add(new LogsQueryResultRow(columnDictionary, Columns, row));
+                rows.Add(new LogsTableRow(columnDictionary, Columns, row));
             }
 
             return rows;
@@ -55,4 +55,4 @@ public override string ToString()
             return $"{Name}: {Rows.Count} rows, {Columns.Count} columns";
         }
     }
-}
\ No newline at end of file
+}
diff --git a/sdk/monitor/Azure.Monitor.Query/src/Models/LogsQueryResultRow.cs b/sdk/monitor/Azure.Monitor.Query/src/Models/LogsTableRow.cs
similarity index 97%
rename from sdk/monitor/Azure.Monitor.Query/src/Models/LogsQueryResultRow.cs
rename to sdk/monitor/Azure.Monitor.Query/src/Models/LogsTableRow.cs
index 97b0aaad6546b..b21f51f2bdf50 100644
--- a/sdk/monitor/Azure.Monitor.Query/src/Models/LogsQueryResultRow.cs
+++ b/sdk/monitor/Azure.Monitor.Query/src/Models/LogsTableRow.cs
@@ -12,13 +12,14 @@ namespace Azure.Monitor.Query.Models
     /// <summary>
     /// Represents a row in the table of results returned from the logs query.
     /// </summary>
-    public class LogsQueryResultRow
+    [CodeGenModel("LogsQueryResultRow")]
+    public class LogsTableRow
     {
         private readonly Dictionary<string, int> _columnMap;
-        private readonly IReadOnlyList<LogsQueryResultColumn> _columns;
+        private readonly IReadOnlyList<LogsTableColumn> _columns;
         private readonly JsonElement _row;
 
-        internal LogsQueryResultRow(Dictionary<string, int> columnMap, IReadOnlyList<LogsQueryResultColumn> columns, JsonElement row)
+        internal LogsTableRow(Dictionary<string, int> columnMap, IReadOnlyList<LogsTableColumn> columns, JsonElement row)
         {
             _columnMap = columnMap;
             _columns = columns;
diff --git a/sdk/monitor/Azure.Monitor.Query/src/Models/Metric.cs b/sdk/monitor/Azure.Monitor.Query/src/Models/MetricResult.cs
similarity index 94%
rename from sdk/monitor/Azure.Monitor.Query/src/Models/Metric.cs
rename to sdk/monitor/Azure.Monitor.Query/src/Models/MetricResult.cs
index 5037746176c6a..322b85d28bd05 100644
--- a/sdk/monitor/Azure.Monitor.Query/src/Models/Metric.cs
+++ b/sdk/monitor/Azure.Monitor.Query/src/Models/MetricResult.cs
@@ -6,7 +6,8 @@
 
 namespace Azure.Monitor.Query.Models
 {
-    public partial class Metric
+    [CodeGenModel("Metric")]
+    public partial class MetricResult
     {
         private const string SuccessErrorCode = "Success";
 
diff --git a/sdk/monitor/Azure.Monitor.Query/src/Models/MetricsQueryResult.cs b/sdk/monitor/Azure.Monitor.Query/src/Models/MetricsQueryResult.cs
index da44b85ef36d1..bb182b2c96ec5 100644
--- a/sdk/monitor/Azure.Monitor.Query/src/Models/MetricsQueryResult.cs
+++ b/sdk/monitor/Azure.Monitor.Query/src/Models/MetricsQueryResult.cs
@@ -14,7 +14,7 @@ public partial class MetricsQueryResult
 
         /// <summary> Metrics returned as the result of the query. </summary>
         [CodeGenMember("Value")]
-        public IReadOnlyList<Metric> Metrics { get; }
+        public IReadOnlyList<MetricResult> Metrics { get; }
 
         /// <summary>
         /// The timespan for which the data was retrieved.
diff --git a/sdk/monitor/Azure.Monitor.Query/src/Models/QueryResultColumn.cs b/sdk/monitor/Azure.Monitor.Query/src/Models/QueryResultColumn.cs
index 0e1796323e3df..9bff8c090858f 100644
--- a/sdk/monitor/Azure.Monitor.Query/src/Models/QueryResultColumn.cs
+++ b/sdk/monitor/Azure.Monitor.Query/src/Models/QueryResultColumn.cs
@@ -6,7 +6,7 @@
 namespace Azure.Monitor.Query.Models
 {
     [CodeGenModel("Column")]
-    public partial class LogsQueryResultColumn
+    public partial class LogsTableColumn
     {
         /// <inheritdoc />
         public override string ToString()
@@ -14,4 +14,4 @@ public override string ToString()
             return $"{Name} ({Type})";
         }
     }
-}
\ No newline at end of file
+}
diff --git a/sdk/monitor/Azure.Monitor.Query/src/Properties/AssemblyInfo.cs b/sdk/monitor/Azure.Monitor.Query/src/Properties/AssemblyInfo.cs
index 390e37022ebbd..40c34c4bb91d8 100644
--- a/sdk/monitor/Azure.Monitor.Query/src/Properties/AssemblyInfo.cs
+++ b/sdk/monitor/Azure.Monitor.Query/src/Properties/AssemblyInfo.cs
@@ -8,5 +8,5 @@
 
 [assembly: Azure.Core.AzureResourceProviderNamespace("Microsoft.Insights")]
 
-[assembly: SuppressMessage("Usage", "AZC0012:Avoid single word type names", Justification = "<Pending>", Scope = "type", Target = "~T:Azure.Monitor.Query.Models.Metric")]
+[assembly: SuppressMessage("Usage", "AZC0012:Avoid single word type names", Justification = "<Pending>", Scope = "type", Target = "~T:Azure.Monitor.Query.Models.MetricResult")]
 [assembly: SuppressMessage("Usage", "AZC0014:Types from System.Text.Json, Newtonsoft.Json, System.Collections.Immutable assemblies should not be exposed as part of public API surface.", Justification = "<Pending>")]
diff --git a/sdk/monitor/Azure.Monitor.Query/src/RowBinder.cs b/sdk/monitor/Azure.Monitor.Query/src/RowBinder.cs
index 98f098faf9c86..570d9667b9644 100644
--- a/sdk/monitor/Azure.Monitor.Query/src/RowBinder.cs
+++ b/sdk/monitor/Azure.Monitor.Query/src/RowBinder.cs
@@ -7,10 +7,10 @@
 
 namespace Azure.Monitor.Query
 {
-    internal class RowBinder: TypeBinder<LogsQueryResultRow>
+    internal class RowBinder: TypeBinder<LogsTableRow>
     {
         internal static RowBinder Shared = new();
-        internal IReadOnlyList<T> BindResults<T>(IReadOnlyList<LogsQueryResultTable> tables)
+        internal IReadOnlyList<T> BindResults<T>(IReadOnlyList<LogsTable> tables)
         {
             List<T> results = new List<T>();
             if (typeof(IDictionary<string, object>).IsAssignableFrom(typeof(T)))
@@ -45,12 +45,12 @@ internal IReadOnlyList<T> BindResults<T>(IReadOnlyList<LogsQueryResultTable> tab
             return results;
         }
 
-        protected override void Set<T>(LogsQueryResultRow destination, T value, BoundMemberInfo memberInfo)
+        protected override void Set<T>(LogsTableRow destination, T value, BoundMemberInfo memberInfo)
         {
             throw new NotSupportedException();
         }
 
-        protected override bool TryGet<T>(BoundMemberInfo memberInfo, LogsQueryResultRow source, out T value)
+        protected override bool TryGet<T>(BoundMemberInfo memberInfo, LogsTableRow source, out T value)
         {
             int column;
 
@@ -98,7 +98,7 @@ protected override bool TryGet<T>(BoundMemberInfo memberInfo, LogsQueryResultRow
             else
             {
                 throw new NotSupportedException($"The {typeof(T)} type is not supported as a deserialization target. " +
-                                                "Supported types are string, bool, long, decimal, double, object, Guid, DateTimeOffset, TimeSpan, BinaryData.");
+                                                "Supported types are string, bool, long, decimal, double, object, Guid, DateTimeOffset, TimeRange, BinaryData.");
             }
 
             return true;
diff --git a/sdk/monitor/Azure.Monitor.Query/tests/LogsQueryClientClientLiveTests.cs b/sdk/monitor/Azure.Monitor.Query/tests/LogsQueryClientClientLiveTests.cs
index 117d2f6807669..390469173877e 100644
--- a/sdk/monitor/Azure.Monitor.Query/tests/LogsQueryClientClientLiveTests.cs
+++ b/sdk/monitor/Azure.Monitor.Query/tests/LogsQueryClientClientLiveTests.cs
@@ -240,7 +240,7 @@ public async Task CanQueryAllSupportedTypes()
                 "dynamic({\"a\":123, \"b\":\"hello\", \"c\":[1,2,3], \"d\":{}})" +
                 "]", _logsTestData.DataTimeRange);
 
-            LogsQueryResultRow row = results.Value.Table.Rows[0];
+            LogsTableRow row = results.Value.Table.Rows[0];
 
             var expectedDate = DateTimeOffset.Parse("2015-12-31 23:59:59.9+00:00");
             Assert.AreEqual(expectedDate, row.GetDateTimeOffset("DateTime"));
diff --git a/sdk/monitor/Azure.Monitor.Query/tests/LogsQueryClientSamples.cs b/sdk/monitor/Azure.Monitor.Query/tests/LogsQueryClientSamples.cs
index 8fe8509a84f11..e86da46342b21 100644
--- a/sdk/monitor/Azure.Monitor.Query/tests/LogsQueryClientSamples.cs
+++ b/sdk/monitor/Azure.Monitor.Query/tests/LogsQueryClientSamples.cs
@@ -31,7 +31,7 @@ public async Task QueryLogsAsTable()
                 "AzureActivity | top 10 by TimeGenerated",
                 new DateTimeRange(TimeSpan.FromDays(1)));
 
-            LogsQueryResultTable table = response.Value.Table;
+            LogsTable table = response.Value.Table;
 
             foreach (var row in table.Rows)
             {
@@ -58,7 +58,7 @@ public async Task QueryLogsAsTablePrintAll()
                 "AzureActivity | top 10 by TimeGenerated",
                 new DateTimeRange(TimeSpan.FromDays(1)));
 
-            LogsQueryResultTable table = response.Value.Table;
+            LogsTable table = response.Value.Table;
 
             foreach (var column in table.Columns)
             {
diff --git a/sdk/monitor/Azure.Monitor.Query/tests/MetricsQueryClientLiveTests.cs b/sdk/monitor/Azure.Monitor.Query/tests/MetricsQueryClientLiveTests.cs
index 6bdd28b49ec88..304440dd34f6a 100644
--- a/sdk/monitor/Azure.Monitor.Query/tests/MetricsQueryClientLiveTests.cs
+++ b/sdk/monitor/Azure.Monitor.Query/tests/MetricsQueryClientLiveTests.cs
@@ -57,7 +57,7 @@ public async Task CanQueryMetrics()
                 new MetricsQueryOptions()
                 {
                     MetricNamespace = _testData.MetricNamespace,
-                    TimeSpan = new DateTimeRange(_testData.StartTime, duration)
+                    TimeRange = new DateTimeRange(_testData.StartTime, duration)
                 });
 
             var timeSeriesData = results.Value.Metrics[0].TimeSeries[0].Data;
@@ -80,7 +80,7 @@ public async Task CanQueryMetricsAllAggregations()
                 new MetricsQueryOptions
                 {
                     MetricNamespace = _testData.MetricNamespace,
-                    TimeSpan = new DateTimeRange(_testData.StartTime, _testData.StartTime.Add(_testData.Duration)),
+                    TimeRange = new DateTimeRange(_testData.StartTime, _testData.StartTime.Add(_testData.Duration)),
                     Aggregations =
                     {
                         MetricAggregationType.Average,
@@ -113,7 +113,7 @@ public async Task CanQueryMetricsStartEnd()
                 new MetricsQueryOptions
                 {
                     MetricNamespace = _testData.MetricNamespace,
-                    TimeSpan = new DateTimeRange(_testData.StartTime, _testData.EndTime),
+                    TimeRange = new DateTimeRange(_testData.StartTime, _testData.EndTime),
                 });
 
             var timeSeriesData = results.Value.Metrics[0].TimeSeries[0].Data;
@@ -133,7 +133,7 @@ public async Task CanQueryMetricsStartDuration()
                 new MetricsQueryOptions
                 {
                     MetricNamespace = _testData.MetricNamespace,
-                    TimeSpan = new DateTimeRange(_testData.StartTime, _testData.Duration)
+                    TimeRange = new DateTimeRange(_testData.StartTime, _testData.Duration)
                 });
 
             var timeSeriesData = results.Value.Metrics[0].TimeSeries[0].Data;
@@ -153,7 +153,7 @@ public async Task CanQueryMetricsDurationEnd()
                 new MetricsQueryOptions
                 {
                     MetricNamespace = _testData.MetricNamespace,
-                    TimeSpan = new DateTimeRange(_testData.Duration, _testData.EndTime)
+                    TimeRange = new DateTimeRange(_testData.Duration, _testData.EndTime)
                 });
 
             var timeSeriesData = results.Value.Metrics[0].TimeSeries[0].Data;
@@ -190,8 +190,8 @@ public async Task CanQueryMetricsStartEndInterval()
                 new MetricsQueryOptions
                 {
                     MetricNamespace = _testData.MetricNamespace,
-                    TimeSpan = new DateTimeRange(_testData.StartTime, _testData.EndTime),
-                    Interval = TimeSpan.FromMinutes(5)
+                    TimeRange = new DateTimeRange(_testData.StartTime, _testData.EndTime),
+                    Granularity = TimeSpan.FromMinutes(5)
                 });
 
             var timeSeriesData = results.Value.Metrics[0].TimeSeries[0].Data;
@@ -211,7 +211,7 @@ public async Task CanQueryMetricsFilter()
                 new MetricsQueryOptions
                 {
                     MetricNamespace = _testData.MetricNamespace,
-                    TimeSpan = new DateTimeRange(_testData.StartTime, _testData.EndTime),
+                    TimeRange = new DateTimeRange(_testData.StartTime, _testData.EndTime),
                     Filter = $"Name eq '{_testData.Name1}'",
                     Aggregations =
                     {
@@ -234,7 +234,7 @@ public async Task CanQueryMetricsFilterTop()
                 new MetricsQueryOptions
                 {
                     MetricNamespace = _testData.MetricNamespace,
-                    TimeSpan = new DateTimeRange(_testData.StartTime, _testData.EndTime),
+                    TimeRange = new DateTimeRange(_testData.StartTime, _testData.EndTime),
                     Filter = $"Name eq '*'",
                     Top = 1,
                     Aggregations =
diff --git a/sdk/monitor/Azure.Monitor.Query/tests/MetricsTestData.cs b/sdk/monitor/Azure.Monitor.Query/tests/MetricsTestData.cs
index a471905f4645f..1c2e2d3388237 100644
--- a/sdk/monitor/Azure.Monitor.Query/tests/MetricsTestData.cs
+++ b/sdk/monitor/Azure.Monitor.Query/tests/MetricsTestData.cs
@@ -110,9 +110,9 @@ private async Task<bool> MetricsPropagated(MetricsQueryClient metricQueryClient)
             var metrics = await metricQueryClient.QueryAsync(_testEnvironment.MetricsResource, new[] {MetricName},
                 new MetricsQueryOptions()
                 {
-                    TimeSpan = new DateTimeRange(StartTime, Duration),
+                    TimeRange = new DateTimeRange(StartTime, Duration),
                     MetricNamespace = MetricNamespace,
-                    Interval = TimeSpan.FromMinutes(1),
+                    Granularity = TimeSpan.FromMinutes(1),
                     Aggregations =
                     {
                         MetricAggregationType.Count