diff --git a/Orm/Xtensive.Orm.Tests.Framework/Measurement.cs b/Orm/Xtensive.Orm.Tests.Framework/Measurement.cs
index 8509b7df26..00a4c9b59e 100644
--- a/Orm/Xtensive.Orm.Tests.Framework/Measurement.cs
+++ b/Orm/Xtensive.Orm.Tests.Framework/Measurement.cs
@@ -34,7 +34,7 @@ public string Name
       get { return name; }
       [DebuggerStepThrough]
       set {
-        ArgumentValidator.EnsureArgumentNotNullOrEmpty(value, "value");
+        ArgumentException.ThrowIfNullOrEmpty(value);
         name = value;
         UpdateFullName();
       }
@@ -231,4 +231,4 @@ void IDisposable.Dispose()
         Complete();
     }
   }
-}
\ No newline at end of file
+}
diff --git a/Orm/Xtensive.Orm.Tests.Framework/TestSqlDriver.cs b/Orm/Xtensive.Orm.Tests.Framework/TestSqlDriver.cs
index 18ab54ba43..76388997a7 100644
--- a/Orm/Xtensive.Orm.Tests.Framework/TestSqlDriver.cs
+++ b/Orm/Xtensive.Orm.Tests.Framework/TestSqlDriver.cs
@@ -24,14 +24,14 @@ public static SqlDriver Create(UrlInfo connectionUrl)
 
     public static SqlDriver Create(string connectionUrl)
     {
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(connectionUrl, "connectionUrl");
+      ArgumentException.ThrowIfNullOrEmpty(connectionUrl);
       return BuildDriver(new ConnectionInfo(connectionUrl));
     }
 
     public static SqlDriver Create(string provider, string connectionString)
     {
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(provider, "provider");
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(connectionString, "connectionString");
+      ArgumentException.ThrowIfNullOrEmpty(provider);
+      ArgumentException.ThrowIfNullOrEmpty(connectionString);
       return BuildDriver(new ConnectionInfo(provider, connectionString));
     }
 
@@ -59,4 +59,4 @@ private static SqlDriverFactory GetFactory(string provider)
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/Orm/Xtensive.Orm/Collections/TypeRegistry.cs b/Orm/Xtensive.Orm/Collections/TypeRegistry.cs
index 70a81c2d33..dfb37c9f48 100644
--- a/Orm/Xtensive.Orm/Collections/TypeRegistry.cs
+++ b/Orm/Xtensive.Orm/Collections/TypeRegistry.cs
@@ -96,7 +96,7 @@ public void Register(Assembly assembly, string @namespace)
     {
       EnsureNotLocked();
       ArgumentNullException.ThrowIfNull(assembly);
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(@namespace, "@namespace");
+      ArgumentException.ThrowIfNullOrEmpty(@namespace);
       Register(new TypeRegistration(assembly, @namespace));
     }
 
diff --git a/Orm/Xtensive.Orm/Core/ArgumentValidator.cs b/Orm/Xtensive.Orm/Core/ArgumentValidator.cs
index 3a7defc5ab..2fafa0214e 100644
--- a/Orm/Xtensive.Orm/Core/ArgumentValidator.cs
+++ b/Orm/Xtensive.Orm/Core/ArgumentValidator.cs
@@ -37,43 +37,6 @@ public static void EnsureArgumentIsNotDefault<T>(T value, [InvokerParameterName]
       }
     }
 
-    /// <summary>
-    /// Ensures argument (<paramref name="value"/>) is not
-    /// <see langoword="null"/> or <see cref="string.Empty"/> string.
-    /// </summary>
-    /// <param name="value">Value to check.</param>
-    /// <param name="parameterName">Name of the method parameter.</param>
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-#if NET7_0_OR_GREATER
-    [Obsolete("Use ArgumentException.ThrowIfNullOrEmpty()")]
-#endif
-    internal static void EnsureArgumentNotNullOrEmpty(string value, [InvokerParameterName] string parameterName)
-    {
-#if NET7_0_OR_GREATER
-      ArgumentException.ThrowIfNullOrEmpty(value, parameterName);
-#else
-      ArgumentNullException.ThrowIfNull(value, parameterName);
-      if (value.Length == 0) {
-        throw new ArgumentException(Strings.ExArgumentCannotBeEmptyString, parameterName);
-      }
-#endif
-    }
-
-    [Obsolete("Use CommunityToolkit.Diagnostics.Guard.IsNotNullOrWhiteSpace()")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    internal static void EnsureArgumentNotNullOrEmptyOrWhiteSpace(string value, [InvokerParameterName] string parameterName)
-    {
-      ArgumentNullException.ThrowIfNull(value, parameterName);
-
-      if (value.Length==0) {
-        throw new ArgumentException(Strings.ExArgumentCannotBeEmptyString, parameterName);
-      }
-
-      if (value.Trim().Length==0) {
-        throw new ArgumentException(Strings.ExArgumentCannotBeWhiteSpacesOnlyString, parameterName);
-      }
-    }
-
     /// <summary>
     /// Ensures argument (<paramref name="value"/>) is not <see langword="null"/>
     /// and of <typeparamref name="T"/> type.
diff --git a/Orm/Xtensive.Orm/Linq/SerializableExpressions/Internals/ReflectionExtensions.cs b/Orm/Xtensive.Orm/Linq/SerializableExpressions/Internals/ReflectionExtensions.cs
index ad47651cc8..4bfc9eb454 100644
--- a/Orm/Xtensive.Orm/Linq/SerializableExpressions/Internals/ReflectionExtensions.cs
+++ b/Orm/Xtensive.Orm/Linq/SerializableExpressions/Internals/ReflectionExtensions.cs
@@ -87,7 +87,7 @@ public static ConstructorInfo GetConstructorFromSerializableForm(this string ser
 
     public static void AddArray<T>(this SerializationInfo info, string key, T[] array)
     {
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(key, "key");
+      ArgumentException.ThrowIfNullOrEmpty(key);
       ArgumentNullException.ThrowIfNull(array);
 
       info.AddValue($"{key}Count", array.Length);
@@ -97,7 +97,7 @@ public static void AddArray<T>(this SerializationInfo info, string key, T[] arra
 
     public static T[] GetArrayFromSerializableForm<T>(this SerializationInfo info, string key)
     {
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(key, "key");
+      ArgumentException.ThrowIfNullOrEmpty(key);
 
       var count = info.GetInt32($"{key}Count");
       var array = new T[count];
diff --git a/Orm/Xtensive.Orm/Modelling/Actions/CreateNodeAction.cs b/Orm/Xtensive.Orm/Modelling/Actions/CreateNodeAction.cs
index a9c487b92c..a6180c2538 100644
--- a/Orm/Xtensive.Orm/Modelling/Actions/CreateNodeAction.cs
+++ b/Orm/Xtensive.Orm/Modelling/Actions/CreateNodeAction.cs
@@ -43,7 +43,7 @@ public Type Type {
     public string Name {
       get { return name; }
       set {
-        ArgumentValidator.EnsureArgumentNotNullOrEmpty(value, "value");
+        ArgumentException.ThrowIfNullOrEmpty(value);
         EnsureNotLocked();
         name = value;
       }
@@ -122,4 +122,4 @@ protected override void GetParameters(List<Pair<string>> parameters)
         parameters.Add(new Pair<string>("Parameters", this.parameters.ToCommaDelimitedString()));
     }
   }
-}
\ No newline at end of file
+}
diff --git a/Orm/Xtensive.Orm/Modelling/Comparison/Hints/DataHint.cs b/Orm/Xtensive.Orm/Modelling/Comparison/Hints/DataHint.cs
index 46cad2c634..1f73232456 100644
--- a/Orm/Xtensive.Orm/Modelling/Comparison/Hints/DataHint.cs
+++ b/Orm/Xtensive.Orm/Modelling/Comparison/Hints/DataHint.cs
@@ -49,11 +49,11 @@ public override List<HintTarget> GetTargets()
     /// </summary>
     protected DataHint(string sourceTablePath,  IReadOnlyList<IdentityPair> identities)
     {
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(sourceTablePath, "sourceTablePath");
+      ArgumentException.ThrowIfNullOrEmpty(sourceTablePath);
       ArgumentNullException.ThrowIfNull(identities, "pairs");
       
       SourceTablePath = sourceTablePath;
       Identities = identities.AsSafeWrapper();
     }
   }
-}
\ No newline at end of file
+}
diff --git a/Orm/Xtensive.Orm/Modelling/Comparison/Hints/IgnoreHint.cs b/Orm/Xtensive.Orm/Modelling/Comparison/Hints/IgnoreHint.cs
index 6163bd2f64..3da59c57b5 100644
--- a/Orm/Xtensive.Orm/Modelling/Comparison/Hints/IgnoreHint.cs
+++ b/Orm/Xtensive.Orm/Modelling/Comparison/Hints/IgnoreHint.cs
@@ -44,8 +44,8 @@ public override string ToString()
     /// <param name="path">The ignored node path.</param>
     public IgnoreHint(string path)
     {
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(path, "path");
+      ArgumentException.ThrowIfNullOrEmpty(path);
       Path = path;
     }
   }
