diff --git a/plugins/org.jkiss.dbeaver.core.eclipse/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.core.eclipse/META-INF/MANIFEST.MF
index 374564d368a4cd7d37a45e6c39039602e45c457c..83962c2ff0f95dcb851f4059902ee64402e10705 100644
--- a/plugins/org.jkiss.dbeaver.core.eclipse/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.core.eclipse/META-INF/MANIFEST.MF
@@ -1,11 +1,11 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: DBeaver Eclipse Plugin
+Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.jkiss.dbeaver.core.eclipse;singleton:=true
 Bundle-Version: 3.5.1
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-ClassPath: .
-Bundle-Vendor: JKISS
+Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
 Require-Bundle: org.jkiss.dbeaver.core,
  org.jkiss.dbeaver.model,
diff --git a/plugins/org.jkiss.dbeaver.core.eclipse/plugin.properties b/plugins/org.jkiss.dbeaver.core.eclipse/plugin.properties
index c5954f88c609bc3c8df136ada4ffc8fba852b4ab..09fea432a4c773a31f2ad06bf0d7313af8c7ac2c 100644
--- a/plugins/org.jkiss.dbeaver.core.eclipse/plugin.properties
+++ b/plugins/org.jkiss.dbeaver.core.eclipse/plugin.properties
@@ -15,6 +15,9 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
+Bundle-Vendor = JKISS
+Bundle-Name = DBeaver Eclipse Plugin
+
 menu.edit=Edit
 menu.navigate=Navigate
 
@@ -24,6 +27,7 @@ pref.page.name.query.manager=Query Manager
 pref.page.name.db.editors=Editors
 pref.page.name.sql.execute=SQL Processing
 pref.page.name.sql.editor=SQL Editor
+pref.page.name.sql.templates = Templates
 pref.page.name.data.editor=Data Editor
 pref.page.name.binary.editor=Binary Editor
 pref.page.name.db.ui=Interface
@@ -35,3 +39,6 @@ pref.page.name.resultset=Result Sets
 pref.page.name.resultset.binaries=Binaries
 pref.page.name.resultset.presentation=Presentation
 pref.page.name.meta=Metadata
+
+search.page.label.db.metadata = DB Metadata
+search.page.label.db.fulltext = DB Full-Text
diff --git a/plugins/org.jkiss.dbeaver.core.eclipse/plugin.xml b/plugins/org.jkiss.dbeaver.core.eclipse/plugin.xml
index 90abe551adde445007f4647b199d0e4f62e9cea1..60904f2d276169ea9404caed72e5e8ef84bb545d 100644
--- a/plugins/org.jkiss.dbeaver.core.eclipse/plugin.xml
+++ b/plugins/org.jkiss.dbeaver.core.eclipse/plugin.xml
@@ -69,7 +69,7 @@
             <keywordReference id="org.jkiss.dbeaver.core.keyword.pref.editor.sql"/>
         </page>
         <page category="org.jkiss.dbeaver.preferences.main.sqleditor" id="org.jkiss.dbeaver.preferences.main.sqlexecute" class="org.jkiss.dbeaver.ui.preferences.PrefPageSQLExecute" name="%pref.page.name.sql.execute"/>
-        <page category="org.jkiss.dbeaver.preferences.main.sqleditor" id="org.jkiss.dbeaver.preferences.main.sql.templates" class="org.jkiss.dbeaver.ui.preferences.PrefPageSQLTemplates" name="Templates"/>
+        <page category="org.jkiss.dbeaver.preferences.main.sqleditor" id="org.jkiss.dbeaver.preferences.main.sql.templates" class="org.jkiss.dbeaver.ui.preferences.PrefPageSQLTemplates" name="%pref.page.name.sql.templates"/>
         <page category="org.jkiss.dbeaver.preferences.editors" id="org.jkiss.dbeaver.ui.editors.binary.pref.HexPreferencesPage" class="org.jkiss.dbeaver.ui.editors.binary.pref.HexPreferencesPage" name="%pref.page.name.binary.editor">
             <keywordReference id="org.jkiss.dbeaver.core.keyword.pref.editor.binary"/>
         </page>
@@ -89,14 +89,14 @@
             enabled="true"
             icon="icons/metadata.png"
             id="org.jkiss.dbeaver.core.eclipse.search.impl.metadata.SearchMetadataPageAdapter"
-            label="DB Metadata">
+            label="%search.page.label.db.metadata">
        </page>
         <page
             class="org.jkiss.dbeaver.core.eclipse.search.impl.data.SearchDataPageAdapter"
             enabled="true"
             icon="icons/metadata.png"
             id="org.jkiss.dbeaver.core.eclipse.search.impl.data.SearchDataPageAdapter"
-            label="DB Full-Text">
+            label="%search.page.label.db.fulltext">
         </page>
     </extension>
     <extension