diff --git a/client/src/components/AccountsTypesSelect.js b/client/src/components/AccountsTypesSelect.js
index 1803f49f6..69782bab7 100644
--- a/client/src/components/AccountsTypesSelect.js
+++ b/client/src/components/AccountsTypesSelect.js
@@ -39,7 +39,7 @@ export default function AccountsTypesSelect({
       items={items}
       selectedItemProp={'id'}
       selectedItem={selectedTypeId}
-      labelProp={'label'}
+      textProp={'label'}
       defaultText={defaultSelectText}
       onItemSelect={handleItemSelected}
       itemPredicate={filterAccountTypeItems}
diff --git a/client/src/components/CategoriesSelectList.js b/client/src/components/CategoriesSelectList.js
index 541c2d813..52bf07a14 100644
--- a/client/src/components/CategoriesSelectList.js
+++ b/client/src/components/CategoriesSelectList.js
@@ -44,7 +44,7 @@ export default function CategoriesSelectList({
       items={categoriesList}
       selectedItemProp={'id'}
       selectedItem={selecetedCategoryId}
-      labelProp={'name'}
+      textProp={'name'}
       defaultText={defaultSelectText}
       onItemSelect={handleItemCategorySelected}
       itemPredicate={filterItemCategory}
diff --git a/client/src/components/DisplayNameList.js b/client/src/components/DisplayNameList.js
index eb0cb28b3..cb09cb4ac 100644
--- a/client/src/components/DisplayNameList.js
+++ b/client/src/components/DisplayNameList.js
@@ -34,7 +34,7 @@ export default function DisplayNameList({
     <ListSelect
       items={formatOptions}
       selectedItemProp={'label'}
-      labelProp={'label'}
+      textProp={'label'}
       defaultText={'Select display name as'}
       filterable={false}
       { ...restProps }
diff --git a/client/src/components/DynamicFilter/DynamicFilterValueField.js b/client/src/components/DynamicFilter/DynamicFilterValueField.js
index 241465ec1..1d56e1bbb 100644
--- a/client/src/components/DynamicFilter/DynamicFilterValueField.js
+++ b/client/src/components/DynamicFilter/DynamicFilterValueField.js
@@ -158,7 +158,7 @@ function DynamicFilterValueField({
             selectedItem={value}
             selectedItemProp={optionsKey}
             defaultText={`Select an option`}
-            labelProp={optionsLabel}
+            textProp={optionsLabel}
             buttonProps={{
               onClick: handleBtnClick
             }}
diff --git a/client/src/components/ItemsListField.js b/client/src/components/ItemsListField.js
index 495772c9a..8b23401a4 100644
--- a/client/src/components/ItemsListField.js
+++ b/client/src/components/ItemsListField.js
@@ -75,7 +75,7 @@ function ItemsListField({
       onItemSelect={onItemSelect}
       selectedItem={`${selectedItemId}`}
       selectedItemProp={'id'}
-      labelProp={'name'}
+      textProp={'name'}
       defaultText={selectedItem ? selectedItem.name : defautlSelectText}
     />
   );
diff --git a/client/src/components/PaymentReceiveListField.js b/client/src/components/PaymentReceiveListField.js
index 4c9f828ba..6b6b3a34d 100644
--- a/client/src/components/PaymentReceiveListField.js
+++ b/client/src/components/PaymentReceiveListField.js
@@ -29,7 +29,7 @@ function PaymentReceiveListField({
       onItemSelect={onInvoiceSelect}
       selectedItem={`${selectedInvoiceId}`}
       selectedItemProp={'id'}
-      labelProp={'name'}
+      textProp={'name'}
       defaultText={defaultSelectText}
     />
   );
diff --git a/client/src/components/SalutationList.js b/client/src/components/SalutationList.js
index 9b7e1d660..96b881589 100644
--- a/client/src/components/SalutationList.js
+++ b/client/src/components/SalutationList.js
@@ -13,7 +13,7 @@ export default function SalutationList({
     <ListSelect
       items={items}
       selectedItemProp={'key'}
-      labelProp={'label'}
+      textProp={'label'}
       defaultText={'Salutation'}
       filterable={false}
       {...restProps}
diff --git a/client/src/containers/Dialogs/InventoryAdjustmentFormDialog/InventoryAdjustmentFormDialogFields.js b/client/src/containers/Dialogs/InventoryAdjustmentFormDialog/InventoryAdjustmentFormDialogFields.js
index af6982c01..a6dd528e6 100644
--- a/client/src/containers/Dialogs/InventoryAdjustmentFormDialog/InventoryAdjustmentFormDialogFields.js
+++ b/client/src/containers/Dialogs/InventoryAdjustmentFormDialog/InventoryAdjustmentFormDialogFields.js
@@ -81,7 +81,7 @@ function InventoryAdjustmentFormDialogFields({
               filterable={false}
               selectedItem={value}
               selectedItemProp={'value'}
-              labelProp={'name'}
+              textProp={'name'}
               popoverProps={{ minimal: true }}
             />
           </FormGroup>
diff --git a/client/src/containers/FinancialStatements/FinancialAccountsFilter.js b/client/src/containers/FinancialStatements/FinancialAccountsFilter.js
index 4f6e89585..233865ad0 100644
--- a/client/src/containers/FinancialStatements/FinancialAccountsFilter.js
+++ b/client/src/containers/FinancialStatements/FinancialAccountsFilter.js
@@ -54,7 +54,7 @@ export default function FinancialAccountsFilter({ ...restProps }) {
                 filterable={false}
                 selectedItem={value}
                 selectedItemProp={'key'}
-                labelProp={'name'}
+                textProp={'name'}
                 onItemSelect={(item) => {
                   setFieldValue('accountsFilter', item.key);
                 }}
diff --git a/client/src/containers/FinancialStatements/SelectDisplayColumnsBy.js b/client/src/containers/FinancialStatements/SelectDisplayColumnsBy.js
index 7c2f1446e..09346a795 100644
--- a/client/src/containers/FinancialStatements/SelectDisplayColumnsBy.js
+++ b/client/src/containers/FinancialStatements/SelectDisplayColumnsBy.js
@@ -27,7 +27,7 @@ export default function SelectsListColumnsBy(props) {
                 filterable={false}
                 selectedItem={value}
                 selectedItemProp={'key'}
-                labelProp={'name'}
+                textProp={'name'}
                 onItemSelect={(item) => {
                   form.setFieldValue('displayColumnsType', item.key);
                 }}
diff --git a/client/src/containers/Preferences/General/GeneralForm.js b/client/src/containers/Preferences/General/GeneralForm.js
index ef1239cbd..46a711c8a 100644
--- a/client/src/containers/Preferences/General/GeneralForm.js
+++ b/client/src/containers/Preferences/General/GeneralForm.js
@@ -105,7 +105,7 @@ export default function PreferencesGeneralForm({}) {
               selectedItem={value}
               selectedItemProp={'value'}
               defaultText={<T id={'select_business_location'} />}
-              labelProp={'name'}
+              textProp={'name'}
               popoverProps={{ minimal: true }}
             />
           </FormGroup>
@@ -130,7 +130,7 @@ export default function PreferencesGeneralForm({}) {
               selectedItem={value}
               selectedItemProp={'code'}
               defaultText={<T id={'select_base_currency'} />}
-              labelProp={'label'}
+              textProp={'label'}
               popoverProps={{ minimal: true }}
             />
           </FormGroup>
@@ -150,7 +150,7 @@ export default function PreferencesGeneralForm({}) {
             <ListSelect
               items={fiscalYearOptions}
               selectedItemProp={'value'}
-              labelProp={'name'}
+              textProp={'name'}
               defaultText={<T id={'select_fiscal_year'} />}
               selectedItem={value}
               onItemSelect={(item) => {}}
@@ -173,7 +173,7 @@ export default function PreferencesGeneralForm({}) {
             <ListSelect
               items={languages}
               selectedItemProp={'value'}
-              labelProp={'name'}
+              textProp={'name'}
               defaultText={<T id={'select_language'} />}
               selectedItem={value}
               onItemSelect={(item) => {}}
@@ -227,7 +227,7 @@ export default function PreferencesGeneralForm({}) {
               selectedItem={value}
               selectedItemProp={'value'}
               defaultText={<T id={'select_date_format'} />}
-              labelProp={'name'}
+              textProp={'name'}
               popoverProps={{ minimal: true }}
             />
           </FormGroup>
diff --git a/client/src/containers/Setup/SetupOrganizationForm.js b/client/src/containers/Setup/SetupOrganizationForm.js
index a78ff2651..c8212594b 100644
--- a/client/src/containers/Setup/SetupOrganizationForm.js
+++ b/client/src/containers/Setup/SetupOrganizationForm.js
@@ -321,7 +321,7 @@ function SetupOrganizationForm({
                 selectedItem={values.base_currency}
                 selectedItemProp={'value'}
                 defaultText={<T id={'select_base_currency'} />}
-                labelProp={'name'}
+                textProp={'name'}
               />
             </FormGroup>
           </Col>
@@ -351,7 +351,7 @@ function SetupOrganizationForm({
                 selectedItem={values.language}
                 selectedItemProp={'value'}
                 defaultText={<T id={'select_language'} />}
-                labelProp={'name'}
+                textProp={'name'}
               />
             </FormGroup>
           </Col>
@@ -380,7 +380,7 @@ function SetupOrganizationForm({
             selectedItem={values.fiscal_year}
             selectedItemProp={'value'}
             defaultText={<T id={'select_fiscal_year'} />}
-            labelProp={'name'}
+            textProp={'name'}
           />
         </FormGroup>