diff --git a/src/include/abstracts/class-wc-retailcrm-abstracts-settings.php b/src/include/abstracts/class-wc-retailcrm-abstracts-settings.php
index af8c6d3..bb54cac 100644
--- a/src/include/abstracts/class-wc-retailcrm-abstracts-settings.php
+++ b/src/include/abstracts/class-wc-retailcrm-abstracts-settings.php
@@ -25,8 +25,8 @@ abstract class WC_Retailcrm_Abstracts_Settings extends WC_Integration
      */
     public function __construct() {
         $this->id                 = 'integration-retailcrm';
-        $this->method_title       = __('retailCRM', 'retailcrm');
-        $this->method_description = __('Integration with retailCRM management system.', 'retailcrm');
+        $this->method_title       = __('RetailCRM', 'retailcrm');
+        $this->method_description = __('Integration with RetailCRM management system.', 'retailcrm');
 
         static::$option_key = $this->get_option_key();
 
@@ -116,7 +116,7 @@ abstract class WC_Retailcrm_Abstracts_Settings extends WC_Integration
             'api_key' => array(
                 'title'             => __( 'API key', 'retailcrm' ),
                 'type'              => 'text',
-                'description'       => __( 'Enter your API key. You can find it in the administration section of retailCRM', 'retailcrm' ),
+                'description'       => __( 'Enter your API key. You can find it in the administration section of RetailCRM', 'retailcrm' ),
                 'desc_tip'          => true,
                 'default'           => ''
             )
@@ -198,10 +198,10 @@ abstract class WC_Retailcrm_Abstracts_Settings extends WC_Integration
 
                     $this->form_fields['client_roles'] = array(
                         'label'       =>  ' ',
-                        'title'       => __('Client roles available for uploading to retailCRM', 'retailcrm'),
+                        'title'       => __('Client roles available for uploading to RetailCRM', 'retailcrm'),
                         'class'       => '',
                         'type'        => 'multiselect',
-                        'description' => __('Select client roles which will be uploaded from website to retailCRM', 'retailcrm'),
+                        'description' => __('Select client roles which will be uploaded from website to RetailCRM', 'retailcrm'),
                         'options'     => $client_roles_option,
                         'css'         => 'min-height:100px;',
                         'select_buttons' => true
@@ -232,10 +232,10 @@ abstract class WC_Retailcrm_Abstracts_Settings extends WC_Integration
 
                     $this->form_fields['order_methods'] = array(
                         'label'       =>  ' ',
-                        'title'       => __('Order methods available for uploading from retailCRM', 'retailcrm'),
+                        'title'       => __('Order methods available for uploading from RetailCRM', 'retailcrm'),
                         'class'       => '',
                         'type'        => 'multiselect',
-                        'description' => __('Select order methods which will be uploaded from retailCRM to the website', 'retailcrm'),
+                        'description' => __('Select order methods which will be uploaded from RetailCRM to the website', 'retailcrm'),
                         'options'     => $order_methods_option,
                         'css'         => 'min-height:100px;',
                         'select_buttons' => true
@@ -358,7 +358,7 @@ abstract class WC_Retailcrm_Abstracts_Settings extends WC_Integration
                     'title'       => __('Stock balance', 'retailcrm'),
                     'class'       => 'checkbox',
                     'type'        => 'checkbox',
-                    'description' => __('Enable this setting if you would like to get information on leftover stocks from retailCRM to the website.', 'retailcrm')
+                    'description' => __('Enable this setting if you would like to get information on leftover stocks from RetailCRM to the website.', 'retailcrm')
                 );
 
                 /**
@@ -432,7 +432,7 @@ abstract class WC_Retailcrm_Abstracts_Settings extends WC_Integration
                         'label'             => __('Upload', 'retailcrm'),
                         'title'             => __('Uploading all customers and orders', 'retailcrm' ),
                         'type'              => 'button',
-                        'description'       => __('Uploading the existing customers and orders to retailCRM', 'retailcrm' ),
+                        'description'       => __('Uploading the existing customers and orders to RetailCRM', 'retailcrm' ),
                         'desc_tip'          => true,
                         'id'                => 'uploads-retailcrm'
                     );
@@ -452,7 +452,7 @@ abstract class WC_Retailcrm_Abstracts_Settings extends WC_Integration
                     'label'             => __('Generate now', 'retailcrm'),
                     'title'             => __('Generating ICML', 'retailcrm'),
                     'type'              => 'button',
-                    'description'       => __('This functionality allows to generate ICML products catalog for uploading to retailCRM.', 'retailcrm'),
+                    'description'       => __('This functionality allows to generate ICML products catalog for uploading to RetailCRM.', 'retailcrm'),
                     'desc_tip'          => true,
                     'id'                => 'icml-retailcrm'
                 );
@@ -493,14 +493,14 @@ abstract class WC_Retailcrm_Abstracts_Settings extends WC_Integration
 
                 $this->form_fields['history'] = array(
                     'label'       => __('Activate history uploads', 'retailcrm'),
-                    'title'       => __('Upload data from retailCRM', 'retailcrm'),
+                    'title'       => __('Upload data from RetailCRM', 'retailcrm'),
                     'class'       => 'checkbox',
                     'type'        => 'checkbox'
                 );
 
                 $this->form_fields['deactivate_update_order'] = array(
-                     'label'       => __('Disable data editing in retailCRM', 'retailcrm'),
-                     'title'       => __('Data updating in retailCRM', 'retailcrm'),
+                     'label'       => __('Disable data editing in RetailCRM', 'retailcrm'),
+                     'title'       => __('Data updating in RetailCRM', 'retailcrm'),
                      'class'       => 'checkbox',
                      'type'        => 'checkbox'
                 );
@@ -513,7 +513,7 @@ abstract class WC_Retailcrm_Abstracts_Settings extends WC_Integration
                 );
 
                 $this->form_fields['update_number'] = array(
-                     'label'       => __('Enable transferring the number to retailCRM', 'retailcrm'),
+                     'label'       => __('Enable transferring the number to RetailCRM', 'retailcrm'),
                      'title'       => __('Transferring the order number', 'retailcrm'),
                      'class'       => 'checkbox',
                      'type'        => 'checkbox'
@@ -707,7 +707,7 @@ abstract class WC_Retailcrm_Abstracts_Settings extends WC_Integration
         $wp_admin_bar->add_menu(
             array(
                 'id' => 'retailcrm_top_menu',
-                'title' => __('retailCRM', 'retailcrm')
+                'title' => __('RetailCRM', 'retailcrm')
             )
         );
         $wp_admin_bar->add_menu(
diff --git a/src/include/order/class-wc-retailcrm-order.php b/src/include/order/class-wc-retailcrm-order.php
index 8eeb9e8..4adaf56 100644
--- a/src/include/order/class-wc-retailcrm-order.php
+++ b/src/include/order/class-wc-retailcrm-order.php
@@ -105,22 +105,14 @@ class WC_Retailcrm_Order extends WC_Retailcrm_Abstracts_Data
     /**
      * @param WC_Order $order
      */
-    protected function set_number($order)
-    {
-        if ($this->is_new) {
-            $this->set_data_field('number', $order->get_order_number());
-        }
-
-        if (isset($this->settings['update_number'])
-            && $this->settings['update_number'] == WC_Retailcrm_Base::YES
-        ) {
-            if (!$this->is_new) {
-                $this->set_data_field('number', $order->get_order_number());
-            }
-        } elseif (!$this->is_new) {
-            unset($this->data['number']);
-        }
-    }
+	protected function set_number($order)
+	{
+		if (isset($this->settings['update_number']) && $this->settings['update_number'] == WC_Retailcrm_Base::YES ) {
+			$this->set_data_field('number', $order->get_order_number());
+		} else {
+			unset($this->data['number']);
+		}
+	}
 
     public function reset_data()
     {