diff --git a/platform/lang-impl/src/com/intellij/psi/templateLanguages/TemplateDataLanguageConfigurable.java b/platform/lang-impl/src/com/intellij/psi/templateLanguages/TemplateDataLanguageConfigurable.java
index 50e970e854b2..1a2980cc7e56 100644
--- a/platform/lang-impl/src/com/intellij/psi/templateLanguages/TemplateDataLanguageConfigurable.java
+++ b/platform/lang-impl/src/com/intellij/psi/templateLanguages/TemplateDataLanguageConfigurable.java
@@ -17,6 +17,7 @@ package com.intellij.psi.templateLanguages;
 
 import com.intellij.lang.LangBundle;
 import com.intellij.lang.Language;
+import com.intellij.openapi.application.ApplicationNamesInfo;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.vfs.VirtualFile;
@@ -36,7 +37,8 @@ import javax.swing.*;
 public class TemplateDataLanguageConfigurable extends LanguagePerFileConfigurable<Language> {
   public TemplateDataLanguageConfigurable(Project project) {
     super(project, Language.class, TemplateDataLanguageMappings.getInstance(project),
-          LangBundle.message("dialog.template.data.language.caption"), LangBundle.message("template.data.language.configurable.tree.table.title"),
+          LangBundle.message("dialog.template.data.language.caption", ApplicationNamesInfo.getInstance().getFullProductName()),
+          LangBundle.message("template.data.language.configurable.tree.table.title"),
           LangBundle.message("template.data.language.override.warning.text"),
           LangBundle.message("template.data.language.override.warning.title"));
   }
diff --git a/platform/platform-impl/src/com/intellij/ide/actions/WhatsNewAction.java b/platform/platform-impl/src/com/intellij/ide/actions/WhatsNewAction.java
index 15090dd47b68..9065452abedf 100644
--- a/platform/platform-impl/src/com/intellij/ide/actions/WhatsNewAction.java
+++ b/platform/platform-impl/src/com/intellij/ide/actions/WhatsNewAction.java
@@ -16,8 +16,10 @@
 package com.intellij.ide.actions;
 
 import com.intellij.ide.BrowserUtil;
+import com.intellij.ide.IdeBundle;
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
+import com.intellij.openapi.application.ApplicationNamesInfo;
 import com.intellij.openapi.application.ex.ApplicationInfoEx;
 import com.intellij.openapi.project.DumbAware;
 
@@ -31,6 +33,13 @@ public class WhatsNewAction extends AnAction implements DumbAware {
 
   @Override
   public void update(AnActionEvent e) {
-    e.getPresentation().setVisible(ApplicationInfoEx.getInstanceEx().getWhatsNewUrl() != null);
+    boolean visible = ApplicationInfoEx.getInstanceEx().getWhatsNewUrl() != null;
+    e.getPresentation().setVisible(visible);
+    if (visible) {
+      e.getPresentation()
+        .setText(IdeBundle.message("whatsnew.action.custom.text", ApplicationNamesInfo.getInstance().getFullProductName()));
+      e.getPresentation().setDescription(
+        IdeBundle.message("whatsnew.action.custom.description", ApplicationNamesInfo.getInstance().getFullProductName()));
+    }
   }
 }
diff --git a/platform/platform-resources-en/src/messages/ActionsBundle.properties b/platform/platform-resources-en/src/messages/ActionsBundle.properties
index f0210b338438..0db89fdfbc1e 100644
--- a/platform/platform-resources-en/src/messages/ActionsBundle.properties
+++ b/platform/platform-resources-en/src/messages/ActionsBundle.properties
@@ -787,8 +787,8 @@ action.ProductivityGude.text=_Productivity Guide
 action.ProductivityGude.description=Show productivity features usages statistics
 action.OnlineDocAction.text=_Online Documentation
 action.OnlineDocAction.description=Show online documentation
-action.WhatsNewAction.text=What's _New in IntelliJ IDEA
-action.WhatsNewAction.description=Find out about the new features in this version of IntelliJ IDEA
+action.WhatsNewAction.text=What's _New
+action.WhatsNewAction.description=Find out about the new features in this version of the IDE
 action.Help.KeymapReference.text=Default _Keymap Reference
 action.Help.KeymapReference.description=Open PDF file with the default keymap reference card.
 action.Help.JetBrainsTV.text=JetBrains T_V
@@ -796,7 +796,7 @@ action.Help.JetBrainsTV.description=View short live demos introducing features o
 action.CheckForUpdate.text=_Check for Update...
 action.CheckForUpdate.description=Check for available update
 action.About.text=_About
-action.About.description=Show information about IntelliJ IDEA
+action.About.description=Show information about the IDE
 group.OtherMenu.text=Other
 group.OtherMenu.description=Actions that are not properly registered
 group.MainToolBar.text=Main Toolbar
diff --git a/platform/platform-resources-en/src/messages/IdeBundle.properties b/platform/platform-resources-en/src/messages/IdeBundle.properties
index cb518f053e97..134c8c9e4f54 100644
--- a/platform/platform-resources-en/src/messages/IdeBundle.properties
+++ b/platform/platform-resources-en/src/messages/IdeBundle.properties
@@ -1087,3 +1087,6 @@ scripting.lib.usageScope.tableTitle=Library
 scripting.lib.usageScope.override.question=Override library settings for child directories and files?
 scripting.lib.usageScope.override.title=Override Library Settings
 open.url.in.browser.tooltip=Open in browser
+
+whatsnew.action.custom.text=What''s _New in {0}
+whatsnew.action.custom.description=Find out about the new features in this version of {0}
diff --git a/platform/platform-resources-en/src/messages/LangBundle.properties b/platform/platform-resources-en/src/messages/LangBundle.properties
index 4ab0eca3d279..5ba8e2d85fa9 100644
--- a/platform/platform-resources-en/src/messages/LangBundle.properties
+++ b/platform/platform-resources-en/src/messages/LangBundle.properties
@@ -42,7 +42,7 @@ xml.terms.variable=variable
 error.cannot.resolve=Cannot resolve
 dialog.template.data.language.caption=<html><body>\
   Template data languages are the underlying languages in template files like those of FreeMarker/Velocity frameworks.<br>\
-  To change template data language settings IntelliJ IDEA uses for a file, directory, or an entire project,<br>\
+  To change template data language settings {0} uses for a file, directory, or an entire project,<br>\
   click an item and then select a language from the Template Data Language list.<p>\
   Note:<br>\
   If not specified, files and directories inherit Template Data Language settings from parent.\