-}
\ No newline at end of file
+}
diff --git a/Orm/Xtensive.Orm/Modelling/Nesting.cs b/Orm/Xtensive.Orm/Modelling/Nesting.cs
index a10ad2a995..56c51aa88d 100644
--- a/Orm/Xtensive.Orm/Modelling/Nesting.cs
+++ b/Orm/Xtensive.Orm/Modelling/Nesting.cs
@@ -73,7 +73,7 @@ internal virtual void Initialize()
     internal Nesting(Node node, string propertyName)
     {
       ArgumentNullException.ThrowIfNull(node);
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(propertyName, "propertyName");
+      ArgumentException.ThrowIfNullOrEmpty(propertyName);
       Node = node;
       PropertyName = propertyName;
       Initialize();
@@ -86,4 +86,4 @@ internal Nesting(Node node)
       Initialize();
     }
   }
-}
\ No newline at end of file
+}
diff --git a/Orm/Xtensive.Orm/Modelling/Node.cs b/Orm/Xtensive.Orm/Modelling/Node.cs
index ab72fd1fe4..bc38722240 100644
--- a/Orm/Xtensive.Orm/Modelling/Node.cs
+++ b/Orm/Xtensive.Orm/Modelling/Node.cs
@@ -428,7 +428,7 @@ protected virtual void CopyPropertyValue(Node target, PropertyAccessor accessor)
     /// <exception cref="InvalidOperationException">newName!=newIndex for <see cref="IUnnamedNode"/>.</exception>
     protected virtual void ValidateMove(Node newParent, string newName, int newIndex)
     {
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(newName, nameof(newName));
+      ArgumentException.ThrowIfNullOrEmpty(newName);
       if (this is IModel) {
         ArgumentValidator.EnsureArgumentIsInRange(newIndex, 0, 0, nameof(newIndex));
         return;
@@ -1012,7 +1012,7 @@ protected Node(Node parent, string name)
       }
 
       if (!(this is IUnnamedNode)) {
-        ArgumentValidator.EnsureArgumentNotNullOrEmpty(name, nameof(name));
+        ArgumentException.ThrowIfNullOrEmpty(name);
       }
 
       Initialize();
@@ -1044,4 +1044,4 @@ void IDeserializationCallback.OnDeserialization(object sender)
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/Orm/Xtensive.Orm/Modelling/NodeCollection.cs b/Orm/Xtensive.Orm/Modelling/NodeCollection.cs
index 68d3aa0a48..319c55f46c 100644
--- a/Orm/Xtensive.Orm/Modelling/NodeCollection.cs
+++ b/Orm/Xtensive.Orm/Modelling/NodeCollection.cs
@@ -372,7 +372,7 @@ protected virtual void Initialize()
     protected NodeCollection(Node parent, string name)
     {
       ArgumentNullException.ThrowIfNull(parent);
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(name, "name");
+      ArgumentException.ThrowIfNullOrEmpty(name);
       this.name = name;
       this.parent = parent;
       Initialize();
@@ -394,4 +394,3 @@ void IDeserializationCallback.OnDeserialization(object sender)
     }
   }
 }
-
diff --git a/Orm/Xtensive.Orm/Orm/Building/Definitions/TypeDef.cs b/Orm/Xtensive.Orm/Orm/Building/Definitions/TypeDef.cs
index 2663457357..ebad45417f 100644
--- a/Orm/Xtensive.Orm/Orm/Building/Definitions/TypeDef.cs
+++ b/Orm/Xtensive.Orm/Orm/Building/Definitions/TypeDef.cs
@@ -171,7 +171,7 @@ public FieldDef DefineField(PropertyInfo property)
     /// <returns></returns>
     public FieldDef DefineField(string name, Type valueType)
     {
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(name, nameof(name));
+      ArgumentException.ThrowIfNullOrEmpty(name);
       ArgumentNullException.ThrowIfNull(valueType);
 
       var field = builder.DefineField(UnderlyingType, name, valueType);
@@ -221,4 +221,4 @@ internal TypeDef(ModelDefBuilder builder, Type type, Validator validator)
         : NodeCollection<TypeDef>.Empty;
     }
   }
-}
\ No newline at end of file
+}
diff --git a/Orm/Xtensive.Orm/Orm/Configuration/DatabaseConfiguration.cs b/Orm/Xtensive.Orm/Orm/Configuration/DatabaseConfiguration.cs
index 15deb1db86..87e2f1838e 100644
--- a/Orm/Xtensive.Orm/Orm/Configuration/DatabaseConfiguration.cs
+++ b/Orm/Xtensive.Orm/Orm/Configuration/DatabaseConfiguration.cs
@@ -28,7 +28,7 @@ public string Name
       get { return name; }
       set
       {
-        ArgumentValidator.EnsureArgumentNotNullOrEmpty(value, "value");
+        ArgumentException.ThrowIfNullOrEmpty(value);
         EnsureNotLocked();
         name = value;
       }
@@ -109,10 +109,10 @@ public DatabaseConfiguration Clone()
     /// <param name="name">Database name.</param>
     public DatabaseConfiguration(string name)
     {
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(name, "name");
+      ArgumentException.ThrowIfNullOrEmpty(name);
       Name = name;
       minTypeId = TypeInfo.MinTypeId;
       maxTypeId = int.MaxValue;
     }
   }
-}
\ No newline at end of file
+}
diff --git a/Orm/Xtensive.Orm/Orm/Configuration/DomainConfiguration.cs b/Orm/Xtensive.Orm/Orm/Configuration/DomainConfiguration.cs
index db595feb62..8e92db972a 100644
--- a/Orm/Xtensive.Orm/Orm/Configuration/DomainConfiguration.cs
+++ b/Orm/Xtensive.Orm/Orm/Configuration/DomainConfiguration.cs
@@ -170,7 +170,7 @@ public static string SectionName
     {
       get => sectionName;
       set {
-        ArgumentValidator.EnsureArgumentNotNullOrEmpty(value, "value");
+        ArgumentException.ThrowIfNullOrEmpty(value);
         if (sectionNameIsDefined) {
           throw Exceptions.AlreadyInitialized(nameof(SectionName));
         }
diff --git a/Orm/Xtensive.Orm/Orm/Configuration/KeyGeneratorConfiguration.cs b/Orm/Xtensive.Orm/Orm/Configuration/KeyGeneratorConfiguration.cs
index e7fb4d1ca7..ad88af5132 100644
--- a/Orm/Xtensive.Orm/Orm/Configuration/KeyGeneratorConfiguration.cs
+++ b/Orm/Xtensive.Orm/Orm/Configuration/KeyGeneratorConfiguration.cs
@@ -26,7 +26,7 @@ public string Name
       get { return name; }
       set
       {
-        ArgumentValidator.EnsureArgumentNotNullOrEmpty(value, "value");
+        ArgumentException.ThrowIfNullOrEmpty(value);
         EnsureNotLocked();
         name = value;
       }
@@ -96,4 +96,4 @@ public KeyGeneratorConfiguration(string name)
       CacheSize = DomainConfiguration.DefaultKeyGeneratorCacheSize;
     }
   }
