diff --git a/backend/app/plugins/wiaas/includes/admin/class-wiaas-admin-orders.php b/backend/app/plugins/wiaas/includes/admin/class-wiaas-admin-orders.php
index 6f75a13..26fb3d1 100644
--- a/backend/app/plugins/wiaas/includes/admin/class-wiaas-admin-orders.php
+++ b/backend/app/plugins/wiaas/includes/admin/class-wiaas-admin-orders.php
@@ -27,13 +27,13 @@ class Wiaas_Admin_Orders {
         if ($is_admin){
             add_filter( 'woocommerce_admin_order_preview_line_item_columns', array(__CLASS__, 'customize_order_preview_columns'));
 
-            add_filter( 'woocommerce_admin_order_preview_line_item_column_payment_type', array(__CLASS__, 'fill_in_payment_type'), 10, 2);
-            add_filter( 'woocommerce_admin_order_preview_line_item_column_services_extra', array(__CLASS__, 'fill_in_services_extra'), 10, 4);
-            add_filter( 'woocommerce_admin_order_preview_line_item_column_services_contract_period', array(__CLASS__, 'fill_in_services_contract_period'), 10, 2);
-            add_filter( 'woocommerce_admin_order_preview_line_item_column_max_contract_period', array(__CLASS__, 'fill_in_max_contract_period'), 10, 2);
-            add_filter( 'woocommerce_admin_order_preview_line_item_column_period_unit', array(__CLASS__, 'fill_in_period_unit'), 10, 2);
-            add_filter( 'woocommerce_admin_order_preview_line_item_column_recurrent_extra', array(__CLASS__, 'fill_in_recurrent_extra'), 10, 4);
-            add_filter( 'woocommerce_admin_order_preview_line_item_column_pay_period', array(__CLASS__, 'fill_in_pay_period'), 10, 2);
+            add_filter( 'woocommerce_admin_order_preview_line_item_column_wiaas_payment_type', array(__CLASS__, 'fill_in_payment_type'), 10, 2);
+            add_filter( 'woocommerce_admin_order_preview_line_item_column_wiaas_services_extra', array(__CLASS__, 'fill_in_services_extra'), 10, 4);
+            add_filter( 'woocommerce_admin_order_preview_line_item_column_wiaas_services_contract_period', array(__CLASS__, 'fill_in_services_contract_period'), 10, 2);
+            add_filter( 'woocommerce_admin_order_preview_line_item_column_wiaas_max_contract_period', array(__CLASS__, 'fill_in_max_contract_period'), 10, 2);
+            add_filter( 'woocommerce_admin_order_preview_line_item_column_wiaas_period_unit', array(__CLASS__, 'fill_in_period_unit'), 10, 2);
+            add_filter( 'woocommerce_admin_order_preview_line_item_column_wiaas_recurrent_extra', array(__CLASS__, 'fill_in_recurrent_extra'), 10, 4);
+            add_filter( 'woocommerce_admin_order_preview_line_item_column_wiaas_pay_period', array(__CLASS__, 'fill_in_pay_period'), 10, 2);
 
         }
     }
@@ -42,9 +42,9 @@ class Wiaas_Admin_Orders {
 
         $new_columns = array();
 
-        $new_columns['reference'] = 'Location';
-        $new_columns['commercial_lead'] = 'Commercial lead';
-        $new_columns['customer'] = 'Customer';
+        $new_columns['wiaas_reference'] = 'Location';
+        $new_columns['wiaas_commercial_lead'] = 'Commercial lead';
+        $new_columns['wiaas_customer'] = 'Customer';
 
         $insertAfterColumn = 1;
 
@@ -58,15 +58,15 @@ class Wiaas_Admin_Orders {
         $column_content = '';
 
         switch ($column){
-            case 'reference':
+            case 'wiaas_reference':
                 $column_content = Wiaas_Order::get_order_reference($post->ID);
                 break;
 
-            case 'commercial_lead':
+            case 'wiaas_commercial_lead':
                 $column_content = Wiaas_Order::get_order_commercial_lead_name($post->ID);
                 break;
 
-            case 'customer':
+            case 'wiaas_customer':
                 $column_content = Wiaas_Order::get_order_customer_full_name($post->ID);
                 break;
         }
@@ -76,7 +76,7 @@ class Wiaas_Admin_Orders {
 
     public static function add_custom_data_to_order_preview ($order){
 
-        $order['commercial_lead_name'] = Wiaas_Order::get_order_commercial_lead_name( $order['data']['id'] );
+        $order['wiaas_commercial_lead_name'] = Wiaas_Order::get_order_commercial_lead_name( $order['data']['id'] );
         $order['needs_shipping'] = true;
 
         return $order;
@@ -87,7 +87,7 @@ class Wiaas_Admin_Orders {
         echo    '<div class="wc-order-preview-addresses">
                     <div class="wc-order-preview-address">
                         <h3>Commercial lead</h3>
-                        <strong>{{data.commercial_lead_name}}</strong>
+                        <strong>{{data.wiaas_commercial_lead_name}}</strong>
                     </div>
                   </div>';
     }
@@ -109,13 +109,13 @@ class Wiaas_Admin_Orders {
 
         unset($columns['total']);
 
-        $columns['payment_type'] = __( 'Payment type', 'wiaas' );
-        $columns['services_extra'] = __( 'Services extra', 'wiaas');
-        $columns['recurrent_extra'] = __( 'Recurrent extra', 'wiaas');
-        $columns['services_contract_period'] = __( 'Contract period', 'wiaas');
-        $columns['max_contract_period'] = __( 'Maximum contract period', 'wiaas');
-        $columns['pay_period'] = __( 'Pay period', 'wiaas');
-        $columns['period_unit'] = __( 'Period unit', 'wiaas');
+        $columns['wiaas_payment_type'] = __( 'Payment type', 'wiaas' );
+        $columns['wiaas_services_extra'] = __( 'Services extra', 'wiaas');
+        $columns['wiaas_recurrent_extra'] = __( 'Recurrent extra', 'wiaas');
+        $columns['wiaas_services_contract_period'] = __( 'Contract period', 'wiaas');
+        $columns['wiaas_max_contract_period'] = __( 'Maximum contract period', 'wiaas');
+        $columns['wiaas_pay_period'] = __( 'Pay period', 'wiaas');
+        $columns['wiaas_period_unit'] = __( 'Period unit', 'wiaas');
 
         $columns['total'] = __( 'Total', 'woocommerce');