diff --git a/application/Espo/Core/Utils/Database/Schema/Converter.php b/application/Espo/Core/Utils/Database/Schema/Converter.php
index 617a11a4be..063eb0de28 100644
--- a/application/Espo/Core/Utils/Database/Schema/Converter.php
+++ b/application/Espo/Core/Utils/Database/Schema/Converter.php
@@ -167,7 +167,8 @@ class Converter
             if (isset($entityParams['indexes']) && is_array($entityParams['indexes'])) {
                 foreach ($entityParams['indexes'] as $indexName => $indexParams) {
                     if (is_array($indexParams['columns'])) {
-                        $indexList[$indexName] = $indexParams['columns'];
+                        $uIndexName = strtoupper( Util::toUnderScore($indexName) );
+                        $indexList[$uIndexName] = Util::toUnderScore($indexParams['columns']);
                     }
                 }
             }