-}
\ No newline at end of file
+}
diff --git a/Orm/Xtensive.Orm/Orm/Configuration/LoggingConfiguration.cs b/Orm/Xtensive.Orm/Orm/Configuration/LoggingConfiguration.cs
index 5630a23dbd..0af3f23357 100644
--- a/Orm/Xtensive.Orm/Orm/Configuration/LoggingConfiguration.cs
+++ b/Orm/Xtensive.Orm/Orm/Configuration/LoggingConfiguration.cs
@@ -43,7 +43,7 @@ public static LoggingConfiguration Load()
     /// <returns>Loaded configuration.</returns>
     public static LoggingConfiguration Load(string sectionName)
     {
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(sectionName, "sectionName");
+      ArgumentException.ThrowIfNullOrEmpty(sectionName);
 
       var section = (ConfigurationSection)ConfigurationManager.GetSection(sectionName);
       if (section==null)
@@ -71,7 +71,7 @@ public static LoggingConfiguration Load(System.Configuration.Configuration confi
     public static LoggingConfiguration Load(System.Configuration.Configuration configuration, string sectionName)
     {
       ArgumentNullException.ThrowIfNull(configuration);
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(sectionName, "sectionName");
+      ArgumentException.ThrowIfNullOrEmpty(sectionName);
 
       var section = (ConfigurationSection) configuration.GetSection(sectionName);
       if (section==null)
diff --git a/Orm/Xtensive.Orm/Orm/Configuration/NameMappingCollection.cs b/Orm/Xtensive.Orm/Orm/Configuration/NameMappingCollection.cs
index cff5eb17f9..9e4bafa6d8 100644
--- a/Orm/Xtensive.Orm/Orm/Configuration/NameMappingCollection.cs
+++ b/Orm/Xtensive.Orm/Orm/Configuration/NameMappingCollection.cs
@@ -38,8 +38,8 @@ public class NameMappingCollection : LockableBase, IEnumerable<KeyValuePair<stri
     /// <param name="mappedName"></param>
     public void Add([NotNull] string originalName, [NotNull] string mappedName)
     {
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(originalName, "originalName");
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(mappedName, "mappedName");
+      ArgumentException.ThrowIfNullOrEmpty(originalName);
+      ArgumentException.ThrowIfNullOrEmpty(mappedName);
       EnsureNotLocked();
       items[originalName] = mappedName;
     }
@@ -50,7 +50,7 @@ public void Add([NotNull] string originalName, [NotNull] string mappedName)
     /// <param name="originalName"></param>
     public bool Remove([NotNull] string originalName)
     {
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(originalName, "originalName");
+      ArgumentException.ThrowIfNullOrEmpty(originalName);
       EnsureNotLocked();
       return items.Remove(originalName);
     }
@@ -61,7 +61,7 @@ public bool Remove([NotNull] string originalName)
     /// <param name="name">Mapped name for <paramref name="name"/>.</param>
     public string Apply([NotNull] string name)
     {
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(name, "name");
+      ArgumentException.ThrowIfNullOrEmpty(name);
       string result;
       if (items.TryGetValue(name, out result))
         return result;
@@ -126,4 +126,4 @@ static NameMappingCollection()
       Empty.Lock();
     }
   }
-}
\ No newline at end of file
+}
diff --git a/Orm/Xtensive.Orm/Orm/Configuration/SessionConfiguration.cs b/Orm/Xtensive.Orm/Orm/Configuration/SessionConfiguration.cs
index 1107f23c39..be848288a5 100644
--- a/Orm/Xtensive.Orm/Orm/Configuration/SessionConfiguration.cs
+++ b/Orm/Xtensive.Orm/Orm/Configuration/SessionConfiguration.cs
@@ -305,7 +305,7 @@ public SessionConfiguration(string name)
     /// <param name="name">Value for <see cref="Name"/>.</param>
     public SessionConfiguration(string name, SessionOptions sessionOptions)
     {
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(name, "name");
+      ArgumentException.ThrowIfNullOrEmpty(name);
 
       Name = name;
       Options = sessionOptions;
diff --git a/Orm/Xtensive.Orm/Orm/Configuration/SessionConfigurationCollection.cs b/Orm/Xtensive.Orm/Orm/Configuration/SessionConfigurationCollection.cs
index 9d76c68e03..e4e9ef8698 100644
--- a/Orm/Xtensive.Orm/Orm/Configuration/SessionConfigurationCollection.cs
+++ b/Orm/Xtensive.Orm/Orm/Configuration/SessionConfigurationCollection.cs
@@ -91,7 +91,7 @@ public override void AddRange(IEnumerable<SessionConfiguration> items)
 
     private void EnsureItemIsValid(SessionConfiguration item)
     {
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(item.Name, "SessionConfiguration.Name");
+      ArgumentException.ThrowIfNullOrEmpty(item.Name, "SessionConfiguration.Name");
       var current = this[item.Name];
       if (current != null)
         throw new InvalidOperationException(string.Format(Strings.ExConfigurationWithXNameAlreadyRegistered, current.Name));
diff --git a/Orm/Xtensive.Orm/Orm/ConnectionInfo.cs b/Orm/Xtensive.Orm/Orm/ConnectionInfo.cs
index 1c7cd102af..d2c690be27 100644
--- a/Orm/Xtensive.Orm/Orm/ConnectionInfo.cs
+++ b/Orm/Xtensive.Orm/Orm/ConnectionInfo.cs
@@ -93,8 +93,8 @@ public bool Equals(ConnectionInfo other)
     /// <param name="connectionString">A value for <see cref="ConnectionString"/>.</param>
     public ConnectionInfo(string provider, string connectionString)
     {
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(provider, "provider");
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(connectionString, "connectionString");
+      ArgumentException.ThrowIfNullOrEmpty(provider);
+      ArgumentException.ThrowIfNullOrEmpty(connectionString);
 
       ConnectionString = connectionString;
       Provider = provider.ToLowerInvariant();
diff --git a/Orm/Xtensive.Orm/Orm/ConnectionInitEventData.cs b/Orm/Xtensive.Orm/Orm/ConnectionInitEventData.cs
index 6825bbaa38..012ec4ff20 100644
--- a/Orm/Xtensive.Orm/Orm/ConnectionInitEventData.cs
+++ b/Orm/Xtensive.Orm/Orm/ConnectionInitEventData.cs
@@ -20,7 +20,7 @@ public class ConnectionInitEventData : ConnectionEventData
     public ConnectionInitEventData(string initializationScript, DbConnection connection, bool reconnect = false)
       : base(connection, reconnect)
     {
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(initializationScript, nameof(initializationScript));
+      ArgumentException.ThrowIfNullOrEmpty(initializationScript);
       InitializationScript = initializationScript;
     }
   }
diff --git a/Orm/Xtensive.Orm/Orm/FullTextSearchCondition/Nodes/PrefixTerm.cs b/Orm/Xtensive.Orm/Orm/FullTextSearchCondition/Nodes/PrefixTerm.cs
index ab84e3d5b6..7f4d1d33dc 100644
--- a/Orm/Xtensive.Orm/Orm/FullTextSearchCondition/Nodes/PrefixTerm.cs
+++ b/Orm/Xtensive.Orm/Orm/FullTextSearchCondition/Nodes/PrefixTerm.cs
@@ -30,8 +30,8 @@ internal PrefixTerm(string prefix)
     internal PrefixTerm(IOperator source, string prefix)
       : base(SearchConditionNodeType.Prefix, source)
     {
-      ArgumentValidator.EnsureArgumentNotNullOrEmptyOrWhiteSpace(prefix, "prefix");
+      ArgumentException.ThrowIfNullOrWhiteSpace(prefix);
       Prefix = prefix;
     }
   }
-}
\ No newline at end of file
+}
diff --git a/Orm/Xtensive.Orm/Orm/FullTextSearchCondition/Nodes/SimpleTerm.cs b/Orm/Xtensive.Orm/Orm/FullTextSearchCondition/Nodes/SimpleTerm.cs
index 57dfe56749..4248aa53f0 100644
--- a/Orm/Xtensive.Orm/Orm/FullTextSearchCondition/Nodes/SimpleTerm.cs
+++ b/Orm/Xtensive.Orm/Orm/FullTextSearchCondition/Nodes/SimpleTerm.cs
@@ -30,7 +30,7 @@ internal SimpleTerm(string term)
     internal SimpleTerm(IOperator source, string term)
       : base(SearchConditionNodeType.SimpleTerm, source)
     {
-      ArgumentValidator.EnsureArgumentNotNullOrEmptyOrWhiteSpace(term, "term");
+      ArgumentException.ThrowIfNullOrWhiteSpace(term);
       Term = term;
     }
   }
