diff --git a/application/Espo/Classes/AddressFormatters/Formatter1.php b/application/Espo/Classes/AddressFormatters/Formatter1.php
index 2a6c68912a..c381664ffa 100644
--- a/application/Espo/Classes/AddressFormatters/Formatter1.php
+++ b/application/Espo/Classes/AddressFormatters/Formatter1.php
@@ -29,7 +29,7 @@
 
 namespace Espo\Classes\AddressFormatters;
 
-use Espo\Core\FieldUtils\Address\{
+use Espo\Core\Fields\Address\{
     AddressFormatter,
     Address,
 };
diff --git a/application/Espo/Classes/AddressFormatters/Formatter2.php b/application/Espo/Classes/AddressFormatters/Formatter2.php
index 394de30778..cd3a349254 100644
--- a/application/Espo/Classes/AddressFormatters/Formatter2.php
+++ b/application/Espo/Classes/AddressFormatters/Formatter2.php
@@ -29,7 +29,7 @@
 
 namespace Espo\Classes\AddressFormatters;
 
-use Espo\Core\FieldUtils\Address\{
+use Espo\Core\Fields\Address\{
     AddressFormatter,
     Address,
 };
diff --git a/application/Espo/Classes/AddressFormatters/Formatter3.php b/application/Espo/Classes/AddressFormatters/Formatter3.php
index 96a09d11c0..62d15a8b00 100644
--- a/application/Espo/Classes/AddressFormatters/Formatter3.php
+++ b/application/Espo/Classes/AddressFormatters/Formatter3.php
@@ -29,7 +29,7 @@
 
 namespace Espo\Classes\AddressFormatters;
 
-use Espo\Core\FieldUtils\Address\{
+use Espo\Core\Fields\Address\{
     AddressFormatter,
     Address,
 };
diff --git a/application/Espo/Classes/AddressFormatters/Formatter4.php b/application/Espo/Classes/AddressFormatters/Formatter4.php
index 66dec8c2b0..5c7dfa2788 100644
--- a/application/Espo/Classes/AddressFormatters/Formatter4.php
+++ b/application/Espo/Classes/AddressFormatters/Formatter4.php
@@ -29,7 +29,7 @@
 
 namespace Espo\Classes\AddressFormatters;
 
-use Espo\Core\FieldUtils\Address\{
+use Espo\Core\Fields\Address\{
     AddressFormatter,
     Address,
 };
diff --git a/application/Espo/Core/Action/Actions/ConvertCurrency.php b/application/Espo/Core/Action/Actions/ConvertCurrency.php
index 21f1b4f30c..15ad3d28bd 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,
-    FieldUtils\Currency\CurrencyConfigDataProvider,
-    FieldUtils\Currency\CurrencyConverter,
-    FieldUtils\Currency\Currency,
-    FieldUtils\Currency\CurrencyRates,
+    Fields\Currency\CurrencyConfigDataProvider,
+    Fields\Currency\CurrencyConverter,
+    Fields\Currency\Currency,
+    Fields\Currency\CurrencyRates,
 };
 
 use Espo\{
diff --git a/application/Espo/Core/FieldUtils/Address/Address.php b/application/Espo/Core/Fields/Address/Address.php
similarity index 99%
rename from application/Espo/Core/FieldUtils/Address/Address.php
rename to application/Espo/Core/Fields/Address/Address.php
index af1f2fb9a1..5c62938a52 100644
--- a/application/Espo/Core/FieldUtils/Address/Address.php
+++ b/application/Espo/Core/Fields/Address/Address.php
@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\FieldUtils\Address;
+namespace Espo\Core\Fields\Address;
 
 /**
  * An address value.
diff --git a/application/Espo/Core/FieldUtils/Address/AddressAttributeExtractor.php b/application/Espo/Core/Fields/Address/AddressAttributeExtractor.php
similarity index 98%
rename from application/Espo/Core/FieldUtils/Address/AddressAttributeExtractor.php
rename to application/Espo/Core/Fields/Address/AddressAttributeExtractor.php
index 83eec85724..4e04c848db 100644
--- a/application/Espo/Core/FieldUtils/Address/AddressAttributeExtractor.php
+++ b/application/Espo/Core/Fields/Address/AddressAttributeExtractor.php
@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\FieldUtils\Address;
+namespace Espo\Core\Fields\Address;
 
 use StdClass;
 
diff --git a/application/Espo/Core/FieldUtils/Address/AddressBuilder.php b/application/Espo/Core/Fields/Address/AddressBuilder.php
similarity index 98%
rename from application/Espo/Core/FieldUtils/Address/AddressBuilder.php
rename to application/Espo/Core/Fields/Address/AddressBuilder.php
index 7ada24a824..e76e7153b6 100644
--- a/application/Espo/Core/FieldUtils/Address/AddressBuilder.php
+++ b/application/Espo/Core/Fields/Address/AddressBuilder.php
@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\FieldUtils\Address;
+namespace Espo\Core\Fields\Address;
 
 /**
  * An address value builder.
diff --git a/application/Espo/Core/FieldUtils/Address/AddressFactory.php b/application/Espo/Core/Fields/Address/AddressFactory.php
similarity index 98%
rename from application/Espo/Core/FieldUtils/Address/AddressFactory.php
rename to application/Espo/Core/Fields/Address/AddressFactory.php
index ccda342077..846b38e4ef 100644
--- a/application/Espo/Core/FieldUtils/Address/AddressFactory.php
+++ b/application/Espo/Core/Fields/Address/AddressFactory.php
@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\FieldUtils\Address;
+namespace Espo\Core\Fields\Address;
 
 use Espo\{
     ORM\Entity,
diff --git a/application/Espo/Core/FieldUtils/Address/AddressFormatter.php b/application/Espo/Core/Fields/Address/AddressFormatter.php
similarity index 97%
rename from application/Espo/Core/FieldUtils/Address/AddressFormatter.php
rename to application/Espo/Core/Fields/Address/AddressFormatter.php
index f43d2611e2..d191eb2099 100644
--- a/application/Espo/Core/FieldUtils/Address/AddressFormatter.php
+++ b/application/Espo/Core/Fields/Address/AddressFormatter.php
@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\FieldUtils\Address;
+namespace Espo\Core\Fields\Address;
 
 /**
  * An address formatter.
diff --git a/application/Espo/Core/FieldUtils/Address/AddressFormatterFactory.php b/application/Espo/Core/Fields/Address/AddressFormatterFactory.php
similarity index 98%
rename from application/Espo/Core/FieldUtils/Address/AddressFormatterFactory.php
rename to application/Espo/Core/Fields/Address/AddressFormatterFactory.php
index ebcbc5a039..d0a5f1a06e 100644
--- a/application/Espo/Core/FieldUtils/Address/AddressFormatterFactory.php
+++ b/application/Espo/Core/Fields/Address/AddressFormatterFactory.php
@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\FieldUtils\Address;
+namespace Espo\Core\Fields\Address;
 
 use RuntimeException;
 
diff --git a/application/Espo/Core/FieldUtils/Address/AddressFormatterMetadataProvider.php b/application/Espo/Core/Fields/Address/AddressFormatterMetadataProvider.php
similarity index 97%
rename from application/Espo/Core/FieldUtils/Address/AddressFormatterMetadataProvider.php
rename to application/Espo/Core/Fields/Address/AddressFormatterMetadataProvider.php
index 64e1aac123..d94164cb29 100644
--- a/application/Espo/Core/FieldUtils/Address/AddressFormatterMetadataProvider.php
+++ b/application/Espo/Core/Fields/Address/AddressFormatterMetadataProvider.php
@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\FieldUtils\Address;
+namespace Espo\Core\Fields\Address;
 
 use Espo\Core\Utils\Metadata;
 
diff --git a/application/Espo/Core/FieldUtils/Currency/Currency.php b/application/Espo/Core/Fields/Currency/Currency.php
similarity index 98%
rename from application/Espo/Core/FieldUtils/Currency/Currency.php
rename to application/Espo/Core/Fields/Currency/Currency.php
index 3abe77cae8..a957fddbbf 100644
--- a/application/Espo/Core/FieldUtils/Currency/Currency.php
+++ b/application/Espo/Core/Fields/Currency/Currency.php
@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\FieldUtils\Currency;
+namespace Espo\Core\Fields\Currency;
 
 use RuntimeException;
 
diff --git a/application/Espo/Core/FieldUtils/Currency/CurrencyAttributeExtractor.php b/application/Espo/Core/Fields/Currency/CurrencyAttributeExtractor.php
similarity index 97%
rename from application/Espo/Core/FieldUtils/Currency/CurrencyAttributeExtractor.php
rename to application/Espo/Core/Fields/Currency/CurrencyAttributeExtractor.php
index d94297856f..9662b7040f 100644
--- a/application/Espo/Core/FieldUtils/Currency/CurrencyAttributeExtractor.php
+++ b/application/Espo/Core/Fields/Currency/CurrencyAttributeExtractor.php
@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\FieldUtils\Currency;
+namespace Espo\Core\Fields\Currency;
 
 use StdClass;
 
diff --git a/application/Espo/Core/FieldUtils/Currency/CurrencyConfigDataProvider.php b/application/Espo/Core/Fields/Currency/CurrencyConfigDataProvider.php
similarity index 98%
rename from application/Espo/Core/FieldUtils/Currency/CurrencyConfigDataProvider.php
rename to application/Espo/Core/Fields/Currency/CurrencyConfigDataProvider.php
index 1d7bca2123..5c83f1d657 100644
--- a/application/Espo/Core/FieldUtils/Currency/CurrencyConfigDataProvider.php
+++ b/application/Espo/Core/Fields/Currency/CurrencyConfigDataProvider.php
@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\FieldUtils\Currency;
+namespace Espo\Core\Fields\Currency;
 
 use Espo\Core\Utils\Config;
 
diff --git a/application/Espo/Core/FieldUtils/Currency/CurrencyConverter.php b/application/Espo/Core/Fields/Currency/CurrencyConverter.php
similarity index 98%
rename from application/Espo/Core/FieldUtils/Currency/CurrencyConverter.php
rename to application/Espo/Core/Fields/Currency/CurrencyConverter.php
index 7600929aac..ba920d49cb 100644
--- a/application/Espo/Core/FieldUtils/Currency/CurrencyConverter.php
+++ b/application/Espo/Core/Fields/Currency/CurrencyConverter.php
@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\FieldUtils\Currency;
+namespace Espo\Core\Fields\Currency;
 
 use RuntimeException;
 
diff --git a/application/Espo/Core/FieldUtils/Currency/CurrencyFactory.php b/application/Espo/Core/Fields/Currency/CurrencyFactory.php
similarity index 97%
rename from application/Espo/Core/FieldUtils/Currency/CurrencyFactory.php
rename to application/Espo/Core/Fields/Currency/CurrencyFactory.php
index 4dbffc2a48..3432acfaa1 100644
--- a/application/Espo/Core/FieldUtils/Currency/CurrencyFactory.php
+++ b/application/Espo/Core/Fields/Currency/CurrencyFactory.php
@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\FieldUtils\Currency;
+namespace Espo\Core\Fields\Currency;
 
 use Espo\{
     ORM\Entity,
diff --git a/application/Espo/Core/FieldUtils/Currency/CurrencyRates.php b/application/Espo/Core/Fields/Currency/CurrencyRates.php
similarity index 98%
rename from application/Espo/Core/FieldUtils/Currency/CurrencyRates.php
rename to application/Espo/Core/Fields/Currency/CurrencyRates.php
index 97b72ae23b..b02ceab2fa 100644
--- a/application/Espo/Core/FieldUtils/Currency/CurrencyRates.php
+++ b/application/Espo/Core/Fields/Currency/CurrencyRates.php
@@ -27,7 +27,7 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace Espo\Core\FieldUtils\Currency;
+namespace Espo\Core\Fields\Currency;
 
 use RuntimeException;
 
diff --git a/application/Espo/Core/MassAction/Actions/MassConvertCurrency.php b/application/Espo/Core/MassAction/Actions/MassConvertCurrency.php
index 7ab42c9d07..bce32798c6 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,
-    FieldUtils\Currency\CurrencyConfigDataProvider,
-    FieldUtils\Currency\CurrencyConverter,
-    FieldUtils\Currency\Currency,
-    FieldUtils\Currency\CurrencyRates,
+    Fields\Currency\CurrencyConfigDataProvider,
+    Fields\Currency\CurrencyConverter,
+    Fields\Currency\Currency,
+    Fields\Currency\CurrencyRates,
 };
 
 use Espo\{
diff --git a/application/Espo/Services/Record.php b/application/Espo/Services/Record.php
index 01ad489e6e..8e3cd79545 100644
--- a/application/Espo/Services/Record.php
+++ b/application/Espo/Services/Record.php
@@ -2643,7 +2643,7 @@ class Record implements Crud,
     }
 
     /**
-     * @deprecated Use `Espo\Core\FieldUtils\Currency\CurrencyConverter`.
+     * @deprecated Use `Espo\Core\Fields\Currency\CurrencyConverter`.
      */
     public function getConvertCurrencyValues(
         Entity $entity, string $targetCurrency, string $baseCurrency,
diff --git a/application/Espo/Tools/Export/Formats/Xlsx.php b/application/Espo/Tools/Export/Formats/Xlsx.php
index 9fc80cdb33..2fa30d81c6 100644
--- a/application/Espo/Tools/Export/Formats/Xlsx.php
+++ b/application/Espo/Tools/Export/Formats/Xlsx.php
@@ -40,8 +40,8 @@ use Espo\Core\{
     FileStorage\Manager as FileStorageManager,
     Utils\File\Manager as FileManager,
     ORM\EntityManager,
-    FieldUtils\Address\Address,
-    FieldUtils\Address\AddressFormatterFactory,
+    Fields\Address\Address,
+    Fields\Address\AddressFormatterFactory,
 };
 
 use PhpOffice\PhpSpreadsheet\Cell\DataType;
diff --git a/tests/integration/Espo/Core/FieldUtils/Address/AddressFormatterTest.php b/tests/integration/Espo/Core/Fields/Address/AddressFormatterTest.php
similarity index 95%
rename from tests/integration/Espo/Core/FieldUtils/Address/AddressFormatterTest.php
rename to tests/integration/Espo/Core/Fields/Address/AddressFormatterTest.php
index 32de61d0e3..02bcddce6c 100644
--- a/tests/integration/Espo/Core/FieldUtils/Address/AddressFormatterTest.php
+++ b/tests/integration/Espo/Core/Fields/Address/AddressFormatterTest.php
@@ -27,9 +27,9 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace tests\integration\Espo\Core\FieldUtils\Address;
+namespace tests\integration\Espo\Core\Fields\Address;
 
-use Espo\Core\FieldUtils\Address\{
+use Espo\Core\Fields\Address\{
     AddressFormatterFactory,
     AddressValue,
 };
diff --git a/tests/unit/Espo/Core/FieldUtils/Address/AddressFormattersTest.php b/tests/unit/Espo/Core/Fields/Address/AddressFormattersTest.php
similarity index 98%
rename from tests/unit/Espo/Core/FieldUtils/Address/AddressFormattersTest.php
rename to tests/unit/Espo/Core/Fields/Address/AddressFormattersTest.php
index b990196b95..afeb02f47f 100644
--- a/tests/unit/Espo/Core/FieldUtils/Address/AddressFormattersTest.php
+++ b/tests/unit/Espo/Core/Fields/Address/AddressFormattersTest.php
@@ -27,10 +27,10 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace tests\unit\Espo\Core\FieldUtils\Address;
+namespace tests\unit\Espo\Core\Fields\Address;
 
 use Espo\Core\{
-    FieldUtils\Address\Address,
+    Fields\Address\Address,
 };
 
 use Espo\Classes\{
diff --git a/tests/unit/Espo/Core/FieldUtils/Address/AddressTest.php b/tests/unit/Espo/Core/Fields/Address/AddressTest.php
similarity index 97%
rename from tests/unit/Espo/Core/FieldUtils/Address/AddressTest.php
rename to tests/unit/Espo/Core/Fields/Address/AddressTest.php
index ce4a07cc14..1d3a841576 100644
--- a/tests/unit/Espo/Core/FieldUtils/Address/AddressTest.php
+++ b/tests/unit/Espo/Core/Fields/Address/AddressTest.php
@@ -27,11 +27,11 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace tests\unit\Espo\Core\FieldUtils\Address;
+namespace tests\unit\Espo\Core\Fields\Address;
 
 use Espo\Core\{
-    FieldUtils\Address\Address,
-    FieldUtils\Address\AddressFactory,
+    Fields\Address\Address,
+    Fields\Address\AddressFactory,
 };
 
 use Espo\ORM\Entity;
diff --git a/tests/unit/Espo/Core/FieldUtils/Currency/CurrencyConfigDataProviderTest.php b/tests/unit/Espo/Core/Fields/Currency/CurrencyConfigDataProviderTest.php
similarity index 97%
rename from tests/unit/Espo/Core/FieldUtils/Currency/CurrencyConfigDataProviderTest.php
rename to tests/unit/Espo/Core/Fields/Currency/CurrencyConfigDataProviderTest.php
index b51874a522..f5314923fe 100644
--- a/tests/unit/Espo/Core/FieldUtils/Currency/CurrencyConfigDataProviderTest.php
+++ b/tests/unit/Espo/Core/Fields/Currency/CurrencyConfigDataProviderTest.php
@@ -27,10 +27,10 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace tests\unit\Espo\Core\FieldUtils\Currency;
+namespace tests\unit\Espo\Core\Fields\Currency;
 
 use Espo\Core\{
-    FieldUtils\Currency\CurrencyConfigDataProvider,
+    Fields\Currency\CurrencyConfigDataProvider,
     Utils\Config,
 };
 
diff --git a/tests/unit/Espo/Core/FieldUtils/Currency/CurrencyConverterTest.php b/tests/unit/Espo/Core/Fields/Currency/CurrencyConverterTest.php
similarity index 95%
rename from tests/unit/Espo/Core/FieldUtils/Currency/CurrencyConverterTest.php
rename to tests/unit/Espo/Core/Fields/Currency/CurrencyConverterTest.php
index 03efc2cbc2..a75954fd9e 100644
--- a/tests/unit/Espo/Core/FieldUtils/Currency/CurrencyConverterTest.php
+++ b/tests/unit/Espo/Core/Fields/Currency/CurrencyConverterTest.php
@@ -27,13 +27,13 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace tests\unit\Espo\Core\FieldUtils\Currency;
+namespace tests\unit\Espo\Core\Fields\Currency;
 
 use Espo\Core\{
-    FieldUtils\Currency\Currency,
-    FieldUtils\Currency\CurrencyConverter,
-    FieldUtils\Currency\CurrencyConfigDataProvider,
-    FieldUtils\Currency\CurrencyRates,
+    Fields\Currency\Currency,
+    Fields\Currency\CurrencyConverter,
+    Fields\Currency\CurrencyConfigDataProvider,
+    Fields\Currency\CurrencyRates,
 };
 
 class CurrencyConverterTest extends \PHPUnit\Framework\TestCase
diff --git a/tests/unit/Espo/Core/FieldUtils/Currency/CurrencyTest.php b/tests/unit/Espo/Core/Fields/Currency/CurrencyTest.php
similarity index 97%
rename from tests/unit/Espo/Core/FieldUtils/Currency/CurrencyTest.php
rename to tests/unit/Espo/Core/Fields/Currency/CurrencyTest.php
index 564082be22..61c035d6f6 100644
--- a/tests/unit/Espo/Core/FieldUtils/Currency/CurrencyTest.php
+++ b/tests/unit/Espo/Core/Fields/Currency/CurrencyTest.php
@@ -27,11 +27,11 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
-namespace tests\unit\Espo\Core\FieldUtils\Currency;
+namespace tests\unit\Espo\Core\Fields\Currency;
 
 use Espo\Core\{
-    FieldUtils\Currency\Currency,
-    FieldUtils\Currency\CurrencyFactory,
+    Fields\Currency\Currency,
+    Fields\Currency\CurrencyFactory,
 };
 
 use Espo\{