Rename accessors

src/Umbraco.Core/Models/PublishedContent/ICurrentVariationAccessor.cs

@@ -1,13 +0,0 @@
-namespace Umbraco.Core.Models.PublishedContent
-{
-    /// <summary>
-    /// Gives access to the current <see cref="PublishedContent.CurrentVariation"/>.
-    /// </summary>
-    public interface ICurrentVariationAccessor
-    {
-        /// <summary>
-        /// Gets or sets the current <see cref="PublishedContent.CurrentVariation"/>.
-        /// </summary>
-        CurrentVariation CurrentVariation { get; set; }
-    }
-}

src/Umbraco.Core/Models/PublishedContent/IVariationContextAccessor.cs

@@ -0,0 +1,13 @@
+namespace Umbraco.Core.Models.PublishedContent
+{
+    /// <summary>
+    /// Gives access to the current <see cref="VariationContext"/>.
+    /// </summary>
+    public interface IVariationContextAccessor
+    {
+        /// <summary>
+        /// Gets or sets the current <see cref="VariationContext"/>.
+        /// </summary>
+        VariationContext VariationContext { get; set; }
+    }
+}

src/Umbraco.Core/Models/PublishedContent/ThreadCultureVariationContextAccessor.cs

@@ -5,18 +5,18 @@ using System.Threading;
 namespace Umbraco.Core.Models.PublishedContent
 {
     /// <summary>
-    /// Provides a CurrentUICulture-based implementation of <see cref="ICurrentVariationAccessor"/>.
+    /// Provides a CurrentUICulture-based implementation of <see cref="IVariationContextAccessor"/>.
     /// </summary>
     /// <remarks>
     /// <para>This accessor does not support segments. There is no need to set the current context.</para>
     /// </remarks>
-    public class ThreadCultureCurrentVariationAccessor : ICurrentVariationAccessor
+    public class ThreadCultureVariationContextAccessor : IVariationContextAccessor
     {
-        private readonly ConcurrentDictionary<string, CurrentVariation> _contexts = new ConcurrentDictionary<string, CurrentVariation>();
+        private readonly ConcurrentDictionary<string, VariationContext> _contexts = new ConcurrentDictionary<string, VariationContext>();
 
-        public CurrentVariation CurrentVariation
+        public VariationContext VariationContext
         {
-            get => _contexts.GetOrAdd(Thread.CurrentThread.CurrentUICulture.Name, culture => new CurrentVariation(culture));
+            get => _contexts.GetOrAdd(Thread.CurrentThread.CurrentUICulture.Name, culture => new VariationContext(culture));
             set => throw new NotSupportedException();
         }
     }

src/Umbraco.Core/Models/PublishedContent/ThreadStaticVariationContextAccessor.cs

@@ -3,18 +3,18 @@
 namespace Umbraco.Core.Models.PublishedContent
 {
     /// <summary>
-    /// Provides a ThreadStatic-based implementation of <see cref="ICurrentVariationAccessor"/>.
+    /// Provides a ThreadStatic-based implementation of <see cref="IVariationContextAccessor"/>.
     /// </summary>
     /// <remarks>
     /// <para>Something must set the current context.</para>
     /// </remarks>
-    public class ThreadStaticCurrentVariationAccessor : ICurrentVariationAccessor
+    public class ThreadStaticVariationContextAccessor : IVariationContextAccessor
     {
         [ThreadStatic]
-        private static CurrentVariation _context;
+        private static VariationContext _context;
 
         /// <inheritdoc />
-        public CurrentVariation CurrentVariation
+        public VariationContext VariationContext
         {
             get => _context;
             set => _context = value;

src/Umbraco.Core/Models/PublishedContent/VariationContext.cs

@@ -1,14 +1,14 @@
 namespace Umbraco.Core.Models.PublishedContent
 {
     /// <summary>
-    /// Represents the current variation.
+    /// Represents the variation context.
     /// </summary>
-    public class CurrentVariation
+    public class VariationContext
     {
         /// <summary>
-        /// Initializes a new instance of the <see cref="CurrentVariation"/> class.
+        /// Initializes a new instance of the <see cref="VariationContext"/> class.
         /// </summary>
-        public CurrentVariation(string culture = null, string segment = null)
+        public VariationContext(string culture = null, string segment = null)
         {
             Culture = culture ?? ""; // cannot be null, default to invariant
             Segment = segment ?? ""; // cannot be null, default to neutral