diff --git a/Orm/Xtensive.Orm/Orm/Logging/LogManager.cs b/Orm/Xtensive.Orm/Orm/Logging/LogManager.cs
index cdbccf0eeb..6be0f02484 100644
--- a/Orm/Xtensive.Orm/Orm/Logging/LogManager.cs
+++ b/Orm/Xtensive.Orm/Orm/Logging/LogManager.cs
@@ -96,7 +96,7 @@ internal void AutoInitialize()
     /// <returns>Founded log or default.</returns>
     public BaseLog GetLog(string logName)
     {
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(logName, "logName");
+      ArgumentException.ThrowIfNullOrEmpty(logName);
 
       lock (syncObj) {
         if (provider==null)
@@ -105,4 +105,4 @@ public BaseLog GetLog(string logName)
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/Orm/Xtensive.Orm/Orm/Model/Node.cs b/Orm/Xtensive.Orm/Orm/Model/Node.cs
index 5dd5521a68..7eccce1861 100644
--- a/Orm/Xtensive.Orm/Orm/Model/Node.cs
+++ b/Orm/Xtensive.Orm/Orm/Model/Node.cs
@@ -107,7 +107,7 @@ public override string ToString()
     /// </summary>
     protected Node(string name)
     {
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(name, "name");
+      ArgumentException.ThrowIfNullOrEmpty(name);
       Name = name;
     }
 
@@ -118,4 +118,4 @@ protected Node()
     {
     }
   }
-}
\ No newline at end of file
+}
diff --git a/Orm/Xtensive.Orm/Orm/Model/NodeCollection.cs b/Orm/Xtensive.Orm/Orm/Model/NodeCollection.cs
index 687dda668b..820a08fce5 100644
--- a/Orm/Xtensive.Orm/Orm/Model/NodeCollection.cs
+++ b/Orm/Xtensive.Orm/Orm/Model/NodeCollection.cs
@@ -227,7 +227,7 @@ public NodeCollection(Node owner, string name)
 
     protected NodeCollection(Node owner, string name, Dictionary<string, TNode> nameIndex)
     {
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(name, "name");
+      ArgumentException.ThrowIfNullOrEmpty(name);
       NameIndex = nameIndex;
       Owner = owner;
       Name = name;
@@ -243,4 +243,4 @@ static NodeCollection()
       Empty.Lock(false);
     }
   }
-}
\ No newline at end of file
+}
diff --git a/Orm/Xtensive.Orm/Orm/Providers/CommandProcessing/CommandFactory.cs b/Orm/Xtensive.Orm/Orm/Providers/CommandProcessing/CommandFactory.cs
index 2922554e59..7c8ad2746f 100644
--- a/Orm/Xtensive.Orm/Orm/Providers/CommandProcessing/CommandFactory.cs
+++ b/Orm/Xtensive.Orm/Orm/Providers/CommandProcessing/CommandFactory.cs
@@ -45,7 +45,7 @@ public IEnumerable<CommandPart> CreatePersistParts(SqlPersistTask task)
     public virtual IEnumerable<CommandPart> CreatePersistParts(SqlPersistTask task, string parameterNamePrefix)
     {
       ArgumentNullException.ThrowIfNull(task);
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(parameterNamePrefix, "parameterNamePrefix");
+      ArgumentException.ThrowIfNullOrEmpty(parameterNamePrefix);
 
       var nodeConfiguration = Session.StorageNode.Configuration;
       var shareStorageNodesOverNodes = Session.Domain.Configuration.ShareStorageSchemaOverNodes;
@@ -95,7 +95,7 @@ public CommandPart CreateQueryPart(IQueryRequest request, ParameterContext param
     public virtual CommandPart CreateQueryPart(IQueryRequest request, string parameterNamePrefix, ParameterContext parameterContext)
     {
       ArgumentNullException.ThrowIfNull(request);
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(parameterNamePrefix, "parameterNamePrefix");
+      ArgumentException.ThrowIfNullOrEmpty(parameterNamePrefix);
 
       int parameterIndex = 0;
       var compilationResult = request.GetCompiledStatement();
diff --git a/Orm/Xtensive.Orm/Orm/Providers/Expressions/QueryParameterIdentity.cs b/Orm/Xtensive.Orm/Orm/Providers/Expressions/QueryParameterIdentity.cs
index a1c26f839f..2ec44b5e3c 100644
--- a/Orm/Xtensive.Orm/Orm/Providers/Expressions/QueryParameterIdentity.cs
+++ b/Orm/Xtensive.Orm/Orm/Providers/Expressions/QueryParameterIdentity.cs
@@ -54,7 +54,7 @@ public QueryParameterIdentity(TypeMapping mapping, object closureObject, string
     {
       ArgumentNullException.ThrowIfNull(mapping);
       ArgumentNullException.ThrowIfNull(closureObject);
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(fieldName, "fieldName");
+      ArgumentException.ThrowIfNullOrEmpty(fieldName);
 
       Mapping = mapping;
       ClosureObject = closureObject;
diff --git a/Orm/Xtensive.Orm/Orm/Providers/SequenceQuery.cs b/Orm/Xtensive.Orm/Orm/Providers/SequenceQuery.cs
index a2d4ff10ff..6ba897b406 100644
--- a/Orm/Xtensive.Orm/Orm/Providers/SequenceQuery.cs
+++ b/Orm/Xtensive.Orm/Orm/Providers/SequenceQuery.cs
@@ -33,8 +33,8 @@ public long ExecuteWith(ISqlExecutor sqlExecutor)
     public SequenceQuery(string deleteQuery, string insertQuery, string selectQuery, SequenceQueryCompartment compartment)
     {
       ArgumentNullException.ThrowIfNull(deleteQuery);
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(insertQuery, "insertQuery");
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(selectQuery, "selectQuery");
+      ArgumentException.ThrowIfNullOrEmpty(insertQuery);
+      ArgumentException.ThrowIfNullOrEmpty(selectQuery);
 
       DeleteQuery = deleteQuery;
       InsertQuery = insertQuery;
@@ -44,8 +44,8 @@ public SequenceQuery(string deleteQuery, string insertQuery, string selectQuery,
 
     public SequenceQuery(string insertQuery, string selectQuery, SequenceQueryCompartment compartment)
     {
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(insertQuery, "insertQuery");
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(selectQuery, "selectQuery");
+      ArgumentException.ThrowIfNullOrEmpty(insertQuery);
+      ArgumentException.ThrowIfNullOrEmpty(selectQuery);
 
       InsertQuery = insertQuery;
       SelectQuery = selectQuery;
@@ -54,9 +54,9 @@ public SequenceQuery(string insertQuery, string selectQuery, SequenceQueryCompar
 
     public SequenceQuery(string selectQuery, SequenceQueryCompartment compartment)
     {
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(selectQuery, "selectQuery");
+      ArgumentException.ThrowIfNullOrEmpty(selectQuery);
       SelectQuery = selectQuery;
       Compartment = compartment;
     }
   }
-}
\ No newline at end of file
+}
diff --git a/Orm/Xtensive.Orm/Orm/Providers/TemporaryTables/TemporaryTableDescriptor.cs b/Orm/Xtensive.Orm/Orm/Providers/TemporaryTables/TemporaryTableDescriptor.cs
index 4f46e120f2..10a723c7f3 100644
--- a/Orm/Xtensive.Orm/Orm/Providers/TemporaryTables/TemporaryTableDescriptor.cs
+++ b/Orm/Xtensive.Orm/Orm/Providers/TemporaryTables/TemporaryTableDescriptor.cs
@@ -84,8 +84,8 @@ public sealed class TemporaryTableDescriptor : IMultiRecordPersistDescriptor
     /// <param name="name">A value for <see cref="Name"/>.</param>
     public TemporaryTableDescriptor(string name)
     {
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(name, "name");
+      ArgumentException.ThrowIfNullOrEmpty(name);
       Name = name;
     }
   }
-}
\ No newline at end of file
+}
diff --git a/Orm/Xtensive.Orm/Orm/RecycledFieldDefinition.cs b/Orm/Xtensive.Orm/Orm/RecycledFieldDefinition.cs
index 12ed97cdbe..e0e41d97ec 100644
--- a/Orm/Xtensive.Orm/Orm/RecycledFieldDefinition.cs
+++ b/Orm/Xtensive.Orm/Orm/RecycledFieldDefinition.cs
@@ -55,7 +55,7 @@ public RecycledFieldDefinition(Type ownerType, string fieldName, Type fieldType)
     public RecycledFieldDefinition(Type ownerType, string fieldName, Type fieldType, string originalFieldName)
     {
       Initialize(ownerType, fieldName, fieldType);
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(originalFieldName, "originalFieldName");
+      ArgumentException.ThrowIfNullOrEmpty(originalFieldName);
 
       OriginalFieldName = originalFieldName;
     }
@@ -63,7 +63,7 @@ public RecycledFieldDefinition(Type ownerType, string fieldName, Type fieldType,
     private void Initialize(Type ownerType, string fieldName, Type fieldType)
     {
       ArgumentNullException.ThrowIfNull(ownerType);
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(fieldName, "fieldName");
+      ArgumentException.ThrowIfNullOrEmpty(fieldName);
       ArgumentNullException.ThrowIfNull(fieldType);
 
       OwnerType = ownerType;
diff --git a/Orm/Xtensive.Orm/Orm/Rse/ColumnCollection.cs b/Orm/Xtensive.Orm/Orm/Rse/ColumnCollection.cs
index 8f37f01c39..0b2613c9ad 100644
--- a/Orm/Xtensive.Orm/Orm/Rse/ColumnCollection.cs
+++ b/Orm/Xtensive.Orm/Orm/Rse/ColumnCollection.cs
@@ -101,7 +101,7 @@ public ColumnCollection Join(IEnumerable<Column> joined)
     /// <returns>Aliased collection of columns.</returns>
     public ColumnCollection Alias(string alias)
     {
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(alias, "alias");
+      ArgumentException.ThrowIfNullOrEmpty(alias);
       return new ColumnCollection(this.Select(column => column.Clone(alias + "." + column.Name)).ToArray(Count));
     }
 
diff --git a/Orm/Xtensive.Orm/Orm/Rse/CompilableProviderExtensions.cs b/Orm/Xtensive.Orm/Orm/Rse/CompilableProviderExtensions.cs
index 8ddf1a624a..fd57cd088b 100644
--- a/Orm/Xtensive.Orm/Orm/Rse/CompilableProviderExtensions.cs
+++ b/Orm/Xtensive.Orm/Orm/Rse/CompilableProviderExtensions.cs
@@ -72,7 +72,7 @@ public static CompilableProvider OrderBy(this CompilableProvider source, Directi
 
     public static CompilableProvider Alias(this CompilableProvider source, string alias)
     {
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(alias, "alias");
+      ArgumentException.ThrowIfNullOrEmpty(alias);
       return new AliasProvider(source, alias);
     }
 
@@ -224,4 +224,4 @@ public static CompilableProvider IndexHint(this CompilableProvider source, Index
       return new IndexHintProvider(source, index);
     }
   }
-}
\ No newline at end of file
+}
diff --git a/Orm/Xtensive.Orm/Orm/Rse/Providers/Compilable/IncludeProvider.cs b/Orm/Xtensive.Orm/Orm/Rse/Providers/Compilable/IncludeProvider.cs
index f139beeaa9..0d610f0717 100644
--- a/Orm/Xtensive.Orm/Orm/Rse/Providers/Compilable/IncludeProvider.cs
+++ b/Orm/Xtensive.Orm/Orm/Rse/Providers/Compilable/IncludeProvider.cs
@@ -91,7 +91,7 @@ public IncludeProvider(CompilableProvider source, IncludeAlgorithm algorithm, bo
       : base(ProviderType.Include, source)
     {
       ArgumentNullException.ThrowIfNull(filterDataSource);
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(resultColumnName, "resultColumnName");
+      ArgumentException.ThrowIfNullOrEmpty(resultColumnName);
       ArgumentNullException.ThrowIfNull(filteredColumns);
       Algorithm = algorithm;
       IsInlined = isInlined;
@@ -102,4 +102,4 @@ public IncludeProvider(CompilableProvider source, IncludeAlgorithm algorithm, bo
       Initialize();
     }
   }
-}
\ No newline at end of file
+}
diff --git a/Orm/Xtensive.Orm/Orm/Rse/Providers/Compilable/StoreProvider.cs b/Orm/Xtensive.Orm/Orm/Rse/Providers/Compilable/StoreProvider.cs
index 732fc1ad03..fd3485062e 100644
--- a/Orm/Xtensive.Orm/Orm/Rse/Providers/Compilable/StoreProvider.cs
+++ b/Orm/Xtensive.Orm/Orm/Rse/Providers/Compilable/StoreProvider.cs
@@ -53,7 +53,7 @@ public StoreProvider(RecordSetHeader header, string name)
       : base (ProviderType.Store)
     {
       ArgumentNullException.ThrowIfNull(header);
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(name, "name");
+      ArgumentException.ThrowIfNullOrEmpty(name);
 
       Name = name;
 
@@ -71,7 +71,7 @@ public StoreProvider(CompilableProvider source, string name)
       : base(ProviderType.Store, source)
     {
       ArgumentNullException.ThrowIfNull(source);
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(name, "name");
+      ArgumentException.ThrowIfNullOrEmpty(name);
 
       Name = name;
       Source = source;
@@ -98,4 +98,4 @@ public StoreProvider(CompilableProvider source)
       Initialize();
     }
   }
-}
\ No newline at end of file
+}
diff --git a/Orm/Xtensive.Orm/Orm/Rse/Providers/Compilable/TagProvider.cs b/Orm/Xtensive.Orm/Orm/Rse/Providers/Compilable/TagProvider.cs
index 8a60396624..7048d9275e 100644
--- a/Orm/Xtensive.Orm/Orm/Rse/Providers/Compilable/TagProvider.cs
+++ b/Orm/Xtensive.Orm/Orm/Rse/Providers/Compilable/TagProvider.cs
@@ -25,9 +25,9 @@ public sealed class TagProvider : UnaryProvider
     public TagProvider(CompilableProvider source, string tag)
       : base(ProviderType.Tag, source)
     {
-      ArgumentValidator.EnsureArgumentNotNullOrEmptyOrWhiteSpace(tag, "tag");
+      ArgumentException.ThrowIfNullOrWhiteSpace(tag);
       Tag = tag;
       Initialize();
     }
   }
