diff --git a/application/Espo/Classes/AddressFormatters/Formatter1.php b/application/Espo/Classes/AddressFormatters/Formatter1.php
index 80c7af2ab9..ad526b1c7b 100644
--- a/application/Espo/Classes/AddressFormatters/Formatter1.php
+++ b/application/Espo/Classes/AddressFormatters/Formatter1.php
@@ -30,8 +30,8 @@
 namespace Espo\Classes\AddressFormatters;
 
 use Espo\Core\{
-    Fields\Address,
-    Fields\Address\AddressFormatter,
+    Field\Address,
+    Field\Address\AddressFormatter,
 };
 
 class Formatter1 implements AddressFormatter
diff --git a/application/Espo/Classes/AddressFormatters/Formatter2.php b/application/Espo/Classes/AddressFormatters/Formatter2.php
index d127ef52af..b1b6c10011 100644
--- a/application/Espo/Classes/AddressFormatters/Formatter2.php
+++ b/application/Espo/Classes/AddressFormatters/Formatter2.php
@@ -30,8 +30,8 @@
 namespace Espo\Classes\AddressFormatters;
 
 use Espo\Core\{
-    Fields\Address,
-    Fields\Address\AddressFormatter,
+    Field\Address,
+    Field\Address\AddressFormatter,
 };
 
 class Formatter2 implements AddressFormatter
diff --git a/application/Espo/Classes/AddressFormatters/Formatter3.php b/application/Espo/Classes/AddressFormatters/Formatter3.php
index 0e9289f152..688c0d7567 100644
--- a/application/Espo/Classes/AddressFormatters/Formatter3.php
+++ b/application/Espo/Classes/AddressFormatters/Formatter3.php
@@ -30,8 +30,8 @@
 namespace Espo\Classes\AddressFormatters;
 
 use Espo\Core\{
-    Fields\Address,
-    Fields\Address\AddressFormatter,
+    Field\Address,
+    Field\Address\AddressFormatter,
 };
 
 class Formatter3 implements AddressFormatter
diff --git a/application/Espo/Classes/AddressFormatters/Formatter4.php b/application/Espo/Classes/AddressFormatters/Formatter4.php
index 505bc784a2..bddb6b0228 100644
--- a/application/Espo/Classes/AddressFormatters/Formatter4.php
+++ b/application/Espo/Classes/AddressFormatters/Formatter4.php
@@ -30,8 +30,8 @@
 namespace Espo\Classes\AddressFormatters;
 
 use Espo\Core\{
-    Fields\Address,
-    Fields\Address\AddressFormatter,
+    Field\Address,
+    Field\Address\AddressFormatter,
 };
 
 class Formatter4 implements AddressFormatter
