diff --git a/src/versions/develop/pages/BO/catalog/products/add/combinationsTab.ts b/src/versions/develop/pages/BO/catalog/products/add/combinationsTab.ts
index 9904a820..05f8332a 100644
--- a/src/versions/develop/pages/BO/catalog/products/add/combinationsTab.ts
+++ b/src/versions/develop/pages/BO/catalog/products/add/combinationsTab.ts
@@ -234,7 +234,7 @@ class CombinationsTab extends BOBasePage implements BOCombinationsTabPageInterfa
     // Bulk edit modal
     this.bulkEditModal = '#bulk-combination-form-modal';
     this.bulkEditModalTitle = `${this.bulkEditModal} .modal-header .modal-title`;
-    // Edit stocks
+    // Bulk edit stocks
     this.bulkEditModalStocksButton = '#bulk_combination_stock_accordion_header h2 button';
     this.bulkEditModalQuantitySwitchButton = (toEnable: number) => '#bulk_combination_stock_disabling_switch_delta_quantity_'
             + `${toEnable}`;
@@ -257,7 +257,7 @@ class CombinationsTab extends BOBasePage implements BOCombinationsTabPageInterfa
     this.bulkEditModalImpactOnWeightSwitchButton = (toEnable: number) => '#bulk_combination_price_disabling_switch_weight_'
             + `${toEnable}`;
     this.bulkEditModalImpactOnWeightInput = '#bulk_combination_price_weight';
-    // Edit specific references
+    // Bulk edit specific references
     this.bulkEditModalSpecificReferences = '#bulk_combination_references_accordion_header h2 button';
     this.bulkEditModalReferenceSwitchButton = (toEnable: number) => '#bulk_combination_references_disabling_switch_'
             + `reference_${toEnable}`;
@@ -620,7 +620,6 @@ class CombinationsTab extends BOBasePage implements BOCombinationsTabPageInterfa
             combinationData.impactOnPriceTExc,
     );
     await this.setValue(combinationFrame!, this.editCombinationModalReferenceInput, combinationData.reference);
-
     await this.waitForSelectorAndClick(page, this.editCombinationModalSaveButton);
 
     return this.getAlertSuccessBlockParagraphContent(combinationFrame!);
diff --git a/src/versions/develop/pages/BO/catalog/products/add/detailsTab.ts b/src/versions/develop/pages/BO/catalog/products/add/detailsTab.ts
index 15361fdf..bfe48e33 100644
--- a/src/versions/develop/pages/BO/catalog/products/add/detailsTab.ts
+++ b/src/versions/develop/pages/BO/catalog/products/add/detailsTab.ts
@@ -1,5 +1,5 @@
 import BOBasePage from '@pages/BO/BOBasePage';
-import type createProductPage from '@pages/BO/catalog/products/add';
+import createProductPage from '@pages/BO/catalog/products/add';
 
 // Import data
 import type ProductData from '@data/faker/product';
@@ -225,7 +225,7 @@ class DetailsTab extends BOBasePage implements BODetailsTabPageInterface {
      * @returns {Promise<string>}
      */
   async getErrorMessageInReferencesForm(page: Page, inputNumber: number): Promise<string> {
-    await this.clickAndWaitForLoadState(page, createProductPage.saveProductButton);
+    await createProductPage.clickOnSaveProductButton(page);
 
     return this.getTextContent(page, this.referenceFormErrorMessage(inputNumber));
   }
diff --git a/src/versions/develop/pages/BO/catalog/products/add/index.ts b/src/versions/develop/pages/BO/catalog/products/add/index.ts
index 8f887eb1..f6bf3c29 100644
--- a/src/versions/develop/pages/BO/catalog/products/add/index.ts
+++ b/src/versions/develop/pages/BO/catalog/products/add/index.ts
@@ -1,7 +1,7 @@
 import BOBasePage from '@pages/BO/BOBasePage';
 
-import virtualProductTab from '@pages/BO/catalog/products/add/virtualProductTab';
 import productsPage from '@pages/BO/catalog/products';
+import virtualProductTab from '@pages/BO/catalog/products/add/virtualProductTab';
 import descriptionTab from '@pages/BO/catalog/products/add/descriptionTab';
 import detailsTab from '@pages/BO/catalog/products/add/detailsTab';
 import stocksTab from '@pages/BO/catalog/products/add/stocksTab';
@@ -15,11 +15,11 @@ import type {BOCreateProductPageInterface} from '@interfaces/BO/catalog/products
 import type {Frame, Page} from 'playwright';
 
 /**
- * Create Product V2 page, contains functions that can be used on the page
+ * Create Product page, contains functions that can be used on the page
  * @class
  * @extends BOBasePage
  */
-class CreateProduct extends BOBasePage implements BOCreateProductPageInterface {
+class CreateProduct extends BOBasePage  implements BOCreateProductPageInterface {
   public readonly pageTitle: string;
 
   public readonly saveAndPublishButtonName: string;
@@ -360,7 +360,7 @@ class CreateProduct extends BOBasePage implements BOCreateProductPageInterface {
     await detailsTab.setProductDetails(page, productData);
 
     if (productData.type === 'virtual') {
-      await virtualProductTab.setVirtualProduct(page, productData);
+      await this.setVirtualProduct(page, productData);
     } else if (productData.type !== 'combinations') {
       await stocksTab.setProductStock(page, productData);
     }
@@ -447,7 +447,7 @@ class CreateProduct extends BOBasePage implements BOCreateProductPageInterface {
     await this.waitForVisibleSelector(page, this.deleteProductFooterModal);
     await this.clickAndWaitForURL(page, this.deleteProductSubmitButton);
 
-    return productsPage.getAlertSuccessBlockParagraphContent(page);
+    return this.getAlertSuccessBlockParagraphContent(page);
   }
 
   /**
diff --git a/src/versions/develop/pages/BO/catalog/products/add/optionsTab.ts b/src/versions/develop/pages/BO/catalog/products/add/optionsTab.ts
index 80cf57a1..26d26d59 100644
--- a/src/versions/develop/pages/BO/catalog/products/add/optionsTab.ts
+++ b/src/versions/develop/pages/BO/catalog/products/add/optionsTab.ts
@@ -4,7 +4,7 @@ import type {Page} from 'playwright';
 import type {BOOptionsTabPageInterface} from '@interfaces/BO/catalog/products/add/optionsTab';
 
 /**
- * Options tab on new product V2 page, contains functions that can be used on the page
+ * Options tab on new product page, contains functions that can be used on the page
  * @class
  * @extends BOBasePage
  */