diff --git a/typo3/sysext/indexed_search/Configuration/TCA/Overrides/sys_template.php b/typo3/sysext/indexed_search/Configuration/TCA/Overrides/sys_template.php
index 6dbb076f526688c6cc77619b94536c64ed49d980..6286552c50532a30fda7d0bf095ee2e94f07334e 100644
--- a/typo3/sysext/indexed_search/Configuration/TCA/Overrides/sys_template.php
+++ b/typo3/sysext/indexed_search/Configuration/TCA/Overrides/sys_template.php
@@ -1,4 +1,4 @@
 <?php
 defined('TYPO3_MODE') or die();
 
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile('indexed_search', 'Configuration/TypoScript', 'Indexed Search (Extbase & Fluid based)');
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile('indexed_search', 'Configuration/TypoScript', 'Indexed Search');
diff --git a/typo3/sysext/indexed_search/Configuration/TCA/Overrides/tt_content.php b/typo3/sysext/indexed_search/Configuration/TCA/Overrides/tt_content.php
index 2bcd8b62156058d8c070c4e912f71410e76c3a23..b528f80e1f56a1ba109706a5756282e23ff1e178 100644
--- a/typo3/sysext/indexed_search/Configuration/TCA/Overrides/tt_content.php
+++ b/typo3/sysext/indexed_search/Configuration/TCA/Overrides/tt_content.php
@@ -1,10 +1,10 @@
 <?php
 defined('TYPO3_MODE') or die();
 
-// Registers "new" extbase based FE plugin and hide layout, pages and recursive fields in BE
+// Registers FE plugin and hide layout, pages and recursive fields in BE
 \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
     'IndexedSearch',
     'Pi2',
-    'Indexed Search (Extbase & Fluid based)'
+    'Indexed Search'
 );
 $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_excludelist']['indexedsearch_pi2'] = 'layout,pages,recursive';
diff --git a/typo3/sysext/indexed_search/Documentation/Configuration/FluidTemplating/Index.rst b/typo3/sysext/indexed_search/Documentation/Configuration/FluidTemplating/Index.rst
index 9862d62701d5f12a4f00dc1dc421b81cbc7b4c2d..45a47c1f351e415f8a86adf0094320cdc3cbee51 100644
--- a/typo3/sysext/indexed_search/Documentation/Configuration/FluidTemplating/Index.rst
+++ b/typo3/sysext/indexed_search/Documentation/Configuration/FluidTemplating/Index.rst
@@ -12,7 +12,7 @@
 Fluid Templating
 ^^^^^^^^^^^^^^^^
 
-The plugin "Indexed Search (Extbase & Fluid based)" can be extended with custom templates:
+The plugin "Indexed Search" can be extended with custom templates:
 
 .. code-block:: typoscript
 
diff --git a/typo3/sysext/indexed_search/ext_localconf.php b/typo3/sysext/indexed_search/ext_localconf.php
index 51ffb6cb55728b37694bf35489fc2b7bb3500df1..dd16033970e0108dac528750dbd5ddd524b2f1d1 100644
--- a/typo3/sysext/indexed_search/ext_localconf.php
+++ b/typo3/sysext/indexed_search/ext_localconf.php
@@ -1,7 +1,7 @@
 <?php
 defined('TYPO3_MODE') or die();
 
-// register extbase plugin
+// register plugin
 \TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin(
     'IndexedSearch',
     'Pi2',