-}
\ No newline at end of file
+}
diff --git a/Orm/Xtensive.Orm/Orm/Upgrade/Hints/ChangeFieldTypeHint.cs b/Orm/Xtensive.Orm/Orm/Upgrade/Hints/ChangeFieldTypeHint.cs
index d6390897e7..59e96f1ed0 100644
--- a/Orm/Xtensive.Orm/Orm/Upgrade/Hints/ChangeFieldTypeHint.cs
+++ b/Orm/Xtensive.Orm/Orm/Upgrade/Hints/ChangeFieldTypeHint.cs
@@ -67,7 +67,7 @@ public bool Equals(ChangeFieldTypeHint other)
     public ChangeFieldTypeHint(Type type, string fieldName)
     {
       ArgumentNullException.ThrowIfNull(type);
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(fieldName, nameof(fieldName));
+      ArgumentException.ThrowIfNullOrEmpty(fieldName);
 
       Type = type;
       FieldName = fieldName;
diff --git a/Orm/Xtensive.Orm/Orm/Upgrade/Hints/CopyFieldHint.cs b/Orm/Xtensive.Orm/Orm/Upgrade/Hints/CopyFieldHint.cs
index dbc5b298e9..5ab9ddd815 100644
--- a/Orm/Xtensive.Orm/Orm/Upgrade/Hints/CopyFieldHint.cs
+++ b/Orm/Xtensive.Orm/Orm/Upgrade/Hints/CopyFieldHint.cs
@@ -75,10 +75,10 @@ public override string ToString() =>
     /// <param name="targetFieldName">Name of target field.</param>
     public CopyFieldHint(string sourceTypeName, string sourceFieldName, Type targetType, string targetFieldName)
     {
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(sourceTypeName, nameof(sourceTypeName));
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(sourceFieldName, nameof(sourceFieldName));
+      ArgumentException.ThrowIfNullOrEmpty(sourceTypeName);
+      ArgumentException.ThrowIfNullOrEmpty(sourceFieldName);
       ArgumentNullException.ThrowIfNull(targetType);
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(targetFieldName, nameof(targetFieldName));
+      ArgumentException.ThrowIfNullOrEmpty(targetFieldName);
       SourceType = sourceTypeName;
       SourceField = sourceFieldName;
       TargetType = targetType;
@@ -106,9 +106,9 @@ public CopyFieldHint(Type sourceType, string fieldName, Type targetType)
     public CopyFieldHint(Type sourceType, string sourceFieldName, Type targetType, string targetFieldName)
     {
       ArgumentNullException.ThrowIfNull(sourceType);
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(sourceFieldName, nameof(sourceFieldName));
+      ArgumentException.ThrowIfNullOrEmpty(sourceFieldName);
       ArgumentNullException.ThrowIfNull(targetType);
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(targetFieldName, nameof(targetFieldName));
+      ArgumentException.ThrowIfNullOrEmpty(targetFieldName);
       
       SourceType = sourceType.FullName;
       SourceField = sourceFieldName;
diff --git a/Orm/Xtensive.Orm/Orm/Upgrade/Hints/MoveFieldHint.cs b/Orm/Xtensive.Orm/Orm/Upgrade/Hints/MoveFieldHint.cs
index 8d90b288b2..226d893037 100644
--- a/Orm/Xtensive.Orm/Orm/Upgrade/Hints/MoveFieldHint.cs
+++ b/Orm/Xtensive.Orm/Orm/Upgrade/Hints/MoveFieldHint.cs
@@ -76,10 +76,10 @@ public override string ToString() =>
     /// <param name="targetFieldName">The target field name.</param>
     public MoveFieldHint(string sourceTypeName, string sourceFieldName, Type targetType, string targetFieldName)
     {
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(sourceTypeName, nameof(sourceTypeName));
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(sourceFieldName, nameof(sourceFieldName));
+      ArgumentException.ThrowIfNullOrEmpty(sourceTypeName);
+      ArgumentException.ThrowIfNullOrEmpty(sourceFieldName);
       ArgumentNullException.ThrowIfNull(targetType);
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(targetFieldName, nameof(targetFieldName));
+      ArgumentException.ThrowIfNullOrEmpty(targetFieldName);
       SourceType = sourceTypeName;
       SourceField = sourceFieldName;
       TargetType = targetType;
@@ -107,9 +107,9 @@ public MoveFieldHint(Type sourceType, string fieldName, Type targetType)
     public MoveFieldHint(Type sourceType, string sourceFieldName, Type targetType, string targetFieldName)
     {
       ArgumentNullException.ThrowIfNull(sourceType);
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(sourceFieldName, nameof(sourceFieldName));
+      ArgumentException.ThrowIfNullOrEmpty(sourceFieldName);
       ArgumentNullException.ThrowIfNull(targetType);
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(targetFieldName, nameof(targetFieldName));
+      ArgumentException.ThrowIfNullOrEmpty(targetFieldName);
 
       SourceType = sourceType.FullName;
       SourceField = sourceFieldName;
diff --git a/Orm/Xtensive.Orm/Orm/Upgrade/Hints/RemoveFieldHint.cs b/Orm/Xtensive.Orm/Orm/Upgrade/Hints/RemoveFieldHint.cs
index 4c3788014e..765aa8ebcf 100644
--- a/Orm/Xtensive.Orm/Orm/Upgrade/Hints/RemoveFieldHint.cs
+++ b/Orm/Xtensive.Orm/Orm/Upgrade/Hints/RemoveFieldHint.cs
@@ -70,8 +70,8 @@ public bool Equals(RemoveFieldHint other)
     /// <param name="fieldName">Removing field name.</param>
     public RemoveFieldHint(string typeName, string fieldName)
     {
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(typeName, nameof(typeName));
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(fieldName, nameof(fieldName));
+      ArgumentException.ThrowIfNullOrEmpty(typeName);
+      ArgumentException.ThrowIfNullOrEmpty(fieldName);
       Type = typeName;
       Field = fieldName;
       AffectedColumns = Array.Empty<string>();
@@ -85,7 +85,7 @@ public RemoveFieldHint(string typeName, string fieldName)
     public RemoveFieldHint(Type type, string fieldName)
     {
       ArgumentNullException.ThrowIfNull(type);
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(fieldName, nameof(fieldName));
+      ArgumentException.ThrowIfNullOrEmpty(fieldName);
 
       Type = type.FullName;
       Field = fieldName;
diff --git a/Orm/Xtensive.Orm/Orm/Upgrade/Hints/RemoveTypeHint.cs b/Orm/Xtensive.Orm/Orm/Upgrade/Hints/RemoveTypeHint.cs
index 5a8c7c8aa1..375df27a70 100644
--- a/Orm/Xtensive.Orm/Orm/Upgrade/Hints/RemoveTypeHint.cs
+++ b/Orm/Xtensive.Orm/Orm/Upgrade/Hints/RemoveTypeHint.cs
@@ -57,7 +57,7 @@ public bool Equals(RemoveTypeHint other)
     /// <param name="typeName">Full name of type.</param>
     public RemoveTypeHint(string typeName)
     {
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(typeName, nameof(typeName));
+      ArgumentException.ThrowIfNullOrEmpty(typeName);
       Type = typeName;
       AffectedTables = Array.Empty<string>();
     }
diff --git a/Orm/Xtensive.Orm/Orm/Upgrade/Hints/RenameFieldHint.cs b/Orm/Xtensive.Orm/Orm/Upgrade/Hints/RenameFieldHint.cs
index a553fe1922..56c6eade8a 100644
--- a/Orm/Xtensive.Orm/Orm/Upgrade/Hints/RenameFieldHint.cs
+++ b/Orm/Xtensive.Orm/Orm/Upgrade/Hints/RenameFieldHint.cs
@@ -68,7 +68,7 @@ public override string ToString() =>
     public RenameFieldHint(Type targetType, string oldFieldName, string newFieldName)
     {
       ArgumentNullException.ThrowIfNull(targetType);
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(oldFieldName, "oldFieldName");
+      ArgumentException.ThrowIfNullOrEmpty(oldFieldName);
       ArgumentNullException.ThrowIfNull(newFieldName);
 
       TargetType = targetType;
diff --git a/Orm/Xtensive.Orm/Orm/Upgrade/Hints/RenameTypeHint.cs b/Orm/Xtensive.Orm/Orm/Upgrade/Hints/RenameTypeHint.cs
index 40930ab224..0887245bb5 100644
--- a/Orm/Xtensive.Orm/Orm/Upgrade/Hints/RenameTypeHint.cs
+++ b/Orm/Xtensive.Orm/Orm/Upgrade/Hints/RenameTypeHint.cs
@@ -63,7 +63,7 @@ public override string ToString() =>
     public RenameTypeHint(string oldType, Type newType)
     {
       ArgumentNullException.ThrowIfNull(newType);
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(oldType, nameof(oldType));
+      ArgumentException.ThrowIfNullOrEmpty(oldType);
 
       if (!oldType.Contains(".", StringComparison.Ordinal))
         oldType = newType.Namespace + "." + oldType;
diff --git a/Orm/Xtensive.Orm/Orm/Upgrade/Internals/Metadata/AssemblyMetadata.cs b/Orm/Xtensive.Orm/Orm/Upgrade/Internals/Metadata/AssemblyMetadata.cs
index fb035b26ff..09f34c6101 100644
--- a/Orm/Xtensive.Orm/Orm/Upgrade/Internals/Metadata/AssemblyMetadata.cs
+++ b/Orm/Xtensive.Orm/Orm/Upgrade/Internals/Metadata/AssemblyMetadata.cs
@@ -23,9 +23,9 @@ public override string ToString()
 
     public AssemblyMetadata(string name, string version)
     {
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(name, "name");
+      ArgumentException.ThrowIfNullOrEmpty(name);
       Name = name;
       Version = version;
     }
   }
-}
\ No newline at end of file
+}
diff --git a/Orm/Xtensive.Orm/Orm/Upgrade/Model/PartialIndexFilterInfo.cs b/Orm/Xtensive.Orm/Orm/Upgrade/Model/PartialIndexFilterInfo.cs
index 94599e630e..bdc90c0258 100644
--- a/Orm/Xtensive.Orm/Orm/Upgrade/Model/PartialIndexFilterInfo.cs
+++ b/Orm/Xtensive.Orm/Orm/Upgrade/Model/PartialIndexFilterInfo.cs
@@ -50,7 +50,7 @@ public override string ToString()
 
     public PartialIndexFilterInfo(string expression)
     {
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(expression, "expression");
+      ArgumentException.ThrowIfNullOrEmpty(expression);
       Expression = expression;
     }
   }
diff --git a/Orm/Xtensive.Orm/Orm/Validation/ObjectValidator.cs b/Orm/Xtensive.Orm/Orm/Validation/ObjectValidator.cs
index da3d3798f0..1d19ae9766 100644
--- a/Orm/Xtensive.Orm/Orm/Validation/ObjectValidator.cs
+++ b/Orm/Xtensive.Orm/Orm/Validation/ObjectValidator.cs
@@ -88,7 +88,7 @@ protected ValidationResult Error(Exception exception)
     /// <param name="innerException">An <see cref="Exception"/> instance to be used as inner exception.</param>
     protected void ThrowConfigurationError(string message, Exception innerException = null)
     {
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(message, "message");
+      ArgumentException.ThrowIfNullOrEmpty(message);
 
       var exceptionMessage = string.Format(
         Strings.ExValidatorXConfigurationFailedOnTypeYWithMessageZ,
@@ -101,4 +101,4 @@ protected void ThrowConfigurationError(string message, Exception innerException
       throw exception;
     }
   }
-}
\ No newline at end of file
+}
diff --git a/Orm/Xtensive.Orm/Orm/Validation/PropertyValidator.cs b/Orm/Xtensive.Orm/Orm/Validation/PropertyValidator.cs
index 05f4e3c3d6..775f4e8e34 100644
--- a/Orm/Xtensive.Orm/Orm/Validation/PropertyValidator.cs
+++ b/Orm/Xtensive.Orm/Orm/Validation/PropertyValidator.cs
@@ -113,7 +113,7 @@ protected ValidationResult Error(Exception exception, object value)
     /// <param name="innerException">An <see cref="Exception"/> instance to be used as inner exception.</param>
     protected void ThrowConfigurationError(string message, Exception innerException = null)
     {
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(message, "message");
+      ArgumentException.ThrowIfNullOrEmpty(message);
 
       var exceptionMessage = string.Format(
         Strings.ExValidatorXConfigurationFailedOnTypeYFieldZWithMessageA,
diff --git a/Orm/Xtensive.Orm/Orm/Validation/ValidationResult.cs b/Orm/Xtensive.Orm/Orm/Validation/ValidationResult.cs
index 4afc824d6b..549c3409a3 100644
--- a/Orm/Xtensive.Orm/Orm/Validation/ValidationResult.cs
+++ b/Orm/Xtensive.Orm/Orm/Validation/ValidationResult.cs
@@ -60,7 +60,7 @@ private ValidationResult()
     public ValidationResult(IValidator source, string errorMessage, FieldInfo field = null, object value = null)
     {
       ArgumentNullException.ThrowIfNull(source);
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(errorMessage, "errorMessage");
+      ArgumentException.ThrowIfNullOrEmpty(errorMessage);
 
       isError = true;
 
@@ -70,4 +70,4 @@ public ValidationResult(IValidator source, string errorMessage, FieldInfo field
       this.value = value;
     }
   }
-}
\ No newline at end of file
+}
diff --git a/Orm/Xtensive.Orm/Reflection/DelegateHelper.cs b/Orm/Xtensive.Orm/Reflection/DelegateHelper.cs
index 49972e8134..dc33d1a920 100644
--- a/Orm/Xtensive.Orm/Reflection/DelegateHelper.cs
+++ b/Orm/Xtensive.Orm/Reflection/DelegateHelper.cs
@@ -352,7 +352,7 @@ public static TDelegate CreateDelegate<TDelegate>(object callTarget, Type type,
       where TDelegate : class
     {
       ArgumentNullException.ThrowIfNull(type);
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(methodName, "methodName");
+      ArgumentException.ThrowIfNullOrEmpty(methodName);
       ArgumentNullException.ThrowIfNull(genericArgumentTypes);
       Type delegateType = typeof (TDelegate);
       if (!WellKnownTypes.Delegate.IsAssignableFrom(delegateType))
@@ -399,7 +399,7 @@ public static TDelegate[] CreateDelegates<TDelegate>(object callTarget, Type typ
       where TDelegate : class
     {
       ArgumentNullException.ThrowIfNull(type);
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(methodName, "methodName");
+      ArgumentException.ThrowIfNullOrEmpty(methodName);
       ArgumentNullException.ThrowIfNull(genericArgumentVariants);
       Type delegateType = typeof (TDelegate);
       if (!WellKnownTypes.Delegate.IsAssignableFrom(delegateType))
diff --git a/Orm/Xtensive.Orm/Reflection/MethodHelper.cs b/Orm/Xtensive.Orm/Reflection/MethodHelper.cs
index 9cfb556e59..e981e5d3e9 100644
--- a/Orm/Xtensive.Orm/Reflection/MethodHelper.cs
+++ b/Orm/Xtensive.Orm/Reflection/MethodHelper.cs
@@ -45,7 +45,7 @@ public struct AnyArrayPlaceholder
     public static MethodInfo GetMethodEx(this Type type, string name, BindingFlags bindingFlags, string[] genericArgumentNames, object[] parameterTypes)
     {
       ArgumentNullException.ThrowIfNull(type);
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(name, "name");
+      ArgumentException.ThrowIfNullOrEmpty(name);
 
       if (genericArgumentNames == null) {
         genericArgumentNames = Array.Empty<string>();
@@ -416,4 +416,4 @@ private static string TryCutMethodNamePrefix(ReadOnlySpan<char> methodName, Read
 
     #endregion
   }
-}
\ No newline at end of file
+}
diff --git a/Orm/Xtensive.Orm/Reflection/TypeHelper.cs b/Orm/Xtensive.Orm/Reflection/TypeHelper.cs
index 20e4e1ae38..3070f9ce52 100644
--- a/Orm/Xtensive.Orm/Reflection/TypeHelper.cs
+++ b/Orm/Xtensive.Orm/Reflection/TypeHelper.cs
@@ -427,7 +427,7 @@ private static T CreateAssociateInternal<T>(Type originalForType,
     /// <returns><see cref="Type"/> object of newly created type.</returns>
     public static Type CreateDummyType(string namePrefix, Type inheritFrom, bool implementProtectedConstructorAccessor)
     {
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(namePrefix, nameof(namePrefix));
+      ArgumentException.ThrowIfNullOrEmpty(namePrefix);
       ArgumentNullException.ThrowIfNull(inheritFrom);
 
 
@@ -448,7 +448,7 @@ public static Type CreateDummyType(string namePrefix, Type inheritFrom, bool imp
     public static Type CreateInheritedDummyType(string typeName, Type inheritFrom,
       bool implementProtectedConstructorAccessor)
     {
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(typeName, nameof(typeName));
+      ArgumentException.ThrowIfNullOrEmpty(typeName);
       ArgumentNullException.ThrowIfNull(inheritFrom);
       EnsureEmitInitialized();
       lock (EmitLock) {
@@ -556,7 +556,7 @@ public static object Activate(Assembly assembly, string typeName, Type[] generic
       params object[] arguments)
     {
       ArgumentNullException.ThrowIfNull(assembly);
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(typeName, nameof(typeName));
+      ArgumentException.ThrowIfNullOrEmpty(typeName);
       var type = assembly.GetType(typeName, false);
       return type == null ? null : Activate(type, genericArguments, arguments);
     }
diff --git a/Orm/Xtensive.Orm/Sql/Dml/Expressions/SqlUserFunctionCall.cs b/Orm/Xtensive.Orm/Sql/Dml/Expressions/SqlUserFunctionCall.cs
index 88e2e0971f..ac78a61145 100644
--- a/Orm/Xtensive.Orm/Sql/Dml/Expressions/SqlUserFunctionCall.cs
+++ b/Orm/Xtensive.Orm/Sql/Dml/Expressions/SqlUserFunctionCall.cs
@@ -32,14 +32,14 @@ internal override SqlUserFunctionCall Clone(SqlNodeCloneContext? context = null)
     internal SqlUserFunctionCall(string name, IReadOnlyList<SqlExpression> arguments)
       : base(SqlFunctionType.UserDefined, arguments)
     {
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(name, "name");
+      ArgumentException.ThrowIfNullOrEmpty(name);
       Name = name;
     }
 
     internal SqlUserFunctionCall(string name, params SqlExpression[] arguments)
       : base(SqlFunctionType.UserDefined, arguments)
     {
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(name, "name");
+      ArgumentException.ThrowIfNullOrEmpty(name);
       Name = name;
     }
 
@@ -48,4 +48,4 @@ public override void AcceptVisitor(ISqlVisitor visitor)
       visitor.Visit(this);
     }
   }
-}
\ No newline at end of file
+}
diff --git a/Orm/Xtensive.Orm/Sql/Model/PairedNodeCollection.cs b/Orm/Xtensive.Orm/Sql/Model/PairedNodeCollection.cs
index 0ae836f9a4..2ffc503b5c 100644
--- a/Orm/Xtensive.Orm/Sql/Model/PairedNodeCollection.cs
+++ b/Orm/Xtensive.Orm/Sql/Model/PairedNodeCollection.cs
@@ -87,7 +87,7 @@ public PairedNodeCollection(TOwner owner, string property, int capacity)
       : base(capacity)
     {
       ArgumentNullException.ThrowIfNull(owner);
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(property, "property");
+      ArgumentException.ThrowIfNullOrEmpty(property);
       this.owner = owner;
       this.property = property;
     }
@@ -103,7 +103,7 @@ public PairedNodeCollection(TOwner owner, string property, int capacity, IEquali
       : base(capacity, equalityComparer)
     {
       ArgumentNullException.ThrowIfNull(owner);
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(property, nameof(property));
+      ArgumentException.ThrowIfNullOrEmpty(property);
       ArgumentNullException.ThrowIfNull(equalityComparer);
 
       this.owner = owner;
@@ -112,4 +112,4 @@ public PairedNodeCollection(TOwner owner, string property, int capacity, IEquali
 
     #endregion
   }
-}
\ No newline at end of file
+}
diff --git a/Orm/Xtensive.Orm/Sql/SqlConnection.cs b/Orm/Xtensive.Orm/Sql/SqlConnection.cs
index 8a6a42f6b9..b6f82511e3 100644
--- a/Orm/Xtensive.Orm/Sql/SqlConnection.cs
+++ b/Orm/Xtensive.Orm/Sql/SqlConnection.cs
@@ -121,7 +121,7 @@ public DbCommand CreateCommand(ISqlCompileUnit statement)
     /// <returns>Created command.</returns>
     public DbCommand CreateCommand(string commandText)
     {
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(commandText, nameof(commandText));
+      ArgumentException.ThrowIfNullOrEmpty(commandText);
       var command = CreateCommand();
       command.CommandText = commandText;
       return command;
@@ -609,4 +609,4 @@ protected SqlConnection(SqlDriver driver)
     {
     }
   }
-}
\ No newline at end of file
+}
diff --git a/Orm/Xtensive.Orm/Sql/SqlDdl.cs b/Orm/Xtensive.Orm/Sql/SqlDdl.cs
index 4688d48a14..6b54bfd16d 100644
--- a/Orm/Xtensive.Orm/Sql/SqlDdl.cs
+++ b/Orm/Xtensive.Orm/Sql/SqlDdl.cs
@@ -302,7 +302,7 @@ public static SqlAlterTable Alter(Table table, SqlAction action)
     public static SqlRenameTable Rename(Table table, string newName)
     {
       ArgumentNullException.ThrowIfNull(table);
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(newName, "newName");
+      ArgumentException.ThrowIfNullOrEmpty(newName);
       if (table.Name==newName)
         throw new ArgumentException(Strings.ExTableAlreadyHasSpecifiedName);
       return new SqlRenameTable(table, newName);
@@ -311,7 +311,7 @@ public static SqlRenameTable Rename(Table table, string newName)
     public static SqlAlterTable Rename(TableColumn column, string newName)
     {
       ArgumentNullException.ThrowIfNull(column, "table");
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(newName, "newName");
+      ArgumentException.ThrowIfNullOrEmpty(newName);
       if (column.Name==newName)
         throw new ArgumentException(Strings.ExColumnAlreadyHasSpecifiedName);
       return Alter(column.Table, new SqlRenameColumn(column, newName));
diff --git a/Orm/Xtensive.Orm/Sql/SqlDml.cs b/Orm/Xtensive.Orm/Sql/SqlDml.cs
index 819f439d34..b31f6bf7c9 100644
--- a/Orm/Xtensive.Orm/Sql/SqlDml.cs
+++ b/Orm/Xtensive.Orm/Sql/SqlDml.cs
@@ -1429,7 +1429,7 @@ public static SqlFunctionCall Tan(SqlExpression argument)
 
     public static SqlNative Native(string value)
     {
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(value, "value");
+      ArgumentException.ThrowIfNullOrEmpty(value);
       return new SqlNative(value);
     }
 
@@ -1452,7 +1452,7 @@ public static SqlCursor Cursor(string name)
 
     public static SqlCursor Cursor(string name, ISqlQueryExpression query)
     {
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(name, "name");
+      ArgumentException.ThrowIfNullOrEmpty(name);
       return new SqlCursor(name, query);
     }
 
@@ -1464,7 +1464,7 @@ public static SqlParameterRef ParameterRef(object parameter)
 
     public static SqlParameterRef ParameterRef(string name)
     {
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(name, "name");
+      ArgumentException.ThrowIfNullOrEmpty(name);
       return new SqlParameterRef(name);
     }
 
@@ -1962,7 +1962,7 @@ public static SqlTableColumn TableColumn(SqlTable sqlTable)
     public static SqlTableColumn TableColumn(SqlTable sqlTable, string name)
     {
       ArgumentNullException.ThrowIfNull(sqlTable, "table");
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(name, "name");
+      ArgumentException.ThrowIfNullOrEmpty(name);
       return new SqlTableColumn(sqlTable, name);
     }
 
@@ -2069,14 +2069,14 @@ public static SqlTableRef TableRef(DataTable dataTable, IEnumerable<string> colu
     public static SqlTableRef TableRef(DataTable dataTable, string name)
     {
       ArgumentNullException.ThrowIfNull(dataTable);
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(name, "name");
+      ArgumentException.ThrowIfNullOrEmpty(name);
       return new SqlTableRef(dataTable, name);
     }
 
     public static SqlTableRef TableRef(DataTable dataTable, string name, IEnumerable<string> columnNames)
     {
       ArgumentNullException.ThrowIfNull(dataTable);
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(name, "name");
+      ArgumentException.ThrowIfNullOrEmpty(name);
       ArgumentNullException.ThrowIfNull(columnNames);
       return new SqlTableRef(dataTable, name, columnNames.ToArray());
     }
@@ -2090,7 +2090,7 @@ public static SqlQueryRef QueryRef(ISqlQueryExpression query)
     public static SqlQueryRef QueryRef(ISqlQueryExpression query, string alias)
     {
       ArgumentNullException.ThrowIfNull(query);
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(alias, "alias");
+      ArgumentException.ThrowIfNullOrEmpty(alias);
       return new SqlQueryRef(query, alias);
     }
 
@@ -2172,25 +2172,25 @@ internal static SqlUnary Unary(SqlNodeType nodeType, SqlExpression operand)
 
     public static SqlVariable Variable(string name, SqlValueType type)
     {
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(name, "name");
+      ArgumentException.ThrowIfNullOrEmpty(name);
       return new SqlVariable(name, type);
     }
 
     public static SqlVariable Variable(string name, SqlType type)
     {
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(name, "name");
+      ArgumentException.ThrowIfNullOrEmpty(name);
       return new SqlVariable(name, new SqlValueType(type));
     }
 
     public static SqlVariable Variable(string name, SqlType type, int size)
     {
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(name, "name");
+      ArgumentException.ThrowIfNullOrEmpty(name);
       return new SqlVariable(name, new SqlValueType(type, size));
     }
 
     public static SqlVariable Variable(string name, SqlType type, short precision, short scale)
     {
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(name, "name");
+      ArgumentException.ThrowIfNullOrEmpty(name);
       return new SqlVariable(name, new SqlValueType(type, precision, scale));
     }
 
@@ -2228,7 +2228,7 @@ public static SqlFastFirstRowsHint FastFirstRowsHint(int amount)
 
     public static SqlNativeHint NativeHint(string hintText)
     {
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(hintText, "hintText");
+      ArgumentException.ThrowIfNullOrEmpty(hintText);
       return new SqlNativeHint(hintText);
     }
 
diff --git a/Orm/Xtensive.Orm/Sql/SqlHelper.cs b/Orm/Xtensive.Orm/Sql/SqlHelper.cs
index 517fc13f7b..d73842e567 100644
--- a/Orm/Xtensive.Orm/Sql/SqlHelper.cs
+++ b/Orm/Xtensive.Orm/Sql/SqlHelper.cs
@@ -365,7 +365,7 @@ public static DefaultSchemaInfo ReadDatabaseAndSchema(string queryText,
       DbConnection connection, DbTransaction transaction)
     {
       ArgumentNullException.ThrowIfNull(connection);
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(queryText, nameof(queryText));
+      ArgumentException.ThrowIfNullOrEmpty(queryText);
 
       using var command = connection.CreateCommand();
       command.CommandText = queryText;
@@ -393,7 +393,7 @@ public static async Task<DefaultSchemaInfo> ReadDatabaseAndSchemaAsync(string qu
       DbConnection connection, DbTransaction transaction, CancellationToken token)
     {
       ArgumentNullException.ThrowIfNull(connection);
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(queryText, nameof(queryText));
+      ArgumentException.ThrowIfNullOrEmpty(queryText);
 
       var command = connection.CreateCommand();
       await using (command.ConfigureAwaitFalse()) {
diff --git a/Orm/Xtensive.Orm/Sql/SqlValueType.cs b/Orm/Xtensive.Orm/Sql/SqlValueType.cs
index 2e8c1ba2b9..1eea3fa798 100644
--- a/Orm/Xtensive.Orm/Sql/SqlValueType.cs
+++ b/Orm/Xtensive.Orm/Sql/SqlValueType.cs
@@ -220,7 +220,7 @@ public SqlValueType(SqlType type, string typeName, int? length, int? precision,
       if (precision.HasValue!=scale.HasValue)
         throw new ArgumentException(Strings.ExInvalidArgumentsScaleAndPrecisionShouldBeUsedTogether);
       if (typeName!=null)
-        ArgumentValidator.EnsureArgumentNotNullOrEmpty(typeName, "typeName");
+        ArgumentException.ThrowIfNullOrEmpty(typeName);
       if (length!=null)
         ArgumentValidator.EnsureArgumentIsGreaterThan(length.Value, 0, "length");
       if (precision!=null)