diff --git a/Block/Adminhtml/CategoryWidget.php b/Block/Adminhtml/CategoryWidget.php
index d6c0ac06ffa96a43b4a101a159da717882d93fed..5e7bd34d05fc1a03226455243cbd937ead8a36ef 100755
--- a/Block/Adminhtml/CategoryWidget.php
+++ b/Block/Adminhtml/CategoryWidget.php
@@ -4,7 +4,7 @@ namespace NicolasBejean\CategoryWidget\Block\Adminhtml;
 use \Magento\Backend\Block\Widget\Grid\Container;
 
 /**
- * Class Image Slider
+ * Class CategoryWidget
  *
  * @category PHP
  * @package  NicolasBejean\CategoryWidget\Block\Adminhtml
@@ -18,8 +18,8 @@ class CategoryWidget extends Container
     {
         $this->_blockGroup     = 'NicolasBejean_CategoryWidget';
         $this->_controller     = 'adminhtml_categoryWidget';
-        $this->_headerText     = __('Image Slider');
-        $this->_addButtonLabel = __('Create New Image Slider');
+        $this->_headerText     = __('Category Widget');
+        $this->_addButtonLabel = __('Create New Category Widget');
 
         parent::_construct();
     }
diff --git a/Block/Adminhtml/CategoryWidget/Edit/DeleteButton.php b/Block/Adminhtml/CategoryWidget/Edit/DeleteButton.php
index ef177df1239a999b67a4dc86675ea09dc094edb8..b596e4f4e89a6bbce8c654a1ad2f4aadd55ffd14 100755
--- a/Block/Adminhtml/CategoryWidget/Edit/DeleteButton.php
+++ b/Block/Adminhtml/CategoryWidget/Edit/DeleteButton.php
@@ -26,7 +26,7 @@ class DeleteButton extends GenericButton implements ButtonProviderInterface
         $data = [];
         if ($this->getCategoryWidgetId()) {
             $data = [
-                'label' => __('Delete Image Slider'),
+                'label' => __('Delete Category Widget'),
                 'class' => 'delete',
                 'on_click' => 'deleteConfirm(\'' . __(
                     'Are you sure you want to do this?'
diff --git a/Block/Adminhtml/CategoryWidget/Edit/GenericButton.php b/Block/Adminhtml/CategoryWidget/Edit/GenericButton.php
index 43b8ba95c7483fd34ab43a6afdef57b85df0063a..028034bdf8c44b9c2d081ee90cb319899afc1741 100755
--- a/Block/Adminhtml/CategoryWidget/Edit/GenericButton.php
+++ b/Block/Adminhtml/CategoryWidget/Edit/GenericButton.php
@@ -34,14 +34,14 @@ class GenericButton
      */
     public function __construct(
         Context                                 $context,
-        CategoryWidgetRepositoryInterface          $categoryWidgetRepository
+        CategoryWidgetRepositoryInterface       $categoryWidgetRepository
     ) {
         $this->context                          = $context;
-        $this->categoryWidgetRepository            = $categoryWidgetRepository;
+        $this->categoryWidgetRepository         = $categoryWidgetRepository;
     }
 
     /**
-     * Get Image Slider ID
+     * Get Category Widget ID
      *
      * @return int|null
      * @throws LocalizedException
@@ -54,7 +54,7 @@ class GenericButton
             )->getId();
         } catch (NoSuchEntityException $e) {
         } catch (LocalizedException $e) {
-            throw new LocalizedException(__('Image Slider with id "%1" does not exist.'));
+            throw new LocalizedException(__('Category Widget with id "%1" does not exist.'));
         }
         return null;
     }
diff --git a/Block/Adminhtml/CategoryWidget/Widget/Chooser.php b/Block/Adminhtml/CategoryWidget/Widget/Chooser.php
index b059e9e8218933f698e660eb9871a626b853a52e..367f6b8ada7ca47964561ea2d83b84e67ac721f0 100755
--- a/Block/Adminhtml/CategoryWidget/Widget/Chooser.php
+++ b/Block/Adminhtml/CategoryWidget/Widget/Chooser.php
@@ -12,7 +12,7 @@ use \Exception;
 use \Magento\Widget\Block\Adminhtml\Widget\Chooser as WidgetChooser;
 
 /**
- * Class Chooser for Image Slider
+ * Class Chooser for Category Widget
  *
  * @category PHP
  * @package  NicolasBejean\CategoryWidget\Block\Adminhtml\CategoryWidget\Widget
@@ -33,27 +33,27 @@ class Chooser extends Extended
     protected $collectionFactory;
 
     /**
-     * @param Context               $context
-     * @param Data                  $backendHelper
+     * @param Context                  $context
+     * @param Data                     $backendHelper
      * @param CategoryWidgetFactory    $categoryWidgetFactory
-     * @param CollectionFactory     $collectionFactory
-     * @param array                 $data
+     * @param CollectionFactory        $collectionFactory
+     * @param array                    $data
      */
     public function __construct(
-        Context                     $context,
-        Data                        $backendHelper,
+        Context                        $context,
+        Data                           $backendHelper,
         CategoryWidgetFactory          $categoryWidgetFactory,
-        CollectionFactory           $collectionFactory,
+        CollectionFactory              $collectionFactory,
         array $data = []
     ) {
         $this->categoryWidgetFactory   = $categoryWidgetFactory;
-        $this->collectionFactory    = $collectionFactory;
+        $this->collectionFactory       = $collectionFactory;
 
         parent::__construct($context, $backendHelper, $data);
     }
 
     /**
-     * Image Slider construction, prepare grid params
+     * Category Widget construction, prepare grid params
      *
      * @return void
      */
