diff --git a/README.rst b/README.rst
index b0b62588..969da005 100644
--- a/README.rst
+++ b/README.rst
@@ -98,7 +98,7 @@ need to manually configure this feature:
 * run ``pip install django-select2>=4.3,<5.0``
 * add ``django_select2`` to your ``INSTALLED_APPS``
 * add ``url(r'^select2/', include('django_select2.urls')),`` to your ``urls.py``
-* set ``DJANGOCMS_ENABLE_SELECT2 = True`` in your ``settings.py``
+* set ``DJANGOCMS_LINK_SELECT2 = True`` in your ``settings.py``
 
 
 Running Tests
diff --git a/djangocms_link/fields.py b/djangocms_link/fields.py
index 8c468da1..8cdb4d52 100644
--- a/djangocms_link/fields.py
+++ b/djangocms_link/fields.py
@@ -4,8 +4,8 @@
 
 ENABLE_SELECT2 = getattr(
     settings,
-    'DJANGOCMS_ENABLE_SELECT2',
-    True
+    'DJANGOCMS_LINK_SELECT2',
+    False
 )
 
 
diff --git a/djangocms_link/models.py b/djangocms_link/models.py
index 3d6e77b9..5f8f4bbb 100644
--- a/djangocms_link/models.py
+++ b/djangocms_link/models.py
@@ -55,7 +55,7 @@ class AbstractLink(CMSPlugin):
         max_length=255,
     )
     name = models.CharField(
-        verbose_name=_('Name'),
+        verbose_name=_('Display name'),
         blank=True,
         max_length=255,
     )