diff --git a/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/JarArtifactFromModulesDialog.form b/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/JarArtifactFromModulesDialog.form
index eed2b888d43f..aeffe083cd9e 100644
--- a/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/JarArtifactFromModulesDialog.form
+++ b/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/JarArtifactFromModulesDialog.form
@@ -67,7 +67,7 @@
         <clientProperties>
           <BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactory$PlainSmallWithIndent"/>
         </clientProperties>
-        <border type="none" title="Jar files from libraries"/>
+        <border type="none" title="JAR files from libraries"/>
         <children>
           <component id="f9a17" class="javax.swing.JRadioButton" binding="myExtractJarsRadioButton">
             <constraints>
@@ -75,7 +75,7 @@
             </constraints>
             <properties>
               <selected value="true"/>
-              <text value="&amp;extract to the target jar"/>
+              <text value="&amp;extract to the target JAR"/>
             </properties>
           </component>
           <hspacer id="90c4f">
diff --git a/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/JarArtifactFromModulesDialog.java b/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/JarArtifactFromModulesDialog.java
index 02d9e4228eec..ea2f4a64f622 100644
--- a/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/JarArtifactFromModulesDialog.java
+++ b/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/JarArtifactFromModulesDialog.java
@@ -55,7 +55,7 @@ public class JarArtifactFromModulesDialog extends DialogWrapper {
   public JarArtifactFromModulesDialog(PackagingElementResolvingContext context) {
     super(context.getProject());
     myContext = context;
-    setTitle("Create Jar from Modules");
+    setTitle("Create JAR from Modules");
     myMainClassLabel.setLabelFor(myMainClassField.getTextField());
     myManifestDirLabel.setLabelFor(myManifestDirField.getTextField());
 
diff --git a/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/JarArtifactType.java b/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/JarArtifactType.java
index 2a0af9007963..bd4494c6f4a3 100644
--- a/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/JarArtifactType.java
+++ b/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/JarArtifactType.java
@@ -33,7 +33,7 @@ import java.util.List;
  */
 public class JarArtifactType extends ArtifactType {
   public JarArtifactType() {
-    super("jar", "Jar");
+    super("jar", "JAR");
   }
 
   public static JarArtifactType getInstance() {
diff --git a/java/compiler/impl/src/com/intellij/packaging/impl/elements/PackagingElementFactoryImpl.java b/java/compiler/impl/src/com/intellij/packaging/impl/elements/PackagingElementFactoryImpl.java
index 0d1737b07e42..7e8f6016d591 100644
--- a/java/compiler/impl/src/com/intellij/packaging/impl/elements/PackagingElementFactoryImpl.java
+++ b/java/compiler/impl/src/com/intellij/packaging/impl/elements/PackagingElementFactoryImpl.java
@@ -274,7 +274,7 @@ public class PackagingElementFactoryImpl extends PackagingElementFactory {
   @NotNull
   @Override
   public PackagingElement<?> createExtractedDirectory(@NotNull VirtualFile jarEntry) {
-    LOG.assertTrue(jarEntry.getFileSystem() instanceof JarFileSystem, "Expected file from jar but file from " + jarEntry.getFileSystem() + " found");
+    LOG.assertTrue(jarEntry.getFileSystem() instanceof JarFileSystem, "Expected file from JAR but file from " + jarEntry.getFileSystem() + " found");
     final String fullPath = jarEntry.getPath();
     final int jarEnd = fullPath.indexOf(JarFileSystem.JAR_SEPARATOR);
     return new ExtractedDirectoryPackagingElement(fullPath.substring(0, jarEnd), fullPath.substring(jarEnd + 1));
diff --git a/java/execution/impl/src/com/intellij/execution/jar/JarApplicationConfigurable.java b/java/execution/impl/src/com/intellij/execution/jar/JarApplicationConfigurable.java
index debdb7b9fdc6..03758cd031cb 100644
--- a/java/execution/impl/src/com/intellij/execution/jar/JarApplicationConfigurable.java
+++ b/java/execution/impl/src/com/intellij/execution/jar/JarApplicationConfigurable.java
@@ -73,7 +73,7 @@ public class JarApplicationConfigurable extends SettingsEditor<JarApplicationCon
   private void createUIComponents() {
     myJarPathComponent = new LabeledComponent<TextFieldWithBrowseButton>();
     TextFieldWithBrowseButton textFieldWithBrowseButton = new TextFieldWithBrowseButton();
-    textFieldWithBrowseButton.addBrowseFolderListener("Choose Jar File", null, myProject,
+    textFieldWithBrowseButton.addBrowseFolderListener("Choose JAR File", null, myProject,
                                                       new FileChooserDescriptor(false, false, true, true, false, false));
     myJarPathComponent.setComponent(textFieldWithBrowseButton);
   }
diff --git a/java/execution/impl/src/com/intellij/execution/jar/JarApplicationConfiguration.java b/java/execution/impl/src/com/intellij/execution/jar/JarApplicationConfiguration.java
index 970abc055032..c76b5873389a 100644
--- a/java/execution/impl/src/com/intellij/execution/jar/JarApplicationConfiguration.java
+++ b/java/execution/impl/src/com/intellij/execution/jar/JarApplicationConfiguration.java
@@ -99,7 +99,7 @@ public class JarApplicationConfiguration extends LocatableConfigurationBase impl
     ProgramParametersUtil.checkWorkingDirectoryExist(this, getProject(), null);
     File jarFile = new File(getJarPath());
     if (!jarFile.exists()) {
-      throw new RuntimeConfigurationWarning("Jar file '" + jarFile.getAbsolutePath() + "' doesn't exist");
+      throw new RuntimeConfigurationWarning("JAR file '" + jarFile.getAbsolutePath() + "' doesn't exist");
     }
     JavaRunConfigurationExtensionManager.checkConfigurationIsValid(this);
   }
diff --git a/java/idea-ui/src/com/intellij/facet/impl/ui/libraries/LibraryOptionsPanel.form b/java/idea-ui/src/com/intellij/facet/impl/ui/libraries/LibraryOptionsPanel.form
index a738a96aa50e..9e5dd85f6936 100644
--- a/java/idea-ui/src/com/intellij/facet/impl/ui/libraries/LibraryOptionsPanel.form
+++ b/java/idea-ui/src/com/intellij/facet/impl/ui/libraries/LibraryOptionsPanel.form
@@ -139,7 +139,7 @@
                               <componentStyle value="SMALL"/>
                               <enabled value="true"/>
                               <fontColor value="BRIGHTER"/>
-                              <text value="&lt;html&gt;{} jars will be downloaded into &lt;b&gt;lib&lt;/b&gt; directory&lt;br&gt; Project level library &lt;b&gt;spring&lt;/b&gt; will be created&lt;/html&gt;"/>
+                              <text value="&lt;html&gt;{} JARs will be downloaded into &lt;b&gt;lib&lt;/b&gt; directory&lt;br&gt; Project level library &lt;b&gt;spring&lt;/b&gt; will be created&lt;/html&gt;"/>
                             </properties>
                           </component>
                           <component id="84326" class="javax.swing.JLabel" binding="myHiddenLabel">
diff --git a/java/idea-ui/src/com/intellij/facet/impl/ui/libraries/LibraryOptionsPanel.java b/java/idea-ui/src/com/intellij/facet/impl/ui/libraries/LibraryOptionsPanel.java
index 3bb96adb1141..a890bdad527d 100644
--- a/java/idea-ui/src/com/intellij/facet/impl/ui/libraries/LibraryOptionsPanel.java
+++ b/java/idea-ui/src/com/intellij/facet/impl/ui/libraries/LibraryOptionsPanel.java
@@ -490,7 +490,7 @@ public class LibraryOptionsPanel implements Disposable {
     else {
       path = PathUtil.getFileName(downloadPath);
     }
-    return MessageFormat.format("{0} {0, choice, 1#jar|2#jars} will be downloaded into <b>{1}</b> directory<br>" +
+    return MessageFormat.format("{0} {0, choice, 1#JAR|2#JARs} will be downloaded into <b>{1}</b> directory<br>" +
                                    "{2} library <b>{3}</b> will be created",
                                    downloadSettings.getSelectedDownloads().size(),
                                    path,
diff --git a/java/java-impl/src/com/intellij/codeInspection/inferNullity/InferNullityAnnotationsAction.java b/java/java-impl/src/com/intellij/codeInspection/inferNullity/InferNullityAnnotationsAction.java
index f9127f0b48a5..df49b83ff48d 100644
--- a/java/java-impl/src/com/intellij/codeInspection/inferNullity/InferNullityAnnotationsAction.java
+++ b/java/java-impl/src/com/intellij/codeInspection/inferNullity/InferNullityAnnotationsAction.java
@@ -159,7 +159,7 @@ public class InferNullityAnnotationsAction extends BaseAnalysisAction {
       }
       else if (Messages.showOkCancelDialog(project, "Infer Nullity Annotations requires that the nullity annotations" +
                                                     " be available in all your project sources.\n\nYou will need to add annotations.jar as a library. " +
-                                                    "It is possible to configure custom jar in e.g. Constant Conditions & Exceptions inspection or use JetBrains annotations available in installation. " +
+                                                    "It is possible to configure custom JAR in e.g. Constant Conditions & Exceptions inspection or use JetBrains annotations available in installation. " +
                                                     " IntelliJ IDEA nullity annotations are freely usable and redistributable under the Apache 2.0 license. Would you like to do it now?",
                                            INFER_NULLITY_ANNOTATIONS, Messages.getErrorIcon()) == Messages.OK) {
         ApplicationManager.getApplication().invokeLater(new Runnable() {
diff --git a/java/java-impl/src/com/intellij/jarFinder/FindJarFix.java b/java/java-impl/src/com/intellij/jarFinder/FindJarFix.java
index ee203e34deac..e82f79652074 100644
--- a/java/java-impl/src/com/intellij/jarFinder/FindJarFix.java
+++ b/java/java-impl/src/com/intellij/jarFinder/FindJarFix.java
@@ -69,7 +69,7 @@ public abstract class FindJarFix<T extends PsiElement> implements IntentionActio
   @NotNull
   @Override
   public String getText() {
-    return "Find jar on web";
+    return "Find JAR on web";
   }
 
   @NotNull
@@ -190,7 +190,7 @@ public abstract class FindJarFix<T extends PsiElement> implements IntentionActio
           } else {
             JBPopupFactory.getInstance()
             .createListPopupBuilder(libNames)
-            .setTitle("Select a jar file")
+            .setTitle("Select a JAR file")
             .setItemChoosenCallback(new Runnable() {
               @Override
               public void run() {
diff --git a/jps/jps-builders/src/org/jetbrains/jps/incremental/artifacts/impl/JarsBuilder.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/artifacts/impl/JarsBuilder.java
index ba43cc7ea05e..c5ce16567be4 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/incremental/artifacts/impl/JarsBuilder.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/incremental/artifacts/impl/JarsBuilder.java
@@ -181,7 +181,7 @@ public class JarsBuilder {
                          packedFilePaths, -1);
           }
           else {
-            LOG.debug("nested jar file " + relativePath + " for " + jar.getPresentableDestination() + " not found");
+            LOG.debug("nested JAR file " + relativePath + " for " + jar.getPresentableDestination() + " not found");
           }
         }
       }
diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/manage/LibraryDataService.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/manage/LibraryDataService.java
index d04d728966bb..873a12fe8eb3 100644
--- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/manage/LibraryDataService.java
+++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/manage/LibraryDataService.java
@@ -152,7 +152,7 @@ public class LibraryDataService implements ProjectDataService<LibraryData, Libra
           VirtualFile jarRoot = JarFileSystem.getInstance().getJarRootForLocalFile(virtualFile);
           if (jarRoot == null) {
             LOG.warn(String.format(
-              "Can't parse contents of the jar file at path '%s' for the library '%s''", file.getAbsolutePath(), libraryName
+              "Can't parse contents of the JAR file at path '%s' for the library '%s''", file.getAbsolutePath(), libraryName
             ));
             continue;
           }
diff --git a/platform/lang-impl/src/com/intellij/openapi/roots/libraries/ui/impl/RootDetectionUtil.java b/platform/lang-impl/src/com/intellij/openapi/roots/libraries/ui/impl/RootDetectionUtil.java
index 5a3efe1a31b7..cb0ad880a079 100644
--- a/platform/lang-impl/src/com/intellij/openapi/roots/libraries/ui/impl/RootDetectionUtil.java
+++ b/platform/lang-impl/src/com/intellij/openapi/roots/libraries/ui/impl/RootDetectionUtil.java
@@ -81,7 +81,7 @@ public class RootDetectionUtil {
                 final HashMap<LibraryRootType, String> names = new HashMap<LibraryRootType, String>();
                 for (LibraryRootType type : root.getTypes()) {
                   final String typeName = detector.getRootTypeName(type);
-                  LOG.assertTrue(typeName != null, "Unexpected root type " + type.getType().name() + (type.isJarDirectory() ? " (jar directory)" : "") + ", detectors: " + detector);
+                  LOG.assertTrue(typeName != null, "Unexpected root type " + type.getType().name() + (type.isJarDirectory() ? " (JAR directory)" : "") + ", detectors: " + detector);
                   names.put(type, typeName);
                 }
                 suggestedRoots.add(new SuggestedChildRootInfo(rootCandidate, root, names));
diff --git a/platform/platform-resources-en/src/messages/FeatureStatisticsBundle.properties b/platform/platform-resources-en/src/messages/FeatureStatisticsBundle.properties
index 9a94f1f267bc..346399cfe60e 100644
--- a/platform/platform-resources-en/src/messages/FeatureStatisticsBundle.properties
+++ b/platform/platform-resources-en/src/messages/FeatureStatisticsBundle.properties
@@ -121,4 +121,4 @@ find.recent.search=Recent searches history
 find.completion=Completion in Find Bar
 switcher=Switcher
 dir.diff=Directory Diff
-jar.diff=Jar Files Diff
+jar.diff=JAR Files Diff
diff --git a/platform/platform-resources-en/src/messages/IdeBundle.properties b/platform/platform-resources-en/src/messages/IdeBundle.properties
index 889a1383aa91..720ac40cc1eb 100644
--- a/platform/platform-resources-en/src/messages/IdeBundle.properties
+++ b/platform/platform-resources-en/src/messages/IdeBundle.properties
@@ -942,10 +942,10 @@ predefined.scope.tests.name=Tests
 scope.editor.legend.recursively.included.label=Recursively included
 scope.editor.legend.partly.included.label=Partially included
 toolwindow.palette=Palette
-jar.build.on.make=Build jars on &make
-jar.build.modules.to.jar=Choose Modules to Jar
-jar.build.module.0.jar.settings=Module ''{0}'' Jar Settings
-jar.build.include.in.jar.file=Include in jar file:
+jar.build.on.make=Build JARs on &make
+jar.build.modules.to.jar=Choose Modules to JAR
+jar.build.module.0.jar.settings=Module ''{0}'' JAR Settings
+jar.build.include.in.jar.file=Include in JAR file:
 search.textfield.title=&Search:
 select.in.scope=Scope
 scope.view.title=Scopes
@@ -1019,7 +1019,7 @@ button.fix=Fix\u2026
 setup.library.dialog.title=Setup Library
 label.library.will.be.created.description.text={0} level library <b>{1}</b> with {2} {2, choice, 1#file|2#files} will be created
 new.library.file.chooser.title=New Library Files
-new.library.file.chooser.description=Select jar files in which library classes are located
+new.library.file.chooser.description=Select JAR files in which library classes are located
 
 create.default.library.type.action.name=Java
 popup.title.select.library.type=Select Library Type
diff --git a/platform/platform-resources-en/src/messages/RefactoringBundle.properties b/platform/platform-resources-en/src/messages/RefactoringBundle.properties
index 48d0e63d60c0..72b1cd7ad131 100644
--- a/platform/platform-resources-en/src/messages/RefactoringBundle.properties
+++ b/platform/platform-resources-en/src/messages/RefactoringBundle.properties
@@ -671,7 +671,7 @@ static.initializer.description=static initializer of class {0}
 instance.initializer.description=instance initializer of class {0}
 file.description=File {0}
 directory.description=Directory {0}
-0.is.located.in.a.jar.file={0} is located in a jar file.\n
+0.is.located.in.a.jar.file={0} is located in a JAR file.\n
 0.is.read.only={0} is read-only.\n
 0.is.not.a.legal.java.identifier=''{0}'' is not a legal java identifier
 method.0.is.already.defined.in.the.1=Method {0} is already defined in the {1}
diff --git a/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/libraries/JarDirectories.java b/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/libraries/JarDirectories.java
index e9e4da53dddd..c4903098fa87 100644
--- a/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/libraries/JarDirectories.java
+++ b/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/libraries/JarDirectories.java
@@ -106,7 +106,7 @@ public class JarDirectories implements JDOMExternalizable {
 
   @Override
   public String toString() {
-    return "Jar dirs: " + myDirectories.values();
+    return "JAR dirs: " + myDirectories.values();
   }
 
 
diff --git a/platform/projectModel-impl/src/messages/ProjectBundle.properties b/platform/projectModel-impl/src/messages/ProjectBundle.properties
index a0fe65ad981a..956bb8a0d2d2 100644
--- a/platform/projectModel-impl/src/messages/ProjectBundle.properties
+++ b/platform/projectModel-impl/src/messages/ProjectBundle.properties
@@ -112,7 +112,7 @@ module.paths.edit.properties.title=Edit Root Properties
 module.javadoc.title=JavaDoc
 module.javadoc.add.url.button=Add JavaDoc URL...
 module.javadoc.add.path.title=Add Path To JavaDoc
-module.javadoc.add.path.prompt=Select jar/zip files or directories in which module javadoc documentation is located
+module.javadoc.add.path.prompt=Select JAR/zip files or directories in which module javadoc documentation is located
 jdk.combo.box.project.item=<No Project SDK>
 jdk.combo.box.none.item=<None>
 jdk.combo.box.invalid.item={0} [Invalid]
@@ -134,7 +134,7 @@ library.sources.not.found=Sources not found
 library.sources.not.attached=Sources not attached
 library.attach.sources.action=Attach Sources
 library.attach.sources.action.busy.text=Attaching...
-library.attach.sources.description=Select jar/zip files or directories in which library sources are located
+library.attach.sources.description=Select JAR/zip files or directories in which library sources are located
 
 project.sdk.not.defined=Project SDK is not defined
 project.sdk.setup=Setup SDK
diff --git a/plugins/devkit/resources/org/jetbrains/idea/devkit/DevKitBundle.properties b/plugins/devkit/resources/org/jetbrains/idea/devkit/DevKitBundle.properties
index 6799f6d2415f..2d1f3de4e3d6 100644
--- a/plugins/devkit/resources/org/jetbrains/idea/devkit/DevKitBundle.properties
+++ b/plugins/devkit/resources/org/jetbrains/idea/devkit/DevKitBundle.properties
@@ -25,7 +25,7 @@ prepare.for.deployment.common=Preparing For Deployment
 prepare.for.deployment=Prepare Plugin Module ''{0}'' For Deployment
 prepare.for.deployment.all=Prepare All Plugin Modules For Deployment
 saved.message.common={0} will be saved in selected directory
-saved.message= {0, choice, 1#Zip|2#Jar} for module ''{1}'' was saved to {2}
+saved.message= {0, choice, 1#Zip|2#JAR} for module ''{1}'' was saved to {2}
 success.deployment.message=Plugin Module ''{0}'' Successfully Prepared For Deployment
 success.deployment.message.all=All Plugins Successfully Prepared For Deployment
 
diff --git a/plugins/gradle/resources/i18n/GradleBundle.properties b/plugins/gradle/resources/i18n/GradleBundle.properties
index 88dfd899deed..0f827062fbce 100644
--- a/plugins/gradle/resources/i18n/GradleBundle.properties
+++ b/plugins/gradle/resources/i18n/GradleBundle.properties
@@ -12,7 +12,7 @@ gradle.settings.text.service.dir.path=Service directory path:
 gradle.settings.text.vm.options=Gradle VM options:
 gradle.settings.text.offline_work=Offline work
 gradle.settings.title.service.dir.path=Select gradle service directory to use
-gradle.generic.text.error.jar.not.found=Gradle jars location is unknown
+gradle.generic.text.error.jar.not.found=Gradle JARs location is unknown
 
 gradle.home.setting.type.explicit.incorrect=Gradle location is incorrect.\nLocation:{0}
 gradle.home.setting.type.explicit.empty=Gradle location is not specified
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/GradleInstallationManager.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/GradleInstallationManager.java
index 07521be885d8..b363eb8b3395 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/GradleInstallationManager.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/GradleInstallationManager.java
@@ -360,7 +360,7 @@ public class GradleInstallationManager {
         filesInfo.setLength(filesInfo.length() - 1);
       }
       GradleLog.LOG.info(String.format(
-        "Gradle sdk check fails. Reason: no one of the given files matches gradle jar pattern (%s). Files: %s",
+        "Gradle sdk check fails. Reason: no one of the given files matches gradle JAR pattern (%s). Files: %s",
         GRADLE_JAR_FILE_PATTERN.toString(), filesInfo
       ));
     }
diff --git a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/importing/GradleImportingTestCase.java b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/importing/GradleImportingTestCase.java
index f59ccee38658..2cf4c7125918 100644
--- a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/importing/GradleImportingTestCase.java
+++ b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/importing/GradleImportingTestCase.java
@@ -160,7 +160,7 @@ public abstract class GradleImportingTestCase extends ExternalSystemImportingTes
       throw new RuntimeException(e);
     }
     if (!location.getScheme().equals("file")) {
-      throw new RuntimeException(String.format("Cannot determine classpath for wrapper Jar from codebase '%s'.", location));
+      throw new RuntimeException(String.format("Cannot determine classpath for wrapper JAR from codebase '%s'.", location));
     }
     return new File(location.getPath());
   }
diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/GroovyBundle.properties b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/GroovyBundle.properties
index 4e3c0eb17c38..0b97a8fbaa35 100644
--- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/GroovyBundle.properties
+++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/GroovyBundle.properties
@@ -31,7 +31,7 @@ newscript.menu.action.description=Creates new Groovy Script
 cannot.compile.groovy.files.no.facet=Cannot find Groovy home for module ''{0}''.\nYou should either:\n\
 - invoke 'Add Framework support' action for this module,\n\
 or:\n\
-- add Groovy jars to module classpath manually.
+- add Groovy JARs to module classpath manually.
 cannot.compile.groovy.files.no.sdk=Cannot Compile Groovy Files.\nPlease Set up SDK for module ''{0}''.
 cannot.compile.groovy.files.no.sdk.mult=Cannot Compile Groovy Files.\nPlease Set up SDK for modules ''{0}''.
 cannot.compile=Cannot Compile
diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/dsl/GroovyClassDescriptor.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/dsl/GroovyClassDescriptor.java
index 2281ad12c4dd..33bd366f6261 100644
--- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/dsl/GroovyClassDescriptor.java
+++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/dsl/GroovyClassDescriptor.java
@@ -38,7 +38,7 @@ public class GroovyClassDescriptor {
       final AtomicInteger integer = GroovyCategorySupport.getCategoryNameUsage("aaa");
     }
     catch (NoSuchMethodError e) {
-      throw new RuntimeException("Incompatible Groovy jar in classpath: " + GroovyCategorySupport.class.getResource("/") + ", please remove it");
+      throw new RuntimeException("Incompatible Groovy JAR in classpath: " + GroovyCategorySupport.class.getResource("/") + ", please remove it");
     }
   }
 
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/ivy/AbstractAttachSourceProvider.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/ivy/AbstractAttachSourceProvider.java
index 53ddae2cc17d..3f2139c174a8 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/ivy/AbstractAttachSourceProvider.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/ivy/AbstractAttachSourceProvider.java
@@ -152,7 +152,7 @@ public abstract class AbstractAttachSourceProvider implements AttachSourcesProvi
           final ByteArrayOutputStream out;
 
           try {
-            LOG.info("Downloading sources jar: " + myUrl);
+            LOG.info("Downloading sources JAR: " + myUrl);
 
             indicator.checkCanceled();
 
diff --git a/plugins/terminal/src/org/jetbrains/plugins/terminal/LocalTerminalDirectRunner.java b/plugins/terminal/src/org/jetbrains/plugins/terminal/LocalTerminalDirectRunner.java
index f67f84412a02..8a5f75b36594 100644
--- a/plugins/terminal/src/org/jetbrains/plugins/terminal/LocalTerminalDirectRunner.java
+++ b/plugins/terminal/src/org/jetbrains/plugins/terminal/LocalTerminalDirectRunner.java
@@ -59,7 +59,7 @@ public class LocalTerminalDirectRunner extends AbstractTerminalRunner<PtyProcess
       }
     }
     catch (Exception e) {
-      LOG.warn("Unable to get jar folder", e);
+      LOG.warn("Unable to get JAR folder", e);
     }
     return null;
   }
diff --git a/resources-en/src/messages/CompilerBundle.properties b/resources-en/src/messages/CompilerBundle.properties
index be7367512247..638cac1b8972 100644
--- a/resources-en/src/messages/CompilerBundle.properties
+++ b/resources-en/src/messages/CompilerBundle.properties
@@ -22,7 +22,7 @@ message.ant.files.generated.ok=Ant build files successfully generated:\n{0}
 error.ant.files.generate.failed=Failed to generate ant build script: {0}
 error.ant.files.backup.failed=Failed to backup file {0}
 generate.ant.build.dialog.cyclic.modules.table.title=Cyclic Module Dependencies
-generate.ant.build.dialog.cyclic.modules.table.description=Some modules have cyclic dependencies.\nIn order to generate ant build script, please select the \"main\" (representative) module for each dependency cycle.\nThe source code for all modules in the cycle will be compiled into the main module's output folders;\nAll modules in the cycle will use the JDK assigned to the main module;\nAny jar archives created will be named after the name of the main module.
+generate.ant.build.dialog.cyclic.modules.table.description=Some modules have cyclic dependencies.\nIn order to generate ant build script, please select the \"main\" (representative) module for each dependency cycle.\nThe source code for all modules in the cycle will be compiled into the main module's output folders;\nAll modules in the cycle will use the JDK assigned to the main module;\nAny JAR files created will be named after the name of the main module.
 generate.ant.build.dialog.cyclic.modules.table.number.column.header=Cycle
 generate.ant.build.dialog.cyclic.modules.table.name.column.header=Main Module
 action.make.selected.modules.text=Make Selected _Modules
diff --git a/updater/src/com/intellij/updater/Runner.java b/updater/src/com/intellij/updater/Runner.java
index 1e57010543e9..39e58e5c9e36 100644
--- a/updater/src/com/intellij/updater/Runner.java
+++ b/updater/src/com/intellij/updater/Runner.java
@@ -138,8 +138,8 @@ public class Runner {
                               optionalFiles,
                               ui);
 
-      logger.info("Packing jar file: " + patchFile );
-      ui.startProcess("Packing jar file '" + patchFile + "'...");
+      logger.info("Packing JAR file: " + patchFile );
+      ui.startProcess("Packing JAR file '" + patchFile + "'...");
 
       FileOutputStream fileOut = new FileOutputStream(patchFile);
       try {
@@ -272,8 +272,8 @@ public class Runner {
 
   private static File resolveJarFile() throws IOException {
     URL url = Runner.class.getResource("");
-    if (url == null) throw new IOException("Cannot resolve jar file path");
-    if (!"jar".equals(url.getProtocol())) throw new IOException("Patch file is not a 'jar' file");
+    if (url == null) throw new IOException("Cannot resolve JAR file path");
+    if (!"jar".equals(url.getProtocol())) throw new IOException("Patch file is not a JAR file");
 
     String path = url.getPath();