@@ -122,7 +122,7 @@ class Chooser extends Extended
             '.setElementValue(categoryWidgetId);
                 ' .
             $chooserJsObject .
-            '.setElementLabel(categoryWidgetName);
+            '.setElementLabel(categoryWidgetTitle);
                 ' .
             $chooserJsObject .
             '.close();
@@ -132,7 +132,7 @@ class Chooser extends Extended
     }
 
     /**
-     * Prepare Image Slider collection
+     * Prepare Category Widget collection
      *
      * @return Extended
      */
@@ -156,13 +156,13 @@ class Chooser extends Extended
         );
 
         $this->addColumn(
-            'chooser_identifier',
-            ['header' => __('Identifier'), 'align' => 'left', 'index' => 'identifier']
+            'chooser_title',
+            ['header' => __('Title'), 'align' => 'left', 'index' => 'title']
         );
 
         $this->addColumn(
-            'chooser_name',
-            ['header' => __('Name'), 'align' => 'left', 'index' => 'name']
+            'chooser_identifier',
+            ['header' => __('Identifier'), 'align' => 'left', 'index' => 'identifier']
         );
 
         $this->addColumn(
diff --git a/Block/Widget/CategoryWidgetNew.php b/Block/Widget/CategoryWidgetNew.php
index 8ebe1dfa1f9a0f629c099fc8ccfbc8fec63e5cd2..725d3a5b6679cc09b15b665450944e2bd346fae7 100755
--- a/Block/Widget/CategoryWidgetNew.php
+++ b/Block/Widget/CategoryWidgetNew.php
@@ -47,7 +47,7 @@ class CategoryWidgetNew extends Template implements BlockInterface
     protected $filterProvider;
 
     /**
-     * Image Slider factory
+     * Category Widget factory
      *
      * @var CategoryWidgetFactory
      */
diff --git a/Controller/Adminhtml/CategoryWidget/Edit.php b/Controller/Adminhtml/CategoryWidget/Edit.php
index 1fcc685a36fa4552f1fa3962527575448bb46561..b0b504bc3733615d35c614f81fb0cd1b36d94cd2 100755
--- a/Controller/Adminhtml/CategoryWidget/Edit.php
+++ b/Controller/Adminhtml/CategoryWidget/Edit.php
@@ -71,11 +71,11 @@ class Edit extends CategoryWidget
         /** @var Page $resultPage */
         $resultPage = $this->resultPageFactory->create();
         $this->initPage($resultPage)->addBreadcrumb(
-            $id ? __('Edit Image Slider') : __('New Image Slider'),
-            $id ? __('Edit Image Slider') : __('New Image Slider')
+            $id ? __('Edit Category Widget') : __('New Category Widget'),
+            $id ? __('Edit Category Widget') : __('New Category Widget')
         );
-        $resultPage->getConfig()->getTitle()->prepend(__('Image Slider'));
-        $resultPage->getConfig()->getTitle()->prepend($model->getId() ? $model->getName() . ' (' . $model->getIdentifier() . ')' : __('New Image Slider'));
+        $resultPage->getConfig()->getTitle()->prepend(__('Category Widget'));
+        $resultPage->getConfig()->getTitle()->prepend($model->getId() ? $model->getName() . ' (' . $model->getIdentifier() . ')' : __('New Category Widget'));
         return $resultPage;
     }
 }
