diff --git a/frontend/src/AppBuilder/QueryManager/Components/DataSourceSelect.jsx b/frontend/src/AppBuilder/QueryManager/Components/DataSourceSelect.jsx
index 0cdcdb844b..f0a3bbe811 100644
--- a/frontend/src/AppBuilder/QueryManager/Components/DataSourceSelect.jsx
+++ b/frontend/src/AppBuilder/QueryManager/Components/DataSourceSelect.jsx
@@ -7,7 +7,7 @@ import { getWorkspaceId, decodeEntities } from '@/_helpers/utils';
 import { ButtonSolid } from '@/_ui/AppButton/AppButton';
 import { useDataSources, useGlobalDataSources, useSampleDataSource } from '@/_stores/dataSourcesStore';
 import { useDataQueriesActions } from '@/_stores/dataQueriesStore';
-import { staticDataSources as staticDatasources } from '../constants';
+import { defaultSources, staticDataSources as staticDatasources } from '../constants';
 import { useQueryPanelActions } from '@/_stores/queryPanelStore';
 import Search from '@/_ui/Icon/solidIcons/Search';
 import { Tooltip } from 'react-tooltip';
@@ -135,7 +135,7 @@ function DataSourceSelect({ isDisabled, selectRef, closePopup, workflowDataSourc
             <div>
               <DataSourceIcon source={source} height={16} />{' '}
               <span data-cy={`ds-${source.name.toLowerCase()}`} className="ms-1 small" style={{ fontSize: '13px' }}>
-                {source.name}
+                {defaultSources[cleanWord(source.name)].name}
               </span>
             </div>
           ),
@@ -178,6 +178,10 @@ function DataSourceSelect({ isDisabled, selectRef, closePopup, workflowDataSourc
     }
   };
 
+  function cleanWord(word) {
+    return word.replace(/default/g, '');
+  }
+
   return (
     <div>
       <Select
diff --git a/server/src/modules/versions/util.service.ts b/server/src/modules/versions/util.service.ts
index 86a29ac741..f5723e0377 100644
--- a/server/src/modules/versions/util.service.ts
+++ b/server/src/modules/versions/util.service.ts
@@ -42,7 +42,7 @@ export class VersionUtilService implements IVersionUtilService {
   async updateVersion(appVersion: AppVersion, appVersionUpdateDto: AppVersionUpdateDto) {
     const editableParams = {};
 
-    const { globalSettings, homePageId, pageSettings } = appVersion;
+    const { globalSettings, homePageId, pageSettings, name } = appVersion;
 
     if (appVersionUpdateDto?.homePageId && homePageId !== appVersionUpdateDto.homePageId) {
       editableParams['homePageId'] = appVersionUpdateDto.homePageId;
@@ -65,6 +65,10 @@ export class VersionUtilService implements IVersionUtilService {
       editableParams['showViewerNavigation'] = appVersionUpdateDto.showViewerNavigation;
     }
 
+    if (appVersionUpdateDto?.name && name !== appVersionUpdateDto.name) {
+      editableParams['name'] = appVersionUpdateDto.name;
+    }
+
     await this.versionRepository.update(appVersion.id, editableParams);
     return;
   }