diff --git a/application/Espo/Classes/DuplicateWhereBuilders/Person.php b/application/Espo/Classes/DuplicateWhereBuilders/Person.php
index f793fabac1..7de2966939 100644
--- a/application/Espo/Classes/DuplicateWhereBuilders/Person.php
+++ b/application/Espo/Classes/DuplicateWhereBuilders/Person.php
@@ -31,7 +31,7 @@ namespace Espo\Classes\DuplicateWhereBuilders;
 
 use Espo\Core\{
     Duplicate\WhereBuilder,
-    Fields\EmailAddressGroup,
+    Field\EmailAddressGroup,
 };
 
 use Espo\ORM\{
diff --git a/application/Espo/Core/Action/Actions/ConvertCurrency.php b/application/Espo/Core/Action/Actions/ConvertCurrency.php
index 1c4afea81e..37316d634e 100644
--- a/application/Espo/Core/Action/Actions/ConvertCurrency.php
+++ b/application/Espo/Core/Action/Actions/ConvertCurrency.php
@@ -40,10 +40,10 @@ use Espo\Core\{
     ORM\EntityManager,
     Utils\FieldUtil,
     Utils\Metadata,
-    Fields\Currency\CurrencyConfigDataProvider,
-    Fields\Currency\CurrencyConverter,
-    Fields\Currency,
-    Fields\Currency\CurrencyRates,
+    Field\Currency\CurrencyConfigDataProvider,
+    Field\Currency\CurrencyConverter,
+    Field\Currency,
+    Field\Currency\CurrencyRates,
 };
 
 use Espo\{
diff --git a/application/Espo/Core/Entities/Person.php b/application/Espo/Core/Entities/Person.php
index c560bb5fbb..5db56043d9 100644
--- a/application/Espo/Core/Entities/Person.php
+++ b/application/Espo/Core/Entities/Person.php
@@ -32,9 +32,9 @@ namespace Espo\Core\Entities;
 use Espo\Core\{
     ORM\Entity,
     ORM\Helper,
-    Fields\EmailAddressGroup,
-    Fields\PhoneNumberGroup,
-    Fields\Address,
+    Field\EmailAddressGroup,
+    Field\PhoneNumberGroup,
+    Field\Address,
 };
 
 use Espo\ORM\{
diff --git a/application/Espo/Core/Fields/Address.php b/application/Espo/Core/Field/Address.php
similarity index 98%
rename from application/Espo/Core/Fields/Address.php
rename to application/Espo/Core/Field/Address.php
index 74b547d792..eded0a7d3b 100644
--- a/application/Espo/Core/Fields/Address.php
+++ b/application/Espo/Core/Field/Address.php
@@ -27,9 +27,9 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\Fields;
+namespace Espo\Core\Field;
 
-use Espo\Core\Fields\Address\AddressBuilder;
+use Espo\Core\Field\Address\AddressBuilder;
 
 /**
  * An address value object. Immutable.
diff --git a/application/Espo/Core/Fields/Address/AddressAttributeExtractor.php b/application/Espo/Core/Field/Address/AddressAttributeExtractor.php
similarity index 97%
rename from application/Espo/Core/Fields/Address/AddressAttributeExtractor.php
rename to application/Espo/Core/Field/Address/AddressAttributeExtractor.php
index 3f0fe0b58c..92d61f7be1 100644
--- a/application/Espo/Core/Fields/Address/AddressAttributeExtractor.php
+++ b/application/Espo/Core/Field/Address/AddressAttributeExtractor.php
@@ -27,11 +27,11 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\Fields\Address;
+namespace Espo\Core\Field\Address;
 
 use Espo\ORM\Value\AttributeExtractor;
 
-use Espo\Core\Fields\Address;
+use Espo\Core\Field\Address;
 
 use StdClass;
 use InvalidArgumentException;
diff --git a/application/Espo/Core/Fields/Address/AddressBuilder.php b/application/Espo/Core/Field/Address/AddressBuilder.php
similarity index 97%
rename from application/Espo/Core/Fields/Address/AddressBuilder.php
rename to application/Espo/Core/Field/Address/AddressBuilder.php
index 13e770b841..0ac2495870 100644
--- a/application/Espo/Core/Fields/Address/AddressBuilder.php
+++ b/application/Espo/Core/Field/Address/AddressBuilder.php
@@ -27,9 +27,9 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\Fields\Address;
+namespace Espo\Core\Field\Address;
 
-use Espo\Core\Fields\Address;
+use Espo\Core\Field\Address;
 
 /**
  * An address value builder.
diff --git a/application/Espo/Core/Fields/Address/AddressFactory.php b/application/Espo/Core/Field/Address/AddressFactory.php
similarity index 96%
rename from application/Espo/Core/Fields/Address/AddressFactory.php
rename to application/Espo/Core/Field/Address/AddressFactory.php
index 1e779c3eeb..e50caf7553 100644
--- a/application/Espo/Core/Fields/Address/AddressFactory.php
+++ b/application/Espo/Core/Field/Address/AddressFactory.php
@@ -27,14 +27,14 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\Fields\Address;
+namespace Espo\Core\Field\Address;
 
 use Espo\{
     ORM\Entity,
     ORM\Value\ValueFactory,
 };
 
-use Espo\Core\Fields\Address;
+use Espo\Core\Field\Address;
 
 class AddressFactory implements ValueFactory
 {
diff --git a/application/Espo/Core/Fields/Address/AddressFormatter.php b/application/Espo/Core/Field/Address/AddressFormatter.php
similarity index 95%
rename from application/Espo/Core/Fields/Address/AddressFormatter.php
rename to application/Espo/Core/Field/Address/AddressFormatter.php
index 56b6ae19aa..a275ab5702 100644
--- a/application/Espo/Core/Fields/Address/AddressFormatter.php
+++ b/application/Espo/Core/Field/Address/AddressFormatter.php
@@ -27,9 +27,9 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\Fields\Address;
+namespace Espo\Core\Field\Address;
 
-use Espo\Core\Fields\Address;
+use Espo\Core\Field\Address;
 
 /**
  * An address formatter.
diff --git a/application/Espo/Core/Fields/Address/AddressFormatterFactory.php b/application/Espo/Core/Field/Address/AddressFormatterFactory.php
similarity index 98%
rename from application/Espo/Core/Fields/Address/AddressFormatterFactory.php
rename to application/Espo/Core/Field/Address/AddressFormatterFactory.php
index 496148b23d..855ca564a3 100644
--- a/application/Espo/Core/Fields/Address/AddressFormatterFactory.php
+++ b/application/Espo/Core/Field/Address/AddressFormatterFactory.php
@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\Fields\Address;
+namespace Espo\Core\Field\Address;
 
 use RuntimeException;
 
diff --git a/application/Espo/Core/Fields/Address/AddressFormatterMetadataProvider.php b/application/Espo/Core/Field/Address/AddressFormatterMetadataProvider.php
similarity index 98%
rename from application/Espo/Core/Fields/Address/AddressFormatterMetadataProvider.php
rename to application/Espo/Core/Field/Address/AddressFormatterMetadataProvider.php
index 7f5600e9a0..64e240520c 100644
--- a/application/Espo/Core/Fields/Address/AddressFormatterMetadataProvider.php
+++ b/application/Espo/Core/Field/Address/AddressFormatterMetadataProvider.php
@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\Fields\Address;
+namespace Espo\Core\Field\Address;
 
 use Espo\Core\Utils\Metadata;
 
diff --git a/application/Espo/Core/Fields/Currency.php b/application/Espo/Core/Field/Currency.php
similarity index 99%
rename from application/Espo/Core/Fields/Currency.php
rename to application/Espo/Core/Field/Currency.php
index 5b31adc5d2..d475f68a40 100644
--- a/application/Espo/Core/Fields/Currency.php
+++ b/application/Espo/Core/Field/Currency.php
@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\Fields;
+namespace Espo\Core\Field;
 
 use RuntimeException;
 
diff --git a/application/Espo/Core/Fields/Currency/CurrencyAttributeExtractor.php b/application/Espo/Core/Field/Currency/CurrencyAttributeExtractor.php
similarity index 96%
rename from application/Espo/Core/Fields/Currency/CurrencyAttributeExtractor.php
rename to application/Espo/Core/Field/Currency/CurrencyAttributeExtractor.php
index 3016fa5dfd..ce3e656b35 100644
--- a/application/Espo/Core/Fields/Currency/CurrencyAttributeExtractor.php
+++ b/application/Espo/Core/Field/Currency/CurrencyAttributeExtractor.php
@@ -27,11 +27,11 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\Fields\Currency;
+namespace Espo\Core\Field\Currency;
 
 use Espo\ORM\Value\AttributeExtractor;
 
-use Espo\Core\Fields\Currency;
+use Espo\Core\Field\Currency;
 
 use StdClass;
 use InvalidArgumentException;
diff --git a/application/Espo/Core/Fields/Currency/CurrencyConfigDataProvider.php b/application/Espo/Core/Field/Currency/CurrencyConfigDataProvider.php
similarity index 98%
rename from application/Espo/Core/Fields/Currency/CurrencyConfigDataProvider.php
rename to application/Espo/Core/Field/Currency/CurrencyConfigDataProvider.php
index 8ae7702dfb..9d94880d67 100644
--- a/application/Espo/Core/Fields/Currency/CurrencyConfigDataProvider.php
+++ b/application/Espo/Core/Field/Currency/CurrencyConfigDataProvider.php
@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\Fields\Currency;
+namespace Espo\Core\Field\Currency;
 
 use Espo\Core\Utils\Config;
 
diff --git a/application/Espo/Core/Fields/Currency/CurrencyConverter.php b/application/Espo/Core/Field/Currency/CurrencyConverter.php
similarity index 98%
rename from application/Espo/Core/Fields/Currency/CurrencyConverter.php
rename to application/Espo/Core/Field/Currency/CurrencyConverter.php
index 1056698202..824a049f2e 100644
--- a/application/Espo/Core/Fields/Currency/CurrencyConverter.php
+++ b/application/Espo/Core/Field/Currency/CurrencyConverter.php
@@ -27,9 +27,9 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\Fields\Currency;
+namespace Espo\Core\Field\Currency;
 
-use Espo\Core\Fields\Currency;
+use Espo\Core\Field\Currency;
 
 use RuntimeException;
 
diff --git a/application/Espo/Core/Fields/Currency/CurrencyFactory.php b/application/Espo/Core/Field/Currency/CurrencyFactory.php
similarity index 96%
rename from application/Espo/Core/Fields/Currency/CurrencyFactory.php
rename to application/Espo/Core/Field/Currency/CurrencyFactory.php
index e10e705850..dfb12df629 100644
--- a/application/Espo/Core/Fields/Currency/CurrencyFactory.php
+++ b/application/Espo/Core/Field/Currency/CurrencyFactory.php
@@ -27,14 +27,14 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\Fields\Currency;
+namespace Espo\Core\Field\Currency;
 
 use Espo\{
     ORM\Entity,
     ORM\Value\ValueFactory,
 };
 
-use Espo\Core\Fields\Currency;
+use Espo\Core\Field\Currency;
 
 use RuntimeException;
 
diff --git a/application/Espo/Core/Fields/Currency/CurrencyRates.php b/application/Espo/Core/Field/Currency/CurrencyRates.php
similarity index 98%
rename from application/Espo/Core/Fields/Currency/CurrencyRates.php
rename to application/Espo/Core/Field/Currency/CurrencyRates.php
index 6f3623b25d..8bb161482a 100644
--- a/application/Espo/Core/Fields/Currency/CurrencyRates.php
+++ b/application/Espo/Core/Field/Currency/CurrencyRates.php
@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\Fields\Currency;
+namespace Espo\Core\Field\Currency;
 
 use RuntimeException;
 
diff --git a/application/Espo/Core/Fields/Date.php b/application/Espo/Core/Field/Date.php
similarity index 99%
rename from application/Espo/Core/Fields/Date.php
rename to application/Espo/Core/Field/Date.php
index 2a81ea22b3..ea337a89cd 100644
--- a/application/Espo/Core/Fields/Date.php
+++ b/application/Espo/Core/Field/Date.php
@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\Fields;
+namespace Espo\Core\Field;
 
 use DateTimeImmutable;
 use DateTimeInterface;
diff --git a/application/Espo/Core/Fields/Date/DateAttributeExtractor.php b/application/Espo/Core/Field/Date/DateAttributeExtractor.php
similarity index 97%
rename from application/Espo/Core/Fields/Date/DateAttributeExtractor.php
rename to application/Espo/Core/Field/Date/DateAttributeExtractor.php
index 65a6cde9ac..3df0db27c1 100644
--- a/application/Espo/Core/Fields/Date/DateAttributeExtractor.php
+++ b/application/Espo/Core/Field/Date/DateAttributeExtractor.php
@@ -27,11 +27,11 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\Fields\Date;
+namespace Espo\Core\Field\Date;
 
 use Espo\ORM\Value\AttributeExtractor;
 
-use Espo\Core\Fields\Date;
+use Espo\Core\Field\Date;
 
 use StdClass;
 use InvalidArgumentException;
diff --git a/application/Espo/Core/Fields/Date/DateFactory.php b/application/Espo/Core/Field/Date/DateFactory.php
similarity index 96%
rename from application/Espo/Core/Fields/Date/DateFactory.php
rename to application/Espo/Core/Field/Date/DateFactory.php
index 3aebe111fb..92844db1a2 100644
--- a/application/Espo/Core/Fields/Date/DateFactory.php
+++ b/application/Espo/Core/Field/Date/DateFactory.php
@@ -27,14 +27,14 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\Fields\Date;
+namespace Espo\Core\Field\Date;
 
 use Espo\{
     ORM\Entity,
     ORM\Value\ValueFactory,
 };
 
-use Espo\Core\Fields\Date;
+use Espo\Core\Field\Date;
 
 use RuntimeException;
 
diff --git a/application/Espo/Core/Fields/DateTime.php b/application/Espo/Core/Field/DateTime.php
similarity index 99%
rename from application/Espo/Core/Fields/DateTime.php
rename to application/Espo/Core/Field/DateTime.php
index d1160833d9..469829c178 100644
--- a/application/Espo/Core/Fields/DateTime.php
+++ b/application/Espo/Core/Field/DateTime.php
@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\Fields;
+namespace Espo\Core\Field;
 
 use DateTimeImmutable;
 use DateTimeInterface;
diff --git a/application/Espo/Core/Fields/DateTime/DateTimeAttributeExtractor.php b/application/Espo/Core/Field/DateTime/DateTimeAttributeExtractor.php
similarity index 96%
rename from application/Espo/Core/Fields/DateTime/DateTimeAttributeExtractor.php
rename to application/Espo/Core/Field/DateTime/DateTimeAttributeExtractor.php
index 40b83f0471..d4941f213d 100644
--- a/application/Espo/Core/Fields/DateTime/DateTimeAttributeExtractor.php
+++ b/application/Espo/Core/Field/DateTime/DateTimeAttributeExtractor.php
@@ -27,11 +27,11 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\Fields\DateTime;
+namespace Espo\Core\Field\DateTime;
 
 use Espo\ORM\Value\AttributeExtractor;
 
-use Espo\Core\Fields\DateTime;
+use Espo\Core\Field\DateTime;
 
 use StdClass;
 use InvalidArgumentException;
diff --git a/application/Espo/Core/Fields/DateTime/DateTimeFactory.php b/application/Espo/Core/Field/DateTime/DateTimeFactory.php
similarity index 96%
rename from application/Espo/Core/Fields/DateTime/DateTimeFactory.php
rename to application/Espo/Core/Field/DateTime/DateTimeFactory.php
index 504a16609a..14c3ee753e 100644
--- a/application/Espo/Core/Fields/DateTime/DateTimeFactory.php
+++ b/application/Espo/Core/Field/DateTime/DateTimeFactory.php
@@ -27,14 +27,14 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\Fields\DateTime;
+namespace Espo\Core\Field\DateTime;
 
 use Espo\{
     ORM\Entity,
     ORM\Value\ValueFactory,
 };
 
-use Espo\Core\Fields\DateTime;
+use Espo\Core\Field\DateTime;
 
 use RuntimeException;
 
diff --git a/application/Espo/Core/Fields/DateTimeOptional.php b/application/Espo/Core/Field/DateTimeOptional.php
similarity index 99%
rename from application/Espo/Core/Fields/DateTimeOptional.php
rename to application/Espo/Core/Field/DateTimeOptional.php
index a8c0d2bfae..3e4941ace2 100644
--- a/application/Espo/Core/Fields/DateTimeOptional.php
+++ b/application/Espo/Core/Field/DateTimeOptional.php
@@ -27,9 +27,9 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\Fields;
+namespace Espo\Core\Field;
 
-use Espo\Core\Fields\{
+use Espo\Core\Field\{
     DateTime,
     Date,
 };
diff --git a/application/Espo/Core/Fields/DateTimeOptional/DateTimeOptionalAttributeExtractor.php b/application/Espo/Core/Field/DateTimeOptional/DateTimeOptionalAttributeExtractor.php
similarity index 96%
rename from application/Espo/Core/Fields/DateTimeOptional/DateTimeOptionalAttributeExtractor.php
rename to application/Espo/Core/Field/DateTimeOptional/DateTimeOptionalAttributeExtractor.php
index 3d53d59c23..a367aa21b0 100644
--- a/application/Espo/Core/Fields/DateTimeOptional/DateTimeOptionalAttributeExtractor.php
+++ b/application/Espo/Core/Field/DateTimeOptional/DateTimeOptionalAttributeExtractor.php
@@ -27,11 +27,11 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\Fields\DateTimeOptional;
+namespace Espo\Core\Field\DateTimeOptional;
 
 use Espo\ORM\Value\AttributeExtractor;
 
-use Espo\Core\Fields\DateTimeOptional;
+use Espo\Core\Field\DateTimeOptional;
 
 use StdClass;
 use InvalidArgumentException;
diff --git a/application/Espo/Core/Fields/DateTimeOptional/DateTimeOptionalFactory.php b/application/Espo/Core/Field/DateTimeOptional/DateTimeOptionalFactory.php
similarity index 96%
rename from application/Espo/Core/Fields/DateTimeOptional/DateTimeOptionalFactory.php
rename to application/Espo/Core/Field/DateTimeOptional/DateTimeOptionalFactory.php
index 4348e79d6d..0a312815f1 100644
--- a/application/Espo/Core/Fields/DateTimeOptional/DateTimeOptionalFactory.php
+++ b/application/Espo/Core/Field/DateTimeOptional/DateTimeOptionalFactory.php
@@ -27,14 +27,14 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\Fields\DateTimeOptional;
+namespace Espo\Core\Field\DateTimeOptional;
 
 use Espo\{
     ORM\Entity,
     ORM\Value\ValueFactory,
 };
 
-use Espo\Core\Fields\DateTimeOptional;
+use Espo\Core\Field\DateTimeOptional;
 
 use RuntimeException;
 
diff --git a/application/Espo/Core/Fields/EmailAddress.php b/application/Espo/Core/Field/EmailAddress.php
similarity index 99%
rename from application/Espo/Core/Fields/EmailAddress.php
rename to application/Espo/Core/Field/EmailAddress.php
index b7c3d6b6f9..7da8e7e6b7 100644
--- a/application/Espo/Core/Fields/EmailAddress.php
+++ b/application/Espo/Core/Field/EmailAddress.php
@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\Fields;
+namespace Espo\Core\Field;
 
 use RuntimeException;
 
diff --git a/application/Espo/Core/Fields/EmailAddress/EmailAddressGroupAttributeExtractor.php b/application/Espo/Core/Field/EmailAddress/EmailAddressGroupAttributeExtractor.php
similarity index 97%
rename from application/Espo/Core/Fields/EmailAddress/EmailAddressGroupAttributeExtractor.php
rename to application/Espo/Core/Field/EmailAddress/EmailAddressGroupAttributeExtractor.php
index 47996a2b06..4801c32072 100644
--- a/application/Espo/Core/Fields/EmailAddress/EmailAddressGroupAttributeExtractor.php
+++ b/application/Espo/Core/Field/EmailAddress/EmailAddressGroupAttributeExtractor.php
@@ -27,11 +27,11 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\Fields\EmailAddress;
+namespace Espo\Core\Field\EmailAddress;
 
 use Espo\ORM\Value\AttributeExtractor;
 
-use Espo\Core\Fields\EmailAddressGroup;
+use Espo\Core\Field\EmailAddressGroup;
 
 use StdClass;
 use InvalidArgumentException;
diff --git a/application/Espo/Core/Fields/EmailAddress/EmailAddressGroupFactory.php b/application/Espo/Core/Field/EmailAddress/EmailAddressGroupFactory.php
similarity index 97%
rename from application/Espo/Core/Fields/EmailAddress/EmailAddressGroupFactory.php
rename to application/Espo/Core/Field/EmailAddress/EmailAddressGroupFactory.php
index 2269d45a15..ef1034f641 100644
--- a/application/Espo/Core/Fields/EmailAddress/EmailAddressGroupFactory.php
+++ b/application/Espo/Core/Field/EmailAddress/EmailAddressGroupFactory.php
@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\Fields\EmailAddress;
+namespace Espo\Core\Field\EmailAddress;
 
 use Espo\ORM\{
     EntityManager,
@@ -37,8 +37,8 @@ use Espo\ORM\{
 
 use Espo\Core\{
     Utils\Metadata,
-    Fields\EmailAddressGroup,
-    Fields\EmailAddress,
+    Field\EmailAddressGroup,
+    Field\EmailAddress,
 };
 
 use RuntimeException;
diff --git a/application/Espo/Core/Fields/EmailAddressGroup.php b/application/Espo/Core/Field/EmailAddressGroup.php
similarity index 99%
rename from application/Espo/Core/Fields/EmailAddressGroup.php
rename to application/Espo/Core/Field/EmailAddressGroup.php
index a8da9c2d0e..ceca3c5278 100644
--- a/application/Espo/Core/Fields/EmailAddressGroup.php
+++ b/application/Espo/Core/Field/EmailAddressGroup.php
@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\Fields;
+namespace Espo\Core\Field;
 
 use RuntimeException;
 
diff --git a/application/Espo/Core/Fields/Link.php b/application/Espo/Core/Field/Link.php
similarity index 98%
rename from application/Espo/Core/Fields/Link.php
rename to application/Espo/Core/Field/Link.php
index 7a7c8a37e9..3a7c939091 100644
--- a/application/Espo/Core/Fields/Link.php
+++ b/application/Espo/Core/Field/Link.php
@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\Fields;
+namespace Espo\Core\Field;
 
 use RuntimeException;
 
diff --git a/application/Espo/Core/Fields/Link/LinkAttributeExtractor.php b/application/Espo/Core/Field/Link/LinkAttributeExtractor.php
similarity index 97%
rename from application/Espo/Core/Fields/Link/LinkAttributeExtractor.php
rename to application/Espo/Core/Field/Link/LinkAttributeExtractor.php
index 9b7753faa9..f7d16b052f 100644
--- a/application/Espo/Core/Fields/Link/LinkAttributeExtractor.php
+++ b/application/Espo/Core/Field/Link/LinkAttributeExtractor.php
@@ -27,11 +27,11 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\Fields\Link;
+namespace Espo\Core\Field\Link;
 
 use Espo\ORM\Value\AttributeExtractor;
 
-use Espo\Core\Fields\Link;
+use Espo\Core\Field\Link;
 
 use StdClass;
 use InvalidArgumentException;
diff --git a/application/Espo/Core/Fields/Link/LinkFactory.php b/application/Espo/Core/Field/Link/LinkFactory.php
similarity index 97%
rename from application/Espo/Core/Fields/Link/LinkFactory.php
rename to application/Espo/Core/Field/Link/LinkFactory.php
index ed69528bd0..7ae168b8e0 100644
--- a/application/Espo/Core/Fields/Link/LinkFactory.php
+++ b/application/Espo/Core/Field/Link/LinkFactory.php
@@ -27,14 +27,14 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\Fields\Link;
+namespace Espo\Core\Field\Link;
 
 use Espo\{
     ORM\Entity,
     ORM\Value\ValueFactory,
 };
 
-use Espo\Core\Fields\Link;
+use Espo\Core\Field\Link;
 
 use RuntimeException;
 
diff --git a/application/Espo/Core/Fields/LinkMultiple.php b/application/Espo/Core/Field/LinkMultiple.php
similarity index 99%
rename from application/Espo/Core/Fields/LinkMultiple.php
rename to application/Espo/Core/Field/LinkMultiple.php
index bbb95fb608..a8a566c16a 100644
--- a/application/Espo/Core/Fields/LinkMultiple.php
+++ b/application/Espo/Core/Field/LinkMultiple.php
@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\Fields;
+namespace Espo\Core\Field;
 
 use RuntimeException;
 
diff --git a/application/Espo/Core/Fields/LinkMultiple/LinkMultipleAttributeExtractor.php b/application/Espo/Core/Field/LinkMultiple/LinkMultipleAttributeExtractor.php
similarity index 97%
rename from application/Espo/Core/Fields/LinkMultiple/LinkMultipleAttributeExtractor.php
rename to application/Espo/Core/Field/LinkMultiple/LinkMultipleAttributeExtractor.php
index d346c07262..b961f2c4f3 100644
--- a/application/Espo/Core/Fields/LinkMultiple/LinkMultipleAttributeExtractor.php
+++ b/application/Espo/Core/Field/LinkMultiple/LinkMultipleAttributeExtractor.php
@@ -27,11 +27,11 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\Fields\LinkMultiple;
+namespace Espo\Core\Field\LinkMultiple;
 
 use Espo\ORM\Value\AttributeExtractor;
 
-use Espo\Core\Fields\LinkMultiple;
+use Espo\Core\Field\LinkMultiple;
 
 use StdClass;
 use InvalidArgumentException;
diff --git a/application/Espo/Core/Fields/LinkMultiple/LinkMultipleFactory.php b/application/Espo/Core/Field/LinkMultiple/LinkMultipleFactory.php
similarity index 98%
rename from application/Espo/Core/Fields/LinkMultiple/LinkMultipleFactory.php
rename to application/Espo/Core/Field/LinkMultiple/LinkMultipleFactory.php
index 8a44be7da9..75cf02d6a0 100644
--- a/application/Espo/Core/Fields/LinkMultiple/LinkMultipleFactory.php
+++ b/application/Espo/Core/Field/LinkMultiple/LinkMultipleFactory.php
@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\Fields\LinkMultiple;
+namespace Espo\Core\Field\LinkMultiple;
 
 use Espo\{
     ORM\Entity,
@@ -37,8 +37,8 @@ use Espo\{
 };
 
 use Espo\Core\{
-    Fields\LinkMultiple,
-    Fields\LinkMultipleItem,
+    Field\LinkMultiple,
+    Field\LinkMultipleItem,
     ORM\Entity as CoreOrmEntity,
 };
 
diff --git a/application/Espo/Core/Fields/LinkMultipleItem.php b/application/Espo/Core/Field/LinkMultipleItem.php
similarity index 99%
rename from application/Espo/Core/Fields/LinkMultipleItem.php
rename to application/Espo/Core/Field/LinkMultipleItem.php
index 9022bda1d6..32e6aad7a7 100644
--- a/application/Espo/Core/Fields/LinkMultipleItem.php
+++ b/application/Espo/Core/Field/LinkMultipleItem.php
@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\Fields;
+namespace Espo\Core\Field;
 
 use RuntimeException;
 
diff --git a/application/Espo/Core/Fields/LinkParent.php b/application/Espo/Core/Field/LinkParent.php
similarity index 98%
rename from application/Espo/Core/Fields/LinkParent.php
rename to application/Espo/Core/Field/LinkParent.php
index 7910de13ac..eae506e195 100644
--- a/application/Espo/Core/Fields/LinkParent.php
+++ b/application/Espo/Core/Field/LinkParent.php
@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\Fields;
+namespace Espo\Core\Field;
 
 use RuntimeException;
 
diff --git a/application/Espo/Core/Fields/LinkParent/LinkParentAttributeExtractor.php b/application/Espo/Core/Field/LinkParent/LinkParentAttributeExtractor.php
similarity index 96%
rename from application/Espo/Core/Fields/LinkParent/LinkParentAttributeExtractor.php
rename to application/Espo/Core/Field/LinkParent/LinkParentAttributeExtractor.php
index bacc724e26..ce136118a7 100644
--- a/application/Espo/Core/Fields/LinkParent/LinkParentAttributeExtractor.php
+++ b/application/Espo/Core/Field/LinkParent/LinkParentAttributeExtractor.php
@@ -27,11 +27,11 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\Fields\LinkParent;
+namespace Espo\Core\Field\LinkParent;
 
 use Espo\ORM\Value\AttributeExtractor;
 
-use Espo\Core\Fields\LinkParent;
+use Espo\Core\Field\LinkParent;
 
 use StdClass;
 use InvalidArgumentException;
diff --git a/application/Espo/Core/Fields/LinkParent/LinkParentFactory.php b/application/Espo/Core/Field/LinkParent/LinkParentFactory.php
similarity index 96%
rename from application/Espo/Core/Fields/LinkParent/LinkParentFactory.php
rename to application/Espo/Core/Field/LinkParent/LinkParentFactory.php
index c9029eb615..db751ff80b 100644
--- a/application/Espo/Core/Fields/LinkParent/LinkParentFactory.php
+++ b/application/Espo/Core/Field/LinkParent/LinkParentFactory.php
@@ -27,14 +27,14 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\Fields\LinkParent;
+namespace Espo\Core\Field\LinkParent;
 
 use Espo\{
     ORM\Entity,
     ORM\Value\ValueFactory,
 };
 
-use Espo\Core\Fields\LinkParent;
+use Espo\Core\Field\LinkParent;
 
 use RuntimeException;
 
diff --git a/application/Espo/Core/Fields/PhoneNumber.php b/application/Espo/Core/Field/PhoneNumber.php
similarity index 99%
rename from application/Espo/Core/Fields/PhoneNumber.php
rename to application/Espo/Core/Field/PhoneNumber.php
index 56cc2b7429..cd88f2fe1f 100644
--- a/application/Espo/Core/Fields/PhoneNumber.php
+++ b/application/Espo/Core/Field/PhoneNumber.php
@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\Fields;
+namespace Espo\Core\Field;
 
 use RuntimeException;
 
diff --git a/application/Espo/Core/Fields/PhoneNumber/PhoneNumberGroupAttributeExtractor.php b/application/Espo/Core/Field/PhoneNumber/PhoneNumberGroupAttributeExtractor.php
similarity index 97%
rename from application/Espo/Core/Fields/PhoneNumber/PhoneNumberGroupAttributeExtractor.php
rename to application/Espo/Core/Field/PhoneNumber/PhoneNumberGroupAttributeExtractor.php
index 286b1351db..2888c69810 100644
--- a/application/Espo/Core/Fields/PhoneNumber/PhoneNumberGroupAttributeExtractor.php
+++ b/application/Espo/Core/Field/PhoneNumber/PhoneNumberGroupAttributeExtractor.php
@@ -27,11 +27,11 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\Fields\PhoneNumber;
+namespace Espo\Core\Field\PhoneNumber;
 
 use Espo\ORM\Value\AttributeExtractor;
 
-use Espo\Core\Fields\PhoneNumberGroup;
+use Espo\Core\Field\PhoneNumberGroup;
 
 use StdClass;
 use InvalidArgumentException;
diff --git a/application/Espo/Core/Fields/PhoneNumber/PhoneNumberGroupFactory.php b/application/Espo/Core/Field/PhoneNumber/PhoneNumberGroupFactory.php
similarity index 97%
rename from application/Espo/Core/Fields/PhoneNumber/PhoneNumberGroupFactory.php
rename to application/Espo/Core/Field/PhoneNumber/PhoneNumberGroupFactory.php
index d20f835969..03b0066ea9 100644
--- a/application/Espo/Core/Fields/PhoneNumber/PhoneNumberGroupFactory.php
+++ b/application/Espo/Core/Field/PhoneNumber/PhoneNumberGroupFactory.php
@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\Fields\PhoneNumber;
+namespace Espo\Core\Field\PhoneNumber;
 
 use Espo\ORM\{
     EntityManager,
@@ -37,8 +37,8 @@ use Espo\ORM\{
 
 use Espo\Core\{
     Utils\Metadata,
-    Fields\PhoneNumberGroup,
-    Fields\PhoneNumber,
+    Field\PhoneNumberGroup,
+    Field\PhoneNumber,
 };
 
 use RuntimeException;
diff --git a/application/Espo/Core/Fields/PhoneNumberGroup.php b/application/Espo/Core/Field/PhoneNumberGroup.php
similarity index 99%
rename from application/Espo/Core/Fields/PhoneNumberGroup.php
rename to application/Espo/Core/Field/PhoneNumberGroup.php
index d5d3d87bb7..4cdb4d1039 100644
--- a/application/Espo/Core/Fields/PhoneNumberGroup.php
+++ b/application/Espo/Core/Field/PhoneNumberGroup.php
@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\Fields;
+namespace Espo\Core\Field;
 
 use RuntimeException;
 
diff --git a/application/Espo/Core/MassAction/Actions/MassConvertCurrency.php b/application/Espo/Core/MassAction/Actions/MassConvertCurrency.php
index 4f035cbc59..91341ce7cc 100644
--- a/application/Espo/Core/MassAction/Actions/MassConvertCurrency.php
+++ b/application/Espo/Core/MassAction/Actions/MassConvertCurrency.php
@@ -41,10 +41,10 @@ use Espo\Core\{
     ORM\EntityManager,
     Utils\FieldUtil,
     Utils\Metadata,
-    Fields\Currency\CurrencyConfigDataProvider,
-    Fields\Currency\CurrencyConverter,
-    Fields\Currency,
-    Fields\Currency\CurrencyRates,
+    Field\Currency\CurrencyConfigDataProvider,
+    Field\Currency\CurrencyConverter,
+    Field\Currency,
+    Field\Currency\CurrencyRates,
 };
 
 use Espo\{
diff --git a/application/Espo/Core/Templates/Entities/Company.php b/application/Espo/Core/Templates/Entities/Company.php
index a364414e9e..8636c0d515 100644
--- a/application/Espo/Core/Templates/Entities/Company.php
+++ b/application/Espo/Core/Templates/Entities/Company.php
@@ -31,9 +31,9 @@ namespace Espo\Core\Templates\Entities;
 
 use Espo\Core\{
     ORM\Entity,
-    Fields\EmailAddressGroup,
-    Fields\PhoneNumberGroup,
-    Fields\Address,
+    Field\EmailAddressGroup,
+    Field\PhoneNumberGroup,
+    Field\Address,
 };
 
 class Company extends Entity
diff --git a/application/Espo/Modules/Crm/Classes/FieldProcessing/Campaign/StatsLoader.php b/application/Espo/Modules/Crm/Classes/FieldProcessing/Campaign/StatsLoader.php
index 5f6c140d1a..8f17c563d1 100644
--- a/application/Espo/Modules/Crm/Classes/FieldProcessing/Campaign/StatsLoader.php
+++ b/application/Espo/Modules/Crm/Classes/FieldProcessing/Campaign/StatsLoader.php
@@ -36,7 +36,7 @@ use Espo\Core\{
     FieldProcessing\LoaderParams,
     ORM\EntityManager,
     Acl,
-    Fields\Currency\CurrencyConfigDataProvider,
+    Field\Currency\CurrencyConfigDataProvider,
 };
 
 use PDO;
diff --git a/application/Espo/Modules/Crm/Entities/Account.php b/application/Espo/Modules/Crm/Entities/Account.php
index 1f643f2e80..98ad615aa7 100644
--- a/application/Espo/Modules/Crm/Entities/Account.php
+++ b/application/Espo/Modules/Crm/Entities/Account.php
@@ -31,9 +31,9 @@ namespace Espo\Modules\Crm\Entities;
 
 use Espo\Core\{
     ORM\Entity,
-    Fields\EmailAddressGroup,
-    Fields\PhoneNumberGroup,
-    Fields\Address,
+    Field\EmailAddressGroup,
+    Field\PhoneNumberGroup,
+    Field\Address,
 };
 
 class Account extends Entity
diff --git a/application/Espo/Modules/Crm/Entities/Call.php b/application/Espo/Modules/Crm/Entities/Call.php
index f4309f07cb..df6dcaa7b6 100644
--- a/application/Espo/Modules/Crm/Entities/Call.php
+++ b/application/Espo/Modules/Crm/Entities/Call.php
@@ -31,7 +31,7 @@ namespace Espo\Modules\Crm\Entities;
 
 use Espo\Core\{
     ORM\Entity,
-    Fields\DateTime,
+    Field\DateTime,
 };
 
 class Call extends Entity
diff --git a/application/Espo/Modules/Crm/Entities/Meeting.php b/application/Espo/Modules/Crm/Entities/Meeting.php
index e8d5a90da9..3ce57580db 100644
--- a/application/Espo/Modules/Crm/Entities/Meeting.php
+++ b/application/Espo/Modules/Crm/Entities/Meeting.php
@@ -31,7 +31,7 @@ namespace Espo\Modules\Crm\Entities;
 
 use Espo\Core\{
     ORM\Entity,
-    Fields\DateTimeOptional,
+    Field\DateTimeOptional,
 };
 
 class Meeting extends Entity
diff --git a/application/Espo/Modules/Crm/Entities/Opportunity.php b/application/Espo/Modules/Crm/Entities/Opportunity.php
index 8f8ed87f44..6e56a57008 100644
--- a/application/Espo/Modules/Crm/Entities/Opportunity.php
+++ b/application/Espo/Modules/Crm/Entities/Opportunity.php
@@ -31,8 +31,8 @@ namespace Espo\Modules\Crm\Entities;
 
 use Espo\Core\{
     ORM\Entity,
-    Fields\Currency,
-    Fields\Date,
+    Field\Currency,
+    Field\Date,
 };
 
 class Opportunity extends Entity
diff --git a/application/Espo/Modules/Crm/Entities/Task.php b/application/Espo/Modules/Crm/Entities/Task.php
index 7ad084b40f..1a6607325a 100644
--- a/application/Espo/Modules/Crm/Entities/Task.php
+++ b/application/Espo/Modules/Crm/Entities/Task.php
@@ -31,7 +31,7 @@ namespace Espo\Modules\Crm\Entities;
 
 use Espo\Core\{
     ORM\Entity,
-    Fields\DateTimeOptional,
+    Field\DateTimeOptional,
 };
 
 class Task extends Entity
diff --git a/application/Espo/Resources/metadata/fields/address.json b/application/Espo/Resources/metadata/fields/address.json
index f9a1c08b66..7b9543a6fe 100644
--- a/application/Espo/Resources/metadata/fields/address.json
+++ b/application/Espo/Resources/metadata/fields/address.json
@@ -60,6 +60,6 @@
    "filter": true,
    "skipOrmDefs": true,
    "personalData": true,
-   "valueFactoryClassName": "Espo\\Core\\Fields\\Address\\AddressFactory",
-   "attributeExtractorClassName": "Espo\\Core\\Fields\\Address\\AddressAttributeExtractor"
+   "valueFactoryClassName": "Espo\\Core\\Field\\Address\\AddressFactory",
+   "attributeExtractorClassName": "Espo\\Core\\Field\\Address\\AddressAttributeExtractor"
 }
diff --git a/application/Espo/Resources/metadata/fields/currency.json b/application/Espo/Resources/metadata/fields/currency.json
index 27b9fa558c..6960a173ce 100644
--- a/application/Espo/Resources/metadata/fields/currency.json
+++ b/application/Espo/Resources/metadata/fields/currency.json
@@ -65,6 +65,6 @@
    ],
    "filter": true,
    "personalData": true,
-   "valueFactoryClassName": "Espo\\Core\\Fields\\Currency\\CurrencyFactory",
-   "attributeExtractorClassName": "Espo\\Core\\Fields\\Currency\\CurrencyAttributeExtractor"
+   "valueFactoryClassName": "Espo\\Core\\Field\\Currency\\CurrencyFactory",
+   "attributeExtractorClassName": "Espo\\Core\\Field\\Currency\\CurrencyAttributeExtractor"
 }
diff --git a/application/Espo/Resources/metadata/fields/date.json b/application/Espo/Resources/metadata/fields/date.json
index 1389aeadd5..12da4a0aaf 100644
--- a/application/Espo/Resources/metadata/fields/date.json
+++ b/application/Espo/Resources/metadata/fields/date.json
@@ -71,6 +71,6 @@
       "notNull":false
    },
    "personalData": true,
-   "valueFactoryClassName": "Espo\\Core\\Fields\\Date\\DateFactory",
-   "attributeExtractorClassName": "Espo\\Core\\Fields\\Date\\DateAttributeExtractor"
+   "valueFactoryClassName": "Espo\\Core\\Field\\Date\\DateFactory",
+   "attributeExtractorClassName": "Espo\\Core\\Field\\Date\\DateAttributeExtractor"
 }
diff --git a/application/Espo/Resources/metadata/fields/datetime.json b/application/Espo/Resources/metadata/fields/datetime.json
index 2ba7fe21d8..67bb6e8232 100644
--- a/application/Espo/Resources/metadata/fields/datetime.json
+++ b/application/Espo/Resources/metadata/fields/datetime.json
@@ -78,6 +78,6 @@
       "notNull":false
    },
    "personalData": true,
-   "valueFactoryClassName": "Espo\\Core\\Fields\\DateTime\\DateTimeFactory",
-   "attributeExtractorClassName": "Espo\\Core\\Fields\\DateTime\\DateTimeAttributeExtractor"
+   "valueFactoryClassName": "Espo\\Core\\Field\\DateTime\\DateTimeFactory",
+   "attributeExtractorClassName": "Espo\\Core\\Field\\DateTime\\DateTimeAttributeExtractor"
 }
diff --git a/application/Espo/Resources/metadata/fields/datetimeOptional.json b/application/Espo/Resources/metadata/fields/datetimeOptional.json
index dcbdba49bf..3d44a1c459 100644
--- a/application/Espo/Resources/metadata/fields/datetimeOptional.json
+++ b/application/Espo/Resources/metadata/fields/datetimeOptional.json
@@ -86,6 +86,6 @@
    },
    "view": "views/fields/datetime-optional",
    "personalData": true,
-   "valueFactoryClassName": "Espo\\Core\\Fields\\DateTimeOptional\\DateTimeOptionalFactory",
-   "attributeExtractorClassName": "Espo\\Core\\Fields\\DateTimeOptional\\DateTimeOptionalAttributeExtractor"
+   "valueFactoryClassName": "Espo\\Core\\Field\\DateTimeOptional\\DateTimeOptionalFactory",
+   "attributeExtractorClassName": "Espo\\Core\\Field\\DateTimeOptional\\DateTimeOptionalAttributeExtractor"
 }
diff --git a/application/Espo/Resources/metadata/fields/email.json b/application/Espo/Resources/metadata/fields/email.json
index 4247bc8957..ebd758cffd 100644
--- a/application/Espo/Resources/metadata/fields/email.json
+++ b/application/Espo/Resources/metadata/fields/email.json
@@ -42,6 +42,6 @@
    },
    "textFilter": true,
    "personalData": true,
-   "valueFactoryClassName": "Espo\\Core\\Fields\\EmailAddress\\EmailAddressGroupFactory",
-   "attributeExtractorClassName": "Espo\\Core\\Fields\\EmailAddress\\EmailAddressGroupAttributeExtractor"
+   "valueFactoryClassName": "Espo\\Core\\Field\\EmailAddress\\EmailAddressGroupFactory",
+   "attributeExtractorClassName": "Espo\\Core\\Field\\EmailAddress\\EmailAddressGroupAttributeExtractor"
 }
diff --git a/application/Espo/Resources/metadata/fields/link.json b/application/Espo/Resources/metadata/fields/link.json
index 92f56f8989..224872fb39 100644
--- a/application/Espo/Resources/metadata/fields/link.json
+++ b/application/Espo/Resources/metadata/fields/link.json
@@ -30,6 +30,6 @@
    ],
    "filter": true,
    "notCreatable": true,
-   "valueFactoryClassName": "Espo\\Core\\Fields\\Link\\LinkFactory",
-   "attributeExtractorClassName": "Espo\\Core\\Fields\\Link\\LinkAttributeExtractor"
+   "valueFactoryClassName": "Espo\\Core\\Field\\Link\\LinkFactory",
+   "attributeExtractorClassName": "Espo\\Core\\Field\\Link\\LinkAttributeExtractor"
 }
diff --git a/application/Espo/Resources/metadata/fields/linkMultiple.json b/application/Espo/Resources/metadata/fields/linkMultiple.json
index 0c799e8432..be552d65b3 100644
--- a/application/Espo/Resources/metadata/fields/linkMultiple.json
+++ b/application/Espo/Resources/metadata/fields/linkMultiple.json
@@ -33,6 +33,6 @@
    "notCreatable": true,
    "notSortable": true,
    "filter": true,
-   "valueFactoryClassName": "Espo\\Core\\Fields\\LinkMultiple\\LinkMultipleFactory",
-   "attributeExtractorClassName": "Espo\\Core\\Fields\\LinkMultiple\\LinkMultipleAttributeExtractor"
+   "valueFactoryClassName": "Espo\\Core\\Field\\LinkMultiple\\LinkMultipleFactory",
+   "attributeExtractorClassName": "Espo\\Core\\Field\\LinkMultiple\\LinkMultipleAttributeExtractor"
 }
diff --git a/application/Espo/Resources/metadata/fields/linkParent.json b/application/Espo/Resources/metadata/fields/linkParent.json
index 77fce9ff42..10a9e10390 100644
--- a/application/Espo/Resources/metadata/fields/linkParent.json
+++ b/application/Espo/Resources/metadata/fields/linkParent.json
@@ -34,6 +34,6 @@
    "fieldDefs":{
       "notStorable":true
    },
-   "valueFactoryClassName": "Espo\\Core\\Fields\\LinkParent\\LinkParentFactory",
-   "attributeExtractorClassName": "Espo\\Core\\Fields\\LinkParent\\LinkParentAttributeExtractor"
+   "valueFactoryClassName": "Espo\\Core\\Field\\LinkParent\\LinkParentFactory",
+   "attributeExtractorClassName": "Espo\\Core\\Field\\LinkParent\\LinkParentAttributeExtractor"
 }
diff --git a/application/Espo/Resources/metadata/fields/phone.json b/application/Espo/Resources/metadata/fields/phone.json
index 754e8953de..691a654364 100644
--- a/application/Espo/Resources/metadata/fields/phone.json
+++ b/application/Espo/Resources/metadata/fields/phone.json
@@ -50,6 +50,6 @@
    "translatedOptions": true,
    "textFilter": true,
    "personalData": true,
-   "valueFactoryClassName": "Espo\\Core\\Fields\\PhoneNumber\\PhoneNumberGroupFactory",
-   "attributeExtractorClassName": "Espo\\Core\\Fields\\PhoneNumber\\PhoneNumberGroupAttributeExtractor"
+   "valueFactoryClassName": "Espo\\Core\\Field\\PhoneNumber\\PhoneNumberGroupFactory",
+   "attributeExtractorClassName": "Espo\\Core\\Field\\PhoneNumber\\PhoneNumberGroupAttributeExtractor"
 }
diff --git a/application/Espo/Services/Record.php b/application/Espo/Services/Record.php
index 8ba62b0577..6dbe59ca47 100644
--- a/application/Espo/Services/Record.php
+++ b/application/Espo/Services/Record.php
@@ -341,7 +341,7 @@ class Record extends RecordService implements
     }
 
     /**
-     * @deprecated Use `Espo\Core\Fields\Currency\CurrencyConverter`.
+     * @deprecated Use `Espo\Core\Field\Currency\CurrencyConverter`.
      */
     public function getConvertCurrencyValues(
         Entity $entity,
diff --git a/application/Espo/Tools/Export/Processors/Xlsx.php b/application/Espo/Tools/Export/Processors/Xlsx.php
index cb7774533c..2d772fee16 100644
--- a/application/Espo/Tools/Export/Processors/Xlsx.php
+++ b/application/Espo/Tools/Export/Processors/Xlsx.php
@@ -38,8 +38,8 @@ use Espo\Core\{
     Utils\DateTime as DateTimeUtil,
     FileStorage\Manager as FileStorageManager,
     ORM\EntityManager,
-    Fields\Address,
-    Fields\Address\AddressFormatterFactory,
+    Field\Address,
+    Field\Address\AddressFormatterFactory,
 };
 
 use Espo\Tools\Export\{
diff --git a/tests/integration/Espo/Actions/ActionTest.php b/tests/integration/Espo/Actions/ActionTest.php
index 41f66c2a89..bfeb543871 100644
--- a/tests/integration/Espo/Actions/ActionTest.php
+++ b/tests/integration/Espo/Actions/ActionTest.php
@@ -35,8 +35,8 @@ use Espo\Core\{
     ORM\EntityManager,
     Application,
     Exceptions\Forbidden,
-    Fields\EmailAddress,
-    Fields\PhoneNumber,
+    Field\EmailAddress,
+    Field\PhoneNumber,
     Action\Actions\Merge\Merger,
     Action\Params,
 };
diff --git a/tests/integration/Espo/Core/Fields/Address/AddressFormatterTest.php b/tests/integration/Espo/Core/Field/Address/AddressFormatterTest.php
similarity index 96%
rename from tests/integration/Espo/Core/Fields/Address/AddressFormatterTest.php
rename to tests/integration/Espo/Core/Field/Address/AddressFormatterTest.php
index fb02be1448..8b51ef81ab 100644
--- a/tests/integration/Espo/Core/Fields/Address/AddressFormatterTest.php
+++ b/tests/integration/Espo/Core/Field/Address/AddressFormatterTest.php
@@ -27,9 +27,9 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace tests\integration\Espo\Core\Fields\Address;
+namespace tests\integration\Espo\Core\Field\Address;
 
-use Espo\Core\Fields\{
+use Espo\Core\Field\{
     Address\AddressFormatterFactory,
     Address,
 };
diff --git a/tests/integration/Espo/Core/Fields/ValueObjectTest.php b/tests/integration/Espo/Core/Field/ValueObjectTest.php
similarity index 99%
rename from tests/integration/Espo/Core/Fields/ValueObjectTest.php
rename to tests/integration/Espo/Core/Field/ValueObjectTest.php
index 285d0ae053..32df745296 100644
--- a/tests/integration/Espo/Core/Fields/ValueObjectTest.php
+++ b/tests/integration/Espo/Core/Field/ValueObjectTest.php
@@ -27,9 +27,9 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace tests\integration\Espo\Core\Fields;
+namespace tests\integration\Espo\Core\Field;
 
-use Espo\Core\Fields\{
+use Espo\Core\Field\{
     Currency,
     Date,
     DateTime,
diff --git a/tests/integration/Espo/Core/FieldProcessing/EmailAddressTest.php b/tests/integration/Espo/Core/FieldProcessing/EmailAddressTest.php
index c1803cb48a..e9351bc5ed 100644
--- a/tests/integration/Espo/Core/FieldProcessing/EmailAddressTest.php
+++ b/tests/integration/Espo/Core/FieldProcessing/EmailAddressTest.php
@@ -32,8 +32,8 @@ namespace tests\integration\Espo\Core\FieldProcessing;
 use Espo\Core\ORM\EntityManager;
 
 use Espo\Core\{
-    Fields\EmailAddressGroup,
-    Fields\EmailAddress,
+    Field\EmailAddressGroup,
+    Field\EmailAddress,
 };
 
 class EmailAddressTest extends \tests\integration\Core\BaseTestCase
diff --git a/tests/integration/Espo/Core/FieldProcessing/PhoneNumberTest.php b/tests/integration/Espo/Core/FieldProcessing/PhoneNumberTest.php
index ae4154abfa..e6001dd4b2 100644
--- a/tests/integration/Espo/Core/FieldProcessing/PhoneNumberTest.php
+++ b/tests/integration/Espo/Core/FieldProcessing/PhoneNumberTest.php
@@ -32,8 +32,8 @@ namespace tests\integration\Espo\Core\FieldProcessing;
 use Espo\Core\ORM\EntityManager;
 
 use Espo\Core\{
-    Fields\PhoneNumberGroup,
-    Fields\PhoneNumber,
+    Field\PhoneNumberGroup,
+    Field\PhoneNumber,
 };
 
 class PhoneNumberTest extends \tests\integration\Core\BaseTestCase
diff --git a/tests/unit/Espo/Core/Fields/Address/AddressFormattersTest.php b/tests/unit/Espo/Core/Field/Address/AddressFormattersTest.php
similarity index 98%
rename from tests/unit/Espo/Core/Fields/Address/AddressFormattersTest.php
rename to tests/unit/Espo/Core/Field/Address/AddressFormattersTest.php
index df6c02f044..769440e17f 100644
--- a/tests/unit/Espo/Core/Fields/Address/AddressFormattersTest.php
+++ b/tests/unit/Espo/Core/Field/Address/AddressFormattersTest.php
@@ -27,10 +27,10 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace tests\unit\Espo\Core\Fields\Address;
+namespace tests\unit\Espo\Core\Field\Address;
 
 use Espo\Core\{
-    Fields\Address,
+    Field\Address,
 };
 
 use Espo\Classes\{
diff --git a/tests/unit/Espo/Core/Fields/Address/AddressTest.php b/tests/unit/Espo/Core/Field/Address/AddressTest.php
similarity index 97%
rename from tests/unit/Espo/Core/Fields/Address/AddressTest.php
rename to tests/unit/Espo/Core/Field/Address/AddressTest.php
index 1837100bf2..367075ddfa 100644
--- a/tests/unit/Espo/Core/Fields/Address/AddressTest.php
+++ b/tests/unit/Espo/Core/Field/Address/AddressTest.php
@@ -27,11 +27,11 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace tests\unit\Espo\Core\Fields\Address;
+namespace tests\unit\Espo\Core\Field\Address;
 
 use Espo\Core\{
-    Fields\Address,
-    Fields\Address\AddressFactory,
+    Field\Address,
+    Field\Address\AddressFactory,
 };
 
 use Espo\ORM\Entity;
diff --git a/tests/unit/Espo/Core/Fields/Currency/CurrencyConfigDataProviderTest.php b/tests/unit/Espo/Core/Field/Currency/CurrencyConfigDataProviderTest.php
similarity index 97%
rename from tests/unit/Espo/Core/Fields/Currency/CurrencyConfigDataProviderTest.php
rename to tests/unit/Espo/Core/Field/Currency/CurrencyConfigDataProviderTest.php
index f5314923fe..c4de390c7f 100644
--- a/tests/unit/Espo/Core/Fields/Currency/CurrencyConfigDataProviderTest.php
+++ b/tests/unit/Espo/Core/Field/Currency/CurrencyConfigDataProviderTest.php
@@ -27,10 +27,10 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace tests\unit\Espo\Core\Fields\Currency;
+namespace tests\unit\Espo\Core\Field\Currency;
 
 use Espo\Core\{
-    Fields\Currency\CurrencyConfigDataProvider,
+    Field\Currency\CurrencyConfigDataProvider,
     Utils\Config,
 };
 
diff --git a/tests/unit/Espo/Core/Fields/Currency/CurrencyConverterTest.php b/tests/unit/Espo/Core/Field/Currency/CurrencyConverterTest.php
similarity index 96%
rename from tests/unit/Espo/Core/Fields/Currency/CurrencyConverterTest.php
rename to tests/unit/Espo/Core/Field/Currency/CurrencyConverterTest.php
index 624fbfaf07..680f82bc10 100644
--- a/tests/unit/Espo/Core/Fields/Currency/CurrencyConverterTest.php
+++ b/tests/unit/Espo/Core/Field/Currency/CurrencyConverterTest.php
@@ -27,13 +27,13 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace tests\unit\Espo\Core\Fields\Currency;
+namespace tests\unit\Espo\Core\Field\Currency;
 
 use Espo\Core\{
-    Fields\Currency,
-    Fields\Currency\CurrencyConverter,
-    Fields\Currency\CurrencyConfigDataProvider,
-    Fields\Currency\CurrencyRates,
+    Field\Currency,
+    Field\Currency\CurrencyConverter,
+    Field\Currency\CurrencyConfigDataProvider,
+    Field\Currency\CurrencyRates,
 };
 
 class CurrencyConverterTest extends \PHPUnit\Framework\TestCase
diff --git a/tests/unit/Espo/Core/Fields/Currency/CurrencyTest.php b/tests/unit/Espo/Core/Field/Currency/CurrencyTest.php
similarity index 97%
rename from tests/unit/Espo/Core/Fields/Currency/CurrencyTest.php
rename to tests/unit/Espo/Core/Field/Currency/CurrencyTest.php
index ed717568c1..634ebcee6b 100644
--- a/tests/unit/Espo/Core/Fields/Currency/CurrencyTest.php
+++ b/tests/unit/Espo/Core/Field/Currency/CurrencyTest.php
@@ -27,11 +27,11 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace tests\unit\Espo\Core\Fields\Currency;
+namespace tests\unit\Espo\Core\Field\Currency;
 
 use Espo\Core\{
-    Fields\Currency,
-    Fields\Currency\CurrencyFactory,
+    Field\Currency,
+    Field\Currency\CurrencyFactory,
 };
 
 use Espo\{
diff --git a/tests/unit/Espo/Core/Fields/Date/DateTest.php b/tests/unit/Espo/Core/Field/Date/DateTest.php
similarity index 98%
rename from tests/unit/Espo/Core/Fields/Date/DateTest.php
rename to tests/unit/Espo/Core/Field/Date/DateTest.php
index 9db583166a..0b9594f60a 100644
--- a/tests/unit/Espo/Core/Fields/Date/DateTest.php
+++ b/tests/unit/Espo/Core/Field/Date/DateTest.php
@@ -27,10 +27,10 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace tests\unit\Espo\Core\Fields\Date;
+namespace tests\unit\Espo\Core\Field\Date;
 
 use Espo\Core\{
-    Fields\Date,
+    Field\Date,
 };
 
 use DateTimeImmutable;
diff --git a/tests/unit/Espo/Core/Fields/DateTime/DateTimeTest.php b/tests/unit/Espo/Core/Field/DateTime/DateTimeTest.php
similarity index 98%
rename from tests/unit/Espo/Core/Fields/DateTime/DateTimeTest.php
rename to tests/unit/Espo/Core/Field/DateTime/DateTimeTest.php
index 1996839339..1af7a67e80 100644
--- a/tests/unit/Espo/Core/Fields/DateTime/DateTimeTest.php
+++ b/tests/unit/Espo/Core/Field/DateTime/DateTimeTest.php
@@ -27,10 +27,10 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace tests\unit\Espo\Core\Fields\DateTime;
+namespace tests\unit\Espo\Core\Field\DateTime;
 
 use Espo\Core\{
-    Fields\DateTime,
+    Field\DateTime,
 };
 
 use DateTimeImmutable;
diff --git a/tests/unit/Espo/Core/Fields/DateTimeOptional/DateTimeOptionalDateTest.php b/tests/unit/Espo/Core/Field/DateTimeOptional/DateTimeOptionalDateTest.php
similarity index 98%
rename from tests/unit/Espo/Core/Fields/DateTimeOptional/DateTimeOptionalDateTest.php
rename to tests/unit/Espo/Core/Field/DateTimeOptional/DateTimeOptionalDateTest.php
index 33c5237330..c6bbb4d529 100644
--- a/tests/unit/Espo/Core/Fields/DateTimeOptional/DateTimeOptionalDateTest.php
+++ b/tests/unit/Espo/Core/Field/DateTimeOptional/DateTimeOptionalDateTest.php
@@ -27,10 +27,10 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace tests\unit\Espo\Core\Fields\DateTimeOptional;
+namespace tests\unit\Espo\Core\Field\DateTimeOptional;
 
 use Espo\Core\{
-    Fields\DateTimeOptional,
+    Field\DateTimeOptional,
 };
 
 use DateTimeImmutable;
diff --git a/tests/unit/Espo/Core/Fields/DateTimeOptional/DateTimeOptionalTest.php b/tests/unit/Espo/Core/Field/DateTimeOptional/DateTimeOptionalTest.php
similarity index 98%
rename from tests/unit/Espo/Core/Fields/DateTimeOptional/DateTimeOptionalTest.php
rename to tests/unit/Espo/Core/Field/DateTimeOptional/DateTimeOptionalTest.php
index 9e1d4840ee..27b9dcf2ac 100644
--- a/tests/unit/Espo/Core/Fields/DateTimeOptional/DateTimeOptionalTest.php
+++ b/tests/unit/Espo/Core/Field/DateTimeOptional/DateTimeOptionalTest.php
@@ -27,10 +27,10 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace tests\unit\Espo\Core\Fields\DateTimeOptionalTest;
+namespace tests\unit\Espo\Core\Field\DateTimeOptionalTest;
 
 use Espo\Core\{
-    Fields\DateTimeOptional,
+    Field\DateTimeOptional,
 };
 
 use DateTimeImmutable;
diff --git a/tests/unit/Espo/Core/Fields/EmailAddress/EmailAddressGroupAttributeExtractorTest.php b/tests/unit/Espo/Core/Field/EmailAddress/EmailAddressGroupAttributeExtractorTest.php
similarity index 94%
rename from tests/unit/Espo/Core/Fields/EmailAddress/EmailAddressGroupAttributeExtractorTest.php
rename to tests/unit/Espo/Core/Field/EmailAddress/EmailAddressGroupAttributeExtractorTest.php
index ef65a1927e..6a3aa102d1 100644
--- a/tests/unit/Espo/Core/Fields/EmailAddress/EmailAddressGroupAttributeExtractorTest.php
+++ b/tests/unit/Espo/Core/Field/EmailAddress/EmailAddressGroupAttributeExtractorTest.php
@@ -27,12 +27,12 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace tests\unit\Espo\Core\Fields\EmailAddress;
+namespace tests\unit\Espo\Core\Field\EmailAddress;
 
 use Espo\Core\{
-    Fields\EmailAddress,
-    Fields\EmailAddressGroup,
-    Fields\EmailAddress\EmailAddressGroupAttributeExtractor,
+    Field\EmailAddress,
+    Field\EmailAddressGroup,
+    Field\EmailAddress\EmailAddressGroupAttributeExtractor,
 };
 
 class EmailAddressGroupAttributeExtractorTest extends \PHPUnit\Framework\TestCase
diff --git a/tests/unit/Espo/Core/Fields/EmailAddress/EmailAddressGroupFactoryTest.php b/tests/unit/Espo/Core/Field/EmailAddress/EmailAddressGroupFactoryTest.php
similarity index 98%
rename from tests/unit/Espo/Core/Fields/EmailAddress/EmailAddressGroupFactoryTest.php
rename to tests/unit/Espo/Core/Field/EmailAddress/EmailAddressGroupFactoryTest.php
index 7804e17cbc..e126e7c311 100644
--- a/tests/unit/Espo/Core/Fields/EmailAddress/EmailAddressGroupFactoryTest.php
+++ b/tests/unit/Espo/Core/Field/EmailAddress/EmailAddressGroupFactoryTest.php
@@ -27,10 +27,10 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace tests\unit\Espo\Core\Fields\EmailAddress;
+namespace tests\unit\Espo\Core\Field\EmailAddress;
 
 use Espo\Core\{
-    Fields\EmailAddress\EmailAddressGroupFactory,
+    Field\EmailAddress\EmailAddressGroupFactory,
     Utils\Metadata,
 };
 
diff --git a/tests/unit/Espo/Core/Fields/EmailAddress/EmailAddressGroupTest.php b/tests/unit/Espo/Core/Field/EmailAddress/EmailAddressGroupTest.php
similarity index 98%
rename from tests/unit/Espo/Core/Fields/EmailAddress/EmailAddressGroupTest.php
rename to tests/unit/Espo/Core/Field/EmailAddress/EmailAddressGroupTest.php
index 0446ced1d8..e68705b893 100644
--- a/tests/unit/Espo/Core/Fields/EmailAddress/EmailAddressGroupTest.php
+++ b/tests/unit/Espo/Core/Field/EmailAddress/EmailAddressGroupTest.php
@@ -27,11 +27,11 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace tests\unit\Espo\Core\Fields\EmailAddress;
+namespace tests\unit\Espo\Core\Field\EmailAddress;
 
 use Espo\Core\{
-    Fields\EmailAddress,
-    Fields\EmailAddressGroup,
+    Field\EmailAddress,
+    Field\EmailAddressGroup,
 };
 
 use RuntimeException;
diff --git a/tests/unit/Espo/Core/Fields/EmailAddress/EmailAddressTest.php b/tests/unit/Espo/Core/Field/EmailAddress/EmailAddressTest.php
similarity index 97%
rename from tests/unit/Espo/Core/Fields/EmailAddress/EmailAddressTest.php
rename to tests/unit/Espo/Core/Field/EmailAddress/EmailAddressTest.php
index 912fe7ec32..d5a376361b 100644
--- a/tests/unit/Espo/Core/Fields/EmailAddress/EmailAddressTest.php
+++ b/tests/unit/Espo/Core/Field/EmailAddress/EmailAddressTest.php
@@ -27,10 +27,10 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace tests\unit\Espo\Core\Fields\EmailAddress;
+namespace tests\unit\Espo\Core\Field\EmailAddress;
 
 use Espo\Core\{
-    Fields\EmailAddress,
+    Field\EmailAddress,
 };
 
 use RuntimeException;
diff --git a/tests/unit/Espo/Core/Fields/Link/LinkTest.php b/tests/unit/Espo/Core/Field/Link/LinkTest.php
similarity index 96%
rename from tests/unit/Espo/Core/Fields/Link/LinkTest.php
rename to tests/unit/Espo/Core/Field/Link/LinkTest.php
index f7e7a09075..3adefbbbfe 100644
--- a/tests/unit/Espo/Core/Fields/Link/LinkTest.php
+++ b/tests/unit/Espo/Core/Field/Link/LinkTest.php
@@ -27,10 +27,10 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace tests\unit\Espo\Core\Fields\Link;
+namespace tests\unit\Espo\Core\Field\Link;
 
 use Espo\Core\{
-    Fields\Link,
+    Field\Link,
 };
 
 use RuntimeException;
diff --git a/tests/unit/Espo/Core/Fields/LinkMultiple/LinkMultipleTest.php b/tests/unit/Espo/Core/Field/LinkMultiple/LinkMultipleTest.php
similarity index 97%
rename from tests/unit/Espo/Core/Fields/LinkMultiple/LinkMultipleTest.php
rename to tests/unit/Espo/Core/Field/LinkMultiple/LinkMultipleTest.php
index 64e9266a63..7a95736762 100644
--- a/tests/unit/Espo/Core/Fields/LinkMultiple/LinkMultipleTest.php
+++ b/tests/unit/Espo/Core/Field/LinkMultiple/LinkMultipleTest.php
@@ -27,11 +27,11 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace tests\unit\Espo\Core\Fields\LinkMultiple;
+namespace tests\unit\Espo\Core\Field\LinkMultiple;
 
 use Espo\Core\{
-    Fields\LinkMultiple,
-    Fields\LinkMultipleItem,
+    Field\LinkMultiple,
+    Field\LinkMultipleItem,
 };
 
 use RuntimeException;
diff --git a/tests/unit/Espo/Core/Fields/LinkParent/LinkParentTest.php b/tests/unit/Espo/Core/Field/LinkParent/LinkParentTest.php
similarity index 96%
rename from tests/unit/Espo/Core/Fields/LinkParent/LinkParentTest.php
rename to tests/unit/Espo/Core/Field/LinkParent/LinkParentTest.php
index 69231b9cb0..d743f32952 100644
--- a/tests/unit/Espo/Core/Fields/LinkParent/LinkParentTest.php
+++ b/tests/unit/Espo/Core/Field/LinkParent/LinkParentTest.php
@@ -27,10 +27,10 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace tests\unit\Espo\Core\Fields\LinkParent;
+namespace tests\unit\Espo\Core\Field\LinkParent;
 
 use Espo\Core\{
-    Fields\LinkParent,
+    Field\LinkParent,
 };
 
 use RuntimeException;
diff --git a/tests/unit/Espo/Core/Fields/PhoneNumber/PhoneNumberGroupAttributeExtractorTest.php b/tests/unit/Espo/Core/Field/PhoneNumber/PhoneNumberGroupAttributeExtractorTest.php
similarity index 94%
rename from tests/unit/Espo/Core/Fields/PhoneNumber/PhoneNumberGroupAttributeExtractorTest.php
rename to tests/unit/Espo/Core/Field/PhoneNumber/PhoneNumberGroupAttributeExtractorTest.php
index 2210954dbb..7c8142f74c 100644
--- a/tests/unit/Espo/Core/Fields/PhoneNumber/PhoneNumberGroupAttributeExtractorTest.php
+++ b/tests/unit/Espo/Core/Field/PhoneNumber/PhoneNumberGroupAttributeExtractorTest.php
@@ -27,12 +27,12 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace tests\unit\Espo\Core\Fields\PhoneNumber;
+namespace tests\unit\Espo\Core\Field\PhoneNumber;
 
 use Espo\Core\{
-    Fields\PhoneNumber,
-    Fields\PhoneNumberGroup,
-    Fields\PhoneNumber\PhoneNumberGroupAttributeExtractor,
+    Field\PhoneNumber,
+    Field\PhoneNumberGroup,
+    Field\PhoneNumber\PhoneNumberGroupAttributeExtractor,
 };
 
 class PhoneNumberGroupAttributeExtractorTest extends \PHPUnit\Framework\TestCase
diff --git a/tests/unit/Espo/Core/Fields/PhoneNumber/PhoneNumberGroupFactoryTest.php b/tests/unit/Espo/Core/Field/PhoneNumber/PhoneNumberGroupFactoryTest.php
similarity index 98%
rename from tests/unit/Espo/Core/Fields/PhoneNumber/PhoneNumberGroupFactoryTest.php
rename to tests/unit/Espo/Core/Field/PhoneNumber/PhoneNumberGroupFactoryTest.php
index 205cb3bea0..8fcc6cd98a 100644
--- a/tests/unit/Espo/Core/Fields/PhoneNumber/PhoneNumberGroupFactoryTest.php
+++ b/tests/unit/Espo/Core/Field/PhoneNumber/PhoneNumberGroupFactoryTest.php
@@ -27,10 +27,10 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace tests\unit\Espo\Core\Fields\PhoneNumber;
+namespace tests\unit\Espo\Core\Field\PhoneNumber;
 
 use Espo\Core\{
-    Fields\PhoneNumber\PhoneNumberGroupFactory,
+    Field\PhoneNumber\PhoneNumberGroupFactory,
     Utils\Metadata,
 };
 
diff --git a/tests/unit/Espo/Core/Fields/PhoneNumber/PhoneNumberGroupTest.php b/tests/unit/Espo/Core/Field/PhoneNumber/PhoneNumberGroupTest.php
similarity index 98%
rename from tests/unit/Espo/Core/Fields/PhoneNumber/PhoneNumberGroupTest.php
rename to tests/unit/Espo/Core/Field/PhoneNumber/PhoneNumberGroupTest.php
index eff635771d..d19636a390 100644
--- a/tests/unit/Espo/Core/Fields/PhoneNumber/PhoneNumberGroupTest.php
+++ b/tests/unit/Espo/Core/Field/PhoneNumber/PhoneNumberGroupTest.php
@@ -27,11 +27,11 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace tests\unit\Espo\Core\Fields\PhoneNumber;
+namespace tests\unit\Espo\Core\Field\PhoneNumber;
 
 use Espo\Core\{
-    Fields\PhoneNumber,
-    Fields\PhoneNumberGroup,
+    Field\PhoneNumber,
+    Field\PhoneNumberGroup,
 };
 
 use RuntimeException;
diff --git a/tests/unit/Espo/Core/Fields/PhoneNumber/PhoneNumberTest.php b/tests/unit/Espo/Core/Field/PhoneNumber/PhoneNumberTest.php
similarity index 97%
rename from tests/unit/Espo/Core/Fields/PhoneNumber/PhoneNumberTest.php
rename to tests/unit/Espo/Core/Field/PhoneNumber/PhoneNumberTest.php
index ef98ba8abc..365d366eb6 100644
--- a/tests/unit/Espo/Core/Fields/PhoneNumber/PhoneNumberTest.php
+++ b/tests/unit/Espo/Core/Field/PhoneNumber/PhoneNumberTest.php
@@ -27,10 +27,10 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace tests\unit\Espo\Core\Fields\PhoneNumber;
+namespace tests\unit\Espo\Core\Field\PhoneNumber;
 
 use Espo\Core\{
-    Fields\PhoneNumber,
+    Field\PhoneNumber,
 };
 
 use RuntimeException;