diff --git a/platform/lang-impl/src/com/intellij/conversion/impl/ui/ConvertProjectDialog.java b/platform/lang-impl/src/com/intellij/conversion/impl/ui/ConvertProjectDialog.java
index 4df11088be71..bf6306bdde9a 100644
--- a/platform/lang-impl/src/com/intellij/conversion/impl/ui/ConvertProjectDialog.java
+++ b/platform/lang-impl/src/com/intellij/conversion/impl/ui/ConvertProjectDialog.java
@@ -72,7 +72,7 @@ public class ConvertProjectDialog extends DialogWrapper {
     }
     else {
       message.append(IdeBundle.message("conversion.dialog.text.1", context.getProjectFile().getName(),
-                                       ApplicationNamesInfo.getInstance().getProductName()));
+                                       ApplicationNamesInfo.getInstance().getFullProductName()));
     }
     message.append(IdeBundle.message("conversion.dialog.text.2", myBackupDir.getAbsolutePath()));
     message.append("</html>");
@@ -155,7 +155,7 @@ public class ConvertProjectDialog extends DialogWrapper {
     List<File> files = getReadOnlyFiles();
     if (!files.isEmpty()) {
       final String message = IdeBundle.message("message.text.unlock.read.only.files",
-                                               ApplicationNamesInfo.getInstance().getProductName(),
+                                               ApplicationNamesInfo.getInstance().getFullProductName(),
                                                getFilesString(files));
       final String[] options = {CommonBundle.getContinueButtonText(), CommonBundle.getCancelButtonText()};
       if (Messages.showOkCancelDialog(myMainPanel, message, IdeBundle.message("dialog.title.convert.project"), options[0], options[1], null) != 0) {
diff --git a/plugins/IntelliLang/src/intentionDescriptions/InvertIfIntention/after.groovy.template b/plugins/groovy/resources/intentionDescriptions/InvertIfIntention/after.groovy.template
similarity index 100%
rename from plugins/IntelliLang/src/intentionDescriptions/InvertIfIntention/after.groovy.template
rename to plugins/groovy/resources/intentionDescriptions/InvertIfIntention/after.groovy.template
diff --git a/plugins/IntelliLang/src/intentionDescriptions/InvertIfIntention/before.groovy.template b/plugins/groovy/resources/intentionDescriptions/InvertIfIntention/before.groovy.template
similarity index 100%
rename from plugins/IntelliLang/src/intentionDescriptions/InvertIfIntention/before.groovy.template
rename to plugins/groovy/resources/intentionDescriptions/InvertIfIntention/before.groovy.template
diff --git a/plugins/IntelliLang/src/intentionDescriptions/InvertIfIntention/description.html b/plugins/groovy/resources/intentionDescriptions/InvertIfIntention/description.html
similarity index 100%
rename from plugins/IntelliLang/src/intentionDescriptions/InvertIfIntention/description.html
rename to plugins/groovy/resources/intentionDescriptions/InvertIfIntention/description.html