diff --git a/Controller/Adminhtml/CategoryWidget/Index.php b/Controller/Adminhtml/CategoryWidget/Index.php
index 761ecab40ef56d142f37265025e07c31ddfd0849..bb11077deafcb9c55baf3ea8a9efecfd09faf2d3 100755
--- a/Controller/Adminhtml/CategoryWidget/Index.php
+++ b/Controller/Adminhtml/CategoryWidget/Index.php
@@ -48,7 +48,7 @@ use \Magento\Framework\App\Request\DataPersistorInterface;
     {
         /** @var Page $resultPage */
         $resultPage = $this->resultPageFactory->create();
-        $this->initPage($resultPage)->getConfig()->getTitle()->prepend(__('Image Slider Manager'));
+        $this->initPage($resultPage)->getConfig()->getTitle()->prepend(__('Category Widget Manager'));
 
         $dataPersistor = $this->_objectManager->get(DataPersistorInterface::class);
         $dataPersistor->clear('nicolasbejean_categorywidget_item');
diff --git a/Controller/Adminhtml/CategoryWidget/InlineEdit.php b/Controller/Adminhtml/CategoryWidget/InlineEdit.php
index 067a5e69206dd4f455e04fa8733498bd465e15cc..8f70bbcb57f0513fd49fb72d25657f9d7f0b55a9 100755
--- a/Controller/Adminhtml/CategoryWidget/InlineEdit.php
+++ b/Controller/Adminhtml/CategoryWidget/InlineEdit.php
@@ -95,7 +95,7 @@ class InlineEdit extends Action
     }
 
     /**
-     * Add Image Slider title to error message
+     * Add Category Widget title to error message
      *
      * @param CategoryWidgetInterface $categoryWidget
      * @param string $errorText
@@ -103,6 +103,6 @@ class InlineEdit extends Action
      */
     protected function getErrorWithImageId(CategoryWidgetInterface $categoryWidget, $errorText)
     {
-        return '[Image Slider ID: ' . $categoryWidget->getId() . '] ' . $errorText;
+        return '[Category Widget ID: ' . $categoryWidget->getId() . '] ' . $errorText;
     }
 }
diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
index 208c814ec10efc0d6064d02b8acfdc5126b07df0..f48ccd1cd4224113863fafb71ee0987b13dfcbee 100644
--- a/etc/adminhtml/system.xml
+++ b/etc/adminhtml/system.xml
@@ -3,7 +3,7 @@
     <system>
         <section id="categorywidget" translate="label" sortOrder="15" showInDefault="1" showInWebsite="1" showInStore="1">
             <class>separator-top</class>
-            <label>Image Slider Manager</label>
+            <label>Category Widget Manager</label>
             <tab>nicolasbejean</tab>
             <resource>NicolasBejean_CategoryWidget::global</resource>
             <group id="resize" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
diff --git a/view/adminhtml/ui_component/categorywidget_categorywidget_form.xml b/view/adminhtml/ui_component/categorywidget_categorywidget_form.xml
index 8b53ef2d661906c4e5d34fffe17f40913da38ae9..af8f07220a2afdf7ce08accea03afa5f767caa5a 100755
--- a/view/adminhtml/ui_component/categorywidget_categorywidget_form.xml
+++ b/view/adminhtml/ui_component/categorywidget_categorywidget_form.xml
@@ -61,7 +61,7 @@
             </argument>
             <settings>
                 <dataType>boolean</dataType>
-                <label translate="true">Enable Image Slider</label>
+                <label translate="true">Enable Category Widget</label>
                 <dataScope>is_active</dataScope>
             </settings>
             <formElements>