diff --git a/.idea/inspectionProfiles/idea_default.xml b/.idea/inspectionProfiles/idea_default.xml
index 006f5cec30fc..9714f215c49d 100644
--- a/.idea/inspectionProfiles/idea_default.xml
+++ b/.idea/inspectionProfiles/idea_default.xml
@@ -1033,6 +1033,10 @@
         <constraint name="__context__" script="&quot;import com.intellij.psi.*&#10;import com.intellij.psi.search.GlobalSearchScope&#10;import com.intellij.psi.util.PsiUtil&#10;&#10;def project = __context__.getProject();&#10;def fqn = c.getValue().substring(1);&#10;if (fqn.indexOf('.') == -1) return false;&#10;def shortName = com.intellij.openapi.util.text.StringUtil.getShortName(fqn);&#10;if (!shortName.equals(com.intellij.openapi.util.text.StringUtil.capitalize(shortName))) return false;&#10;&#10;def cClass = JavaPsiFacade.getInstance(project).findClass(fqn, GlobalSearchScope.allScope(project));&#10; cClass == null&#10;&quot;" target="true" within="" contains="" />
         <constraint name="c" within="" contains="" />
       </searchConfiguration>
+      <replaceConfiguration name="can simplify Logger.getInstance" text="Logger.getInstance(&quot;#$c$&quot;)" recursive="false" caseInsensitive="true" type="JAVA" pattern_context="default" reformatAccordingToStyle="true" shortenFQN="true" replacement="Logger.getInstance($c$.class)">
+        <constraint name="__context__" script="&quot;import com.intellij.psi.*&#10;import com.intellij.psi.search.GlobalSearchScope&#10;import com.intellij.psi.util.PsiUtil&#10;&#10;def project = __context__.getProject();&#10;def cClass = JavaPsiFacade.getInstance(project).findClass(c.getValue().substring(1), GlobalSearchScope.allScope(project));&#10;def cVirtualFile = c==null?null:PsiUtil.getVirtualFile(cClass);&#10;&#10;cVirtualFile != null &amp;&amp;  &#10;__context__.getContainingFile().getResolveScope().contains(cVirtualFile)&#10;&quot;" target="true" within="" contains="" />
+        <constraint name="c" within="" contains="" />
+      </replaceConfiguration>
     </inspection_tool>
     <inspection_tool class="SafeVarargsDetector" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="SeamAnnotationIncorrectSignatureInspection" enabled="false" level="ERROR" enabled_by_default="false" />
diff --git a/java/compiler/impl/src/com/intellij/compiler/CompilerConfigurationImpl.java b/java/compiler/impl/src/com/intellij/compiler/CompilerConfigurationImpl.java
index 9d5910df7a8e..94f525676637 100644
--- a/java/compiler/impl/src/com/intellij/compiler/CompilerConfigurationImpl.java
+++ b/java/compiler/impl/src/com/intellij/compiler/CompilerConfigurationImpl.java
@@ -67,7 +67,7 @@ import static org.jetbrains.jps.model.serialization.java.compiler.JpsJavaCompile
 
 @State(name = "CompilerConfiguration", storages = @Storage("compiler.xml"))
 public class CompilerConfigurationImpl extends CompilerConfiguration implements PersistentStateComponent<Element>, ProjectComponent {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.compiler.CompilerConfiguration");
+  private static final Logger LOG = Logger.getInstance(CompilerConfiguration.class);
 
   public static final String TESTS_EXTERNAL_COMPILER_HOME_PROPERTY_NAME = "tests.external.compiler.home";
   public static final int DEFAULT_BUILD_PROCESS_HEAP_SIZE = 700;
diff --git a/java/compiler/impl/src/com/intellij/compiler/CompilerManagerImpl.java b/java/compiler/impl/src/com/intellij/compiler/CompilerManagerImpl.java
index a610e1d7b86f..54ea8c865adb 100644
--- a/java/compiler/impl/src/com/intellij/compiler/CompilerManagerImpl.java
+++ b/java/compiler/impl/src/com/intellij/compiler/CompilerManagerImpl.java
@@ -55,7 +55,7 @@ import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
 
 public class CompilerManagerImpl extends CompilerManager {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.compiler.CompilerManagerImpl");
+  private static final Logger LOG = Logger.getInstance(CompilerManagerImpl.class);
 
   private final Project myProject;
 
diff --git a/java/compiler/impl/src/com/intellij/compiler/actions/MakeModuleAction.java b/java/compiler/impl/src/com/intellij/compiler/actions/MakeModuleAction.java
index bf5c0547551f..fbc4410d341d 100644
--- a/java/compiler/impl/src/com/intellij/compiler/actions/MakeModuleAction.java
+++ b/java/compiler/impl/src/com/intellij/compiler/actions/MakeModuleAction.java
@@ -24,7 +24,7 @@ import com.intellij.task.ProjectTaskManager;
 import org.jetbrains.annotations.NotNull;
 
 public class MakeModuleAction extends CompileActionBase {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.compiler.actions.MakeModuleAction");
+  private static final Logger LOG = Logger.getInstance(MakeModuleAction.class);
 
   @Override
   protected void doAction(DataContext dataContext, Project project) {
diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/CompileContextImpl.java b/java/compiler/impl/src/com/intellij/compiler/impl/CompileContextImpl.java
index 48a36e0d3711..8596c9c4c255 100644
--- a/java/compiler/impl/src/com/intellij/compiler/impl/CompileContextImpl.java
+++ b/java/compiler/impl/src/com/intellij/compiler/impl/CompileContextImpl.java
@@ -31,7 +31,7 @@ import org.jetbrains.annotations.Nullable;
 import java.util.UUID;
 
 public class CompileContextImpl extends UserDataHolderBase implements CompileContextEx {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.compiler.impl.CompileContextImpl");
+  private static final Logger LOG = Logger.getInstance(CompileContextImpl.class);
   private final Project myProject;
   private final CompilerTask myBuildSession;
   private final MessagesContainer myMessages;
diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java b/java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java
index f2aea16e1ca6..e1474f8f2e94 100644
--- a/java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java
+++ b/java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java
@@ -62,7 +62,7 @@ import java.util.concurrent.TimeUnit;
 import static org.jetbrains.jps.api.CmdlineRemoteProto.Message.ControllerMessage.ParametersMessage.TargetTypeBuildScope;
 
 public class CompileDriver {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.compiler.impl.CompileDriver");
+  private static final Logger LOG = Logger.getInstance(CompileDriver.class);
 
   private static final Key<Boolean> COMPILATION_STARTED_AUTOMATICALLY = Key.create("compilation_started_automatically");
   private static final Key<ExitStatus> COMPILE_SERVER_BUILD_STATUS = Key.create("COMPILE_SERVER_BUILD_STATUS");
diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/CompilerCacheManager.java b/java/compiler/impl/src/com/intellij/compiler/impl/CompilerCacheManager.java
index 1895fa8d5217..6cf0afcc3559 100644
--- a/java/compiler/impl/src/com/intellij/compiler/impl/CompilerCacheManager.java
+++ b/java/compiler/impl/src/com/intellij/compiler/impl/CompilerCacheManager.java
@@ -36,7 +36,7 @@ import java.util.Map;
  * @author Eugene Zhuravlev
  */
 public class CompilerCacheManager implements Disposable {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.compiler.impl.CompilerCacheManager");
+  private static final Logger LOG = Logger.getInstance(CompilerCacheManager.class);
   private final Map<Compiler, Object> myCompilerToCacheMap = new HashMap<>();
   private final List<Disposable> myCacheDisposables = new ArrayList<>();
   private final File myCachesRoot;
diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/CompilerUtil.java b/java/compiler/impl/src/com/intellij/compiler/impl/CompilerUtil.java
index d3c5dcc402b7..0504403f55f8 100644
--- a/java/compiler/impl/src/com/intellij/compiler/impl/CompilerUtil.java
+++ b/java/compiler/impl/src/com/intellij/compiler/impl/CompilerUtil.java
@@ -22,7 +22,7 @@ import java.util.HashSet;
  * @author Jeka
  */
 public class CompilerUtil {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.compiler.impl.CompilerUtil");
+  private static final Logger LOG = Logger.getInstance(CompilerUtil.class);
 
   public static String quotePath(String path) {
     if (path != null && path.indexOf(' ') != -1) {
diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/FileProcessingCompilerAdapterTask.java b/java/compiler/impl/src/com/intellij/compiler/impl/FileProcessingCompilerAdapterTask.java
index ebef3239e18a..47caec2b76be 100644
--- a/java/compiler/impl/src/com/intellij/compiler/impl/FileProcessingCompilerAdapterTask.java
+++ b/java/compiler/impl/src/com/intellij/compiler/impl/FileProcessingCompilerAdapterTask.java
@@ -22,7 +22,7 @@ import java.util.List;
  * @author Eugene Zhuravlev
  */
 public class FileProcessingCompilerAdapterTask implements CompileTask {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.compiler.impl.FileProcessingCompilerAdapterTask");
+  private static final Logger LOG = Logger.getInstance(FileProcessingCompilerAdapterTask.class);
 
   private final FileProcessingCompiler myCompiler;
 
diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/FileProcessingCompilerStateCache.java b/java/compiler/impl/src/com/intellij/compiler/impl/FileProcessingCompilerStateCache.java
index 524119f1aa20..12e0bf4babe1 100644
--- a/java/compiler/impl/src/com/intellij/compiler/impl/FileProcessingCompilerStateCache.java
+++ b/java/compiler/impl/src/com/intellij/compiler/impl/FileProcessingCompilerStateCache.java
@@ -29,7 +29,7 @@ import java.io.*;
 import java.util.Collection;
 
 public class FileProcessingCompilerStateCache {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.compiler.impl.FileProcessingCompilerStateCache");
+  private static final Logger LOG = Logger.getInstance(FileProcessingCompilerStateCache.class);
   private final StateCache<MyState> myCache;
 
   public FileProcessingCompilerStateCache(File storeDirectory, final ValidityStateFactory stateFactory) throws IOException {
diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/OneProjectItemCompileScope.java b/java/compiler/impl/src/com/intellij/compiler/impl/OneProjectItemCompileScope.java
index f772d5ff1a6a..267a86a2e0f3 100644
--- a/java/compiler/impl/src/com/intellij/compiler/impl/OneProjectItemCompileScope.java
+++ b/java/compiler/impl/src/com/intellij/compiler/impl/OneProjectItemCompileScope.java
@@ -20,7 +20,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class OneProjectItemCompileScope extends ExportableUserDataHolderBase implements CompileScope{
-  private static final Logger LOG = Logger.getInstance("#com.intellij.compiler.impl.OneProjectItemCompileScope");
+  private static final Logger LOG = Logger.getInstance(OneProjectItemCompileScope.class);
   private final Project myProject;
   private final VirtualFile myFile;
   private final String myUrl;
diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/javac/FilePathActionJavac.java b/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/javac/FilePathActionJavac.java
index 56814910eddd..9c4660fb4725 100644
--- a/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/javac/FilePathActionJavac.java
+++ b/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/javac/FilePathActionJavac.java
@@ -29,7 +29,7 @@ import java.util.regex.Pattern;
  * @author Eugene Zhuravlev
  */
 public class FilePathActionJavac extends JavacParserAction {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.compiler.impl.javaCompiler.javac.FilePathActionJavac");
+  private static final Logger LOG = Logger.getInstance(FilePathActionJavac.class);
   private final Matcher myJdk7FormatMatcher;
 
   public FilePathActionJavac(final Matcher matcher) {
diff --git a/java/compiler/impl/src/com/intellij/compiler/options/CompilerUIConfigurable.java b/java/compiler/impl/src/com/intellij/compiler/options/CompilerUIConfigurable.java
index 057ac1263913..f46e56c246b2 100644
--- a/java/compiler/impl/src/com/intellij/compiler/options/CompilerUIConfigurable.java
+++ b/java/compiler/impl/src/com/intellij/compiler/options/CompilerUIConfigurable.java
@@ -37,7 +37,7 @@ import java.util.*;
 import static com.intellij.compiler.options.CompilerOptionsFilter.Setting;
 
 public class CompilerUIConfigurable implements SearchableConfigurable, Configurable.NoScroll {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.compiler.options.CompilerUIConfigurable");
+  private static final Logger LOG = Logger.getInstance(CompilerUIConfigurable.class);
 
   private static final Set<Setting> EXTERNAL_BUILD_SETTINGS = EnumSet.of(
     Setting.EXTERNAL_BUILD, Setting.AUTO_MAKE, Setting.PARALLEL_COMPILATION, Setting.REBUILD_MODULE_ON_DEPENDENCY_CHANGE,
diff --git a/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java b/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java
index 3a40fbcc7f14..9607e07419f0 100644
--- a/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java
+++ b/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java
@@ -115,7 +115,7 @@ public final class BuildManager implements Disposable {
   private static final Key<CharSequence> STDERR_OUTPUT = Key.create("_process_launch_errors_");
   private static final SimpleDateFormat USAGE_STAMP_DATE_FORMAT = new SimpleDateFormat("dd.MM.yyyy");
 
-  private static final Logger LOG = Logger.getInstance("#com.intellij.compiler.server.BuildManager");
+  private static final Logger LOG = Logger.getInstance(BuildManager.class);
   private static final String COMPILER_PROCESS_JDK_PROPERTY = "compiler.process.jdk";
   public static final String SYSTEM_ROOT = "compile-server";
   public static final String TEMP_DIR_NAME = "_temp_";
diff --git a/java/compiler/impl/src/com/intellij/compiler/server/BuildMessageDispatcher.java b/java/compiler/impl/src/com/intellij/compiler/server/BuildMessageDispatcher.java
index 986cad3afbf1..9c2ac59213a0 100644
--- a/java/compiler/impl/src/com/intellij/compiler/server/BuildMessageDispatcher.java
+++ b/java/compiler/impl/src/com/intellij/compiler/server/BuildMessageDispatcher.java
@@ -24,7 +24,7 @@ import java.util.concurrent.ConcurrentHashMap;
 */
 @ChannelHandler.Sharable
 class BuildMessageDispatcher extends SimpleChannelInboundHandlerAdapter<CmdlineRemoteProto.Message> {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.compiler.server.BuildMessageDispatcher");
+  private static final Logger LOG = Logger.getInstance(BuildMessageDispatcher.class);
 
   private static final AttributeKey<SessionData> SESSION_DATA = AttributeKey.valueOf("BuildMessageDispatcher.sessionData");
 
diff --git a/java/compiler/impl/src/com/intellij/compiler/server/DefaultMessageHandler.java b/java/compiler/impl/src/com/intellij/compiler/server/DefaultMessageHandler.java
index 562c03c96e0e..268fba157241 100644
--- a/java/compiler/impl/src/com/intellij/compiler/server/DefaultMessageHandler.java
+++ b/java/compiler/impl/src/com/intellij/compiler/server/DefaultMessageHandler.java
@@ -33,7 +33,7 @@ import java.util.concurrent.TimeUnit;
  * @author Eugene Zhuravlev
  */
 public abstract class DefaultMessageHandler implements BuilderMessageHandler {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.compiler.server.DefaultMessageHandler");
+  private static final Logger LOG = Logger.getInstance(DefaultMessageHandler.class);
   private final Project myProject;
   private final ExecutorService myTaskExecutor = SequentialTaskExecutor.createSequentialApplicationPoolExecutor(
     "DefaultMessageHandler Pool");
diff --git a/java/compiler/impl/src/com/intellij/compiler/server/impl/BuildProcessClasspathManager.java b/java/compiler/impl/src/com/intellij/compiler/server/impl/BuildProcessClasspathManager.java
index e8928a5b5cf2..e3657639ef89 100644
--- a/java/compiler/impl/src/com/intellij/compiler/server/impl/BuildProcessClasspathManager.java
+++ b/java/compiler/impl/src/com/intellij/compiler/server/impl/BuildProcessClasspathManager.java
@@ -26,7 +26,7 @@ import java.util.jar.JarFile;
  * @author nik
  */
 public class BuildProcessClasspathManager {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.compiler.server.impl.BuildProcessClasspathManager");
+  private static final Logger LOG = Logger.getInstance(BuildProcessClasspathManager.class);
 
   private List<String> myCompileServerPluginsClasspath;
 
diff --git a/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/ArtifactManagerImpl.java b/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/ArtifactManagerImpl.java
index ccd3f882f4eb..44e0fc9512c5 100644
--- a/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/ArtifactManagerImpl.java
+++ b/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/ArtifactManagerImpl.java
@@ -41,7 +41,7 @@ import java.util.*;
  */
 @State(name = ArtifactManagerImpl.COMPONENT_NAME, storages = @Storage(value = "artifacts", stateSplitter = ArtifactManagerStateSplitter.class))
 public class ArtifactManagerImpl extends ArtifactManager implements PersistentStateComponent<ArtifactManagerState>, Disposable {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.packaging.impl.artifacts.ArtifactManagerImpl");
+  private static final Logger LOG = Logger.getInstance(ArtifactManagerImpl.class);
   @NonNls public static final String COMPONENT_NAME = "ArtifactManager";
   @NonNls public static final String PACKAGING_ELEMENT_NAME = "element";
   @NonNls public static final String TYPE_ID_ATTRIBUTE = "id";
diff --git a/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/JarFromModulesTemplate.java b/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/JarFromModulesTemplate.java
index 9d489942380a..cb9c8f95c37c 100644
--- a/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/JarFromModulesTemplate.java
+++ b/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/JarFromModulesTemplate.java
@@ -46,7 +46,7 @@ import java.util.*;
  * @author nik
  */
 public class JarFromModulesTemplate extends ArtifactTemplate {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.packaging.impl.artifacts.JarFromModulesTemplate");
+  private static final Logger LOG = Logger.getInstance(JarFromModulesTemplate.class);
 
   private final PackagingElementResolvingContext myContext;
 
diff --git a/java/compiler/impl/src/com/intellij/packaging/impl/elements/ArtifactPackagingElement.java b/java/compiler/impl/src/com/intellij/packaging/impl/elements/ArtifactPackagingElement.java
index 806b9240ff89..e850c93a1729 100644
--- a/java/compiler/impl/src/com/intellij/packaging/impl/elements/ArtifactPackagingElement.java
+++ b/java/compiler/impl/src/com/intellij/packaging/impl/elements/ArtifactPackagingElement.java
@@ -27,7 +27,7 @@ import java.util.List;
  * @author nik
  */
 public class ArtifactPackagingElement extends ComplexPackagingElement<ArtifactPackagingElement.ArtifactPackagingElementState> {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.packaging.impl.elements.ArtifactPackagingElement");
+  private static final Logger LOG = Logger.getInstance(ArtifactPackagingElement.class);
   private final Project myProject;
   private ArtifactPointer myArtifactPointer;
   @NonNls public static final String ARTIFACT_NAME_ATTRIBUTE = "artifact-name";
diff --git a/java/compiler/impl/src/com/intellij/packaging/impl/elements/ManifestFileUtil.java b/java/compiler/impl/src/com/intellij/packaging/impl/elements/ManifestFileUtil.java
index e4c8ff763522..a1a53c9f79c2 100644
--- a/java/compiler/impl/src/com/intellij/packaging/impl/elements/ManifestFileUtil.java
+++ b/java/compiler/impl/src/com/intellij/packaging/impl/elements/ManifestFileUtil.java
@@ -59,7 +59,7 @@ import java.util.jar.Manifest;
  * @author nik
  */
 public class ManifestFileUtil {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.roots.ui.configuration.artifacts.ArtifactEditorContextImpl");
+  private static final Logger LOG = Logger.getInstance(ManifestFileUtil.class);
   public static final String MANIFEST_PATH = JarFile.MANIFEST_NAME;
   public static final String MANIFEST_FILE_NAME = PathUtil.getFileName(MANIFEST_PATH);
   public static final String MANIFEST_DIR_NAME = PathUtil.getParentPath(MANIFEST_PATH);
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 13d162e0e514..1296bdcf544d 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
@@ -34,7 +34,7 @@ import java.util.List;
  * @author nik
  */
 public class PackagingElementFactoryImpl extends PackagingElementFactory {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.packaging.impl.elements.PackagingElementFactoryImpl");
+  private static final Logger LOG = Logger.getInstance(PackagingElementFactoryImpl.class);
   public static final PackagingElementType<DirectoryPackagingElement> DIRECTORY_ELEMENT_TYPE = new DirectoryElementType();
   public static final PackagingElementType<ArchivePackagingElement> ARCHIVE_ELEMENT_TYPE = new ArchiveElementType();
   public static final PackagingElementType<FileCopyPackagingElement> FILE_COPY_ELEMENT_TYPE = new FileCopyElementType();
diff --git a/java/compiler/impl/src/com/intellij/packaging/impl/ui/actions/PackageFileWorker.java b/java/compiler/impl/src/com/intellij/packaging/impl/ui/actions/PackageFileWorker.java
index 7a4256196013..7e9759390603 100644
--- a/java/compiler/impl/src/com/intellij/packaging/impl/ui/actions/PackageFileWorker.java
+++ b/java/compiler/impl/src/com/intellij/packaging/impl/ui/actions/PackageFileWorker.java
@@ -55,7 +55,7 @@ import java.util.List;
  * @author nik
  */
 public class PackageFileWorker {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.packaging.impl.ui.actions.PackageFileWorker");
+  private static final Logger LOG = Logger.getInstance(PackageFileWorker.class);
   private final File myFile;
   private final String myRelativeOutputPath;
   private final boolean myPackIntoArchives;
diff --git a/java/compiler/openapi/src/com/intellij/compiler/CompilerWorkspaceConfiguration.java b/java/compiler/openapi/src/com/intellij/compiler/CompilerWorkspaceConfiguration.java
index 24107ff86cf0..fd9ea6f156db 100644
--- a/java/compiler/openapi/src/com/intellij/compiler/CompilerWorkspaceConfiguration.java
+++ b/java/compiler/openapi/src/com/intellij/compiler/CompilerWorkspaceConfiguration.java
@@ -14,7 +14,7 @@ import org.jetbrains.annotations.NotNull;
 
 @State(name = "CompilerWorkspaceConfiguration", storages = @Storage(StoragePathMacros.WORKSPACE_FILE))
 public class CompilerWorkspaceConfiguration implements PersistentStateComponent<CompilerWorkspaceConfiguration> {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.compiler.CompilerWorkspaceConfiguration");
+  private static final Logger LOG = Logger.getInstance(CompilerWorkspaceConfiguration.class);
 
   static {
     LOG.info("Available processors: " + Runtime.getRuntime().availableProcessors());
diff --git a/java/compiler/openapi/src/com/intellij/compiler/ModuleCompilerUtil.java b/java/compiler/openapi/src/com/intellij/compiler/ModuleCompilerUtil.java
index 4fd3c16710ac..d2599a73e26c 100644
--- a/java/compiler/openapi/src/com/intellij/compiler/ModuleCompilerUtil.java
+++ b/java/compiler/openapi/src/com/intellij/compiler/ModuleCompilerUtil.java
@@ -25,7 +25,7 @@ import java.util.*;
  * @author dsl
  */
 public final class ModuleCompilerUtil {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.compiler.ModuleCompilerUtil");
+  private static final Logger LOG = Logger.getInstance(ModuleCompilerUtil.class);
   private ModuleCompilerUtil() { }
 
   @NotNull
diff --git a/java/compiler/tests/com/intellij/compiler/JavacOutputParserTest.java b/java/compiler/tests/com/intellij/compiler/JavacOutputParserTest.java
index b131234495f2..2e0c11fb1f47 100644
--- a/java/compiler/tests/com/intellij/compiler/JavacOutputParserTest.java
+++ b/java/compiler/tests/com/intellij/compiler/JavacOutputParserTest.java
@@ -28,7 +28,7 @@ import java.util.regex.Matcher;
  */
 @SuppressWarnings({"HardCodedStringLiteral"})
 public class JavacOutputParserTest extends TestCase {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.compiler.JavacOutputParserTest");
+  private static final Logger LOG = Logger.getInstance(JavacOutputParserTest.class);
   private static final ResourceBundle ourBundle;
 
   static {
diff --git a/java/debugger/impl/src/com/intellij/debugger/actions/JavaMarkObjectActionHandler.java b/java/debugger/impl/src/com/intellij/debugger/actions/JavaMarkObjectActionHandler.java
index 9e096faae900..0f8abf706935 100644
--- a/java/debugger/impl/src/com/intellij/debugger/actions/JavaMarkObjectActionHandler.java
+++ b/java/debugger/impl/src/com/intellij/debugger/actions/JavaMarkObjectActionHandler.java
@@ -56,7 +56,7 @@ import static com.intellij.openapi.actionSystem.PlatformDataKeys.CONTEXT_COMPONE
  * @author Jeka
  */
 public class JavaMarkObjectActionHandler extends MarkObjectActionHandler {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.actions.JavaMarkObjectActionHandler");
+  private static final Logger LOG = Logger.getInstance(JavaMarkObjectActionHandler.class);
   public static final long AUTO_MARKUP_REFERRING_OBJECTS_LIMIT = 100L; // todo: some reasonable limit
 
   @Override
diff --git a/java/debugger/impl/src/com/intellij/debugger/actions/JumpToObjectAction.java b/java/debugger/impl/src/com/intellij/debugger/actions/JumpToObjectAction.java
index bf0b41413dfb..9d6b1f7d9e77 100644
--- a/java/debugger/impl/src/com/intellij/debugger/actions/JumpToObjectAction.java
+++ b/java/debugger/impl/src/com/intellij/debugger/actions/JumpToObjectAction.java
@@ -23,7 +23,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 public class JumpToObjectAction extends DebuggerAction{
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.actions.JumpToObjectAction");
+  private static final Logger LOG = Logger.getInstance(JumpToObjectAction.class);
   @Override
   public void actionPerformed(@NotNull AnActionEvent e) {
     DebuggerTreeNodeImpl selectedNode = getSelectedNode(e.getDataContext());
diff --git a/java/debugger/impl/src/com/intellij/debugger/actions/ViewAsGroup.java b/java/debugger/impl/src/com/intellij/debugger/actions/ViewAsGroup.java
index 603e60b24e32..61ed9ec26db4 100644
--- a/java/debugger/impl/src/com/intellij/debugger/actions/ViewAsGroup.java
+++ b/java/debugger/impl/src/com/intellij/debugger/actions/ViewAsGroup.java
@@ -24,7 +24,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class ViewAsGroup extends ActionGroup implements DumbAware {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.actions.ViewAsGroup");
+  private static final Logger LOG = Logger.getInstance(ViewAsGroup.class);
 
   private volatile AnAction[] myChildren = AnAction.EMPTY_ARRAY;
 
diff --git a/java/debugger/impl/src/com/intellij/debugger/engine/ContextUtil.java b/java/debugger/impl/src/com/intellij/debugger/engine/ContextUtil.java
index a4922ff60a77..c6b92251973d 100644
--- a/java/debugger/impl/src/com/intellij/debugger/engine/ContextUtil.java
+++ b/java/debugger/impl/src/com/intellij/debugger/engine/ContextUtil.java
@@ -19,6 +19,7 @@ import com.intellij.debugger.SourcePosition;
 import com.intellij.debugger.engine.evaluation.DefaultCodeFragmentFactory;
 import com.intellij.debugger.engine.evaluation.EvaluateException;
 import com.intellij.debugger.engine.jdi.StackFrameProxy;
+import com.intellij.debugger.impl.PositionUtil;
 import com.intellij.debugger.jdi.LocalVariableProxyImpl;
 import com.intellij.debugger.jdi.StackFrameProxyImpl;
 import com.intellij.openapi.application.ReadAction;
@@ -34,7 +35,7 @@ import java.util.List;
 
 public class ContextUtil {
   public static final Key<Boolean> IS_JSP_IMPLICIT = new Key<>("JspImplicit");
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.impl.PositionUtil");
+  private static final Logger LOG = Logger.getInstance(PositionUtil.class);
 
   @Nullable
   public static SourcePosition getSourcePosition(@Nullable final StackFrameContext context) {
diff --git a/java/debugger/impl/src/com/intellij/debugger/engine/DebugProcessImpl.java b/java/debugger/impl/src/com/intellij/debugger/engine/DebugProcessImpl.java
index 4f9d24d6a810..46171267a5e1 100644
--- a/java/debugger/impl/src/com/intellij/debugger/engine/DebugProcessImpl.java
+++ b/java/debugger/impl/src/com/intellij/debugger/engine/DebugProcessImpl.java
@@ -88,7 +88,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
 
 public abstract class DebugProcessImpl extends UserDataHolderBase implements DebugProcess {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.engine.DebugProcessImpl");
+  private static final Logger LOG = Logger.getInstance(DebugProcessImpl.class);
 
   @NonNls private static final String SOCKET_ATTACHING_CONNECTOR_NAME = "com.sun.jdi.SocketAttach";
   @NonNls private static final String SHMEM_ATTACHING_CONNECTOR_NAME = "com.sun.jdi.SharedMemoryAttach";
diff --git a/java/debugger/impl/src/com/intellij/debugger/engine/JVMNameUtil.java b/java/debugger/impl/src/com/intellij/debugger/engine/JVMNameUtil.java
index 90e06c784902..994f0d35ef63 100644
--- a/java/debugger/impl/src/com/intellij/debugger/engine/JVMNameUtil.java
+++ b/java/debugger/impl/src/com/intellij/debugger/engine/JVMNameUtil.java
@@ -27,7 +27,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class JVMNameUtil {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.engine.JVMNameUtil");
+  private static final Logger LOG = Logger.getInstance(JVMNameUtil.class);
 
   public static final String CONSTRUCTOR_NAME = "<init>";
 
diff --git a/java/debugger/impl/src/com/intellij/debugger/engine/PositionManagerImpl.java b/java/debugger/impl/src/com/intellij/debugger/engine/PositionManagerImpl.java
index 77f344863ece..9a9fd19445f1 100644
--- a/java/debugger/impl/src/com/intellij/debugger/engine/PositionManagerImpl.java
+++ b/java/debugger/impl/src/com/intellij/debugger/engine/PositionManagerImpl.java
@@ -43,7 +43,7 @@ import java.util.function.Consumer;
  * @author lex
  */
 public class PositionManagerImpl implements PositionManager, MultiRequestPositionManager {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.engine.PositionManagerImpl");
+  private static final Logger LOG = Logger.getInstance(PositionManagerImpl.class);
 
   private final DebugProcessImpl myDebugProcess;
 
diff --git a/java/debugger/impl/src/com/intellij/debugger/engine/RequestHint.java b/java/debugger/impl/src/com/intellij/debugger/engine/RequestHint.java
index 2a29f51a6ebd..7da481b18689 100644
--- a/java/debugger/impl/src/com/intellij/debugger/engine/RequestHint.java
+++ b/java/debugger/impl/src/com/intellij/debugger/engine/RequestHint.java
@@ -27,7 +27,7 @@ public class RequestHint {
   public static final int STOP = 0;
   public static final int RESUME = -100;
 
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.engine.RequestHint");
+  private static final Logger LOG = Logger.getInstance(RequestHint.class);
   @MagicConstant (intValues = {StepRequest.STEP_MIN, StepRequest.STEP_LINE})
   private final int mySize;
   @MagicConstant (intValues = {StepRequest.STEP_INTO, StepRequest.STEP_OVER, StepRequest.STEP_OUT})
diff --git a/java/debugger/impl/src/com/intellij/debugger/engine/SuspendContextImpl.java b/java/debugger/impl/src/com/intellij/debugger/engine/SuspendContextImpl.java
index b45ec442f2cf..39271f399dd8 100644
--- a/java/debugger/impl/src/com/intellij/debugger/engine/SuspendContextImpl.java
+++ b/java/debugger/impl/src/com/intellij/debugger/engine/SuspendContextImpl.java
@@ -32,7 +32,7 @@ import java.util.concurrent.ConcurrentLinkedQueue;
  * @author lex
  */
 public abstract class SuspendContextImpl extends XSuspendContext implements SuspendContext {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.engine.SuspendContextImpl");
+  private static final Logger LOG = Logger.getInstance(SuspendContextImpl.class);
 
   private final DebugProcessImpl myDebugProcess;
   private final int mySuspendPolicy;
diff --git a/java/debugger/impl/src/com/intellij/debugger/engine/SuspendManagerImpl.java b/java/debugger/impl/src/com/intellij/debugger/engine/SuspendManagerImpl.java
index 9073b1c0cc49..b94c0a40d320 100644
--- a/java/debugger/impl/src/com/intellij/debugger/engine/SuspendManagerImpl.java
+++ b/java/debugger/impl/src/com/intellij/debugger/engine/SuspendManagerImpl.java
@@ -20,7 +20,7 @@ import java.util.concurrent.ConcurrentLinkedDeque;
  * @author lex
  */
 public class SuspendManagerImpl implements SuspendManager {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.engine.SuspendManager");
+  private static final Logger LOG = Logger.getInstance(SuspendManager.class);
 
   private final Deque<SuspendContextImpl> myEventContexts = new ConcurrentLinkedDeque<>();
   /**
diff --git a/java/debugger/impl/src/com/intellij/debugger/engine/SuspendManagerUtil.java b/java/debugger/impl/src/com/intellij/debugger/engine/SuspendManagerUtil.java
index 1e3129aee956..199657ed9ae5 100644
--- a/java/debugger/impl/src/com/intellij/debugger/engine/SuspendManagerUtil.java
+++ b/java/debugger/impl/src/com/intellij/debugger/engine/SuspendManagerUtil.java
@@ -26,7 +26,7 @@ import java.util.Set;
 import java.util.stream.Collectors;
 
 public class SuspendManagerUtil {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.engine.SuspendManagerUtil");
+  private static final Logger LOG = Logger.getInstance(SuspendManagerUtil.class);
 
   public static boolean isEvaluating(SuspendManager suspendManager, ThreadReferenceProxyImpl thread) {
     for (SuspendContextImpl suspendContext : suspendManager.getEventContexts()) {
diff --git a/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/BinaryExpressionEvaluator.java b/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/BinaryExpressionEvaluator.java
index ad2492220562..5c97c29f75f9 100644
--- a/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/BinaryExpressionEvaluator.java
+++ b/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/BinaryExpressionEvaluator.java
@@ -20,7 +20,7 @@ import com.sun.jdi.*;
 import org.jetbrains.annotations.NotNull;
 
 class BinaryExpressionEvaluator implements Evaluator {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.engine.evaluation.expression.BinaryExpressionEvaluator");
+  private static final Logger LOG = Logger.getInstance(BinaryExpressionEvaluator.class);
   private final Evaluator myLeftOperand;
   private final Evaluator myRightOperand;
   private final IElementType myOpType;
diff --git a/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/CodeFragmentEvaluator.java b/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/CodeFragmentEvaluator.java
index 630186195030..1c4ad689880e 100644
--- a/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/CodeFragmentEvaluator.java
+++ b/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/CodeFragmentEvaluator.java
@@ -16,7 +16,7 @@ import java.util.Map;
  * @author lex
  */
 public class CodeFragmentEvaluator extends BlockStatementEvaluator{
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.engine.evaluation.expression.CodeFragmentEvaluator");
+  private static final Logger LOG = Logger.getInstance(CodeFragmentEvaluator.class);
 
   private final CodeFragmentEvaluator myParentFragmentEvaluator;
   private final Map<String, Object> mySyntheticLocals = new HashMap<>();
diff --git a/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/EvaluatorBuilderImpl.java b/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/EvaluatorBuilderImpl.java
index 53df087e8548..ccf40f48cb7d 100644
--- a/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/EvaluatorBuilderImpl.java
+++ b/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/EvaluatorBuilderImpl.java
@@ -74,7 +74,7 @@ public class EvaluatorBuilderImpl implements EvaluatorBuilder {
   }
 
   private static class Builder extends JavaElementVisitor {
-    private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.engine.evaluation.expression.EvaluatorBuilderImpl");
+    private static final Logger LOG = Logger.getInstance(EvaluatorBuilderImpl.class);
     private Evaluator myResult = null;
     private PsiClass myContextPsiClass;
     private CodeFragmentEvaluator myCurrentFragmentEvaluator;
diff --git a/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/ExpressionEvaluatorImpl.java b/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/ExpressionEvaluatorImpl.java
index 7461ec44de9d..887353d18559 100644
--- a/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/ExpressionEvaluatorImpl.java
+++ b/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/ExpressionEvaluatorImpl.java
@@ -24,7 +24,7 @@ import com.intellij.openapi.diagnostic.Logger;
 import com.sun.jdi.Value;
 
 public class ExpressionEvaluatorImpl implements ExpressionEvaluator {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.engine.evaluation.expression.ExpressionEvaluator");
+  private static final Logger LOG = Logger.getInstance(ExpressionEvaluator.class);
   private final Evaluator myEvaluator;
 
   public ExpressionEvaluatorImpl(Evaluator evaluator) {
diff --git a/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/InstanceofEvaluator.java b/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/InstanceofEvaluator.java
index d99ca501cfa7..54dd98e0df53 100644
--- a/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/InstanceofEvaluator.java
+++ b/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/InstanceofEvaluator.java
@@ -16,7 +16,7 @@ import com.sun.jdi.ObjectReference;
 import com.sun.jdi.Value;
 
 class InstanceofEvaluator implements Evaluator {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.engine.evaluation.expression.InstanceofEvaluator");
+  private static final Logger LOG = Logger.getInstance(InstanceofEvaluator.class);
   private final Evaluator myOperandEvaluator;
   private final TypeEvaluator myTypeEvaluator;
 
diff --git a/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/LocalVariableEvaluator.java b/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/LocalVariableEvaluator.java
index 90ac6c318d6c..35ea4ea4a98f 100644
--- a/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/LocalVariableEvaluator.java
+++ b/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/LocalVariableEvaluator.java
@@ -44,7 +44,7 @@ import org.jetbrains.annotations.Nullable;
 import java.util.Map;
 
 class LocalVariableEvaluator implements Evaluator {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.engine.evaluation.expression.LocalVariableEvaluator");
+  private static final Logger LOG = Logger.getInstance(LocalVariableEvaluator.class);
 
   private final String myLocalVariableName;
   private EvaluationContextImpl myContext;
diff --git a/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/MethodEvaluator.java b/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/MethodEvaluator.java
index 0397d4926724..adc5e4766f4d 100644
--- a/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/MethodEvaluator.java
+++ b/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/MethodEvaluator.java
@@ -30,7 +30,7 @@ import java.util.Arrays;
 import java.util.List;
 
 public class MethodEvaluator implements Evaluator {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.engine.evaluation.expression.MethodEvaluator");
+  private static final Logger LOG = Logger.getInstance(MethodEvaluator.class);
   private final JVMName myClassName;
   private final JVMName myMethodSignature;
   private final String myMethodName;
diff --git a/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/NewArrayInstanceEvaluator.java b/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/NewArrayInstanceEvaluator.java
index 692a918cb2c6..80785ba94130 100644
--- a/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/NewArrayInstanceEvaluator.java
+++ b/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/NewArrayInstanceEvaluator.java
@@ -16,7 +16,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 
 class NewArrayInstanceEvaluator implements Evaluator {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.engine.evaluation.expression.NewArrayInstanceEvaluator");
+  private static final Logger LOG = Logger.getInstance(NewArrayInstanceEvaluator.class);
   private final Evaluator myArrayTypeEvaluator;
   private final Evaluator myDimensionEvaluator;
   private final Evaluator myInitializerEvaluator;
diff --git a/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/SyntheticVariableEvaluator.java b/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/SyntheticVariableEvaluator.java
index 0fccd4f97462..922faa075051 100644
--- a/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/SyntheticVariableEvaluator.java
+++ b/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/SyntheticVariableEvaluator.java
@@ -18,7 +18,7 @@ import org.jetbrains.annotations.Nullable;
  * @author lex
  */
 public class SyntheticVariableEvaluator implements Evaluator{
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.engine.evaluation.expression.SyntheticVariableEvaluator");
+  private static final Logger LOG = Logger.getInstance(SyntheticVariableEvaluator.class);
 
   private final CodeFragmentEvaluator myCodeFragmentEvaluator;
   private final String myLocalName;
diff --git a/java/debugger/impl/src/com/intellij/debugger/engine/requests/MethodReturnValueWatcher.java b/java/debugger/impl/src/com/intellij/debugger/engine/requests/MethodReturnValueWatcher.java
index 466974d340d7..18c7a182208d 100644
--- a/java/debugger/impl/src/com/intellij/debugger/engine/requests/MethodReturnValueWatcher.java
+++ b/java/debugger/impl/src/com/intellij/debugger/engine/requests/MethodReturnValueWatcher.java
@@ -27,7 +27,7 @@ import org.jetbrains.annotations.Nullable;
  * @author Eugene Zhuravlev
  */
 public class MethodReturnValueWatcher implements OverheadProducer {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.engine.requests.MethodReturnValueWatcher");
+  private static final Logger LOG = Logger.getInstance(MethodReturnValueWatcher.class);
   private @Nullable Method myLastExecutedMethod;
   private @Nullable Value myLastMethodReturnValue;
 
diff --git a/java/debugger/impl/src/com/intellij/debugger/impl/DebuggerContextImpl.java b/java/debugger/impl/src/com/intellij/debugger/impl/DebuggerContextImpl.java
index 6380d6805866..73fc517c56b7 100644
--- a/java/debugger/impl/src/com/intellij/debugger/impl/DebuggerContextImpl.java
+++ b/java/debugger/impl/src/com/intellij/debugger/impl/DebuggerContextImpl.java
@@ -25,7 +25,7 @@ import org.jetbrains.annotations.Nullable;
 
 
 public final class DebuggerContextImpl implements DebuggerContext {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.impl.DebuggerContextImpl");
+  private static final Logger LOG = Logger.getInstance(DebuggerContextImpl.class);
 
   public static final DebuggerContextImpl EMPTY_CONTEXT = createDebuggerContext(null, null, null, null);
 
diff --git a/java/debugger/impl/src/com/intellij/debugger/impl/DebuggerManagerImpl.java b/java/debugger/impl/src/com/intellij/debugger/impl/DebuggerManagerImpl.java
index d7706beda39e..34126a955710 100644
--- a/java/debugger/impl/src/com/intellij/debugger/impl/DebuggerManagerImpl.java
+++ b/java/debugger/impl/src/com/intellij/debugger/impl/DebuggerManagerImpl.java
@@ -41,7 +41,7 @@ import java.util.*;
 
 @State(name = "DebuggerManager", storages = {@Storage(StoragePathMacros.WORKSPACE_FILE)})
 public class DebuggerManagerImpl extends DebuggerManagerEx implements PersistentStateComponent<Element> {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.impl.DebuggerManagerImpl");
+  private static final Logger LOG = Logger.getInstance(DebuggerManagerImpl.class);
   public static final String LOCALHOST_ADDRESS_FALLBACK = "127.0.0.1";
 
   private final Project myProject;
diff --git a/java/debugger/impl/src/com/intellij/debugger/impl/DebuggerSession.java b/java/debugger/impl/src/com/intellij/debugger/impl/DebuggerSession.java
index c4819fed81e2..1a8befa8a533 100644
--- a/java/debugger/impl/src/com/intellij/debugger/impl/DebuggerSession.java
+++ b/java/debugger/impl/src/com/intellij/debugger/impl/DebuggerSession.java
@@ -60,7 +60,7 @@ import java.util.List;
 import java.util.concurrent.atomic.AtomicReference;
 
 public class DebuggerSession implements AbstractDebuggerSession {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.impl.DebuggerSession");
+  private static final Logger LOG = Logger.getInstance(DebuggerSession.class);
   // flags
   private final MyDebuggerStateManager myContextManager;
 
diff --git a/java/debugger/impl/src/com/intellij/debugger/impl/DebuggerUtilsEx.java b/java/debugger/impl/src/com/intellij/debugger/impl/DebuggerUtilsEx.java
index c294a5cd502e..2d8875002c47 100644
--- a/java/debugger/impl/src/com/intellij/debugger/impl/DebuggerUtilsEx.java
+++ b/java/debugger/impl/src/com/intellij/debugger/impl/DebuggerUtilsEx.java
@@ -69,7 +69,7 @@ import java.util.function.Function;
 import java.util.regex.PatternSyntaxException;
 
 public abstract class DebuggerUtilsEx extends DebuggerUtils {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.impl.DebuggerUtilsEx");
+  private static final Logger LOG = Logger.getInstance(DebuggerUtilsEx.class);
 
   /**
    * @param context
diff --git a/java/debugger/impl/src/com/intellij/debugger/impl/DebuggerUtilsImpl.java b/java/debugger/impl/src/com/intellij/debugger/impl/DebuggerUtilsImpl.java
index ef659b4a6b26..ad09a019bb8f 100644
--- a/java/debugger/impl/src/com/intellij/debugger/impl/DebuggerUtilsImpl.java
+++ b/java/debugger/impl/src/com/intellij/debugger/impl/DebuggerUtilsImpl.java
@@ -49,7 +49,7 @@ import java.util.stream.Stream;
 
 public class DebuggerUtilsImpl extends DebuggerUtilsEx{
   public static final Key<PsiType> PSI_TYPE_KEY = Key.create("PSI_TYPE_KEY");
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.impl.DebuggerUtilsImpl");
+  private static final Logger LOG = Logger.getInstance(DebuggerUtilsImpl.class);
 
   @Override
   public PsiExpression substituteThis(PsiExpression expressionWithThis, PsiExpression howToEvaluateThis, Value howToEvaluateThisValue, StackFrameContext context)
diff --git a/java/debugger/impl/src/com/intellij/debugger/impl/EventQueue.java b/java/debugger/impl/src/com/intellij/debugger/impl/EventQueue.java
index 2774bb6d0fc1..dcb7b1cb0295 100644
--- a/java/debugger/impl/src/com/intellij/debugger/impl/EventQueue.java
+++ b/java/debugger/impl/src/com/intellij/debugger/impl/EventQueue.java
@@ -26,7 +26,7 @@ import java.util.concurrent.locks.ReentrantLock;
 
 
 public class EventQueue<E> {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.impl.EventQueue");
+  private static final Logger LOG = Logger.getInstance(EventQueue.class);
 
   private final LinkedList[] myEvents;
   private final ReentrantLock myLock;
diff --git a/java/debugger/impl/src/com/intellij/debugger/impl/GenericDebuggerParametersRunnerConfigurable.java b/java/debugger/impl/src/com/intellij/debugger/impl/GenericDebuggerParametersRunnerConfigurable.java
index e3fa3602328c..f9986e40e837 100644
--- a/java/debugger/impl/src/com/intellij/debugger/impl/GenericDebuggerParametersRunnerConfigurable.java
+++ b/java/debugger/impl/src/com/intellij/debugger/impl/GenericDebuggerParametersRunnerConfigurable.java
@@ -20,7 +20,7 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
 public class GenericDebuggerParametersRunnerConfigurable extends SettingsEditor<GenericDebuggerRunnerSettings> {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.impl.GenericDebuggerParametersRunnerConfigurable");
+  private static final Logger LOG = Logger.getInstance(GenericDebuggerParametersRunnerConfigurable.class);
   private JPanel myPanel;
   private JTextField myAddressField;
   private JPanel myShMemPanel;
diff --git a/java/debugger/impl/src/com/intellij/debugger/impl/InvokeThread.java b/java/debugger/impl/src/com/intellij/debugger/impl/InvokeThread.java
index 0156eaf7af0f..8220ff399990 100644
--- a/java/debugger/impl/src/com/intellij/debugger/impl/InvokeThread.java
+++ b/java/debugger/impl/src/com/intellij/debugger/impl/InvokeThread.java
@@ -17,7 +17,7 @@ import java.util.concurrent.*;
  * @author lex
  */
 public abstract class InvokeThread<E extends PrioritizedTask> {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.impl.InvokeThread");
+  private static final Logger LOG = Logger.getInstance(InvokeThread.class);
 
   private static final ThreadLocal<WorkerThreadRequest> ourWorkerRequest = new ThreadLocal<>();
 
diff --git a/java/debugger/impl/src/com/intellij/debugger/impl/ReloadClassesWorker.java b/java/debugger/impl/src/com/intellij/debugger/impl/ReloadClassesWorker.java
index 29473432ddf3..e3a24997e238 100644
--- a/java/debugger/impl/src/com/intellij/debugger/impl/ReloadClassesWorker.java
+++ b/java/debugger/impl/src/com/intellij/debugger/impl/ReloadClassesWorker.java
@@ -38,7 +38,7 @@ import java.util.stream.IntStream;
  * @author lex
  */
 class ReloadClassesWorker {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.impl.ReloadClassesWorker");
+  private static final Logger LOG = Logger.getInstance(ReloadClassesWorker.class);
   private final DebuggerSession  myDebuggerSession;
   private final HotSwapProgress  myProgress;
 
diff --git a/java/debugger/impl/src/com/intellij/debugger/impl/SourceCodeChecker.java b/java/debugger/impl/src/com/intellij/debugger/impl/SourceCodeChecker.java
index 12dbbf426840..f50258d70fc8 100644
--- a/java/debugger/impl/src/com/intellij/debugger/impl/SourceCodeChecker.java
+++ b/java/debugger/impl/src/com/intellij/debugger/impl/SourceCodeChecker.java
@@ -43,7 +43,7 @@ import java.util.List;
  * @author egor
  */
 public class SourceCodeChecker {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.impl.SourceCodeChecker");
+  private static final Logger LOG = Logger.getInstance(SourceCodeChecker.class);
 
   private SourceCodeChecker() {
   }
diff --git a/java/debugger/impl/src/com/intellij/debugger/impl/descriptors/data/ArrayItemData.java b/java/debugger/impl/src/com/intellij/debugger/impl/descriptors/data/ArrayItemData.java
index 8015680e2422..ed408ae40460 100644
--- a/java/debugger/impl/src/com/intellij/debugger/impl/descriptors/data/ArrayItemData.java
+++ b/java/debugger/impl/src/com/intellij/debugger/impl/descriptors/data/ArrayItemData.java
@@ -22,7 +22,7 @@ import com.sun.jdi.ArrayReference;
 import org.jetbrains.annotations.NotNull;
 
 public final class ArrayItemData extends DescriptorData<ArrayElementDescriptorImpl>{
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.impl.descriptors.data.ArrayItemData");
+  private static final Logger LOG = Logger.getInstance(ArrayItemData.class);
 
   private final ArrayReference myArray;
   private final int myIndex;
diff --git a/java/debugger/impl/src/com/intellij/debugger/jdi/LocalVariablesUtil.java b/java/debugger/impl/src/com/intellij/debugger/jdi/LocalVariablesUtil.java
index 2be72cdddefc..358858a93230 100644
--- a/java/debugger/impl/src/com/intellij/debugger/jdi/LocalVariablesUtil.java
+++ b/java/debugger/impl/src/com/intellij/debugger/jdi/LocalVariablesUtil.java
@@ -79,7 +79,7 @@ import java.util.*;
       return map;
  */
 public class LocalVariablesUtil {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.jdi.LocalVariablesUtil");
+  private static final Logger LOG = Logger.getInstance(LocalVariablesUtil.class);
 
   private static final boolean ourInitializationOk;
   private static Class<?> ourSlotInfoClass;
diff --git a/java/debugger/impl/src/com/intellij/debugger/jdi/StackFrameProxyImpl.java b/java/debugger/impl/src/com/intellij/debugger/jdi/StackFrameProxyImpl.java
index 96b70d6028a0..a86b18de545a 100644
--- a/java/debugger/impl/src/com/intellij/debugger/jdi/StackFrameProxyImpl.java
+++ b/java/debugger/impl/src/com/intellij/debugger/jdi/StackFrameProxyImpl.java
@@ -26,7 +26,7 @@ import java.util.List;
 import java.util.Map;
 
 public class StackFrameProxyImpl extends JdiProxy implements StackFrameProxy {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.jdi.StackFrameProxyImpl");
+  private static final Logger LOG = Logger.getInstance(StackFrameProxyImpl.class);
   private static final int FRAMES_BATCH_MAX = 10;
   private final ThreadReferenceProxyImpl myThreadProxy;
   private final int myFrameFromBottomIndex; // 1-based
diff --git a/java/debugger/impl/src/com/intellij/debugger/jdi/ThreadGroupReferenceProxyImpl.java b/java/debugger/impl/src/com/intellij/debugger/jdi/ThreadGroupReferenceProxyImpl.java
index 5d708a5801da..c9a14e5f8d46 100644
--- a/java/debugger/impl/src/com/intellij/debugger/jdi/ThreadGroupReferenceProxyImpl.java
+++ b/java/debugger/impl/src/com/intellij/debugger/jdi/ThreadGroupReferenceProxyImpl.java
@@ -16,7 +16,7 @@ import org.jetbrains.annotations.NonNls;
 import java.util.List;
 
 public class ThreadGroupReferenceProxyImpl extends ObjectReferenceProxyImpl implements ThreadGroupReferenceProxy{
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.jdi.ThreadGroupReferenceProxyImpl");
+  private static final Logger LOG = Logger.getInstance(ThreadGroupReferenceProxyImpl.class);
   //caches
   private ThreadGroupReferenceProxyImpl myParentThreadGroupProxy;
   private boolean myIsParentGroupCached = false;
diff --git a/java/debugger/impl/src/com/intellij/debugger/jdi/ThreadReferenceProxyImpl.java b/java/debugger/impl/src/com/intellij/debugger/jdi/ThreadReferenceProxyImpl.java
index 7e3df906fbe2..97f76c3bd5f1 100644
--- a/java/debugger/impl/src/com/intellij/debugger/jdi/ThreadReferenceProxyImpl.java
+++ b/java/debugger/impl/src/com/intellij/debugger/jdi/ThreadReferenceProxyImpl.java
@@ -23,7 +23,7 @@ import org.jetbrains.annotations.NotNull;
 import java.util.*;
 
 public final class ThreadReferenceProxyImpl extends ObjectReferenceProxyImpl implements ThreadReferenceProxy {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.jdi.ThreadReferenceProxyImpl");
+  private static final Logger LOG = Logger.getInstance(ThreadReferenceProxyImpl.class);
   // cached data
   private String myName;
   private int                       myFrameCount = -1;
diff --git a/java/debugger/impl/src/com/intellij/debugger/jdi/VirtualMachineProxyImpl.java b/java/debugger/impl/src/com/intellij/debugger/jdi/VirtualMachineProxyImpl.java
index 45b9ab0d37ff..8d339b46d6d5 100644
--- a/java/debugger/impl/src/com/intellij/debugger/jdi/VirtualMachineProxyImpl.java
+++ b/java/debugger/impl/src/com/intellij/debugger/jdi/VirtualMachineProxyImpl.java
@@ -35,7 +35,7 @@ import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 
 public class VirtualMachineProxyImpl implements JdiTimer, VirtualMachineProxy {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.jdi.VirtualMachineProxyImpl");
+  private static final Logger LOG = Logger.getInstance(VirtualMachineProxyImpl.class);
   private final DebugProcessImpl myDebugProcess;
   private final VirtualMachine myVirtualMachine;
   private int myTimeStamp = 0;
diff --git a/java/debugger/impl/src/com/intellij/debugger/settings/RendererConfiguration.java b/java/debugger/impl/src/com/intellij/debugger/settings/RendererConfiguration.java
index 2d3345ed75b6..de0389bd97c7 100644
--- a/java/debugger/impl/src/com/intellij/debugger/settings/RendererConfiguration.java
+++ b/java/debugger/impl/src/com/intellij/debugger/settings/RendererConfiguration.java
@@ -17,7 +17,7 @@ import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 
 public class RendererConfiguration implements Cloneable, JDOMExternalizable {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.settings.NodeRendererSettings");
+  private static final Logger LOG = Logger.getInstance(NodeRendererSettings.class);
 
   private static final int VERSION = 8;
 
diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/BreakpointManager.java b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/BreakpointManager.java
index e65ea35b04d0..a97a248a35e8 100644
--- a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/BreakpointManager.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/BreakpointManager.java
@@ -67,7 +67,7 @@ import java.util.Map;
 import java.util.function.Consumer;
 
 public class BreakpointManager {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.ui.breakpoints.BreakpointManager");
+  private static final Logger LOG = Logger.getInstance(BreakpointManager.class);
 
   @NonNls private static final String MASTER_BREAKPOINT_TAG_NAME = "master_breakpoint";
   @NonNls private static final String SLAVE_BREAKPOINT_TAG_NAME = "slave_breakpoint";
diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/BreakpointWithHighlighter.java b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/BreakpointWithHighlighter.java
index 1511e8422b58..347d0243c3e1 100644
--- a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/BreakpointWithHighlighter.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/BreakpointWithHighlighter.java
@@ -37,7 +37,7 @@ import org.jetbrains.java.debugger.breakpoints.properties.JavaBreakpointProperti
 import javax.swing.*;
 
 public abstract class BreakpointWithHighlighter<P extends JavaBreakpointProperties> extends Breakpoint<P> {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.ui.breakpoints.BreakpointWithHighlighter");
+  private static final Logger LOG = Logger.getInstance(BreakpointWithHighlighter.class);
 
   @Nullable
   private SourcePosition mySourcePosition;
diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/ExceptionBreakpoint.java b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/ExceptionBreakpoint.java
index 8bd2a737c7ae..3ac2c89d0451 100644
--- a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/ExceptionBreakpoint.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/ExceptionBreakpoint.java
@@ -40,7 +40,7 @@ import org.jetbrains.java.debugger.breakpoints.properties.JavaExceptionBreakpoin
 import javax.swing.*;
 
 public class ExceptionBreakpoint extends Breakpoint<JavaExceptionBreakpointProperties> {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.ui.breakpoints.ExceptionBreakpoint");
+  private static final Logger LOG = Logger.getInstance(ExceptionBreakpoint.class);
 
   protected final static String READ_NO_CLASS_NAME = DebuggerBundle.message("error.absent.exception.breakpoint.class.name");
   public static final @NonNls Key<ExceptionBreakpoint> CATEGORY = BreakpointCategory.lookup("exception_breakpoints");
diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/FieldBreakpoint.java b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/FieldBreakpoint.java
index b7cbf6f1c830..c1c55a5b5142 100644
--- a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/FieldBreakpoint.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/FieldBreakpoint.java
@@ -43,7 +43,7 @@ import org.jetbrains.java.debugger.breakpoints.properties.JavaFieldBreakpointPro
 import javax.swing.*;
 
 public class FieldBreakpoint extends BreakpointWithHighlighter<JavaFieldBreakpointProperties> {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.ui.breakpoints.FieldBreakpoint");
+  private static final Logger LOG = Logger.getInstance(FieldBreakpoint.class);
   private boolean myIsStatic;
 
   @NonNls public static final Key<FieldBreakpoint> CATEGORY = BreakpointCategory.lookup("field_breakpoints");
diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/MethodBreakpoint.java b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/MethodBreakpoint.java
index 848f7baa9e67..cf6f49962040 100644
--- a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/MethodBreakpoint.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/MethodBreakpoint.java
@@ -65,7 +65,7 @@ import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.BiConsumer;
 
 public class MethodBreakpoint extends BreakpointWithHighlighter<JavaMethodBreakpointProperties> implements MethodBreakpointBase {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.ui.breakpoints.MethodBreakpoint");
+  private static final Logger LOG = Logger.getInstance(MethodBreakpoint.class);
   @Nullable private JVMName mySignature;
   private boolean myIsStatic;
 
diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/StepIntoBreakpoint.java b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/StepIntoBreakpoint.java
index 24a984acb2ed..c9a089aa7b60 100644
--- a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/StepIntoBreakpoint.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/StepIntoBreakpoint.java
@@ -21,7 +21,7 @@ import java.util.List;
  * @author Eugene Zhuravlev
  */
 public class StepIntoBreakpoint extends RunToCursorBreakpoint {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.ui.breakpoints.StepIntoBreakpoint");
+  private static final Logger LOG = Logger.getInstance(StepIntoBreakpoint.class);
   @NotNull private final BreakpointStepMethodFilter myFilter;
   @Nullable private RequestHint myHint;
 
diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/WildcardMethodBreakpoint.java b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/WildcardMethodBreakpoint.java
index 0ac8ec62aadd..1d661cd46f21 100644
--- a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/WildcardMethodBreakpoint.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/WildcardMethodBreakpoint.java
@@ -53,7 +53,7 @@ import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
 
 public class WildcardMethodBreakpoint extends Breakpoint<JavaMethodBreakpointProperties> implements MethodBreakpointBase {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.ui.breakpoints.ExceptionBreakpoint");
+  private static final Logger LOG = Logger.getInstance(ExceptionBreakpoint.class);
 
   public WildcardMethodBreakpoint(Project project, XBreakpoint<JavaMethodBreakpointProperties> breakpoint) {
     super(project, breakpoint);
diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/impl/ThreadsDebuggerTree.java b/java/debugger/impl/src/com/intellij/debugger/ui/impl/ThreadsDebuggerTree.java
index a3e5d5f3a1cd..641368a7b146 100644
--- a/java/debugger/impl/src/com/intellij/debugger/ui/impl/ThreadsDebuggerTree.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/impl/ThreadsDebuggerTree.java
@@ -30,7 +30,7 @@ import java.util.Enumeration;
 import java.util.List;
 
 public class ThreadsDebuggerTree extends DebuggerTree {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.ui.impl.ThreadsDebuggerTree");
+  private static final Logger LOG = Logger.getInstance(ThreadsDebuggerTree.class);
 
   public ThreadsDebuggerTree(Project project) {
     super(project);
diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/DefaultNodeDescriptor.java b/java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/DefaultNodeDescriptor.java
index 99209f84e904..67176ee9c10b 100644
--- a/java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/DefaultNodeDescriptor.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/DefaultNodeDescriptor.java
@@ -25,7 +25,7 @@ import com.intellij.openapi.diagnostic.Logger;
 
 
 public final class DefaultNodeDescriptor extends NodeDescriptorImpl{
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.ui.impl.watch.DefaultNodeDescriptor");
+  private static final Logger LOG = Logger.getInstance(DefaultNodeDescriptor.class);
   public boolean equals(Object obj) {
     return obj instanceof DefaultNodeDescriptor;
   }
diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/NodeDescriptorFactoryImpl.java b/java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/NodeDescriptorFactoryImpl.java
index abb5b08c4fe7..deecf55354bb 100644
--- a/java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/NodeDescriptorFactoryImpl.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/NodeDescriptorFactoryImpl.java
@@ -35,7 +35,7 @@ import org.jetbrains.annotations.Nullable;
 import java.util.HashMap;
 
 public class NodeDescriptorFactoryImpl implements NodeDescriptorFactory {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.ui.impl.watch.NodeDescriptorFactoryImpl");
+  private static final Logger LOG = Logger.getInstance(NodeDescriptorFactoryImpl.class);
   private DescriptorTree myCurrentHistoryTree = new DescriptorTree(true);
 
   private DescriptorTreeSearcher myDescriptorSearcher;
diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/NodeDescriptorImpl.java b/java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/NodeDescriptorImpl.java
index 53b8cb64ecf9..4bd44fb5099f 100644
--- a/java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/NodeDescriptorImpl.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/NodeDescriptorImpl.java
@@ -20,7 +20,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 public abstract class NodeDescriptorImpl implements NodeDescriptor {
-  protected static final Logger LOG = Logger.getInstance("#com.intellij.debugger.ui.impl.watch.NodeDescriptorImpl");
+  protected static final Logger LOG = Logger.getInstance(NodeDescriptorImpl.class);
 
   public static final String UNKNOWN_VALUE_MESSAGE = "";
   public boolean myIsExpanded = false;
diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/ArrayRenderer.java b/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/ArrayRenderer.java
index 951bf6158d02..e4bde19f2be0 100644
--- a/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/ArrayRenderer.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/ArrayRenderer.java
@@ -55,7 +55,7 @@ import java.awt.event.MouseEvent;
 import java.util.Collections;
 
 public class ArrayRenderer extends NodeRendererImpl{
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.ui.tree.render.ArrayRenderer");
+  private static final Logger LOG = Logger.getInstance(ArrayRenderer.class);
 
   public static final @NonNls String UNIQUE_ID = "ArrayRenderer";
 
diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/BasicRendererProperties.java b/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/BasicRendererProperties.java
index 8c21a5a297d5..4cc0a9d9dc08 100644
--- a/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/BasicRendererProperties.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/BasicRendererProperties.java
@@ -9,7 +9,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 public final class BasicRendererProperties implements Cloneable {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.ui.tree.render.BasicRendererProperties");
+  private static final Logger LOG = Logger.getInstance(BasicRendererProperties.class);
 
   private static final @NonNls String NAME_OPTION = "NAME";
   private String myName;
diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/BatchEvaluator.java b/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/BatchEvaluator.java
index e9d9e53e9fb9..9af065c1c0d5 100644
--- a/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/BatchEvaluator.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/BatchEvaluator.java
@@ -21,7 +21,7 @@ import org.jetbrains.annotations.NotNull;
 import java.util.*;
 
 public class BatchEvaluator {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.ui.tree.render.BatchEvaluator");
+  private static final Logger LOG = Logger.getInstance(BatchEvaluator.class);
 
   private final DebugProcess myDebugProcess;
   private boolean myBatchEvaluatorChecked;
diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/ClassRenderer.java b/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/ClassRenderer.java
index 43b0bf165524..682a5d91cf2e 100644
--- a/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/ClassRenderer.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/ClassRenderer.java
@@ -35,7 +35,7 @@ import java.util.List;
 import java.util.Set;
 
 public class ClassRenderer extends NodeRendererImpl{
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.ui.tree.render.ClassRenderer");
+  private static final Logger LOG = Logger.getInstance(ClassRenderer.class);
 
   public static final @NonNls String UNIQUE_ID = "ClassRenderer";
 
diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/CompoundTypeRenderer.java b/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/CompoundTypeRenderer.java
index a18c756655c0..514fda24b94b 100644
--- a/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/CompoundTypeRenderer.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/CompoundTypeRenderer.java
@@ -24,7 +24,7 @@ import org.jetbrains.annotations.NotNull;
 
 public class CompoundTypeRenderer extends CompoundNodeRenderer {
   public static final @NonNls String UNIQUE_ID = "CompoundTypeRenderer";
-  protected static final Logger LOG = Logger.getInstance("#com.intellij.debugger.ui.tree.render.CompoundReferenceRenderer");
+  protected static final Logger LOG = Logger.getInstance(CompoundReferenceRenderer.class);
   private static final AutoToStringRenderer AUTO_TO_STRING_RENDERER = new AutoToStringRenderer();
 
   public CompoundTypeRenderer(NodeRendererSettings rendererSettings,
diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/HexRenderer.java b/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/HexRenderer.java
index 747c2df9462f..e2083a4a9f65 100644
--- a/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/HexRenderer.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/HexRenderer.java
@@ -11,7 +11,7 @@ import org.jetbrains.annotations.NotNull;
 
 public class HexRenderer extends NodeRendererImpl {
   public static final @NonNls String UNIQUE_ID = "HexRenderer";
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.ui.tree.render.HexRenderer");
+  private static final Logger LOG = Logger.getInstance(HexRenderer.class);
 
   public HexRenderer() {
     super(DEFAULT_NAME, false);
diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/TypeRenderer.java b/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/TypeRenderer.java
index b4a288604e4a..5947eb739d1b 100644
--- a/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/TypeRenderer.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/TypeRenderer.java
@@ -11,7 +11,7 @@ import org.jdom.Element;
 import org.jetbrains.annotations.NotNull;
 
 public abstract class TypeRenderer implements Renderer {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.ui.tree.render.ReferenceRenderer");
+  private static final Logger LOG = Logger.getInstance(ReferenceRenderer.class);
   protected BasicRendererProperties myProperties = new BasicRendererProperties(false);
 
   protected TypeRenderer() {
diff --git a/java/debugger/openapi/src/com/intellij/debugger/SourcePosition.java b/java/debugger/openapi/src/com/intellij/debugger/SourcePosition.java
index 0e79b279d79a..f50362f06952 100644
--- a/java/debugger/openapi/src/com/intellij/debugger/SourcePosition.java
+++ b/java/debugger/openapi/src/com/intellij/debugger/SourcePosition.java
@@ -24,7 +24,7 @@ import java.lang.ref.WeakReference;
 import java.util.List;
 
 public abstract class SourcePosition implements Navigatable{
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.SourcePosition");
+  private static final Logger LOG = Logger.getInstance(SourcePosition.class);
   @NotNull
   public abstract PsiFile getFile();
 
diff --git a/java/debugger/openapi/src/com/intellij/debugger/engine/DebuggerUtils.java b/java/debugger/openapi/src/com/intellij/debugger/engine/DebuggerUtils.java
index 45c27e165c0f..310f6d4e4dc9 100644
--- a/java/debugger/openapi/src/com/intellij/debugger/engine/DebuggerUtils.java
+++ b/java/debugger/openapi/src/com/intellij/debugger/engine/DebuggerUtils.java
@@ -41,7 +41,7 @@ import org.jetbrains.annotations.Nullable;
 import java.util.*;
 
 public abstract class DebuggerUtils {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.engine.DebuggerUtils");
+  private static final Logger LOG = Logger.getInstance(DebuggerUtils.class);
   private static final Key<Method> TO_STRING_METHOD_KEY = new Key<>("CachedToStringMethod");
   public static final Set<String> ourPrimitiveTypeNames = ContainerUtil.set(
     "byte", "short", "int", "long", "float", "double", "boolean", "char"
diff --git a/java/debugger/openapi/src/com/intellij/debugger/engine/JSR45PositionManager.java b/java/debugger/openapi/src/com/intellij/debugger/engine/JSR45PositionManager.java
index 1d1ac17644a7..af32147f1768 100644
--- a/java/debugger/openapi/src/com/intellij/debugger/engine/JSR45PositionManager.java
+++ b/java/debugger/openapi/src/com/intellij/debugger/engine/JSR45PositionManager.java
@@ -29,7 +29,7 @@ import java.util.regex.Pattern;
  * @author Eugene Zhuravlev
  */
 public abstract class JSR45PositionManager<Scope> implements PositionManager {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.engine.JSR45PositionManager");
+  private static final Logger LOG = Logger.getInstance(JSR45PositionManager.class);
   protected final DebugProcess      myDebugProcess;
   protected final Scope myScope;
   private final String myStratumId;
diff --git a/java/debugger/openapi/src/com/intellij/debugger/engine/evaluation/EvaluateException.java b/java/debugger/openapi/src/com/intellij/debugger/engine/evaluation/EvaluateException.java
index 43b402a9b893..fd9da3db6ccf 100644
--- a/java/debugger/openapi/src/com/intellij/debugger/engine/evaluation/EvaluateException.java
+++ b/java/debugger/openapi/src/com/intellij/debugger/engine/evaluation/EvaluateException.java
@@ -21,7 +21,7 @@ import com.sun.jdi.ObjectReference;
 import org.jetbrains.annotations.Nullable;
 
 public class EvaluateException extends Exception {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.engine.evaluation.EvaluateException");
+  private static final Logger LOG = Logger.getInstance(EvaluateException.class);
   private ObjectReference myTargetException;
 
   public EvaluateException(final String message) {
diff --git a/java/execution/impl/src/com/intellij/compiler/options/CompileStepBeforeRun.java b/java/execution/impl/src/com/intellij/compiler/options/CompileStepBeforeRun.java
index 5ae60a2362e9..2c888366df84 100644
--- a/java/execution/impl/src/com/intellij/compiler/options/CompileStepBeforeRun.java
+++ b/java/execution/impl/src/com/intellij/compiler/options/CompileStepBeforeRun.java
@@ -37,7 +37,7 @@ import javax.swing.*;
  * @author spleaner
  */
 public class CompileStepBeforeRun extends BeforeRunTaskProvider<CompileStepBeforeRun.MakeBeforeRunTask> {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.compiler.options.CompileStepBeforeRun");
+  private static final Logger LOG = Logger.getInstance(CompileStepBeforeRun.class);
   public static final Key<MakeBeforeRunTask> ID = Key.create("Make");
   /**
    * @deprecated to be removed in IDEA 2020.1
diff --git a/java/execution/impl/src/com/intellij/execution/filters/YourkitFilter.java b/java/execution/impl/src/com/intellij/execution/filters/YourkitFilter.java
index 8d57928a7789..eb01ebb0cfdf 100644
--- a/java/execution/impl/src/com/intellij/execution/filters/YourkitFilter.java
+++ b/java/execution/impl/src/com/intellij/execution/filters/YourkitFilter.java
@@ -35,7 +35,7 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 public class YourkitFilter implements Filter{
-  private static final Logger LOG = Logger.getInstance("#com.intellij.execution.filters.YourkitFilter");
+  private static final Logger LOG = Logger.getInstance(YourkitFilter.class);
 
   private final Project myProject;
 
diff --git a/java/execution/impl/src/com/intellij/execution/jshell/DropJShellStateAction.java b/java/execution/impl/src/com/intellij/execution/jshell/DropJShellStateAction.java
index 3abd553d76a9..e78509269097 100644
--- a/java/execution/impl/src/com/intellij/execution/jshell/DropJShellStateAction.java
+++ b/java/execution/impl/src/com/intellij/execution/jshell/DropJShellStateAction.java
@@ -14,7 +14,7 @@ import org.jetbrains.annotations.NotNull;
  * @author Eugene Zhuravlev
  */
 class DropJShellStateAction extends AnAction{
-  private static final Logger LOG = Logger.getInstance("#com.intellij.execution.jshell.ExecuteJShellAction");
+  private static final Logger LOG = Logger.getInstance(ExecuteJShellAction.class);
   private static final AnAction ourInstance = new DropJShellStateAction();
 
   private DropJShellStateAction() {
diff --git a/java/execution/impl/src/com/intellij/execution/jshell/JShellHandler.java b/java/execution/impl/src/com/intellij/execution/jshell/JShellHandler.java
index 820b796b7834..b2bbab2a0b5d 100644
--- a/java/execution/impl/src/com/intellij/execution/jshell/JShellHandler.java
+++ b/java/execution/impl/src/com/intellij/execution/jshell/JShellHandler.java
@@ -56,7 +56,7 @@ import java.util.concurrent.atomic.AtomicReference;
  * @author Eugene Zhuravlev
  */
 public class JShellHandler {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.execution.jshell.JShellHandler");
+  private static final Logger LOG = Logger.getInstance(JShellHandler.class);
   private static final int DEBUG_PORT = -1;
   public static final Key<JShellHandler> MARKER_KEY = Key.create("JShell console key");
   private static final Charset ourCharset = StandardCharsets.UTF_8;
diff --git a/java/execution/impl/src/com/intellij/execution/junit2/info/MethodLocation.java b/java/execution/impl/src/com/intellij/execution/junit2/info/MethodLocation.java
index bd554f544962..901a33e510b1 100644
--- a/java/execution/impl/src/com/intellij/execution/junit2/info/MethodLocation.java
+++ b/java/execution/impl/src/com/intellij/execution/junit2/info/MethodLocation.java
@@ -31,7 +31,7 @@ import java.util.Iterator;
 // Author: dyoma
 
 public class MethodLocation extends Location<PsiMethod> {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.execution.junit2.info.MethodLocation");
+  private static final Logger LOG = Logger.getInstance(MethodLocation.class);
   private final Project myProject;
   @NotNull private final PsiMethod myMethod;
   private final Location<? extends PsiClass> myClassLocation;
diff --git a/java/execution/impl/src/com/intellij/execution/testframework/ResetConfigurationModuleAdapter.java b/java/execution/impl/src/com/intellij/execution/testframework/ResetConfigurationModuleAdapter.java
index dd95942b4b64..9aa57e2af31a 100644
--- a/java/execution/impl/src/com/intellij/execution/testframework/ResetConfigurationModuleAdapter.java
+++ b/java/execution/impl/src/com/intellij/execution/testframework/ResetConfigurationModuleAdapter.java
@@ -33,7 +33,7 @@ import java.util.HashSet;
 import java.util.Set;
 
 public class ResetConfigurationModuleAdapter extends HyperlinkAdapter {
-  private static final Logger LOG = Logger.getInstance("#" + ResetConfigurationModuleAdapter.class);
+  private static final Logger LOG = Logger.getInstance(ResetConfigurationModuleAdapter.class);
   private final Project myProject;
   private final boolean myIsDebug;
   private final ToolWindowManager myToolWindowManager;
diff --git a/java/idea-ui/src/com/intellij/facet/impl/ProjectFacetsConfigurator.java b/java/idea-ui/src/com/intellij/facet/impl/ProjectFacetsConfigurator.java
index 074b460fdc92..855341fca90a 100644
--- a/java/idea-ui/src/com/intellij/facet/impl/ProjectFacetsConfigurator.java
+++ b/java/idea-ui/src/com/intellij/facet/impl/ProjectFacetsConfigurator.java
@@ -43,7 +43,7 @@ import java.util.*;
  * @author nik
  */
 public class ProjectFacetsConfigurator implements FacetsProvider {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.facet.impl.ProjectFacetsConfigurator");
+  private static final Logger LOG = Logger.getInstance(ProjectFacetsConfigurator.class);
   private final Map<Module, ModifiableFacetModel> myModifiableModels = new HashMap<>();
   private final Map<Facet, FacetEditorImpl> myEditors = new LinkedHashMap<>();
   private final Map<Module, FacetTreeModel> myTreeModels = new HashMap<>();
diff --git a/java/idea-ui/src/com/intellij/facet/impl/ui/FacetTreeModel.java b/java/idea-ui/src/com/intellij/facet/impl/ui/FacetTreeModel.java
index 072f3e1527b5..9bf26a428301 100644
--- a/java/idea-ui/src/com/intellij/facet/impl/ui/FacetTreeModel.java
+++ b/java/idea-ui/src/com/intellij/facet/impl/ui/FacetTreeModel.java
@@ -33,7 +33,7 @@ import java.util.List;
  * @author nik
  */
 public class FacetTreeModel {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.facet.impl.ui.FacetTreeModel");
+  private static final Logger LOG = Logger.getInstance(FacetTreeModel.class);
   private static final FacetInfo ROOT = new FacetInfo(null, "", null, null);
   private final List<FacetInfo> myFacetInfos = new ArrayList<>();
   private final BidirectionalMap<FacetInfo, FacetInfo> myParents = new BidirectionalMap<>();
diff --git a/java/idea-ui/src/com/intellij/facet/impl/ui/actions/AddFacetToModuleAction.java b/java/idea-ui/src/com/intellij/facet/impl/ui/actions/AddFacetToModuleAction.java
index 1dc4e32b673e..4378077f351b 100644
--- a/java/idea-ui/src/com/intellij/facet/impl/ui/actions/AddFacetToModuleAction.java
+++ b/java/idea-ui/src/com/intellij/facet/impl/ui/actions/AddFacetToModuleAction.java
@@ -26,7 +26,7 @@ import java.util.TreeMap;
  * @author nik
 */
 public class AddFacetToModuleAction extends AnAction implements DumbAware {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.facet.impl.ui.actions.AddFacetToModuleAction");
+  private static final Logger LOG = Logger.getInstance(AddFacetToModuleAction.class);
   private final FacetEditorFacade myEditor;
   private final Project myProject;
   private final FacetType myType;
diff --git a/java/idea-ui/src/com/intellij/facet/impl/ui/libraries/DownloadingOptionsDialog.java b/java/idea-ui/src/com/intellij/facet/impl/ui/libraries/DownloadingOptionsDialog.java
index b81c609a03af..a78c020d187a 100644
--- a/java/idea-ui/src/com/intellij/facet/impl/ui/libraries/DownloadingOptionsDialog.java
+++ b/java/idea-ui/src/com/intellij/facet/impl/ui/libraries/DownloadingOptionsDialog.java
@@ -49,7 +49,7 @@ import java.util.List;
  * @author Dmitry Avdeev
  */
 public class DownloadingOptionsDialog extends DialogWrapper {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.facet.impl.ui.libraries.DownloadingOptionsDialog");
+  private static final Logger LOG = Logger.getInstance(DownloadingOptionsDialog.class);
 
   private enum AdditionalDownloadType {SOURCES, DOCUMENTATION}
 
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 abff68c33736..17d52c787a50 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
@@ -57,7 +57,7 @@ import java.util.List;
  * @author Dmitry Avdeev
  */
 public class LibraryOptionsPanel implements Disposable {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.facet.impl.ui.libraries.LibraryOptionsPanel");
+  private static final Logger LOG = Logger.getInstance(LibraryOptionsPanel.class);
 
   private JBLabel myMessageLabel;
   private JPanel myPanel;
diff --git a/java/idea-ui/src/com/intellij/framework/addSupport/impl/AddFrameworkSupportInProjectStructureAction.java b/java/idea-ui/src/com/intellij/framework/addSupport/impl/AddFrameworkSupportInProjectStructureAction.java
index c572744d3d7e..9f425f0cccab 100644
--- a/java/idea-ui/src/com/intellij/framework/addSupport/impl/AddFrameworkSupportInProjectStructureAction.java
+++ b/java/idea-ui/src/com/intellij/framework/addSupport/impl/AddFrameworkSupportInProjectStructureAction.java
@@ -36,7 +36,7 @@ import org.jetbrains.annotations.Nullable;
  * @author nik
  */
 public class AddFrameworkSupportInProjectStructureAction extends DumbAwareAction {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.framework.addSupport.impl.AddFrameworkSupportInProjectStructureAction");
+  private static final Logger LOG = Logger.getInstance(AddFrameworkSupportInProjectStructureAction.class);
   private final FrameworkTypeEx myFrameworkType;
   private final FrameworkSupportInModuleProvider myProvider;
   @NotNull private final ModuleStructureConfigurable myModuleStructureConfigurable;
diff --git a/java/idea-ui/src/com/intellij/framework/library/impl/DownloadableLibraryServiceImpl.java b/java/idea-ui/src/com/intellij/framework/library/impl/DownloadableLibraryServiceImpl.java
index 8bd2450788f2..07fd77e2a402 100644
--- a/java/idea-ui/src/com/intellij/framework/library/impl/DownloadableLibraryServiceImpl.java
+++ b/java/idea-ui/src/com/intellij/framework/library/impl/DownloadableLibraryServiceImpl.java
@@ -39,7 +39,7 @@ import java.net.URL;
  * @author nik
  */
 public class DownloadableLibraryServiceImpl extends DownloadableLibraryService {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.framework.library.impl.DownloadableLibraryServiceImpl");
+  private static final Logger LOG = Logger.getInstance(DownloadableLibraryServiceImpl.class);
 
   @NotNull
   @Override
diff --git a/java/idea-ui/src/com/intellij/ide/util/frameworkSupport/FrameworkSupportUtil.java b/java/idea-ui/src/com/intellij/ide/util/frameworkSupport/FrameworkSupportUtil.java
index 7828f7bf9fc4..9eee8e6bab98 100644
--- a/java/idea-ui/src/com/intellij/ide/util/frameworkSupport/FrameworkSupportUtil.java
+++ b/java/idea-ui/src/com/intellij/ide/util/frameworkSupport/FrameworkSupportUtil.java
@@ -24,7 +24,7 @@ import java.util.*;
  * @author nik
  */
 public class FrameworkSupportUtil {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.ide.util.frameworkSupport.FrameworkSupportUtil");
+  private static final Logger LOG = Logger.getInstance(FrameworkSupportUtil.class);
 
   private FrameworkSupportUtil() {
   }
diff --git a/java/idea-ui/src/com/intellij/ide/util/importProject/FacetBasedDetectedFrameworkDescriptionInWizard.java b/java/idea-ui/src/com/intellij/ide/util/importProject/FacetBasedDetectedFrameworkDescriptionInWizard.java
index 2d6f6ff67bc4..3ebf54eb31a1 100644
--- a/java/idea-ui/src/com/intellij/ide/util/importProject/FacetBasedDetectedFrameworkDescriptionInWizard.java
+++ b/java/idea-ui/src/com/intellij/ide/util/importProject/FacetBasedDetectedFrameworkDescriptionInWizard.java
@@ -21,7 +21,7 @@ import java.util.Set;
  * @author nik
  */
 public class FacetBasedDetectedFrameworkDescriptionInWizard<F extends Facet, C extends FacetConfiguration> extends FacetBasedDetectedFrameworkDescription<F, C> {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.ide.util.importProject.FacetBasedDetectedFrameworkDescriptionInWizard");
+  private static final Logger LOG = Logger.getInstance(FacetBasedDetectedFrameworkDescriptionInWizard.class);
   private final ModuleDescriptor myModuleDescriptor;
 
   public FacetBasedDetectedFrameworkDescriptionInWizard(@NotNull ModuleDescriptor moduleDescriptor,
diff --git a/java/idea-ui/src/com/intellij/ide/util/importProject/ModuleInsight.java b/java/idea-ui/src/com/intellij/ide/util/importProject/ModuleInsight.java
index 14e31698ac51..b183086d4c38 100644
--- a/java/idea-ui/src/com/intellij/ide/util/importProject/ModuleInsight.java
+++ b/java/idea-ui/src/com/intellij/ide/util/importProject/ModuleInsight.java
@@ -28,7 +28,7 @@ import java.util.function.Predicate;
  * @author Eugene Zhuravlev
  */
 public abstract class ModuleInsight {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.ide.util.importProject.ModuleInsight");
+  private static final Logger LOG = Logger.getInstance(ModuleInsight.class);
   @NotNull protected final ProgressIndicatorWrapper myProgress;
 
   private final Set<File> myEntryPointRoots = new HashSet<>();
diff --git a/java/idea-ui/src/com/intellij/ide/util/importProject/RootDetectionProcessor.java b/java/idea-ui/src/com/intellij/ide/util/importProject/RootDetectionProcessor.java
index ee27dd0e89bd..3e1250f35fc3 100644
--- a/java/idea-ui/src/com/intellij/ide/util/importProject/RootDetectionProcessor.java
+++ b/java/idea-ui/src/com/intellij/ide/util/importProject/RootDetectionProcessor.java
@@ -29,7 +29,7 @@ import java.util.*;
  * @author nik
  */
 public class RootDetectionProcessor {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.ide.util.importProject.RootDetectionProcessor");
+  private static final Logger LOG = Logger.getInstance(RootDetectionProcessor.class);
   private final File myBaseDir;
   private final ProjectStructureDetector[] myDetectors;
   private final List<DetectedProjectRoot>[] myDetectedRoots;
diff --git a/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/SourcePathsStep.java b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/SourcePathsStep.java
index 9fc3a55c0023..616d1c84f938 100644
--- a/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/SourcePathsStep.java
+++ b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/SourcePathsStep.java
@@ -49,7 +49,7 @@ import java.util.List;
  */
 public class SourcePathsStep extends AbstractStepWithProgress<List<JavaModuleSourceRoot>> {
 
-  private static final Logger LOG = Logger.getInstance("#com.intellij.ide.util.newProjectWizard.SourcePathsStep");
+  private static final Logger LOG = Logger.getInstance(SourcePathsStep.class);
 
   private String myCurrentMode;
   @NonNls private static final String CREATE_SOURCE_PANEL = "create_source";
diff --git a/java/idea-ui/src/com/intellij/ide/util/projectWizard/importSources/impl/ProjectFromSourcesBuilderImpl.java b/java/idea-ui/src/com/intellij/ide/util/projectWizard/importSources/impl/ProjectFromSourcesBuilderImpl.java
index eb9483e638d7..cb5553d65b68 100644
--- a/java/idea-ui/src/com/intellij/ide/util/projectWizard/importSources/impl/ProjectFromSourcesBuilderImpl.java
+++ b/java/idea-ui/src/com/intellij/ide/util/projectWizard/importSources/impl/ProjectFromSourcesBuilderImpl.java
@@ -48,7 +48,7 @@ import java.util.*;
  * @author Eugene Zhuravlev
  */
 public class ProjectFromSourcesBuilderImpl extends ProjectImportBuilder implements ProjectFromSourcesBuilder {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.ide.util.projectWizard.importSources.impl.ProjectFromSourcesBuilderImpl");
+  private static final Logger LOG = Logger.getInstance(ProjectFromSourcesBuilderImpl.class);
   private static final String NAME = "Existing Sources";
   private String myBaseProjectPath;
   private final List<ProjectConfigurationUpdater> myUpdaters = new ArrayList<>();
diff --git a/java/idea-ui/src/com/intellij/jarRepository/JarRepositoryManager.java b/java/idea-ui/src/com/intellij/jarRepository/JarRepositoryManager.java
index 033c3346dbfb..435229236b6c 100644
--- a/java/idea-ui/src/com/intellij/jarRepository/JarRepositoryManager.java
+++ b/java/idea-ui/src/com/intellij/jarRepository/JarRepositoryManager.java
@@ -60,7 +60,7 @@ import java.util.function.Consumer;
 import java.util.function.Function;
 
 public class JarRepositoryManager {
-  private static final Logger LOG = Logger.getInstance("#org.jetbrains.idea.maven.utils.library.RepositoryAttachHandler");
+  private static final Logger LOG = Logger.getInstance(JarRepositoryManager.class);
 
   private static final String MAVEN_REPOSITORY_MACRO = "$MAVEN_REPOSITORY$";
   private static final String DEFAULT_REPOSITORY_PATH = ".m2/repository";
diff --git a/java/idea-ui/src/com/intellij/openapi/projectRoots/ui/SdkEditor.java b/java/idea-ui/src/com/intellij/openapi/projectRoots/ui/SdkEditor.java
index 9c7fb40323d5..a3b229bed580 100644
--- a/java/idea-ui/src/com/intellij/openapi/projectRoots/ui/SdkEditor.java
+++ b/java/idea-ui/src/com/intellij/openapi/projectRoots/ui/SdkEditor.java
@@ -42,7 +42,7 @@ import java.util.List;
  * @author MYakovlev
  */
 public class SdkEditor implements Configurable, Place.Navigator {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.projectRoots.ui.SdkEditor");
+  private static final Logger LOG = Logger.getInstance(SdkEditor.class);
   private static final String SDK_TAB = "sdkTab";
 
   private Sdk mySdk;
diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ProjectStructureConfigurable.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ProjectStructureConfigurable.java
index 8c1bd590c79b..949775fed8d3 100644
--- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ProjectStructureConfigurable.java
+++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ProjectStructureConfigurable.java
@@ -56,7 +56,7 @@ import static com.intellij.openapi.roots.ui.configuration.ProjectStructureConfig
 
 public class ProjectStructureConfigurable implements SearchableConfigurable, Place.Navigator,
                                                                               Configurable.NoMargin, Configurable.NoScroll {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.roots.ui.configuration.ProjectStructureConfigurable");
+  private static final Logger LOG = Logger.getInstance(ProjectStructureConfigurable.class);
 
   public static final DataKey<ProjectStructureConfigurable> KEY = DataKey.create("ProjectStructureConfiguration");
 
diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/LayoutTree.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/LayoutTree.java
index c6b6bdcb380f..7d9b5d448945 100644
--- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/LayoutTree.java
+++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/LayoutTree.java
@@ -53,7 +53,7 @@ import java.util.function.Predicate;
 * @author nik
 */
 public class LayoutTree extends SimpleDnDAwareTree implements AdvancedDnDSource {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.roots.ui.configuration.artifacts.LayoutTree");
+  private static final Logger LOG = Logger.getInstance(LayoutTree.class);
   private final ArtifactEditorImpl myArtifactsEditor;
   private final StructureTreeModel<?> myTreeModel;
 
diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ManifestFilesInfo.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ManifestFilesInfo.java
index d822f8467a80..3544a89bf8c4 100644
--- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ManifestFilesInfo.java
+++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ManifestFilesInfo.java
@@ -31,7 +31,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 public class ManifestFilesInfo {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.roots.ui.configuration.artifacts.ManifestFilesInfo");
+  private static final Logger LOG = Logger.getInstance(ManifestFilesInfo.class);
   private final Map<VirtualFile, ManifestFileConfiguration> myManifestFiles = new HashMap<>();
   private final Map<VirtualFile, ManifestFileConfiguration> myOriginalManifestFiles = new HashMap<>();
 
diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/classpath/ChangeLibraryLevelActionBase.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/classpath/ChangeLibraryLevelActionBase.java
index 5810ff785d27..126806054566 100644
--- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/classpath/ChangeLibraryLevelActionBase.java
+++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/classpath/ChangeLibraryLevelActionBase.java
@@ -42,7 +42,7 @@ import java.util.Set;
  * @author nik
  */
 public abstract class ChangeLibraryLevelActionBase extends AnAction {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.roots.ui.configuration.classpath.ChangeLibraryLevelActionBase");
+  private static final Logger LOG = Logger.getInstance(ChangeLibraryLevelActionBase.class);
   protected final Project myProject;
   protected final String myTargetTableLevel;
   protected final boolean myCopy;
diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/classpath/ClasspathPanelImpl.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/classpath/ClasspathPanelImpl.java
index d63727b51c79..9aee8dcfe098 100644
--- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/classpath/ClasspathPanelImpl.java
+++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/classpath/ClasspathPanelImpl.java
@@ -65,7 +65,7 @@ import java.util.*;
 import static com.intellij.openapi.wm.IdeFocusManager.getGlobalInstance;
 
 public class ClasspathPanelImpl extends JPanel implements ClasspathPanel {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.roots.ui.configuration.classpath.ClasspathPanelImpl");
+  private static final Logger LOG = Logger.getInstance(ClasspathPanelImpl.class);
   private final JBTable myEntryTable;
   private final ClasspathTableModel myModel;
   private final EventDispatcher<OrderPanelListener> myListeners = EventDispatcher.create(OrderPanelListener.class);
diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraries/LibraryEditingUtil.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraries/LibraryEditingUtil.java
index 6e9d2f892322..5e61ecd682d1 100644
--- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraries/LibraryEditingUtil.java
+++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraries/LibraryEditingUtil.java
@@ -50,7 +50,7 @@ import java.util.*;
  * @author nik
  */
 public class LibraryEditingUtil {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.roots.ui.configuration.libraries.LibraryEditingUtil");
+  private static final Logger LOG = Logger.getInstance(LibraryEditingUtil.class);
 
   private LibraryEditingUtil() {
   }
diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ChangeLibraryLevelAction.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ChangeLibraryLevelAction.java
index 532e89caa85e..dd31b8327af6 100644
--- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ChangeLibraryLevelAction.java
+++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ChangeLibraryLevelAction.java
@@ -35,7 +35,7 @@ import java.util.Collection;
  * @author nik
  */
 public class ChangeLibraryLevelAction extends ChangeLibraryLevelActionBase {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.roots.ui.configuration.projectRoot.ChangeLibraryLevelAction");
+  private static final Logger LOG = Logger.getInstance(ChangeLibraryLevelAction.class);
   private final JComponent myParentComponent;
   private final BaseLibrariesConfigurable mySourceConfigurable;
   private final BaseLibrariesConfigurable myTargetConfigurable;
diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/FacetEditorFacadeImpl.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/FacetEditorFacadeImpl.java
index 0a02d40c8071..9508b8a782ff 100644
--- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/FacetEditorFacadeImpl.java
+++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/FacetEditorFacadeImpl.java
@@ -34,7 +34,7 @@ import java.util.*;
  * @author nik
  */
 public class FacetEditorFacadeImpl implements FacetEditorFacade {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.roots.ui.configuration.projectRoot.FacetEditorFacadeImpl");
+  private static final Logger LOG = Logger.getInstance(FacetEditorFacadeImpl.class);
   private final ModuleStructureConfigurable myStructureConfigurable;
   private final Runnable myTreeUpdater;
   private final Map<Facet, MasterDetailsComponent.MyNode> myNodes = new HashMap<>();
diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/LibrariesContainerFactory.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/LibrariesContainerFactory.java
index f8550827260b..28a36b01121c 100644
--- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/LibrariesContainerFactory.java
+++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/LibrariesContainerFactory.java
@@ -52,7 +52,7 @@ import java.util.List;
  * @author nik
  */
 public class LibrariesContainerFactory {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.roots.ui.configuration.projectRoot.LibrariesContainerFactory");
+  private static final Logger LOG = Logger.getInstance(LibrariesContainerFactory.class);
   private static final Library[] EMPTY_LIBRARIES_ARRAY = Library.EMPTY_ARRAY;
 
   private LibrariesContainerFactory() {
diff --git a/java/idea-ui/src/com/intellij/util/descriptors/impl/ConfigFileFactoryImpl.java b/java/idea-ui/src/com/intellij/util/descriptors/impl/ConfigFileFactoryImpl.java
index f9c66f11f331..eaec4b5ba3a5 100644
--- a/java/idea-ui/src/com/intellij/util/descriptors/impl/ConfigFileFactoryImpl.java
+++ b/java/idea-ui/src/com/intellij/util/descriptors/impl/ConfigFileFactoryImpl.java
@@ -38,7 +38,7 @@ import java.io.IOException;
  * @author nik
  */
 public class ConfigFileFactoryImpl extends ConfigFileFactory {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.util.descriptors.impl.ConfigFileFactoryImpl");
+  private static final Logger LOG = Logger.getInstance(ConfigFileFactoryImpl.class);
 
   @Override
   public ConfigFileMetaDataProvider createMetaDataProvider(final ConfigFileMetaData... metaData) {
diff --git a/java/idea-ui/src/com/intellij/util/descriptors/impl/ConfigFileInfoSetImpl.java b/java/idea-ui/src/com/intellij/util/descriptors/impl/ConfigFileInfoSetImpl.java
index 84b26a6c2f3e..27af9d81fffe 100644
--- a/java/idea-ui/src/com/intellij/util/descriptors/impl/ConfigFileInfoSetImpl.java
+++ b/java/idea-ui/src/com/intellij/util/descriptors/impl/ConfigFileInfoSetImpl.java
@@ -35,7 +35,7 @@ import java.util.TreeSet;
  * @author nik
  */
 public class ConfigFileInfoSetImpl implements ConfigFileInfoSet {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.util.descriptors.impl.ConfigFileInfoSetImpl");
+  private static final Logger LOG = Logger.getInstance(ConfigFileInfoSetImpl.class);
   @NonNls private static final String ELEMENT_NAME = "deploymentDescriptor";
   @NonNls private static final String ID_ATTRIBUTE = "name";
   @NonNls private static final String URL_ATTRIBUTE = "url";
diff --git a/java/idea-ui/src/org/jetbrains/idea/maven/utils/library/RepositoryUtils.java b/java/idea-ui/src/org/jetbrains/idea/maven/utils/library/RepositoryUtils.java
index f47dc399e683..2a616bc1a20c 100644
--- a/java/idea-ui/src/org/jetbrains/idea/maven/utils/library/RepositoryUtils.java
+++ b/java/idea-ui/src/org/jetbrains/idea/maven/utils/library/RepositoryUtils.java
@@ -34,7 +34,7 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 public class RepositoryUtils {
-  private static final Logger LOG = Logger.getInstance("#org.jetbrains.idea.maven.utils.library.RepositoryUtils");
+  private static final Logger LOG = Logger.getInstance(RepositoryUtils.class);
 
   public static boolean libraryHasSources(@Nullable Library library) {
     return library != null && library.getUrls(OrderRootType.SOURCES).length > 0;
diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/RemoveSuppressWarningAction.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/RemoveSuppressWarningAction.java
index d577e909337b..43df8ecdf40e 100644
--- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/RemoveSuppressWarningAction.java
+++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/RemoveSuppressWarningAction.java
@@ -39,7 +39,7 @@ import java.util.List;
 import java.util.Set;
 
 public class RemoveSuppressWarningAction implements LocalQuickFix {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.daemon.impl.RemoveSuppressWarningAction");
+  private static final Logger LOG = Logger.getInstance(RemoveSuppressWarningAction.class);
 
   @NotNull
   private final String myID;
diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/GenericsHighlightUtil.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/GenericsHighlightUtil.java
index 2463e544f48f..d3506515da0a 100644
--- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/GenericsHighlightUtil.java
+++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/GenericsHighlightUtil.java
@@ -42,7 +42,7 @@ import java.util.*;
  * @author cdr
  */
 public class GenericsHighlightUtil {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.daemon.impl.analysis.GenericsHighlightUtil");
+  private static final Logger LOG = Logger.getInstance(GenericsHighlightUtil.class);
 
   private static final QuickFixFactory QUICK_FIX_FACTORY = QuickFixFactory.getInstance();
 
diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightFixUtil.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightFixUtil.java
index b167137863e2..8006d070a89d 100644
--- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightFixUtil.java
+++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightFixUtil.java
@@ -33,7 +33,7 @@ import java.util.Collections;
 import java.util.List;
 
 public class HighlightFixUtil {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.daemon.impl.analysis.HighlightFixUtil");
+  private static final Logger LOG = Logger.getInstance(HighlightFixUtil.class);
 
   private static final QuickFixFactory QUICK_FIX_FACTORY = QuickFixFactory.getInstance();
 
diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java
index 9b32a1e9b8b9..67de4be9f232 100644
--- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java
+++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java
@@ -69,7 +69,7 @@ import java.util.regex.Pattern;
 import java.util.stream.Stream;
 
 public class HighlightUtil extends HighlightUtilBase {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.daemon.impl.analysis.HighlightUtil");
+  private static final Logger LOG = Logger.getInstance(HighlightUtil.class);
 
   private static final QuickFixFactory QUICK_FIX_FACTORY = QuickFixFactory.getInstance();
 
diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddTypeArgumentsFix.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddTypeArgumentsFix.java
index 8e3530f8c2ff..a032fa74a3bf 100644
--- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddTypeArgumentsFix.java
+++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddTypeArgumentsFix.java
@@ -29,7 +29,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 public class AddTypeArgumentsFix extends MethodArgumentFix {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.daemon.impl.quickfix.AddTypeArgumentsFix");
+  private static final Logger LOG = Logger.getInstance(AddTypeArgumentsFix.class);
 
   private AddTypeArgumentsFix(PsiExpressionList list, int i, PsiType toType, final ArgumentFixerActionFactory factory) {
     super(list, i, toType, factory);
diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ArgumentFixerActionFactory.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ArgumentFixerActionFactory.java
index f0693728053f..1e31ec061ab2 100644
--- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ArgumentFixerActionFactory.java
+++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ArgumentFixerActionFactory.java
@@ -38,7 +38,7 @@ import java.util.Set;
  * @author ven
  */
 public abstract class ArgumentFixerActionFactory {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.daemon.impl.quickfix.ArgumentFixerActionFactory");
+  private static final Logger LOG = Logger.getInstance(ArgumentFixerActionFactory.class);
 
   @Nullable
   protected abstract PsiExpression getModifiedArgument(PsiExpression expression, final PsiType toType) throws IncorrectOperationException;
diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ExtendsListFix.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ExtendsListFix.java
index e5921fb01464..c81f0f2ead51 100644
--- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ExtendsListFix.java
+++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ExtendsListFix.java
@@ -31,7 +31,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 public class ExtendsListFix extends LocalQuickFixAndIntentionActionOnPsiElement {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.daemon.impl.quickfix.ExtendsListFix");
+  private static final Logger LOG = Logger.getInstance(ExtendsListFix.class);
 
   @Nullable
   protected final SmartPsiElementPointer<PsiClass> myClassToExtendFromPointer;
diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/guess/impl/ExpressionTypeMemoryState.java b/java/java-analysis-impl/src/com/intellij/codeInsight/guess/impl/ExpressionTypeMemoryState.java
index d499bfc20881..d904477033c8 100644
--- a/java/java-analysis-impl/src/com/intellij/codeInsight/guess/impl/ExpressionTypeMemoryState.java
+++ b/java/java-analysis-impl/src/com/intellij/codeInsight/guess/impl/ExpressionTypeMemoryState.java
@@ -38,7 +38,7 @@ import java.util.Objects;
  * @author peter
  */
 public class ExpressionTypeMemoryState extends DfaMemoryStateImpl {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.guess.impl.ExpressionTypeMemoryState");
+  private static final Logger LOG = Logger.getInstance(ExpressionTypeMemoryState.class);
   public static final TObjectHashingStrategy<PsiExpression> EXPRESSION_HASHING_STRATEGY = new TObjectHashingStrategy<PsiExpression>() {
     @Override
     public int computeHashCode(PsiExpression object) {
diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/AbstractDependencyVisitor.java b/java/java-analysis-impl/src/com/intellij/codeInspection/AbstractDependencyVisitor.java
index 7ee52f656e5b..7fc279739e39 100644
--- a/java/java-analysis-impl/src/com/intellij/codeInspection/AbstractDependencyVisitor.java
+++ b/java/java-analysis-impl/src/com/intellij/codeInspection/AbstractDependencyVisitor.java
@@ -29,7 +29,7 @@ import java.util.Map;
  */
 public abstract class AbstractDependencyVisitor extends ClassVisitor {
 
-  private static final Logger LOG = Logger.getInstance("#com.intellij.dsm.model.classes.DependencyVisitor");
+  private static final Logger LOG = Logger.getInstance(AbstractDependencyVisitor.class);
   private static final Label LABEL = new Label();
 
   private final AnnotationDependencyVisitor myAnnotationVisitor = new AnnotationDependencyVisitor();
diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/canBeFinal/CanBeFinalInspection.java b/java/java-analysis-impl/src/com/intellij/codeInspection/canBeFinal/CanBeFinalInspection.java
index e2cc75f5784b..e3eb4a51e06a 100644
--- a/java/java-analysis-impl/src/com/intellij/codeInspection/canBeFinal/CanBeFinalInspection.java
+++ b/java/java-analysis-impl/src/com/intellij/codeInspection/canBeFinal/CanBeFinalInspection.java
@@ -35,7 +35,7 @@ import javax.swing.*;
 import java.awt.*;
 
 public class CanBeFinalInspection extends GlobalJavaBatchInspectionTool {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInspection.canBeFinal.CanBeFinalInspection");
+  private static final Logger LOG = Logger.getInstance(CanBeFinalInspection.class);
 
   public boolean REPORT_CLASSES;
   public boolean REPORT_METHODS;
diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/ControlFlowAnalyzer.java b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/ControlFlowAnalyzer.java
index 31f811cbc897..ee16304fbf51 100644
--- a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/ControlFlowAnalyzer.java
+++ b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/ControlFlowAnalyzer.java
@@ -39,7 +39,7 @@ import java.util.*;
 import static com.intellij.psi.CommonClassNames.*;
 
 public class ControlFlowAnalyzer extends JavaElementVisitor {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInspection.dataFlow.ControlFlowAnalyzer");
+  private static final Logger LOG = Logger.getInstance(ControlFlowAnalyzer.class);
   private static final CallMatcher LIST_INITIALIZER = CallMatcher.anyOf(
     CallMatcher.staticCall(JAVA_UTIL_ARRAYS, "asList"),
     CallMatcher.staticCall(JAVA_UTIL_LIST, "of"));
diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/DataFlowInspectionBase.java b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/DataFlowInspectionBase.java
index e6e7d530f2b0..0d43785eda01 100644
--- a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/DataFlowInspectionBase.java
+++ b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/DataFlowInspectionBase.java
@@ -47,7 +47,7 @@ import java.util.*;
 import static com.intellij.util.ObjectUtils.tryCast;
 
 public abstract class DataFlowInspectionBase extends AbstractBaseJavaLocalInspectionTool {
-  static final Logger LOG = Logger.getInstance("#com.intellij.codeInspection.dataFlow.DataFlowInspection");
+  static final Logger LOG = Logger.getInstance(DataFlowInspectionBase.class);
   @NonNls private static final String SHORT_NAME = "ConstantConditions";
   public boolean SUGGEST_NULLABLE_ANNOTATIONS;
   public boolean DONT_REPORT_TRUE_ASSERT_STATEMENTS;
diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/DataFlowInstructionVisitor.java b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/DataFlowInstructionVisitor.java
index 7b45e68075a6..822c7c8fc73d 100644
--- a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/DataFlowInstructionVisitor.java
+++ b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/DataFlowInstructionVisitor.java
@@ -33,7 +33,7 @@ import java.util.stream.Stream;
 import static com.intellij.util.ObjectUtils.tryCast;
 
 final class DataFlowInstructionVisitor extends StandardInstructionVisitor {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInspection.dataFlow.DataFlowInstructionVisitor");
+  private static final Logger LOG = Logger.getInstance(DataFlowInstructionVisitor.class);
   private final Map<NullabilityProblemKind.NullabilityProblem<?>, StateInfo> myStateInfos = new LinkedHashMap<>();
   private final Map<PsiTypeCastExpression, StateInfo> myClassCastProblems = new HashMap<>();
   private final Map<PsiTypeCastExpression, TypeConstraint> myRealOperandTypes = new HashMap<>();
diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/DataFlowRunner.java b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/DataFlowRunner.java
index ec7e828bdb02..259255f9335b 100644
--- a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/DataFlowRunner.java
+++ b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/DataFlowRunner.java
@@ -40,7 +40,7 @@ import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 
 public class DataFlowRunner {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInspection.dataFlow.DataFlowRunner");
+  private static final Logger LOG = Logger.getInstance(DataFlowRunner.class);
   private static final int MERGING_BACK_BRANCHES_THRESHOLD = 50;
 
   private Instruction[] myInstructions;
diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/StandardInstructionVisitor.java b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/StandardInstructionVisitor.java
index 8791c9953939..44e244cb0afe 100644
--- a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/StandardInstructionVisitor.java
+++ b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/StandardInstructionVisitor.java
@@ -28,7 +28,7 @@ import static com.intellij.util.ObjectUtils.tryCast;
  * @author peter
  */
 public class StandardInstructionVisitor extends InstructionVisitor {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInspection.dataFlow.StandardInstructionVisitor");
+  private static final Logger LOG = Logger.getInstance(StandardInstructionVisitor.class);
   private final boolean myStopAnalysisOnNpe;
 
   private final Set<InstanceofInstruction> myReachable = new THashSet<>();
diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/inference/JavaSourceInference.java b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/inference/JavaSourceInference.java
index e0513a596278..bfa6c4104774 100644
--- a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/inference/JavaSourceInference.java
+++ b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/inference/JavaSourceInference.java
@@ -35,7 +35,7 @@ import static com.intellij.codeInspection.dataFlow.StandardMethodContract.ValueC
  */
 public class JavaSourceInference {
   public static final int MAX_CONTRACT_COUNT = 10;
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInspection.dataFlow.inference.JavaSourceInference");
+  private static final Logger LOG = Logger.getInstance(JavaSourceInference.class);
 
   enum InferenceMode {
     DISABLED, ENABLED, PARAMETERS
diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/miscGenerics/RedundantTypeArgsInspection.java b/java/java-analysis-impl/src/com/intellij/codeInspection/miscGenerics/RedundantTypeArgsInspection.java
index 14b9ac332c79..9de69fdcb237 100644
--- a/java/java-analysis-impl/src/com/intellij/codeInspection/miscGenerics/RedundantTypeArgsInspection.java
+++ b/java/java-analysis-impl/src/com/intellij/codeInspection/miscGenerics/RedundantTypeArgsInspection.java
@@ -32,7 +32,7 @@ import java.util.List;
  * @author ven
  */
 public class RedundantTypeArgsInspection extends GenericsInspectionToolBase {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInspection.miscGenerics.RedundantTypeArgsInspection");
+  private static final Logger LOG = Logger.getInstance(RedundantTypeArgsInspection.class);
 
   private static final LocalQuickFix ourQuickFixAction = new MyQuickFixAction();
   public static final String SHORT_NAME = "RedundantTypeArguments";
diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/nullable/NullableStuffInspectionBase.java b/java/java-analysis-impl/src/com/intellij/codeInspection/nullable/NullableStuffInspectionBase.java
index 9b7a1cb05989..d3d975efdd16 100644
--- a/java/java-analysis-impl/src/com/intellij/codeInspection/nullable/NullableStuffInspectionBase.java
+++ b/java/java-analysis-impl/src/com/intellij/codeInspection/nullable/NullableStuffInspectionBase.java
@@ -55,7 +55,7 @@ public class NullableStuffInspectionBase extends AbstractBaseJavaLocalInspection
   @SuppressWarnings({"WeakerAccess"}) public boolean REPORT_NULLS_PASSED_TO_NON_ANNOTATED_METHOD = true;
   public boolean REPORT_NULLS_PASSED_TO_NOT_NULL_PARAMETER = true;
 
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInspection.nullable.NullableStuffInspectionBase");
+  private static final Logger LOG = Logger.getInstance(NullableStuffInspectionBase.class);
 
   @Override
   public void writeSettings(@NotNull Element node) throws WriteExternalException {
diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/visibility/VisibilityInspection.java b/java/java-analysis-impl/src/com/intellij/codeInspection/visibility/VisibilityInspection.java
index c53429fec0b5..4e0af6d5feb6 100644
--- a/java/java-analysis-impl/src/com/intellij/codeInspection/visibility/VisibilityInspection.java
+++ b/java/java-analysis-impl/src/com/intellij/codeInspection/visibility/VisibilityInspection.java
@@ -38,7 +38,7 @@ import java.util.TreeMap;
 public final class VisibilityInspection extends GlobalJavaBatchInspectionTool {
   private static final ExtensionPointName<VisibilityExtension> EP_NAME = new ExtensionPointName<>("com.intellij.visibility");
 
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInspection.visibility.VisibilityInspection");
+  private static final Logger LOG = Logger.getInstance(VisibilityInspection.class);
   public boolean SUGGEST_PACKAGE_LOCAL_FOR_MEMBERS = true;
   public boolean SUGGEST_PACKAGE_LOCAL_FOR_TOP_CLASSES = true;
   public boolean SUGGEST_PRIVATE_FOR_INNERS;
diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/wrongPackageStatement/AdjustPackageNameFix.java b/java/java-analysis-impl/src/com/intellij/codeInspection/wrongPackageStatement/AdjustPackageNameFix.java
index 8b3eae05ff18..90455be028c9 100644
--- a/java/java-analysis-impl/src/com/intellij/codeInspection/wrongPackageStatement/AdjustPackageNameFix.java
+++ b/java/java-analysis-impl/src/com/intellij/codeInspection/wrongPackageStatement/AdjustPackageNameFix.java
@@ -24,7 +24,7 @@ import com.intellij.psi.*;
 import org.jetbrains.annotations.NotNull;
 
 public class AdjustPackageNameFix implements LocalQuickFix {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInspection.wrongPackageStatement.AdjustPackageNameFix");
+  private static final Logger LOG = Logger.getInstance(AdjustPackageNameFix.class);
   private final String myName;
 
   public AdjustPackageNameFix(String targetPackage) {
diff --git a/java/java-analysis-impl/src/com/intellij/find/findUsages/JavaFindUsagesHelper.java b/java/java-analysis-impl/src/com/intellij/find/findUsages/JavaFindUsagesHelper.java
index 431b06b24c16..a5523fd3461b 100644
--- a/java/java-analysis-impl/src/com/intellij/find/findUsages/JavaFindUsagesHelper.java
+++ b/java/java-analysis-impl/src/com/intellij/find/findUsages/JavaFindUsagesHelper.java
@@ -36,7 +36,7 @@ import org.jetbrains.annotations.Nullable;
 import java.util.*;
 
 public class JavaFindUsagesHelper {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.find.findUsages.JavaFindUsagesHelper");
+  private static final Logger LOG = Logger.getInstance(JavaFindUsagesHelper.class);
 
   @NotNull
   public static Set<String> getElementNames(@NotNull final PsiElement element) {
diff --git a/java/java-analysis-impl/src/com/intellij/psi/impl/search/JavaNullMethodArgumentUtil.java b/java/java-analysis-impl/src/com/intellij/psi/impl/search/JavaNullMethodArgumentUtil.java
index 65ce44137a92..a0a8370783dd 100644
--- a/java/java-analysis-impl/src/com/intellij/psi/impl/search/JavaNullMethodArgumentUtil.java
+++ b/java/java-analysis-impl/src/com/intellij/psi/impl/search/JavaNullMethodArgumentUtil.java
@@ -35,7 +35,7 @@ import java.util.Collections;
 import java.util.Objects;
 
 public class JavaNullMethodArgumentUtil {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.search.JavaNullMethodArgumentUtil");
+  private static final Logger LOG = Logger.getInstance(JavaNullMethodArgumentUtil.class);
 
   public static boolean hasNullArgument(@NotNull PsiMethod method, final int argumentIdx) {
     final boolean[] result = {false};
diff --git a/java/java-analysis-impl/src/com/intellij/psi/impl/search/ThrowSearchUtil.java b/java/java-analysis-impl/src/com/intellij/psi/impl/search/ThrowSearchUtil.java
index 31f2a3e7fafa..1af2f7c8891f 100644
--- a/java/java-analysis-impl/src/com/intellij/psi/impl/search/ThrowSearchUtil.java
+++ b/java/java-analysis-impl/src/com/intellij/psi/impl/search/ThrowSearchUtil.java
@@ -33,7 +33,7 @@ import java.util.Set;
  * Author: msk
  */
 public class ThrowSearchUtil {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.search.ThrowSearchUtil");
+  private static final Logger LOG = Logger.getInstance(ThrowSearchUtil.class);
 
   private ThrowSearchUtil() {
   }
diff --git a/java/java-analysis-impl/src/com/intellij/refactoring/util/duplicates/DuplicatesFinder.java b/java/java-analysis-impl/src/com/intellij/refactoring/util/duplicates/DuplicatesFinder.java
index c3eb9c4193fe..ed8edb98b6e8 100644
--- a/java/java-analysis-impl/src/com/intellij/refactoring/util/duplicates/DuplicatesFinder.java
+++ b/java/java-analysis-impl/src/com/intellij/refactoring/util/duplicates/DuplicatesFinder.java
@@ -42,7 +42,7 @@ import java.util.*;
  * @author dsl
  */
 public class DuplicatesFinder {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.util.duplicates.DuplicatesFinder");
+  private static final Logger LOG = Logger.getInstance(DuplicatesFinder.class);
   public static final Key<Parameter> PARAMETER = Key.create("PARAMETER");
   @NotNull private final PsiElement[] myPattern;
   private final InputVariables myParameters;
diff --git a/java/java-analysis-impl/src/com/intellij/refactoring/util/duplicates/Match.java b/java/java-analysis-impl/src/com/intellij/refactoring/util/duplicates/Match.java
index 7c9d09f3a569..e6782a352f0a 100644
--- a/java/java-analysis-impl/src/com/intellij/refactoring/util/duplicates/Match.java
+++ b/java/java-analysis-impl/src/com/intellij/refactoring/util/duplicates/Match.java
@@ -39,7 +39,7 @@ import java.util.*;
  * @author dsl
  */
 public final class Match {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.util.duplicates.Match");
+  private static final Logger LOG = Logger.getInstance(Match.class);
   private final PsiElement myMatchStart;
   private final PsiElement myMatchEnd;
   private final Map<PsiVariable, List<PsiElement>> myParameterValues = new HashMap<>();
diff --git a/java/java-impl/src/com/intellij/codeInsight/ExpectedTypeUtil.java b/java/java-impl/src/com/intellij/codeInsight/ExpectedTypeUtil.java
index 04329aaf339a..af3db77a1865 100644
--- a/java/java-impl/src/com/intellij/codeInsight/ExpectedTypeUtil.java
+++ b/java/java-impl/src/com/intellij/codeInsight/ExpectedTypeUtil.java
@@ -27,7 +27,7 @@ import org.jetbrains.annotations.Nullable;
 import java.util.*;
 
 public class ExpectedTypeUtil {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.ExpectedTypeUtil");
+  private static final Logger LOG = Logger.getInstance(ExpectedTypeUtil.class);
 
   @NotNull
   public static ExpectedTypeInfo[] intersect(List<ExpectedTypeInfo[]> typeInfos) {
diff --git a/java/java-impl/src/com/intellij/codeInsight/ExpectedTypesProvider.java b/java/java-impl/src/com/intellij/codeInsight/ExpectedTypesProvider.java
index 29be3142924f..3275c73bbf87 100644
--- a/java/java-impl/src/com/intellij/codeInsight/ExpectedTypesProvider.java
+++ b/java/java-impl/src/com/intellij/codeInsight/ExpectedTypesProvider.java
@@ -45,7 +45,7 @@ import java.util.*;
 public class ExpectedTypesProvider {
   private static final ExpectedTypeInfo VOID_EXPECTED = createInfoImpl(PsiType.VOID, ExpectedTypeInfo.TYPE_OR_SUBTYPE, PsiType.VOID, TailType.SEMICOLON);
 
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.ExpectedTypesProvider");
+  private static final Logger LOG = Logger.getInstance(ExpectedTypesProvider.class);
 
   public static ExpectedTypesProvider getInstance(@NotNull Project project) {
     return ServiceManager.getService(project, ExpectedTypesProvider.class);
diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/AllClassesGetter.java b/java/java-impl/src/com/intellij/codeInsight/completion/AllClassesGetter.java
index 1aa17bba1bf5..cd56ff1ff612 100644
--- a/java/java-impl/src/com/intellij/codeInsight/completion/AllClassesGetter.java
+++ b/java/java-impl/src/com/intellij/codeInsight/completion/AllClassesGetter.java
@@ -22,7 +22,7 @@ import java.util.LinkedHashSet;
 import java.util.Set;
 
 public class AllClassesGetter {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.completion.AllClassesGetter");
+  private static final Logger LOG = Logger.getInstance(AllClassesGetter.class);
   public static final InsertHandler<JavaPsiClassReferenceElement> TRY_SHORTENING = new InsertHandler<JavaPsiClassReferenceElement>() {
 
     private void _handleInsert(final InsertionContext context, final JavaPsiClassReferenceElement item) {
diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/AnnotationInsertHandler.java b/java/java-impl/src/com/intellij/codeInsight/completion/AnnotationInsertHandler.java
index 0820effe97cb..a963fab87948 100644
--- a/java/java-impl/src/com/intellij/codeInsight/completion/AnnotationInsertHandler.java
+++ b/java/java-impl/src/com/intellij/codeInsight/completion/AnnotationInsertHandler.java
@@ -12,7 +12,7 @@ import org.jetbrains.annotations.NotNull;
 * @author peter
 */
 class AnnotationInsertHandler implements InsertHandler<JavaPsiClassReferenceElement> {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.completion.AnnotationInsertHandler");
+  private static final Logger LOG = Logger.getInstance(AnnotationInsertHandler.class);
   static final AnnotationInsertHandler INSTANCE = new AnnotationInsertHandler();
 
   @Override
diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/ConstructorInsertHandler.java b/java/java-impl/src/com/intellij/codeInsight/completion/ConstructorInsertHandler.java
index 9d9af7375a48..10c6d296cb36 100644
--- a/java/java-impl/src/com/intellij/codeInsight/completion/ConstructorInsertHandler.java
+++ b/java/java-impl/src/com/intellij/codeInsight/completion/ConstructorInsertHandler.java
@@ -47,7 +47,7 @@ import java.util.List;
 * @author peter
 */
 public class ConstructorInsertHandler implements InsertHandler<LookupElementDecorator<LookupElement>> {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.completion.ConstructorInsertHandler");
+  private static final Logger LOG = Logger.getInstance(ConstructorInsertHandler.class);
   public static final ConstructorInsertHandler SMART_INSTANCE = new ConstructorInsertHandler(true);
   public static final ConstructorInsertHandler BASIC_INSTANCE = new ConstructorInsertHandler(false);
   private final boolean mySmart;
diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionContributor.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionContributor.java
index 964814d24ce1..c1f3e8be7fc5 100644
--- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionContributor.java
+++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionContributor.java
@@ -63,7 +63,7 @@ import static com.intellij.util.ObjectUtils.assertNotNull;
  * @author peter
  */
 public class JavaCompletionContributor extends CompletionContributor {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.completion.JavaCompletionContributor");
+  private static final Logger LOG = Logger.getInstance(JavaCompletionContributor.class);
 
   private static final ElementPattern<PsiElement> UNEXPECTED_REFERENCE_AFTER_DOT =
     psiElement().afterLeaf(".").insideStarting(psiExpressionStatement());
diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionUtil.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionUtil.java
index 7733e0d6c4fa..d6884c72b873 100644
--- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionUtil.java
+++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionUtil.java
@@ -60,7 +60,7 @@ import static com.intellij.psi.util.proximity.ReferenceListWeigher.ReferenceList
 
 public class JavaCompletionUtil {
   public static final Key<Boolean> FORCE_SHOW_SIGNATURE_ATTR = Key.create("forceShowSignature");
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.completion.JavaCompletionUtil");
+  private static final Logger LOG = Logger.getInstance(JavaCompletionUtil.class);
   public static final Key<PairFunction<PsiExpression, CompletionParameters, PsiType>> DYNAMIC_TYPE_EVALUATOR = Key.create("DYNAMIC_TYPE_EVALUATOR");
 
   private static final Key<PsiType> QUALIFIER_TYPE_ATTR = Key.create("qualifierType"); // SmartPsiElementPointer to PsiType of "qualifier"
diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavaDocCompletionContributor.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaDocCompletionContributor.java
index 5b50adf9c837..973d2a61ffea 100644
--- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaDocCompletionContributor.java
+++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaDocCompletionContributor.java
@@ -49,7 +49,7 @@ import static com.intellij.patterns.PlatformPatterns.psiElement;
 import static com.intellij.patterns.StandardPatterns.string;
 
 public class JavaDocCompletionContributor extends CompletionContributor {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.completion.JavaDocCompletionContributor");
+  private static final Logger LOG = Logger.getInstance(JavaDocCompletionContributor.class);
   private static final @NonNls String VALUE_TAG = "value";
   private static final @NonNls String LINK_TAG = "link";
   private static final InsertHandler<LookupElement> PARAM_DESCRIPTION_INSERT_HANDLER = (context, item) -> {
diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavaInheritorsGetter.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaInheritorsGetter.java
index e239e1918ecc..2154acde4003 100644
--- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaInheritorsGetter.java
+++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaInheritorsGetter.java
@@ -50,7 +50,7 @@ import static com.intellij.patterns.PsiJavaPatterns.psiElement;
  * @author peter
  */
 public class JavaInheritorsGetter extends CompletionProvider<CompletionParameters> {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.completion.JavaInheritorsGetter");
+  private static final Logger LOG = Logger.getInstance(JavaInheritorsGetter.class);
   private final ConstructorInsertHandler myConstructorInsertHandler;
 
   public JavaInheritorsGetter(final ConstructorInsertHandler constructorInsertHandler) {
diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/ReferenceExpressionCompletionContributor.java b/java/java-impl/src/com/intellij/codeInsight/completion/ReferenceExpressionCompletionContributor.java
index ec3307926226..88d48de10d6f 100644
--- a/java/java-impl/src/com/intellij/codeInsight/completion/ReferenceExpressionCompletionContributor.java
+++ b/java/java-impl/src/com/intellij/codeInsight/completion/ReferenceExpressionCompletionContributor.java
@@ -28,7 +28,7 @@ import static com.intellij.patterns.PsiJavaPatterns.psiElement;
  * @author peter
  */
 public class ReferenceExpressionCompletionContributor {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.completion.ReferenceExpressionCompletionContributor");
+  private static final Logger LOG = Logger.getInstance(ReferenceExpressionCompletionContributor.class);
 
   @NotNull
   static ElementFilter getReferenceFilter(PsiElement element, boolean allowRecursion) {
diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/TypeArgumentCompletionProvider.java b/java/java-impl/src/com/intellij/codeInsight/completion/TypeArgumentCompletionProvider.java
index f556fbac3b64..1fa806130caf 100644
--- a/java/java-impl/src/com/intellij/codeInsight/completion/TypeArgumentCompletionProvider.java
+++ b/java/java-impl/src/com/intellij/codeInsight/completion/TypeArgumentCompletionProvider.java
@@ -29,7 +29,7 @@ import static com.intellij.patterns.PsiJavaPatterns.psiElement;
 */
 class TypeArgumentCompletionProvider extends CompletionProvider<CompletionParameters> {
   static final ElementPattern<PsiElement> IN_TYPE_ARGS = psiElement().inside(PsiReferenceParameterList.class);
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.completion.TypeArgumentCompletionProvider");
+  private static final Logger LOG = Logger.getInstance(TypeArgumentCompletionProvider.class);
   private final boolean mySmart;
   @Nullable private final JavaCompletionSession mySession;
 
diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/actions/AddImportAction.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/actions/AddImportAction.java
index 1948158196ed..9eb00a14239b 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/actions/AddImportAction.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/actions/AddImportAction.java
@@ -42,7 +42,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class AddImportAction implements QuestionAction {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.daemon.impl.actions.AddImportAction");
+  private static final Logger LOG = Logger.getInstance(AddImportAction.class);
 
   private final Project myProject;
   private final PsiReference myReference;
diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AccessStaticViaInstanceFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AccessStaticViaInstanceFix.java
index 32d2e4c61e45..00719676dbdc 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AccessStaticViaInstanceFix.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AccessStaticViaInstanceFix.java
@@ -41,7 +41,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class AccessStaticViaInstanceFix extends LocalQuickFixAndIntentionActionOnPsiElement {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.daemon.impl.quickfix.AccessStaticViaInstanceFix");
+  private static final Logger LOG = Logger.getInstance(AccessStaticViaInstanceFix.class);
   private final boolean myOnTheFly;
   private final String myText;
 
diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddExceptionToCatchFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddExceptionToCatchFix.java
index bb47fe18c7cc..a1089e23d0a9 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddExceptionToCatchFix.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddExceptionToCatchFix.java
@@ -45,7 +45,7 @@ import java.util.List;
  * @author mike
  */
 public class AddExceptionToCatchFix extends BaseIntentionAction {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.daemon.impl.quickfix.AddExceptionToCatchFix");
+  private static final Logger LOG = Logger.getInstance(AddExceptionToCatchFix.class);
   private final boolean myUncaughtOnly;
 
   public AddExceptionToCatchFix(boolean uncaughtOnly) {
diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddExceptionToThrowsFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddExceptionToThrowsFix.java
index 48128125feca..9ed087410e6a 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddExceptionToThrowsFix.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddExceptionToThrowsFix.java
@@ -41,7 +41,7 @@ import java.util.*;
  * @author mike
  */
 public class AddExceptionToThrowsFix extends BaseIntentionAction {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.daemon.impl.quickfix.AddExceptionToThrowsFix");
+  private static final Logger LOG = Logger.getInstance(AddExceptionToThrowsFix.class);
   private final PsiElement myWrongElement;
 
   public AddExceptionToThrowsFix(@NotNull PsiElement wrongElement) {
diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddVariableInitializerFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddVariableInitializerFix.java
index 19b7d59121d3..4694bc26fec4 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddVariableInitializerFix.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddVariableInitializerFix.java
@@ -30,7 +30,7 @@ import java.util.List;
 import java.util.Objects;
 
 public class AddVariableInitializerFix extends LocalQuickFixAndIntentionActionOnPsiElement {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.daemon.impl.quickfix.AddReturnFix");
+  private static final Logger LOG = Logger.getInstance(AddReturnFix.class);
 
   public AddVariableInitializerFix(@NotNull PsiVariable variable) {
     super(variable);
diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/BringVariableIntoScopeFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/BringVariableIntoScopeFix.java
index 65dc61e8c544..327fec9c6feb 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/BringVariableIntoScopeFix.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/BringVariableIntoScopeFix.java
@@ -35,7 +35,7 @@ import java.util.Objects;
  * @author ven
  */
 public class BringVariableIntoScopeFix implements IntentionAction {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.daemon.impl.quickfix.BringVariableIntoScopeFix");
+  private static final Logger LOG = Logger.getInstance(BringVariableIntoScopeFix.class);
   private final PsiReferenceExpression myUnresolvedReference;
   private volatile PsiLocalVariable myOutOfScopeVariable;
 
diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateClassFromUsageBaseFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateClassFromUsageBaseFix.java
index 4121386250c4..c64ea5a24963 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateClassFromUsageBaseFix.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateClassFromUsageBaseFix.java
@@ -33,8 +33,7 @@ import org.jetbrains.annotations.Nullable;
  * @author ven
  */
 public abstract class CreateClassFromUsageBaseFix extends BaseIntentionAction {
-  protected static final Logger LOG = Logger.getInstance(
-    "#com.intellij.codeInsight.daemon.impl.quickfix.CreateClassFromUsageBaseFix");
+  protected static final Logger LOG = Logger.getInstance(CreateClassFromUsageBaseFix.class);
   protected CreateClassKind myKind;
   private final SmartPsiElementPointer<PsiJavaCodeReferenceElement> myRefElement;
 
diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateFromUsageBaseFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateFromUsageBaseFix.java
index 6f5c5a0c52ec..e46fa7b11716 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateFromUsageBaseFix.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateFromUsageBaseFix.java
@@ -54,7 +54,7 @@ import java.util.*;
  * @author Mike
  */
 public abstract class CreateFromUsageBaseFix extends BaseIntentionAction {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.daemon.impl.quickfix.CreateFromUsageBaseFix");
+  private static final Logger LOG = Logger.getInstance(CreateFromUsageBaseFix.class);
 
   @Override
   public boolean isAvailable(@NotNull Project project, Editor editor, PsiFile file) {
diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateFromUsageUtils.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateFromUsageUtils.java
index 86952e9a5d95..cd2748ec18e5 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateFromUsageUtils.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateFromUsageUtils.java
@@ -84,8 +84,7 @@ import java.util.*;
  * @author mike
  */
 public class CreateFromUsageUtils {
-  private static final Logger LOG = Logger.getInstance(
-    "#com.intellij.codeInsight.daemon.impl.quickfix.CreateFromUsageUtils");
+  private static final Logger LOG = Logger.getInstance(CreateFromUsageUtils.class);
   private static final int MAX_GUESSED_MEMBERS_COUNT = 10;
   private static final int MAX_RAW_GUESSED_MEMBERS_COUNT = 2 * MAX_GUESSED_MEMBERS_COUNT;
 
diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateInnerClassFromNewFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateInnerClassFromNewFix.java
index b82906e545ea..adf9d77f1b27 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateInnerClassFromNewFix.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateInnerClassFromNewFix.java
@@ -26,7 +26,7 @@ import com.intellij.util.JavaPsiConstructorUtil;
  * @author yole
  */
 public class CreateInnerClassFromNewFix extends CreateClassFromNewFix {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.daemon.impl.quickfix.CreateInnerClassFromNewFix");
+  private static final Logger LOG = Logger.getInstance(CreateInnerClassFromNewFix.class);
 
   public CreateInnerClassFromNewFix(final PsiNewExpression expr) {
     super(expr);
diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateLocalFromUsageFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateLocalFromUsageFix.java
index b120860453fa..bf673e645266 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateLocalFromUsageFix.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateLocalFromUsageFix.java
@@ -45,7 +45,7 @@ public class CreateLocalFromUsageFix extends CreateVarFromUsageFix {
     super(referenceExpression);
   }
 
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.daemon.impl.quickfix.CreateLocalFromUsageFix");
+  private static final Logger LOG = Logger.getInstance(CreateLocalFromUsageFix.class);
 
   @Override
   public String getText(String varName) {
diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateLocalVarFromInstanceofAction.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateLocalVarFromInstanceofAction.java
index 0b77257898c3..0c36719b94fe 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateLocalVarFromInstanceofAction.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateLocalVarFromInstanceofAction.java
@@ -37,7 +37,7 @@ import org.jetbrains.annotations.Nullable;
  * @author cdr
  */
 public class CreateLocalVarFromInstanceofAction extends BaseIntentionAction {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.daemon.impl.quickfix.CreateLocalVarFromInstanceofAction");
+  private static final Logger LOG = Logger.getInstance(CreateLocalVarFromInstanceofAction.class);
 
   @Override
   public boolean isAvailable(@NotNull Project project, Editor editor, PsiFile file) {
diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateMethodFromUsageFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateMethodFromUsageFix.java
index 694a95ddde4c..5810cb767df2 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateMethodFromUsageFix.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateMethodFromUsageFix.java
@@ -32,7 +32,7 @@ import static com.intellij.codeInsight.daemon.impl.quickfix.CreateFromUsageBaseF
  * @author Mike
  */
 public class CreateMethodFromUsageFix {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.daemon.impl.quickfix.CreateMethodFromUsageFix");
+  private static final Logger LOG = Logger.getInstance(CreateMethodFromUsageFix.class);
 
   public static boolean isMethodSignatureExists(PsiMethodCallExpression call, PsiClass target) {
     String name = call.getMethodExpression().getReferenceName();
diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateParameterFromUsageFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateParameterFromUsageFix.java
index f789948e3023..43a7de64391f 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateParameterFromUsageFix.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateParameterFromUsageFix.java
@@ -41,7 +41,7 @@ import java.util.List;
  * @author Mike
  */
 public class CreateParameterFromUsageFix extends CreateVarFromUsageFix {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.daemon.impl.quickfix.CreateParameterFromUsageFix");
+  private static final Logger LOG = Logger.getInstance(CreateParameterFromUsageFix.class);
 
   public CreateParameterFromUsageFix(PsiReferenceExpression referenceElement) {
     super(referenceElement);
diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/DeferFinalAssignmentFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/DeferFinalAssignmentFix.java
index 579dea59f9af..38c83c829dc2 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/DeferFinalAssignmentFix.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/DeferFinalAssignmentFix.java
@@ -35,7 +35,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class DeferFinalAssignmentFix implements IntentionAction {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.daemon.impl.quickfix.DeferFinalAssignmentFix");
+  private static final Logger LOG = Logger.getInstance(DeferFinalAssignmentFix.class);
 
   private final PsiVariable variable;
   private final PsiReferenceExpression expression;
diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/GuessTypeParameters.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/GuessTypeParameters.java
index bd684edf8244..57c193b3d706 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/GuessTypeParameters.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/GuessTypeParameters.java
@@ -28,7 +28,7 @@ import static com.intellij.util.containers.ContainerUtil.map;
   */
 public class GuessTypeParameters {
 
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.daemon.impl.quickfix.GuessTypeParameters");
+  private static final Logger LOG = Logger.getInstance(GuessTypeParameters.class);
 
   private final Project myProject;
   private final PsiManager myManager;
diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MakeClassInterfaceFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MakeClassInterfaceFix.java
index 95d40bdf00be..da8ff4f01728 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MakeClassInterfaceFix.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MakeClassInterfaceFix.java
@@ -29,7 +29,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 public class MakeClassInterfaceFix extends LocalQuickFixAndIntentionActionOnPsiElement {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.daemon.impl.quickfix.MakeClassInterfaceFix");
+  private static final Logger LOG = Logger.getInstance(MakeClassInterfaceFix.class);
 
   private final boolean myMakeInterface;
   private final String myName;
diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ModifierFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ModifierFix.java
index 892be69c589c..f3136a75e70a 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ModifierFix.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ModifierFix.java
@@ -30,7 +30,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class ModifierFix extends LocalQuickFixAndIntentionActionOnPsiElement {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.daemon.impl.quickfix.ModifierFix");
+  private static final Logger LOG = Logger.getInstance(ModifierFix.class);
 
   @PsiModifier.ModifierConstant private final String myModifier;
   private final boolean myShouldHave;
diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MoveBoundClassToFrontFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MoveBoundClassToFrontFix.java
index 0330639f4975..c38a91f4f994 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MoveBoundClassToFrontFix.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MoveBoundClassToFrontFix.java
@@ -28,7 +28,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 public class MoveBoundClassToFrontFix extends ExtendsListFix {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.daemon.impl.quickfix.MoveBoundClassToFrontFix");
+  private static final Logger LOG = Logger.getInstance(MoveBoundClassToFrontFix.class);
   private final String myName;
 
   public MoveBoundClassToFrontFix(@NotNull PsiClass aClass, @NotNull PsiClassType classToExtendFrom) {
diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/RemoveUnusedVariableFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/RemoveUnusedVariableFix.java
index f787b076faad..608587954def 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/RemoveUnusedVariableFix.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/RemoveUnusedVariableFix.java
@@ -39,7 +39,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class RemoveUnusedVariableFix implements IntentionAction {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.daemon.impl.quickfix.RemoveUnusedVariableFix");
+  private static final Logger LOG = Logger.getInstance(RemoveUnusedVariableFix.class);
   private final PsiVariable myVariable;
 
   public RemoveUnusedVariableFix(PsiVariable variable) {
diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/SurroundWithTryCatchFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/SurroundWithTryCatchFix.java
index 0a3b4cbb1ae7..674cfcef10a9 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/SurroundWithTryCatchFix.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/SurroundWithTryCatchFix.java
@@ -35,7 +35,7 @@ import org.jetbrains.annotations.NotNull;
  * @author mike
  */
 public class SurroundWithTryCatchFix implements IntentionAction {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.daemon.impl.quickfix.SurroundWithTryCatchFix");
+  private static final Logger LOG = Logger.getInstance(SurroundWithTryCatchFix.class);
 
   private PsiElement myElement;
 
diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/VariableAccessFromInnerClassFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/VariableAccessFromInnerClassFix.java
index 0210c1c6185f..0ccf807e0c98 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/VariableAccessFromInnerClassFix.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/VariableAccessFromInnerClassFix.java
@@ -45,7 +45,7 @@ import org.jetbrains.annotations.NotNull;
 import java.util.*;
 
 public class VariableAccessFromInnerClassFix implements IntentionAction {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.daemon.impl.quickfix.VariableAccessFromInnerClassFix");
+  private static final Logger LOG = Logger.getInstance(VariableAccessFromInnerClassFix.class);
   private final PsiVariable myVariable;
   private final PsiElement myContext;
   private final int myFixType;
diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/VariableTypeFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/VariableTypeFix.java
index 8c8161261988..403fd037f55c 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/VariableTypeFix.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/VariableTypeFix.java
@@ -41,7 +41,7 @@ import org.jetbrains.annotations.Nullable;
 import java.util.ArrayList;
 
 public class VariableTypeFix extends LocalQuickFixAndIntentionActionOnPsiElement {
-  static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.daemon.impl.quickfix.VariableTypeFix");
+  static final Logger LOG = Logger.getInstance(VariableTypeFix.class);
 
   private final PsiType myReturnType;
   protected final String myName;
diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/quickFix/CreateClassOrPackageFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/quickFix/CreateClassOrPackageFix.java
index b172005f8794..57e1a8e6cf0b 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/quickFix/CreateClassOrPackageFix.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/quickFix/CreateClassOrPackageFix.java
@@ -44,7 +44,7 @@ import java.util.*;
  * @author peter
  */
 public class CreateClassOrPackageFix extends LocalQuickFixAndIntentionActionOnPsiElement {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.daemon.quickFix.CreateClassOrPackageFix");
+  private static final Logger LOG = Logger.getInstance(CreateClassOrPackageFix.class);
   private final List<? extends PsiDirectory> myWritableDirectoryList;
   private final String myPresentation;
 
diff --git a/java/java-impl/src/com/intellij/codeInsight/editorActions/BlockJoinLinesHandler.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/BlockJoinLinesHandler.java
index 892bade71c04..7aa0e414ce7c 100644
--- a/java/java-impl/src/com/intellij/codeInsight/editorActions/BlockJoinLinesHandler.java
+++ b/java/java-impl/src/com/intellij/codeInsight/editorActions/BlockJoinLinesHandler.java
@@ -26,7 +26,7 @@ import com.intellij.util.IncorrectOperationException;
 import org.jetbrains.annotations.NotNull;
 
 public class BlockJoinLinesHandler implements JoinLinesHandlerDelegate {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.editorActions.BlockJoinLinesHandler");
+  private static final Logger LOG = Logger.getInstance(BlockJoinLinesHandler.class);
 
   @Override
   public int tryJoinLines(@NotNull final Document document, @NotNull final PsiFile psiFile, final int start, final int end) {
diff --git a/java/java-impl/src/com/intellij/codeInsight/editorActions/CopyPasteReferenceProcessor.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/CopyPasteReferenceProcessor.java
index aff9a984467a..b83e20d6e788 100644
--- a/java/java-impl/src/com/intellij/codeInsight/editorActions/CopyPasteReferenceProcessor.java
+++ b/java/java-impl/src/com/intellij/codeInsight/editorActions/CopyPasteReferenceProcessor.java
@@ -50,7 +50,7 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 public abstract class CopyPasteReferenceProcessor<TRef extends PsiElement> extends CopyPastePostProcessor<ReferenceTransferableData> {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.editorActions.CopyPasteReferenceProcessor");
+  private static final Logger LOG = Logger.getInstance(CopyPasteReferenceProcessor.class);
   
   @NotNull
   @Override
diff --git a/java/java-impl/src/com/intellij/codeInsight/editorActions/DeclarationJoinLinesHandler.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/DeclarationJoinLinesHandler.java
index 40743c4d91dc..40ad2e578e40 100644
--- a/java/java-impl/src/com/intellij/codeInsight/editorActions/DeclarationJoinLinesHandler.java
+++ b/java/java-impl/src/com/intellij/codeInsight/editorActions/DeclarationJoinLinesHandler.java
@@ -35,7 +35,7 @@ import org.jetbrains.annotations.Nullable;
 import java.util.Objects;
 
 public class DeclarationJoinLinesHandler implements JoinLinesHandlerDelegate {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.editorActions.DeclarationJoinLinesHandler");
+  private static final Logger LOG = Logger.getInstance(DeclarationJoinLinesHandler.class);
 
   @Override
   public int tryJoinLines(@NotNull final Document document, @NotNull final PsiFile file, final int start, final int end) {
diff --git a/java/java-impl/src/com/intellij/codeInsight/editorActions/JavaCopyPasteReferenceProcessor.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/JavaCopyPasteReferenceProcessor.java
index d9c632645c5e..b9af66f338d4 100644
--- a/java/java-impl/src/com/intellij/codeInsight/editorActions/JavaCopyPasteReferenceProcessor.java
+++ b/java/java-impl/src/com/intellij/codeInsight/editorActions/JavaCopyPasteReferenceProcessor.java
@@ -37,7 +37,7 @@ import java.util.Set;
  * @author peter
  */
 public class JavaCopyPasteReferenceProcessor extends CopyPasteReferenceProcessor<PsiJavaCodeReferenceElement> {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.editorActions.JavaCopyPasteReferenceProcessor");
+  private static final Logger LOG = Logger.getInstance(JavaCopyPasteReferenceProcessor.class);
 
   @Override
   protected void addReferenceData(PsiFile file, int startOffset, PsiElement element, ArrayList<ReferenceData> to) {
diff --git a/java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/JavaSmartEnterProcessor.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/JavaSmartEnterProcessor.java
index 592a799e970a..1dd3169bd8be 100644
--- a/java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/JavaSmartEnterProcessor.java
+++ b/java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/JavaSmartEnterProcessor.java
@@ -50,7 +50,7 @@ import static com.intellij.patterns.PsiJavaPatterns.psiElement;
  * @author spleaner
  */
 public class JavaSmartEnterProcessor extends SmartEnterProcessor {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.editorActions.smartEnter.JavaSmartEnterProcessor");
+  private static final Logger LOG = Logger.getInstance(JavaSmartEnterProcessor.class);
 
   private static final Fixer[] ourFixers;
   private static final EnterProcessor[] ourEnterProcessors = {
diff --git a/java/java-impl/src/com/intellij/codeInsight/folding/impl/JavaElementSignatureProvider.java b/java/java-impl/src/com/intellij/codeInsight/folding/impl/JavaElementSignatureProvider.java
index 1b766ccde863..5a63532509e6 100644
--- a/java/java-impl/src/com/intellij/codeInsight/folding/impl/JavaElementSignatureProvider.java
+++ b/java/java-impl/src/com/intellij/codeInsight/folding/impl/JavaElementSignatureProvider.java
@@ -13,7 +13,7 @@ import java.util.StringTokenizer;
 
 @SuppressWarnings({"HardCodedStringLiteral"})
 public class JavaElementSignatureProvider extends AbstractElementSignatureProvider {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.folding.impl.JavaElementSignatureProvider");
+  private static final Logger LOG = Logger.getInstance(JavaElementSignatureProvider.class);
 
   @Override
   @Nullable
diff --git a/java/java-impl/src/com/intellij/codeInsight/generation/GenerateConstructorHandler.java b/java/java-impl/src/com/intellij/codeInsight/generation/GenerateConstructorHandler.java
index 3dd180c4a121..85a76209bb8e 100644
--- a/java/java-impl/src/com/intellij/codeInsight/generation/GenerateConstructorHandler.java
+++ b/java/java-impl/src/com/intellij/codeInsight/generation/GenerateConstructorHandler.java
@@ -25,7 +25,7 @@ import java.util.Collections;
 import java.util.List;
 
 public class GenerateConstructorHandler extends GenerateMembersHandlerBase {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.generation.GenerateConstructorHandler");
+  private static final Logger LOG = Logger.getInstance(GenerateConstructorHandler.class);
 
   private boolean myCopyJavadoc;
 
diff --git a/java/java-impl/src/com/intellij/codeInsight/generation/GenerateDelegateHandler.java b/java/java-impl/src/com/intellij/codeInsight/generation/GenerateDelegateHandler.java
index 0dbb7c479b8a..64c8813916b8 100644
--- a/java/java-impl/src/com/intellij/codeInsight/generation/GenerateDelegateHandler.java
+++ b/java/java-impl/src/com/intellij/codeInsight/generation/GenerateDelegateHandler.java
@@ -44,7 +44,7 @@ import java.util.*;
  * @author mike
  */
 public class GenerateDelegateHandler implements LanguageCodeInsightActionHandler {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.generation.GenerateDelegateHandler");
+  private static final Logger LOG = Logger.getInstance(GenerateDelegateHandler.class);
   private boolean myToCopyJavaDoc;
 
   @Override
diff --git a/java/java-impl/src/com/intellij/codeInsight/generation/GenerateEqualsHandler.java b/java/java-impl/src/com/intellij/codeInsight/generation/GenerateEqualsHandler.java
index 5d3be98775b1..92a61a6331b0 100644
--- a/java/java-impl/src/com/intellij/codeInsight/generation/GenerateEqualsHandler.java
+++ b/java/java-impl/src/com/intellij/codeInsight/generation/GenerateEqualsHandler.java
@@ -36,7 +36,7 @@ import java.util.List;
  * @author dsl
  */
 public class GenerateEqualsHandler extends GenerateMembersHandlerBase {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.generation.GenerateEqualsHandler");
+  private static final Logger LOG = Logger.getInstance(GenerateEqualsHandler.class);
   private PsiField[] myEqualsFields;
   private PsiField[] myHashCodeFields;
   private PsiField[] myNonNullFields;
diff --git a/java/java-impl/src/com/intellij/codeInsight/generation/GenerateEqualsHelper.java b/java/java-impl/src/com/intellij/codeInsight/generation/GenerateEqualsHelper.java
index 54ec50c6329b..8e4c0aae7398 100644
--- a/java/java-impl/src/com/intellij/codeInsight/generation/GenerateEqualsHelper.java
+++ b/java/java-impl/src/com/intellij/codeInsight/generation/GenerateEqualsHelper.java
@@ -40,7 +40,7 @@ import java.util.*;
  * @author dsl
  */
 public class GenerateEqualsHelper implements Runnable {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.generation.GenerateEqualsHelper");
+  private static final Logger LOG = Logger.getInstance(GenerateEqualsHelper.class);
 
   @NonNls private static final String INSTANCE_NAME = "instanceBaseName";
   @NonNls private static final String BASE_PARAM_NAME = "baseParamName";
diff --git a/java/java-impl/src/com/intellij/codeInsight/generation/GenerateGetterSetterHandlerBase.java b/java/java-impl/src/com/intellij/codeInsight/generation/GenerateGetterSetterHandlerBase.java
index cea736a76727..10bc4d586134 100644
--- a/java/java-impl/src/com/intellij/codeInsight/generation/GenerateGetterSetterHandlerBase.java
+++ b/java/java-impl/src/com/intellij/codeInsight/generation/GenerateGetterSetterHandlerBase.java
@@ -49,7 +49,7 @@ import java.util.Collections;
 import java.util.List;
 
 public abstract class GenerateGetterSetterHandlerBase extends GenerateMembersHandlerBase {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.generation.GenerateGetterSetterHandlerBase");
+  private static final Logger LOG = Logger.getInstance(GenerateGetterSetterHandlerBase.class);
 
   static {
     GenerateAccessorProviderRegistrar.registerProvider(s -> {
diff --git a/java/java-impl/src/com/intellij/codeInsight/generation/GenerateMembersHandlerBase.java b/java/java-impl/src/com/intellij/codeInsight/generation/GenerateMembersHandlerBase.java
index f0f7799422d5..ef0cf6e391bf 100644
--- a/java/java-impl/src/com/intellij/codeInsight/generation/GenerateMembersHandlerBase.java
+++ b/java/java-impl/src/com/intellij/codeInsight/generation/GenerateMembersHandlerBase.java
@@ -47,7 +47,7 @@ import java.util.List;
 import java.util.Objects;
 
 public abstract class GenerateMembersHandlerBase implements CodeInsightActionHandler, ContextAwareActionHandler {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.generation.GenerateMembersHandlerBase");
+  private static final Logger LOG = Logger.getInstance(GenerateMembersHandlerBase.class);
 
   private final String myChooserTitle;
   protected boolean myToCopyJavaDoc;
diff --git a/java/java-impl/src/com/intellij/codeInsight/generation/GenerateMembersUtil.java b/java/java-impl/src/com/intellij/codeInsight/generation/GenerateMembersUtil.java
index f1cd7559f621..f79d36650300 100644
--- a/java/java-impl/src/com/intellij/codeInsight/generation/GenerateMembersUtil.java
+++ b/java/java-impl/src/com/intellij/codeInsight/generation/GenerateMembersUtil.java
@@ -39,7 +39,7 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 public class GenerateMembersUtil {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.generation.GenerateMembersUtil");
+  private static final Logger LOG = Logger.getInstance(GenerateMembersUtil.class);
 
   private GenerateMembersUtil() {
   }
diff --git a/java/java-impl/src/com/intellij/codeInsight/generation/OverrideImplementUtil.java b/java/java-impl/src/com/intellij/codeInsight/generation/OverrideImplementUtil.java
index 77c9cc933bfd..deb505c12bfd 100644
--- a/java/java-impl/src/com/intellij/codeInsight/generation/OverrideImplementUtil.java
+++ b/java/java-impl/src/com/intellij/codeInsight/generation/OverrideImplementUtil.java
@@ -55,7 +55,7 @@ import java.awt.event.ActionEvent;
 import java.util.*;
 
 public class OverrideImplementUtil extends OverrideImplementExploreUtil {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.generation.OverrideImplementUtil");
+  private static final Logger LOG = Logger.getInstance(OverrideImplementUtil.class);
   public static final String IMPLEMENT_COMMAND_MARKER = "implement";
 
   private OverrideImplementUtil() { }
diff --git a/java/java-impl/src/com/intellij/codeInsight/generation/surroundWith/SurroundWithUtil.java b/java/java-impl/src/com/intellij/codeInsight/generation/surroundWith/SurroundWithUtil.java
index a64f9a4cef3d..538a58c57627 100644
--- a/java/java-impl/src/com/intellij/codeInsight/generation/surroundWith/SurroundWithUtil.java
+++ b/java/java-impl/src/com/intellij/codeInsight/generation/surroundWith/SurroundWithUtil.java
@@ -35,8 +35,8 @@ import org.jetbrains.annotations.Nullable;
 import java.util.ArrayList;
 
 public class SurroundWithUtil {
-  
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.generation.surroundWith.SurroundWithUtil");
+
+  private static final Logger LOG = Logger.getInstance(SurroundWithUtil.class);
 
   private SurroundWithUtil() {
   }
diff --git a/java/java-impl/src/com/intellij/codeInsight/generation/ui/GenerateEqualsWizard.java b/java/java-impl/src/com/intellij/codeInsight/generation/ui/GenerateEqualsWizard.java
index bbcfe05957dc..69ee7112ab5d 100644
--- a/java/java-impl/src/com/intellij/codeInsight/generation/ui/GenerateEqualsWizard.java
+++ b/java/java-impl/src/com/intellij/codeInsight/generation/ui/GenerateEqualsWizard.java
@@ -44,7 +44,7 @@ import java.util.regex.Pattern;
  * @author dsl
  */
 public class GenerateEqualsWizard extends AbstractGenerateEqualsWizard<PsiClass, PsiMember, MemberInfo> {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.generation.ui.GenerateEqualsWizard");
+  private static final Logger LOG = Logger.getInstance(GenerateEqualsWizard.class);
 
   private static final MyMemberInfoFilter MEMBER_INFO_FILTER = new MyMemberInfoFilter();
 
diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/AddOnDemandStaticImportAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/AddOnDemandStaticImportAction.java
index ab105f4417e2..c232ddf856c4 100644
--- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/AddOnDemandStaticImportAction.java
+++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/AddOnDemandStaticImportAction.java
@@ -44,7 +44,7 @@ import java.util.Objects;
  * @author ven
  */
 public class AddOnDemandStaticImportAction extends BaseElementAtCaretIntentionAction {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.intention.impl.AddOnDemandStaticImportAction");
+  private static final Logger LOG = Logger.getInstance(AddOnDemandStaticImportAction.class);
 
   @Override
   @NotNull
diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/AddSingleMemberStaticImportAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/AddSingleMemberStaticImportAction.java
index 104f8d98cb1e..9b548dd85940 100644
--- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/AddSingleMemberStaticImportAction.java
+++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/AddSingleMemberStaticImportAction.java
@@ -42,7 +42,7 @@ import org.jetbrains.annotations.Nullable;
 import java.util.Objects;
 
 public class AddSingleMemberStaticImportAction extends BaseElementAtCaretIntentionAction {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.intention.impl.AddSingleMemberStaticImportAction");
+  private static final Logger LOG = Logger.getInstance(AddSingleMemberStaticImportAction.class);
   private static final Key<PsiElement> TEMP_REFERENT_USER_DATA = new Key<>("TEMP_REFERENT_USER_DATA");
 
   @Override
diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/CopyAbstractMethodImplementationHandler.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/CopyAbstractMethodImplementationHandler.java
index 3180ffd839a8..60c699ae667e 100644
--- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/CopyAbstractMethodImplementationHandler.java
+++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/CopyAbstractMethodImplementationHandler.java
@@ -45,7 +45,7 @@ import java.util.*;
  * @author yole
  */
 public class CopyAbstractMethodImplementationHandler {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.intention.impl.CopyAbstractMethodImplementationHandler");
+  private static final Logger LOG = Logger.getInstance(CopyAbstractMethodImplementationHandler.class);
 
   private final Project myProject;
   private final Editor myEditor;
diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/ImplementAbstractMethodHandler.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/ImplementAbstractMethodHandler.java
index 6b002d1dfd20..2ae5e00d9fd2 100644
--- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/ImplementAbstractMethodHandler.java
+++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/ImplementAbstractMethodHandler.java
@@ -44,7 +44,7 @@ import javax.swing.*;
 import java.util.*;
 
 public class ImplementAbstractMethodHandler {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.intention.impl.ImplementAbstractMethodHandler");
+  private static final Logger LOG = Logger.getInstance(ImplementAbstractMethodHandler.class);
 
   private final Project myProject;
   private final Editor myEditor;
diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/InvertIfConditionAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/InvertIfConditionAction.java
index 84cebb8c278a..c945297cacef 100644
--- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/InvertIfConditionAction.java
+++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/InvertIfConditionAction.java
@@ -27,7 +27,7 @@ import java.util.Objects;
  * @author mike
  */
 public class InvertIfConditionAction extends PsiElementBaseIntentionAction {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.intention.impl.InvertIfConditionAction");
+  private static final Logger LOG = Logger.getInstance(InvertIfConditionAction.class);
 
   @Override
   public boolean isAvailable(@NotNull Project project, Editor editor, @NotNull PsiElement element) {
diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/SplitIfAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/SplitIfAction.java
index 2fd6cb9fc94f..4ca7bffbb7db 100644
--- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/SplitIfAction.java
+++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/SplitIfAction.java
@@ -36,7 +36,7 @@ import static com.intellij.codeInsight.intention.impl.SplitConditionUtil.getROpe
  * @author mike
  */
 public class SplitIfAction extends BaseElementAtCaretIntentionAction {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.intention.impl.SplitIfAction");
+  private static final Logger LOG = Logger.getInstance(SplitIfAction.class);
 
   @Override
   public boolean isAvailable(@NotNull Project project, Editor editor, @NotNull PsiElement element) {
diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/config/QuickFixFactoryImpl.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/config/QuickFixFactoryImpl.java
index 91142083a4d7..21dd3a721f85 100644
--- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/config/QuickFixFactoryImpl.java
+++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/config/QuickFixFactoryImpl.java
@@ -55,7 +55,7 @@ import java.util.*;
  * @author cdr
  */
 public class QuickFixFactoryImpl extends QuickFixFactory {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.intention.impl.config.QuickFixFactoryImpl");
+  private static final Logger LOG = Logger.getInstance(QuickFixFactoryImpl.class);
 
   @NotNull
   @Override
diff --git a/java/java-impl/src/com/intellij/codeInsight/javadoc/JavaDocInfoGenerator.java b/java/java-impl/src/com/intellij/codeInsight/javadoc/JavaDocInfoGenerator.java
index 1829d6ac4078..de6331cafe12 100644
--- a/java/java-impl/src/com/intellij/codeInsight/javadoc/JavaDocInfoGenerator.java
+++ b/java/java-impl/src/com/intellij/codeInsight/javadoc/JavaDocInfoGenerator.java
@@ -53,7 +53,7 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 public class JavaDocInfoGenerator {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.javadoc.JavaDocInfoGenerator");
+  private static final Logger LOG = Logger.getInstance(JavaDocInfoGenerator.class);
 
   private interface InheritDocProvider<T> {
     Pair<T, InheritDocProvider<T>> getInheritDoc();
diff --git a/java/java-impl/src/com/intellij/codeInsight/lookup/LookupItemUtil.java b/java/java-impl/src/com/intellij/codeInsight/lookup/LookupItemUtil.java
index 7f6272ba04ad..8e54b27067ba 100644
--- a/java/java-impl/src/com/intellij/codeInsight/lookup/LookupItemUtil.java
+++ b/java/java-impl/src/com/intellij/codeInsight/lookup/LookupItemUtil.java
@@ -26,7 +26,7 @@ import com.intellij.psi.util.PsiUtilCore;
 import org.jetbrains.annotations.NotNull;
 
 public class LookupItemUtil {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.lookup.LookupItemUtil");
+  private static final Logger LOG = Logger.getInstance(LookupItemUtil.class);
 
   /**
    * @deprecated use {@link LookupElementBuilder}
diff --git a/java/java-impl/src/com/intellij/codeInsight/lookup/PsiTypeLookupItem.java b/java/java-impl/src/com/intellij/codeInsight/lookup/PsiTypeLookupItem.java
index a6f65b4f7d77..186706b683e2 100644
--- a/java/java-impl/src/com/intellij/codeInsight/lookup/PsiTypeLookupItem.java
+++ b/java/java-impl/src/com/intellij/codeInsight/lookup/PsiTypeLookupItem.java
@@ -35,7 +35,7 @@ public class PsiTypeLookupItem extends LookupItem implements TypedLookupItem {
     }
   };
 
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.lookup.PsiTypeLookupItem");
+  private static final Logger LOG = Logger.getInstance(PsiTypeLookupItem.class);
   public static final ClassConditionKey<PsiTypeLookupItem> CLASS_CONDITION_KEY = ClassConditionKey.create(PsiTypeLookupItem.class);
   private final boolean myDiamond;
   private final int myBracketsCount;
diff --git a/java/java-impl/src/com/intellij/codeInsight/navigation/actions/GotoBreakContinueHandler.java b/java/java-impl/src/com/intellij/codeInsight/navigation/actions/GotoBreakContinueHandler.java
index b20c81707621..1d0b682bb2a6 100644
--- a/java/java-impl/src/com/intellij/codeInsight/navigation/actions/GotoBreakContinueHandler.java
+++ b/java/java-impl/src/com/intellij/codeInsight/navigation/actions/GotoBreakContinueHandler.java
@@ -25,7 +25,7 @@ import org.jetbrains.annotations.Nullable;
  * @author yole
  */
 public class GotoBreakContinueHandler extends GotoDeclarationHandlerBase {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.navigation.actions.GotoBreakContinueHandler");
+  private static final Logger LOG = Logger.getInstance(GotoBreakContinueHandler.class);
 
   @Override
   @Nullable
diff --git a/java/java-impl/src/com/intellij/codeInsight/template/ExpressionUtil.java b/java/java-impl/src/com/intellij/codeInsight/template/ExpressionUtil.java
index 93615aeac044..c26d6db01054 100644
--- a/java/java-impl/src/com/intellij/codeInsight/template/ExpressionUtil.java
+++ b/java/java-impl/src/com/intellij/codeInsight/template/ExpressionUtil.java
@@ -30,7 +30,7 @@ import org.jetbrains.annotations.Nullable;
   * @author mike
   */
  public class ExpressionUtil {
-   private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.template.ExpressionUtil");
+   private static final Logger LOG = Logger.getInstance(ExpressionUtil.class);
 
    private ExpressionUtil() {
    }
diff --git a/java/java-impl/src/com/intellij/codeInsight/template/impl/JavaTemplateUtil.java b/java/java-impl/src/com/intellij/codeInsight/template/impl/JavaTemplateUtil.java
index fae2f6263e97..d803510f3d1e 100644
--- a/java/java-impl/src/com/intellij/codeInsight/template/impl/JavaTemplateUtil.java
+++ b/java/java-impl/src/com/intellij/codeInsight/template/impl/JavaTemplateUtil.java
@@ -33,7 +33,7 @@ import java.util.List;
 import java.util.Set;
 
 public class JavaTemplateUtil {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.template.impl.JavaTemplateUtil");
+  private static final Logger LOG = Logger.getInstance(JavaTemplateUtil.class);
 
   private JavaTemplateUtil() {
   }
diff --git a/java/java-impl/src/com/intellij/codeInsight/template/macro/IterableVariableMacro.java b/java/java-impl/src/com/intellij/codeInsight/template/macro/IterableVariableMacro.java
index f81242d12a00..a2db5927b545 100644
--- a/java/java-impl/src/com/intellij/codeInsight/template/macro/IterableVariableMacro.java
+++ b/java/java-impl/src/com/intellij/codeInsight/template/macro/IterableVariableMacro.java
@@ -34,7 +34,7 @@ import java.util.List;
  * @author ven
  */
 public class IterableVariableMacro extends VariableTypeMacroBase {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.template.macro.IterableVariableMacro");
+  private static final Logger LOG = Logger.getInstance(IterableVariableMacro.class);
 
   @Override
   public String getName() {
diff --git a/java/java-impl/src/com/intellij/codeInsight/template/macro/MacroUtil.java b/java/java-impl/src/com/intellij/codeInsight/template/macro/MacroUtil.java
index b51f30fe3d4c..8c6c4073222e 100644
--- a/java/java-impl/src/com/intellij/codeInsight/template/macro/MacroUtil.java
+++ b/java/java-impl/src/com/intellij/codeInsight/template/macro/MacroUtil.java
@@ -22,7 +22,7 @@ import java.util.List;
 import java.util.Set;
 
 public class MacroUtil {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.template.macro.MacroUtil");
+  private static final Logger LOG = Logger.getInstance(MacroUtil.class);
 
   @Nullable public static PsiType resultToPsiType(Result result, ExpressionContext context){
     if (result instanceof PsiTypeResult) {
diff --git a/java/java-impl/src/com/intellij/codeInspection/AddAssertStatementFix.java b/java/java-impl/src/com/intellij/codeInspection/AddAssertStatementFix.java
index 0fe1dd1c013f..7ab2b9c57034 100644
--- a/java/java-impl/src/com/intellij/codeInspection/AddAssertStatementFix.java
+++ b/java/java-impl/src/com/intellij/codeInspection/AddAssertStatementFix.java
@@ -29,7 +29,7 @@ import org.jetbrains.annotations.NotNull;
  * @author ven
  */
 public class AddAssertStatementFix implements LocalQuickFix {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInspection.AddAssertStatementFix");
+  private static final Logger LOG = Logger.getInstance(AddAssertStatementFix.class);
   private final String myText;
 
   public AddAssertStatementFix(@NotNull String text) {
diff --git a/java/java-impl/src/com/intellij/codeInspection/MoveToPackageFix.java b/java/java-impl/src/com/intellij/codeInspection/MoveToPackageFix.java
index cece25303181..11621e33e9ba 100644
--- a/java/java-impl/src/com/intellij/codeInspection/MoveToPackageFix.java
+++ b/java/java-impl/src/com/intellij/codeInspection/MoveToPackageFix.java
@@ -31,7 +31,7 @@ import com.intellij.util.IncorrectOperationException;
 import org.jetbrains.annotations.NotNull;
 
 public class MoveToPackageFix implements LocalQuickFix {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInspection.MoveToPackageFix");
+  private static final Logger LOG = Logger.getInstance(MoveToPackageFix.class);
   private final String myTargetPackage;
 
   public MoveToPackageFix(String targetPackage) {
diff --git a/java/java-impl/src/com/intellij/codeInspection/SurroundWithIfFix.java b/java/java-impl/src/com/intellij/codeInspection/SurroundWithIfFix.java
index 1a5e81fd0820..11cfddcb1a5f 100644
--- a/java/java-impl/src/com/intellij/codeInspection/SurroundWithIfFix.java
+++ b/java/java-impl/src/com/intellij/codeInspection/SurroundWithIfFix.java
@@ -36,7 +36,7 @@ import org.jetbrains.annotations.NotNull;
  * @author ven
  */
 public class SurroundWithIfFix implements LocalQuickFix {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInspection.SurroundWithIfFix");
+  private static final Logger LOG = Logger.getInstance(SurroundWithIfFix.class);
   private final String myText;
   private final String mySuffix;
 
diff --git a/java/java-impl/src/com/intellij/codeInspection/defaultFileTemplateUsage/FileHeaderChecker.java b/java/java-impl/src/com/intellij/codeInspection/defaultFileTemplateUsage/FileHeaderChecker.java
index 4e7ec0dfbb2a..a81a7c032543 100644
--- a/java/java-impl/src/com/intellij/codeInspection/defaultFileTemplateUsage/FileHeaderChecker.java
+++ b/java/java-impl/src/com/intellij/codeInspection/defaultFileTemplateUsage/FileHeaderChecker.java
@@ -40,7 +40,7 @@ import java.util.regex.Pattern;
  * @author cdr
  */
 public class FileHeaderChecker {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInspection.defaultFileTemplateUsage.FileHeaderChecker");
+  private static final Logger LOG = Logger.getInstance(FileHeaderChecker.class);
 
   static ProblemDescriptor checkFileHeader(@NotNull PsiFile file, @NotNull InspectionManager manager, boolean onTheFly) {
     TIntObjectHashMap<String> offsetToProperty = new TIntObjectHashMap<>();
diff --git a/java/java-impl/src/com/intellij/codeInspection/emptyMethod/EmptyMethodInspection.java b/java/java-impl/src/com/intellij/codeInspection/emptyMethod/EmptyMethodInspection.java
index 09bbc2647f6c..59d1a760c8ed 100644
--- a/java/java-impl/src/com/intellij/codeInspection/emptyMethod/EmptyMethodInspection.java
+++ b/java/java-impl/src/com/intellij/codeInspection/emptyMethod/EmptyMethodInspection.java
@@ -47,7 +47,7 @@ public class EmptyMethodInspection extends GlobalJavaBatchInspectionTool {
   @SuppressWarnings("PublicField")
   public boolean commentsAreContent = false;
   @NonNls private static final String QUICK_FIX_NAME = InspectionsBundle.message("inspection.empty.method.delete.quickfix");
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInspection.emptyMethod.EmptyMethodInspection");
+  private static final Logger LOG = Logger.getInstance(EmptyMethodInspection.class);
 
   @Override
   @Nullable
diff --git a/java/java-impl/src/com/intellij/codeInspection/miscGenerics/RedundantArrayForVarargsCallInspection.java b/java/java-impl/src/com/intellij/codeInspection/miscGenerics/RedundantArrayForVarargsCallInspection.java
index c97c26194c4f..3182736748ee 100644
--- a/java/java-impl/src/com/intellij/codeInspection/miscGenerics/RedundantArrayForVarargsCallInspection.java
+++ b/java/java-impl/src/com/intellij/codeInspection/miscGenerics/RedundantArrayForVarargsCallInspection.java
@@ -25,7 +25,7 @@ import java.util.List;
  * @author ven
  */
 public class RedundantArrayForVarargsCallInspection extends GenericsInspectionToolBase {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInspection.miscGenerics.RedundantArrayForVarargsCallInspection");
+  private static final Logger LOG = Logger.getInstance(RedundantArrayForVarargsCallInspection.class);
   private static final LocalQuickFix myQuickFixAction = new MyQuickFix();
 
   private static class MyQuickFix implements LocalQuickFix {
diff --git a/java/java-impl/src/com/intellij/codeInspection/uncheckedWarnings/UncheckedWarningLocalInspection.java b/java/java-impl/src/com/intellij/codeInspection/uncheckedWarnings/UncheckedWarningLocalInspection.java
index 5da73449c1ad..9ec9c8d08d5c 100644
--- a/java/java-impl/src/com/intellij/codeInspection/uncheckedWarnings/UncheckedWarningLocalInspection.java
+++ b/java/java-impl/src/com/intellij/codeInspection/uncheckedWarnings/UncheckedWarningLocalInspection.java
@@ -38,7 +38,7 @@ public class UncheckedWarningLocalInspection extends AbstractBaseJavaLocalInspec
   @NonNls public static final String SHORT_NAME = "UNCHECKED_WARNING";
   public static final String DISPLAY_NAME = InspectionsBundle.message("unchecked.warning");
   @NonNls private static final String ID = "unchecked";
-  private static final Logger LOG = Logger.getInstance("#" + UncheckedWarningLocalInspection.class);
+  private static final Logger LOG = Logger.getInstance(UncheckedWarningLocalInspection.class);
   public boolean IGNORE_UNCHECKED_ASSIGNMENT;
   public boolean IGNORE_UNCHECKED_GENERICS_ARRAY_CREATION;
   public boolean IGNORE_UNCHECKED_CALL;
diff --git a/java/java-impl/src/com/intellij/find/findUsages/JavaFindUsagesHandler.java b/java/java-impl/src/com/intellij/find/findUsages/JavaFindUsagesHandler.java
index c07b7e83e421..7aea38bc283d 100644
--- a/java/java-impl/src/com/intellij/find/findUsages/JavaFindUsagesHandler.java
+++ b/java/java-impl/src/com/intellij/find/findUsages/JavaFindUsagesHandler.java
@@ -39,7 +39,7 @@ import java.util.*;
  * @author peter
  */
 public class JavaFindUsagesHandler extends FindUsagesHandler{
-  private static final Logger LOG = Logger.getInstance("#com.intellij.find.findUsages.JavaFindUsagesHandler");
+  private static final Logger LOG = Logger.getInstance(JavaFindUsagesHandler.class);
   protected static final String ACTION_STRING = FindBundle.message("find.super.method.warning.action.verb");
 
   private final PsiElement[] myElementsToSearch;
diff --git a/java/java-impl/src/com/intellij/ide/actions/JavaQualifiedNameProvider.java b/java/java-impl/src/com/intellij/ide/actions/JavaQualifiedNameProvider.java
index 3eaadb70027c..546015a673d6 100644
--- a/java/java-impl/src/com/intellij/ide/actions/JavaQualifiedNameProvider.java
+++ b/java/java-impl/src/com/intellij/ide/actions/JavaQualifiedNameProvider.java
@@ -32,7 +32,7 @@ import java.util.List;
  * @author yole
  */
 public class JavaQualifiedNameProvider implements QualifiedNameProvider {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.ide.actions.JavaQualifiedNameProvider");
+  private static final Logger LOG = Logger.getInstance(JavaQualifiedNameProvider.class);
 
   @Override
   @Nullable
diff --git a/java/java-impl/src/com/intellij/ide/favoritesTreeView/smartPointerPsiNodes/BaseSmartPointerPsiNode.java b/java/java-impl/src/com/intellij/ide/favoritesTreeView/smartPointerPsiNodes/BaseSmartPointerPsiNode.java
index f2572cebf8f0..f2220acf31d5 100644
--- a/java/java-impl/src/com/intellij/ide/favoritesTreeView/smartPointerPsiNodes/BaseSmartPointerPsiNode.java
+++ b/java/java-impl/src/com/intellij/ide/favoritesTreeView/smartPointerPsiNodes/BaseSmartPointerPsiNode.java
@@ -5,6 +5,7 @@ import com.intellij.ide.projectView.PresentationData;
 import com.intellij.ide.projectView.ProjectViewNode;
 import com.intellij.ide.projectView.ViewSettings;
 import com.intellij.ide.projectView.impl.CompoundProjectViewNodeDecorator;
+import com.intellij.ide.projectView.impl.nodes.BasePsiNode;
 import com.intellij.ide.projectView.impl.nodes.PackageElement;
 import com.intellij.ide.util.treeView.AbstractTreeNode;
 import com.intellij.navigation.NavigationItem;
@@ -24,7 +25,7 @@ import java.util.ArrayList;
 import java.util.Collection;
 
 abstract class BaseSmartPointerPsiNode <Type extends SmartPsiElementPointer> extends ProjectViewNode<Type> implements PsiElementNavigationItem {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.ide.projectView.impl.nodes.BasePsiNode");
+  private static final Logger LOG = Logger.getInstance(BasePsiNode.class);
 
   BaseSmartPointerPsiNode(@NotNull Project project, @NotNull Type value, @NotNull ViewSettings viewSettings) {
     super(project, value, viewSettings);
diff --git a/java/java-impl/src/com/intellij/ide/hierarchy/call/CallHierarchyBrowser.java b/java/java-impl/src/com/intellij/ide/hierarchy/call/CallHierarchyBrowser.java
index f8ce89332b4c..4da56023ed06 100644
--- a/java/java-impl/src/com/intellij/ide/hierarchy/call/CallHierarchyBrowser.java
+++ b/java/java-impl/src/com/intellij/ide/hierarchy/call/CallHierarchyBrowser.java
@@ -39,7 +39,7 @@ import java.util.Comparator;
 import java.util.Map;
 
 public class CallHierarchyBrowser extends CallHierarchyBrowserBase {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.ide.hierarchy.call.CallHierarchyBrowser");
+  private static final Logger LOG = Logger.getInstance(CallHierarchyBrowser.class);
 
   public CallHierarchyBrowser(@NotNull Project project, @NotNull PsiMember method) {
     super(project, method);
diff --git a/java/java-impl/src/com/intellij/ide/hierarchy/method/MethodHierarchyBrowser.java b/java/java-impl/src/com/intellij/ide/hierarchy/method/MethodHierarchyBrowser.java
index 10c1d2d7a087..b086381ed79d 100644
--- a/java/java-impl/src/com/intellij/ide/hierarchy/method/MethodHierarchyBrowser.java
+++ b/java/java-impl/src/com/intellij/ide/hierarchy/method/MethodHierarchyBrowser.java
@@ -23,7 +23,7 @@ import java.util.Comparator;
 import java.util.Map;
 
 public class MethodHierarchyBrowser extends MethodHierarchyBrowserBase {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.ide.hierarchy.method.MethodHierarchyBrowser");
+  private static final Logger LOG = Logger.getInstance(MethodHierarchyBrowser.class);
 
   public MethodHierarchyBrowser(final Project project, final PsiMethod method) {
     super(project, method);
diff --git a/java/java-impl/src/com/intellij/ide/hierarchy/method/OverrideImplementMethodAction.java b/java/java-impl/src/com/intellij/ide/hierarchy/method/OverrideImplementMethodAction.java
index 39c81f108a5b..e31c9368d177 100644
--- a/java/java-impl/src/com/intellij/ide/hierarchy/method/OverrideImplementMethodAction.java
+++ b/java/java-impl/src/com/intellij/ide/hierarchy/method/OverrideImplementMethodAction.java
@@ -24,7 +24,7 @@ import java.util.Collection;
 import java.util.List;
 
 abstract class OverrideImplementMethodAction extends AnAction {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.ide.hierarchy.method.OverrideImplementMethodAction");
+  private static final Logger LOG = Logger.getInstance(OverrideImplementMethodAction.class);
 
   @Override
   public final void actionPerformed(@NotNull final AnActionEvent event) {
diff --git a/java/java-impl/src/com/intellij/ide/hierarchy/type/JavaTypeHierarchyProvider.java b/java/java-impl/src/com/intellij/ide/hierarchy/type/JavaTypeHierarchyProvider.java
index ffba860855d2..24e7b290d991 100644
--- a/java/java-impl/src/com/intellij/ide/hierarchy/type/JavaTypeHierarchyProvider.java
+++ b/java/java-impl/src/com/intellij/ide/hierarchy/type/JavaTypeHierarchyProvider.java
@@ -17,7 +17,7 @@ import org.jetbrains.annotations.NotNull;
  * @author yole
  */
 public class JavaTypeHierarchyProvider implements HierarchyProvider {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.ide.hierarchy.type.JavaTypeHierarchyProvider");
+  private static final Logger LOG = Logger.getInstance(JavaTypeHierarchyProvider.class);
   @Override
   public PsiElement getTarget(@NotNull final DataContext dataContext) {
     final Project project = CommonDataKeys.PROJECT.getData(dataContext);
diff --git a/java/java-impl/src/com/intellij/ide/hierarchy/type/TypeHierarchyBrowser.java b/java/java-impl/src/com/intellij/ide/hierarchy/type/TypeHierarchyBrowser.java
index 9304d021a9fd..b12c599a1cfd 100644
--- a/java/java-impl/src/com/intellij/ide/hierarchy/type/TypeHierarchyBrowser.java
+++ b/java/java-impl/src/com/intellij/ide/hierarchy/type/TypeHierarchyBrowser.java
@@ -25,7 +25,7 @@ import java.util.Comparator;
 import java.util.Map;
 
 public class TypeHierarchyBrowser extends TypeHierarchyBrowserBase {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.ide.hierarchy.type.TypeHierarchyBrowser");
+  private static final Logger LOG = Logger.getInstance(TypeHierarchyBrowser.class);
 
   public TypeHierarchyBrowser(final Project project, final PsiClass psiClass) {
     super(project, psiClass);
diff --git a/java/java-impl/src/com/intellij/ide/util/FQNameCellRenderer.java b/java/java-impl/src/com/intellij/ide/util/FQNameCellRenderer.java
index 9cbe31afe082..83b53a265703 100644
--- a/java/java-impl/src/com/intellij/ide/util/FQNameCellRenderer.java
+++ b/java/java-impl/src/com/intellij/ide/util/FQNameCellRenderer.java
@@ -14,7 +14,7 @@ import java.awt.*;
 
 public class FQNameCellRenderer extends SimpleColoredComponent implements ListCellRenderer{
   private final Font FONT;
-  private static final Logger LOG = Logger.getInstance("#com.intellij.ide.util.FQNameCellRenderer");
+  private static final Logger LOG = Logger.getInstance(FQNameCellRenderer.class);
 
   public FQNameCellRenderer() {
     EditorColorsScheme scheme = EditorColorsManager.getInstance().getGlobalScheme();
diff --git a/java/java-impl/src/com/intellij/ide/util/PackageChooserDialog.java b/java/java-impl/src/com/intellij/ide/util/PackageChooserDialog.java
index 66a928c9d6df..1d237a922686 100644
--- a/java/java-impl/src/com/intellij/ide/util/PackageChooserDialog.java
+++ b/java/java-impl/src/com/intellij/ide/util/PackageChooserDialog.java
@@ -48,7 +48,7 @@ import java.util.Enumeration;
 import java.util.List;
 
 public class PackageChooserDialog extends PackageChooser {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.ide.util.PackageChooserDialog");
+  private static final Logger LOG = Logger.getInstance(PackageChooserDialog.class);
 
   private Tree myTree;
   private DefaultTreeModel myModel;
diff --git a/java/java-impl/src/com/intellij/ide/util/gotoByName/DefaultSymbolNavigationContributor.java b/java/java-impl/src/com/intellij/ide/util/gotoByName/DefaultSymbolNavigationContributor.java
index 8baad9c7e989..0d52c6b0250c 100644
--- a/java/java-impl/src/com/intellij/ide/util/gotoByName/DefaultSymbolNavigationContributor.java
+++ b/java/java-impl/src/com/intellij/ide/util/gotoByName/DefaultSymbolNavigationContributor.java
@@ -32,7 +32,7 @@ import java.util.Iterator;
 import java.util.Set;
 
 public class DefaultSymbolNavigationContributor implements ChooseByNameContributorEx, GotoClassContributor {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.ide.util.gotoByName.DefaultSymbolNavigationContributor");
+  private static final Logger LOG = Logger.getInstance(DefaultSymbolNavigationContributor.class);
 
   @Nullable
   @Override
diff --git a/java/java-impl/src/com/intellij/lang/java/JavaFormattingModelBuilder.java b/java/java-impl/src/com/intellij/lang/java/JavaFormattingModelBuilder.java
index efff28126879..b81fafdd6eed 100644
--- a/java/java-impl/src/com/intellij/lang/java/JavaFormattingModelBuilder.java
+++ b/java/java-impl/src/com/intellij/lang/java/JavaFormattingModelBuilder.java
@@ -42,7 +42,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 public class JavaFormattingModelBuilder implements FormattingModelBuilderEx {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.lang.java.JavaFormattingModelBuilder");
+  private static final Logger LOG = Logger.getInstance(JavaFormattingModelBuilder.class);
 
   @Override
   @NotNull
diff --git a/java/java-impl/src/com/intellij/lang/java/JavaImportOptimizer.java b/java/java-impl/src/com/intellij/lang/java/JavaImportOptimizer.java
index 2e81a4696e53..77eec0ea639a 100644
--- a/java/java-impl/src/com/intellij/lang/java/JavaImportOptimizer.java
+++ b/java/java-impl/src/com/intellij/lang/java/JavaImportOptimizer.java
@@ -33,7 +33,7 @@ import org.jetbrains.annotations.NotNull;
  * @author max
  */
 public class JavaImportOptimizer implements ImportOptimizer {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.lang.java.JavaImportOptimizer");
+  private static final Logger LOG = Logger.getInstance(JavaImportOptimizer.class);
 
   @Override
   @NotNull
diff --git a/java/java-impl/src/com/intellij/openapi/projectRoots/impl/JavaSdkImpl.java b/java/java-impl/src/com/intellij/openapi/projectRoots/impl/JavaSdkImpl.java
index ff6387c19f22..4b27d17536c6 100644
--- a/java/java-impl/src/com/intellij/openapi/projectRoots/impl/JavaSdkImpl.java
+++ b/java/java-impl/src/com/intellij/openapi/projectRoots/impl/JavaSdkImpl.java
@@ -51,7 +51,7 @@ import java.util.stream.Stream;
  * @author Eugene Zhuravlev
  */
 public final class JavaSdkImpl extends JavaSdk {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.projectRoots.impl.JavaSdkImpl");
+  private static final Logger LOG = Logger.getInstance(JavaSdkImpl.class);
 
   public static final DataKey<Boolean> KEY = DataKey.create("JavaSdk");
 
diff --git a/java/java-impl/src/com/intellij/openapi/vcs/contentAnnotation/VcsContentAnnotationExceptionFilter.java b/java/java-impl/src/com/intellij/openapi/vcs/contentAnnotation/VcsContentAnnotationExceptionFilter.java
index d6f4120b74cb..62cff17fead6 100644
--- a/java/java-impl/src/com/intellij/openapi/vcs/contentAnnotation/VcsContentAnnotationExceptionFilter.java
+++ b/java/java-impl/src/com/intellij/openapi/vcs/contentAnnotation/VcsContentAnnotationExceptionFilter.java
@@ -49,7 +49,7 @@ import java.util.*;
 
 class VcsContentAnnotationExceptionFilter implements Filter, FilterMixin {
   private final Project myProject;
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.vcs.contentAnnotation.VcsContentAnnotationExceptionFilter");
+  private static final Logger LOG = Logger.getInstance(VcsContentAnnotationExceptionFilter.class);
   private final VcsContentAnnotationSettings mySettings;
   private final Map<VirtualFile,VcsRevisionNumber> myRevNumbersCache = new HashMap<>();
   private final ExceptionInfoCache myCache;
diff --git a/java/java-impl/src/com/intellij/psi/formatter/java/AbstractJavaBlock.java b/java/java-impl/src/com/intellij/psi/formatter/java/AbstractJavaBlock.java
index 7ac3d40f6365..4d2dbdeaf61b 100644
--- a/java/java-impl/src/com/intellij/psi/formatter/java/AbstractJavaBlock.java
+++ b/java/java-impl/src/com/intellij/psi/formatter/java/AbstractJavaBlock.java
@@ -37,7 +37,7 @@ import static com.intellij.psi.formatter.java.JavaFormatterUtil.getWrapType;
 import static com.intellij.psi.formatter.java.MultipleFieldDeclarationHelper.findLastFieldInGroup;
 
 public abstract class AbstractJavaBlock extends AbstractBlock implements JavaBlock, ReservedWrapsProvider {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.formatter.java.AbstractJavaBlock");
+  private static final Logger LOG = Logger.getInstance(AbstractJavaBlock.class);
 
   @NotNull protected final CommonCodeStyleSettings mySettings;
   @NotNull protected final JavaCodeStyleSettings myJavaSettings;
diff --git a/java/java-impl/src/com/intellij/psi/formatter/java/JavaSpacePropertyProcessor.java b/java/java-impl/src/com/intellij/psi/formatter/java/JavaSpacePropertyProcessor.java
index 568b51393928..9d700730914d 100644
--- a/java/java-impl/src/com/intellij/psi/formatter/java/JavaSpacePropertyProcessor.java
+++ b/java/java-impl/src/com/intellij/psi/formatter/java/JavaSpacePropertyProcessor.java
@@ -46,7 +46,7 @@ import static com.intellij.openapi.util.Pair.pair;
 import static com.intellij.psi.codeStyle.CommonCodeStyleSettings.*;
 
 public class JavaSpacePropertyProcessor extends JavaElementVisitor {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.formatter.java.JavaSpacePropertyProcessor");
+  private static final Logger LOG = Logger.getInstance(JavaSpacePropertyProcessor.class);
 
   private static final TokenSet REF_LIST_KEYWORDS = TokenSet.create(
     JavaTokenType.EXTENDS_KEYWORD, JavaTokenType.IMPLEMENTS_KEYWORD, JavaTokenType.THROWS_KEYWORD, JavaTokenType.WITH_KEYWORD);
diff --git a/java/java-impl/src/com/intellij/psi/impl/JavaPsiImplementationHelperImpl.java b/java/java-impl/src/com/intellij/psi/impl/JavaPsiImplementationHelperImpl.java
index 16af10166176..c9b68b9aef9d 100644
--- a/java/java-impl/src/com/intellij/psi/impl/JavaPsiImplementationHelperImpl.java
+++ b/java/java-impl/src/com/intellij/psi/impl/JavaPsiImplementationHelperImpl.java
@@ -47,7 +47,7 @@ import java.util.stream.Stream;
  * @author yole
  */
 public class JavaPsiImplementationHelperImpl extends JavaPsiImplementationHelper {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.JavaPsiImplementationHelperImpl");
+  private static final Logger LOG = Logger.getInstance(JavaPsiImplementationHelperImpl.class);
 
   private final Project myProject;
 
diff --git a/java/java-impl/src/com/intellij/psi/impl/file/JavaDirectoryServiceImpl.java b/java/java-impl/src/com/intellij/psi/impl/file/JavaDirectoryServiceImpl.java
index b5815f1923e3..04f4ad0d1716 100644
--- a/java/java-impl/src/com/intellij/psi/impl/file/JavaDirectoryServiceImpl.java
+++ b/java/java-impl/src/com/intellij/psi/impl/file/JavaDirectoryServiceImpl.java
@@ -48,7 +48,7 @@ import java.util.Map;
 import java.util.Properties;
 
 public class JavaDirectoryServiceImpl extends CoreJavaDirectoryService {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.file.JavaDirectoryServiceImpl");
+  private static final Logger LOG = Logger.getInstance(JavaDirectoryServiceImpl.class);
 
   @Override
   public PsiPackage getPackage(@NotNull PsiDirectory dir) {
diff --git a/java/java-impl/src/com/intellij/psi/impl/file/PsiJavaDirectoryImpl.java b/java/java-impl/src/com/intellij/psi/impl/file/PsiJavaDirectoryImpl.java
index 5dc87efce4fd..3b3a27f70fe3 100644
--- a/java/java-impl/src/com/intellij/psi/impl/file/PsiJavaDirectoryImpl.java
+++ b/java/java-impl/src/com/intellij/psi/impl/file/PsiJavaDirectoryImpl.java
@@ -32,7 +32,7 @@ import com.intellij.util.IncorrectOperationException;
 import org.jetbrains.annotations.NotNull;
 
 public class PsiJavaDirectoryImpl extends PsiDirectoryImpl {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.file.PsiJavaDirectoryImpl");
+  private static final Logger LOG = Logger.getInstance(PsiJavaDirectoryImpl.class);
 
   public PsiJavaDirectoryImpl(final PsiManagerImpl manager, final VirtualFile file) {
     super(manager, file);
diff --git a/java/java-impl/src/com/intellij/psi/impl/migration/PsiMigrationImpl.java b/java/java-impl/src/com/intellij/psi/impl/migration/PsiMigrationImpl.java
index 69b5dcefc335..664d243888f9 100644
--- a/java/java-impl/src/com/intellij/psi/impl/migration/PsiMigrationImpl.java
+++ b/java/java-impl/src/com/intellij/psi/impl/migration/PsiMigrationImpl.java
@@ -32,7 +32,7 @@ import java.util.Map;
  * @author dsl
  */
 public class PsiMigrationImpl implements PsiMigration {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.migration.PsiMigrationImpl");
+  private static final Logger LOG = Logger.getInstance(PsiMigrationImpl.class);
   private final PsiMigrationManager myMigrationManager;
   private final JavaPsiFacade myFacade;
   private final PsiManagerImpl myManager;
diff --git a/java/java-impl/src/com/intellij/psi/impl/migration/PsiMigrationManager.java b/java/java-impl/src/com/intellij/psi/impl/migration/PsiMigrationManager.java
index 691bd84d08ec..a63a24741a1f 100644
--- a/java/java-impl/src/com/intellij/psi/impl/migration/PsiMigrationManager.java
+++ b/java/java-impl/src/com/intellij/psi/impl/migration/PsiMigrationManager.java
@@ -25,7 +25,7 @@ import com.intellij.psi.impl.PsiManagerImpl;
 import org.jetbrains.annotations.NotNull;
 
 public class PsiMigrationManager {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.migration.PsiMigrationManager");
+  private static final Logger LOG = Logger.getInstance(PsiMigrationManager.class);
 
   public static PsiMigrationManager getInstance(Project project) {
     return ServiceManager.getService(project, PsiMigrationManager.class);
diff --git a/java/java-impl/src/com/intellij/psi/impl/source/PsiExpressionCodeFragmentImpl.java b/java/java-impl/src/com/intellij/psi/impl/source/PsiExpressionCodeFragmentImpl.java
index 1db3bac0bcd2..70aed08be959 100644
--- a/java/java-impl/src/com/intellij/psi/impl/source/PsiExpressionCodeFragmentImpl.java
+++ b/java/java-impl/src/com/intellij/psi/impl/source/PsiExpressionCodeFragmentImpl.java
@@ -29,7 +29,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 public class PsiExpressionCodeFragmentImpl extends PsiCodeFragmentImpl implements PsiExpressionCodeFragment {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.PsiExpressionCodeFragmentImpl");
+  private static final Logger LOG = Logger.getInstance(PsiExpressionCodeFragmentImpl.class);
   private PsiType myExpectedType;
 
   public PsiExpressionCodeFragmentImpl(@NotNull Project project,
diff --git a/java/java-impl/src/com/intellij/psi/impl/source/PsiJavaCodeReferenceCodeFragmentImpl.java b/java/java-impl/src/com/intellij/psi/impl/source/PsiJavaCodeReferenceCodeFragmentImpl.java
index 0748a6f52a80..05aaad605292 100644
--- a/java/java-impl/src/com/intellij/psi/impl/source/PsiJavaCodeReferenceCodeFragmentImpl.java
+++ b/java/java-impl/src/com/intellij/psi/impl/source/PsiJavaCodeReferenceCodeFragmentImpl.java
@@ -30,7 +30,7 @@ import org.jetbrains.annotations.Nullable;
  * @author ven
  */
 public class PsiJavaCodeReferenceCodeFragmentImpl extends PsiCodeFragmentImpl implements PsiJavaCodeReferenceCodeFragment {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.PsiJavaCodeReferenceCodeFragmentImpl");
+  private static final Logger LOG = Logger.getInstance(PsiJavaCodeReferenceCodeFragmentImpl.class);
   private final boolean myIsClassesAccepted;
 
   public PsiJavaCodeReferenceCodeFragmentImpl(@NotNull Project project,
diff --git a/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/BraceEnforcer.java b/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/BraceEnforcer.java
index c9710784ca89..8f882e2a7d9c 100644
--- a/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/BraceEnforcer.java
+++ b/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/BraceEnforcer.java
@@ -32,7 +32,7 @@ import org.jetbrains.annotations.NotNull;
  * @author max
  */
 public class BraceEnforcer extends JavaJspRecursiveElementVisitor {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.codeStyle.BraceEnforcer");
+  private static final Logger LOG = Logger.getInstance(BraceEnforcer.class);
 
   private final PostFormatProcessorHelper myPostProcessor;
 
diff --git a/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/ImportHelper.java b/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/ImportHelper.java
index 001598a4324a..28faf85edd44 100644
--- a/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/ImportHelper.java
+++ b/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/ImportHelper.java
@@ -51,7 +51,7 @@ import java.util.stream.Collectors;
 import static java.util.stream.Collectors.toSet;
 
 public class ImportHelper{
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.codeStyle.ImportHelper");
+  private static final Logger LOG = Logger.getInstance(ImportHelper.class);
 
   private final JavaCodeStyleSettings mySettings;
   @NonNls private static final String JAVA_LANG_PACKAGE = "java.lang";
diff --git a/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/ImportsFormatter.java b/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/ImportsFormatter.java
index 68431240e870..e30b4d7bbadb 100644
--- a/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/ImportsFormatter.java
+++ b/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/ImportsFormatter.java
@@ -35,7 +35,7 @@ import org.jetbrains.annotations.NotNull;
  * @author lesya
  */
 public class ImportsFormatter extends XmlRecursiveElementVisitor {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.codeStyle.ImportsFormatter");
+  private static final Logger LOG = Logger.getInstance(ImportsFormatter.class);
   
   private final FormattingDocumentModelImpl myDocumentModel;
   private final CommonCodeStyleSettings.IndentOptions myIndentOptions;
diff --git a/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/JavaCodeStyleManagerImpl.java b/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/JavaCodeStyleManagerImpl.java
index da21579eb5ba..773198250c17 100644
--- a/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/JavaCodeStyleManagerImpl.java
+++ b/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/JavaCodeStyleManagerImpl.java
@@ -34,7 +34,7 @@ import java.util.function.Predicate;
  * @author max
  */
 public class JavaCodeStyleManagerImpl extends JavaCodeStyleManager {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.codeStyle.JavaCodeStyleManagerImpl");
+  private static final Logger LOG = Logger.getInstance(JavaCodeStyleManagerImpl.class);
 
   @NonNls private static final String IMPL_SUFFIX = "Impl";
   @NonNls private static final String GET_PREFIX = "get";
diff --git a/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/PsiBasedFormatterModelWithShiftIndentInside.java b/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/PsiBasedFormatterModelWithShiftIndentInside.java
index f3493c047f3d..73cdd34a2262 100644
--- a/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/PsiBasedFormatterModelWithShiftIndentInside.java
+++ b/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/PsiBasedFormatterModelWithShiftIndentInside.java
@@ -39,7 +39,7 @@ import org.jetbrains.annotations.NotNull;
 
 public class PsiBasedFormatterModelWithShiftIndentInside extends PsiBasedFormattingModel {
   private static final Logger LOG =
-      Logger.getInstance("#com.intellij.psi.impl.source.codeStyle.PsiBasedFormatterModelWithShiftIndentInside");
+    Logger.getInstance(PsiBasedFormatterModelWithShiftIndentInside.class);
 
   private final Project myProject;
 
diff --git a/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/JavaClassReference.java b/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/JavaClassReference.java
index 6069e3027e94..67a45696bd35 100644
--- a/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/JavaClassReference.java
+++ b/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/JavaClassReference.java
@@ -56,7 +56,7 @@ import java.util.Map;
  * @author peter
  */
 public class JavaClassReference extends GenericReference implements PsiJavaReference, LocalQuickFixProvider {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.resolve.reference.impl.providers.JavaClassReference");
+  private static final Logger LOG = Logger.getInstance(JavaClassReference.class);
   protected final int myIndex;
   private TextRange myRange;
   private final String myText;
diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/JavaTreeCopyHandler.java b/java/java-impl/src/com/intellij/psi/impl/source/tree/JavaTreeCopyHandler.java
index 41304ff1c7e1..3c4d2b359960 100644
--- a/java/java-impl/src/com/intellij/psi/impl/source/tree/JavaTreeCopyHandler.java
+++ b/java/java-impl/src/com/intellij/psi/impl/source/tree/JavaTreeCopyHandler.java
@@ -33,7 +33,7 @@ import com.intellij.util.IncorrectOperationException;
 import java.util.Map;
 
 public class JavaTreeCopyHandler implements TreeCopyHandler {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.tree.JavaTreeCopyHandler");
+  private static final Logger LOG = Logger.getInstance(JavaTreeCopyHandler.class);
 
   private static final Key<Boolean> ALREADY_ESCAPED = new Key<>("ALREADY_ESCAPED");
   private static final Key<Boolean> ESCAPEMENT_ENGAGED = new Key<>("ESCAPEMENT_ENGAGED");
diff --git a/java/java-impl/src/com/intellij/refactoring/IntroduceHandlerBase.java b/java/java-impl/src/com/intellij/refactoring/IntroduceHandlerBase.java
index d21b1bf4f01c..0c70eb8457d8 100644
--- a/java/java-impl/src/com/intellij/refactoring/IntroduceHandlerBase.java
+++ b/java/java-impl/src/com/intellij/refactoring/IntroduceHandlerBase.java
@@ -33,7 +33,7 @@ import org.jetbrains.annotations.TestOnly;
  * @author dsl
  */
 public abstract class IntroduceHandlerBase implements RefactoringActionHandler, ContextAwareActionHandler {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.IntroduceHandlerBase");
+  private static final Logger LOG = Logger.getInstance(IntroduceHandlerBase.class);
 
   @Override
   public boolean isAvailableForQuickList(@NotNull Editor editor, @NotNull PsiFile file, @NotNull DataContext dataContext) {
diff --git a/java/java-impl/src/com/intellij/refactoring/anonymousToInner/AnonymousToInnerDialog.java b/java/java-impl/src/com/intellij/refactoring/anonymousToInner/AnonymousToInnerDialog.java
index c734f45d6462..9844f01f9c43 100644
--- a/java/java-impl/src/com/intellij/refactoring/anonymousToInner/AnonymousToInnerDialog.java
+++ b/java/java-impl/src/com/intellij/refactoring/anonymousToInner/AnonymousToInnerDialog.java
@@ -26,7 +26,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 class AnonymousToInnerDialog extends DialogWrapper{
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.anonymousToInner.AnonymousToInnerDialog");
+  private static final Logger LOG = Logger.getInstance(AnonymousToInnerDialog.class);
 
   private final Project myProject;
   private final PsiAnonymousClass myAnonClass;
diff --git a/java/java-impl/src/com/intellij/refactoring/anonymousToInner/AnonymousToInnerHandler.java b/java/java-impl/src/com/intellij/refactoring/anonymousToInner/AnonymousToInnerHandler.java
index 3662da4597ff..cfcf562d5012 100644
--- a/java/java-impl/src/com/intellij/refactoring/anonymousToInner/AnonymousToInnerHandler.java
+++ b/java/java-impl/src/com/intellij/refactoring/anonymousToInner/AnonymousToInnerHandler.java
@@ -49,7 +49,7 @@ import org.jetbrains.annotations.Nullable;
 import java.util.*;
 
 public class AnonymousToInnerHandler implements RefactoringActionHandler {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.anonymousToInner.AnonymousToInnerHandler");
+  private static final Logger LOG = Logger.getInstance(AnonymousToInnerHandler.class);
 
   static final String REFACTORING_NAME = RefactoringBundle.message("anonymousToInner.refactoring.name");
 
diff --git a/java/java-impl/src/com/intellij/refactoring/changeClassSignature/ChangeClassSignatureProcessor.java b/java/java-impl/src/com/intellij/refactoring/changeClassSignature/ChangeClassSignatureProcessor.java
index 3d5716634de0..13887cbf5055 100644
--- a/java/java-impl/src/com/intellij/refactoring/changeClassSignature/ChangeClassSignatureProcessor.java
+++ b/java/java-impl/src/com/intellij/refactoring/changeClassSignature/ChangeClassSignatureProcessor.java
@@ -43,7 +43,7 @@ import java.util.*;
  * @author dsl
  */
 public class ChangeClassSignatureProcessor extends BaseRefactoringProcessor {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.changeClassSignature.ChangeClassSignatureProcessor");
+  private static final Logger LOG = Logger.getInstance(ChangeClassSignatureProcessor.class);
   private PsiClass myClass;
   private final TypeParameterInfo[] myNewSignature;
 
diff --git a/java/java-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureProcessor.java b/java/java-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureProcessor.java
index 4aeb944ebf04..9b4749699e0d 100644
--- a/java/java-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureProcessor.java
+++ b/java/java-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureProcessor.java
@@ -33,7 +33,7 @@ import static com.intellij.util.ObjectUtils.assertNotNull;
  * @author Jeka
  */
 public class ChangeSignatureProcessor extends ChangeSignatureProcessorBase {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.changeSignature.ChangeSignatureProcessor");
+  private static final Logger LOG = Logger.getInstance(ChangeSignatureProcessor.class);
 
   public ChangeSignatureProcessor(Project project,
                                   PsiMethod method,
diff --git a/java/java-impl/src/com/intellij/refactoring/changeSignature/JavaChangeInfoImpl.java b/java/java-impl/src/com/intellij/refactoring/changeSignature/JavaChangeInfoImpl.java
index d411e704c8c1..933a9402359c 100644
--- a/java/java-impl/src/com/intellij/refactoring/changeSignature/JavaChangeInfoImpl.java
+++ b/java/java-impl/src/com/intellij/refactoring/changeSignature/JavaChangeInfoImpl.java
@@ -33,7 +33,7 @@ import java.util.*;
  * @author Jeka
  */
 public class JavaChangeInfoImpl extends UserDataHolderBase implements JavaChangeInfo {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.changeSignature.JavaChangeInfoImpl");
+  private static final Logger LOG = Logger.getInstance(JavaChangeInfoImpl.class);
 
   @PsiModifier.ModifierConstant
   @NotNull
diff --git a/java/java-impl/src/com/intellij/refactoring/changeSignature/JavaChangeSignatureUsageProcessor.java b/java/java-impl/src/com/intellij/refactoring/changeSignature/JavaChangeSignatureUsageProcessor.java
index 2a05349ec190..1520c5f0dc7f 100644
--- a/java/java-impl/src/com/intellij/refactoring/changeSignature/JavaChangeSignatureUsageProcessor.java
+++ b/java/java-impl/src/com/intellij/refactoring/changeSignature/JavaChangeSignatureUsageProcessor.java
@@ -67,7 +67,7 @@ import java.util.*;
  * @author Maxim.Medvedev
  */
 public class JavaChangeSignatureUsageProcessor implements ChangeSignatureUsageProcessor {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.changeSignature.JavaChangeSignatureUsageProcessor");
+  private static final Logger LOG = Logger.getInstance(JavaChangeSignatureUsageProcessor.class);
 
   private static boolean isJavaUsage(UsageInfo info) {
     final PsiElement element = info.getElement();
diff --git a/java/java-impl/src/com/intellij/refactoring/changeSignature/JavaChangeSignatureUsageSearcher.java b/java/java-impl/src/com/intellij/refactoring/changeSignature/JavaChangeSignatureUsageSearcher.java
index 8db7c0a9b5d5..71684e1a7336 100644
--- a/java/java-impl/src/com/intellij/refactoring/changeSignature/JavaChangeSignatureUsageSearcher.java
+++ b/java/java-impl/src/com/intellij/refactoring/changeSignature/JavaChangeSignatureUsageSearcher.java
@@ -48,7 +48,7 @@ import java.util.Set;
  */
 class JavaChangeSignatureUsageSearcher {
   private final JavaChangeInfo myChangeInfo;
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.changeSignature.JavaChangeSignatureUsageSearcher");
+  private static final Logger LOG = Logger.getInstance(JavaChangeSignatureUsageSearcher.class);
 
   JavaChangeSignatureUsageSearcher(JavaChangeInfo changeInfo) {
     this.myChangeInfo = changeInfo;
diff --git a/java/java-impl/src/com/intellij/refactoring/changeSignature/MethodCallUsageInfo.java b/java/java-impl/src/com/intellij/refactoring/changeSignature/MethodCallUsageInfo.java
index 2452d6c1e844..152ea91f98eb 100644
--- a/java/java-impl/src/com/intellij/refactoring/changeSignature/MethodCallUsageInfo.java
+++ b/java/java-impl/src/com/intellij/refactoring/changeSignature/MethodCallUsageInfo.java
@@ -23,7 +23,7 @@ import com.intellij.usageView.UsageInfo;
  * @author ven
  */
 public class MethodCallUsageInfo extends UsageInfo {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.changeSignature.MethodCallUsageInfo");
+  private static final Logger LOG = Logger.getInstance(MethodCallUsageInfo.class);
   private final boolean myToChangeArguments;
   private final boolean myToCatchExceptions;
   private final PsiMethod myReferencedMethod;
diff --git a/java/java-impl/src/com/intellij/refactoring/changeSignature/ParameterInfoImpl.java b/java/java-impl/src/com/intellij/refactoring/changeSignature/ParameterInfoImpl.java
index 7785941bbfb1..9c89f58d0c85 100644
--- a/java/java-impl/src/com/intellij/refactoring/changeSignature/ParameterInfoImpl.java
+++ b/java/java-impl/src/com/intellij/refactoring/changeSignature/ParameterInfoImpl.java
@@ -30,7 +30,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class ParameterInfoImpl implements JavaParameterInfo {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.changeSignature.ParameterInfoImpl");
+  private static final Logger LOG = Logger.getInstance(ParameterInfoImpl.class);
 
   public int oldParameterIndex;
   private boolean useAnySingleVariable;
diff --git a/java/java-impl/src/com/intellij/refactoring/convertToInstanceMethod/ConvertToInstanceMethodDialog.java b/java/java-impl/src/com/intellij/refactoring/convertToInstanceMethod/ConvertToInstanceMethodDialog.java
index 42c2a9f829a3..2089b05db87e 100644
--- a/java/java-impl/src/com/intellij/refactoring/convertToInstanceMethod/ConvertToInstanceMethodDialog.java
+++ b/java/java-impl/src/com/intellij/refactoring/convertToInstanceMethod/ConvertToInstanceMethodDialog.java
@@ -18,7 +18,7 @@ import java.awt.event.MouseEvent;
  * @author ven
  */
 public class ConvertToInstanceMethodDialog  extends MoveInstanceMethodDialogBase {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.convertToInstanceMethod.ConvertToInstanceMethodDialog");
+  private static final Logger LOG = Logger.getInstance(ConvertToInstanceMethodDialog.class);
 
   public ConvertToInstanceMethodDialog(final PsiMethod method, final Object[] variables) {
     super(method, variables, ConvertToInstanceMethodHandler.REFACTORING_NAME);
diff --git a/java/java-impl/src/com/intellij/refactoring/convertToInstanceMethod/ConvertToInstanceMethodHandler.java b/java/java-impl/src/com/intellij/refactoring/convertToInstanceMethod/ConvertToInstanceMethodHandler.java
index c05c3e272acc..ae81f1f49dea 100644
--- a/java/java-impl/src/com/intellij/refactoring/convertToInstanceMethod/ConvertToInstanceMethodHandler.java
+++ b/java/java-impl/src/com/intellij/refactoring/convertToInstanceMethod/ConvertToInstanceMethodHandler.java
@@ -37,7 +37,7 @@ import java.util.List;
  * @author dsl
  */
 public class ConvertToInstanceMethodHandler implements RefactoringActionHandler {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.convertToInstanceMethod.ConvertToInstanceMethodHandler");
+  private static final Logger LOG = Logger.getInstance(ConvertToInstanceMethodHandler.class);
   static final String REFACTORING_NAME = RefactoringBundle.message("convert.to.instance.method.title");
 
   @Override
diff --git a/java/java-impl/src/com/intellij/refactoring/convertToInstanceMethod/ConvertToInstanceMethodProcessor.java b/java/java-impl/src/com/intellij/refactoring/convertToInstanceMethod/ConvertToInstanceMethodProcessor.java
index 51a8f09d54c0..20310f6984c1 100644
--- a/java/java-impl/src/com/intellij/refactoring/convertToInstanceMethod/ConvertToInstanceMethodProcessor.java
+++ b/java/java-impl/src/com/intellij/refactoring/convertToInstanceMethod/ConvertToInstanceMethodProcessor.java
@@ -52,7 +52,7 @@ import java.util.*;
  */
 public class ConvertToInstanceMethodProcessor extends BaseRefactoringProcessor {
   private static final Logger LOG =
-    Logger.getInstance("#com.intellij.refactoring.convertToInstanceMethod.ConvertToInstanceMethodProcessor");
+    Logger.getInstance(ConvertToInstanceMethodProcessor.class);
   private PsiMethod myMethod;
   private @Nullable PsiParameter myTargetParameter;
   private PsiClass myTargetClass;
diff --git a/java/java-impl/src/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsHandler.java b/java/java-impl/src/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsHandler.java
index 22c54c113f85..e27331a7cc09 100644
--- a/java/java-impl/src/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsHandler.java
+++ b/java/java-impl/src/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsHandler.java
@@ -33,7 +33,7 @@ import java.util.HashSet;
 import java.util.List;
 
 public class EncapsulateFieldsHandler implements RefactoringActionHandler {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.encapsulateFields.EncapsulateFieldsHandler");
+  private static final Logger LOG = Logger.getInstance(EncapsulateFieldsHandler.class);
   public static final String REFACTORING_NAME = RefactoringBundle.message("encapsulate.fields.title");
 
   @Override
diff --git a/java/java-impl/src/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsProcessor.java b/java/java-impl/src/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsProcessor.java
index c8fe533a928c..53993944e07e 100644
--- a/java/java-impl/src/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsProcessor.java
+++ b/java/java-impl/src/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsProcessor.java
@@ -28,7 +28,7 @@ import org.jetbrains.annotations.Nullable;
 import java.util.*;
 
 public class EncapsulateFieldsProcessor extends BaseRefactoringProcessor {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.encapsulateFields.EncapsulateFieldsProcessor");
+  private static final Logger LOG = Logger.getInstance(EncapsulateFieldsProcessor.class);
 
   private PsiClass myClass;
   @NotNull
diff --git a/java/java-impl/src/com/intellij/refactoring/extractInterface/ExtractInterfaceHandler.java b/java/java-impl/src/com/intellij/refactoring/extractInterface/ExtractInterfaceHandler.java
index ea66073e84c7..a74437244e2a 100644
--- a/java/java-impl/src/com/intellij/refactoring/extractInterface/ExtractInterfaceHandler.java
+++ b/java/java-impl/src/com/intellij/refactoring/extractInterface/ExtractInterfaceHandler.java
@@ -44,7 +44,7 @@ import com.intellij.util.containers.MultiMap;
 import org.jetbrains.annotations.NotNull;
 
 public class ExtractInterfaceHandler implements RefactoringActionHandler, ElementsHandler, ContextAwareActionHandler {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.extractInterface.ExtractInterfaceHandler");
+  private static final Logger LOG = Logger.getInstance(ExtractInterfaceHandler.class);
 
   public static final String REFACTORING_NAME = RefactoringBundle.message("extract.interface.title");
 
diff --git a/java/java-impl/src/com/intellij/refactoring/extractMethod/ExtractMethodHandler.java b/java/java-impl/src/com/intellij/refactoring/extractMethod/ExtractMethodHandler.java
index da5339a4cb6d..4a4a5b2c20ac 100644
--- a/java/java-impl/src/com/intellij/refactoring/extractMethod/ExtractMethodHandler.java
+++ b/java/java-impl/src/com/intellij/refactoring/extractMethod/ExtractMethodHandler.java
@@ -60,7 +60,7 @@ import java.util.List;
 import java.util.Optional;
 
 public class ExtractMethodHandler implements RefactoringActionHandler, ContextAwareActionHandler {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.extractMethod.ExtractMethodHandler");
+  private static final Logger LOG = Logger.getInstance(ExtractMethodHandler.class);
 
   public static final String REFACTORING_NAME = RefactoringBundle.message("extract.method.title");
 
diff --git a/java/java-impl/src/com/intellij/refactoring/extractMethod/ExtractMethodProcessor.java b/java/java-impl/src/com/intellij/refactoring/extractMethod/ExtractMethodProcessor.java
index 053e90d6bc4c..db024652d568 100644
--- a/java/java-impl/src/com/intellij/refactoring/extractMethod/ExtractMethodProcessor.java
+++ b/java/java-impl/src/com/intellij/refactoring/extractMethod/ExtractMethodProcessor.java
@@ -69,7 +69,7 @@ import static com.intellij.codeInsight.AnnotationUtil.CHECK_TYPE;
 import static com.intellij.refactoring.util.duplicates.DuplicatesFinder.MatchType;
 
 public class ExtractMethodProcessor implements MatchProvider {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.extractMethod.ExtractMethodProcessor");
+  private static final Logger LOG = Logger.getInstance(ExtractMethodProcessor.class);
   @TestOnly
   public static final Key<Boolean> SIGNATURE_CHANGE_ALLOWED = Key.create("SignatureChangeAllowed");
 
diff --git a/java/java-impl/src/com/intellij/refactoring/extractSuperclass/ExtractSuperBaseProcessor.java b/java/java-impl/src/com/intellij/refactoring/extractSuperclass/ExtractSuperBaseProcessor.java
index b312179e0928..673e45b6c757 100644
--- a/java/java-impl/src/com/intellij/refactoring/extractSuperclass/ExtractSuperBaseProcessor.java
+++ b/java/java-impl/src/com/intellij/refactoring/extractSuperclass/ExtractSuperBaseProcessor.java
@@ -43,7 +43,7 @@ import java.util.Collection;
  * @author dsl
  */
 public abstract class ExtractSuperBaseProcessor extends TurnRefsToSuperProcessorBase {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.extractSuperclass.ExtractSuperClassProcessor");
+  private static final Logger LOG = Logger.getInstance(ExtractSuperClassProcessor.class);
   protected PsiDirectory myTargetDirectory;
   protected final String myNewClassName;
   protected final MemberInfo[] myMemberInfos;
diff --git a/java/java-impl/src/com/intellij/refactoring/extractSuperclass/ExtractSuperclassHandler.java b/java/java-impl/src/com/intellij/refactoring/extractSuperclass/ExtractSuperclassHandler.java
index 48e5f074ddb2..7927b0f99ce7 100644
--- a/java/java-impl/src/com/intellij/refactoring/extractSuperclass/ExtractSuperclassHandler.java
+++ b/java/java-impl/src/com/intellij/refactoring/extractSuperclass/ExtractSuperclassHandler.java
@@ -46,7 +46,7 @@ import org.jetbrains.annotations.NotNull;
 import java.util.List;
 
 public class ExtractSuperclassHandler implements ElementsHandler, ExtractSuperclassDialog.Callback, ContextAwareActionHandler {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.extractSuperclass.ExtractSuperclassHandler");
+  private static final Logger LOG = Logger.getInstance(ExtractSuperclassHandler.class);
 
   public static final String REFACTORING_NAME = RefactoringBundle.message("extract.superclass.title");
 
diff --git a/java/java-impl/src/com/intellij/refactoring/inheritanceToDelegation/InheritanceToDelegationHandler.java b/java/java-impl/src/com/intellij/refactoring/inheritanceToDelegation/InheritanceToDelegationHandler.java
index 8fbfb012f8f0..7d496e10c986 100644
--- a/java/java-impl/src/com/intellij/refactoring/inheritanceToDelegation/InheritanceToDelegationHandler.java
+++ b/java/java-impl/src/com/intellij/refactoring/inheritanceToDelegation/InheritanceToDelegationHandler.java
@@ -40,7 +40,7 @@ import org.jetbrains.annotations.NotNull;
 import java.util.*;
 
 public class InheritanceToDelegationHandler implements RefactoringActionHandler, ContextAwareActionHandler {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.inheritanceToDelegation.InheritanceToDelegationHandler");
+  private static final Logger LOG = Logger.getInstance(InheritanceToDelegationHandler.class);
 
   public static final String REFACTORING_NAME = RefactoringBundle.message("replace.inheritance.with.delegation.title");
 
diff --git a/java/java-impl/src/com/intellij/refactoring/inheritanceToDelegation/InheritanceToDelegationProcessor.java b/java/java-impl/src/com/intellij/refactoring/inheritanceToDelegation/InheritanceToDelegationProcessor.java
index 2db45266df8f..0e46467de1b4 100644
--- a/java/java-impl/src/com/intellij/refactoring/inheritanceToDelegation/InheritanceToDelegationProcessor.java
+++ b/java/java-impl/src/com/intellij/refactoring/inheritanceToDelegation/InheritanceToDelegationProcessor.java
@@ -61,7 +61,7 @@ import java.util.*;
  * @author dsl
  */
 public class InheritanceToDelegationProcessor extends BaseRefactoringProcessor {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.inheritanceToDelegation.InheritanceToDelegationProcessor");
+  private static final Logger LOG = Logger.getInstance(InheritanceToDelegationProcessor.class);
   private final PsiClass myClass;
   private final String myInnerClassName;
   private final boolean myIsDelegateOtherMembers;
diff --git a/java/java-impl/src/com/intellij/refactoring/inheritanceToDelegation/InnerClassConstructor.java b/java/java-impl/src/com/intellij/refactoring/inheritanceToDelegation/InnerClassConstructor.java
index 94d841f78dc0..56d74f5cb895 100644
--- a/java/java-impl/src/com/intellij/refactoring/inheritanceToDelegation/InnerClassConstructor.java
+++ b/java/java-impl/src/com/intellij/refactoring/inheritanceToDelegation/InnerClassConstructor.java
@@ -23,7 +23,7 @@ import com.intellij.util.IncorrectOperationException;
  * @author dsl
  */
 public class InnerClassConstructor extends InnerClassMethod {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.inheritanceToDelegation.InnerClassConstructor");
+  private static final Logger LOG = Logger.getInstance(InnerClassConstructor.class);
   public InnerClassConstructor(PsiMethod method) {
     super(method);
     LOG.assertTrue(method.isConstructor());
diff --git a/java/java-impl/src/com/intellij/refactoring/inline/InlineConstantFieldProcessor.java b/java/java-impl/src/com/intellij/refactoring/inline/InlineConstantFieldProcessor.java
index 1333795d880d..8200cc7aac05 100644
--- a/java/java-impl/src/com/intellij/refactoring/inline/InlineConstantFieldProcessor.java
+++ b/java/java-impl/src/com/intellij/refactoring/inline/InlineConstantFieldProcessor.java
@@ -49,7 +49,7 @@ import java.util.stream.Stream;
  * @author ven
  */
 public class InlineConstantFieldProcessor extends BaseRefactoringProcessor {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.inline.InlineConstantFieldProcessor");
+  private static final Logger LOG = Logger.getInstance(InlineConstantFieldProcessor.class);
   private PsiField myField;
   private final PsiReferenceExpression myRefExpr;
   private final boolean myInlineThisOnly;
diff --git a/java/java-impl/src/com/intellij/refactoring/inline/InlineLocalHandler.java b/java/java-impl/src/com/intellij/refactoring/inline/InlineLocalHandler.java
index 2d877da7a055..59543c52de0a 100644
--- a/java/java-impl/src/com/intellij/refactoring/inline/InlineLocalHandler.java
+++ b/java/java-impl/src/com/intellij/refactoring/inline/InlineLocalHandler.java
@@ -68,7 +68,7 @@ import java.util.Collections;
 import java.util.List;
 
 public class InlineLocalHandler extends JavaInlineActionHandler {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.inline.InlineLocalHandler");
+  private static final Logger LOG = Logger.getInstance(InlineLocalHandler.class);
 
   private static final String REFACTORING_NAME = RefactoringBundle.message("inline.variable.title");
 
diff --git a/java/java-impl/src/com/intellij/refactoring/inline/InlineMethodHelper.java b/java/java-impl/src/com/intellij/refactoring/inline/InlineMethodHelper.java
index b1e13d6c2b54..ae4232f6ad74 100644
--- a/java/java-impl/src/com/intellij/refactoring/inline/InlineMethodHelper.java
+++ b/java/java-impl/src/com/intellij/refactoring/inline/InlineMethodHelper.java
@@ -28,7 +28,7 @@ import java.util.Objects;
  * It helps to declare parameters as locals, passing arguments from the call site and then tries to inline the parameters when possible.
  */
 class InlineMethodHelper {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.inline.InlineMethodHelper");
+  private static final Logger LOG = Logger.getInstance(InlineMethodHelper.class);
 
   private final @NotNull Project myProject;
   private final @NotNull PsiManager myManager;
diff --git a/java/java-impl/src/com/intellij/refactoring/inline/InlineMethodProcessor.java b/java/java-impl/src/com/intellij/refactoring/inline/InlineMethodProcessor.java
index c9ef312fe317..ae1622b414e1 100644
--- a/java/java-impl/src/com/intellij/refactoring/inline/InlineMethodProcessor.java
+++ b/java/java-impl/src/com/intellij/refactoring/inline/InlineMethodProcessor.java
@@ -58,7 +58,7 @@ import java.util.stream.Stream;
 import static com.intellij.util.ObjectUtils.tryCast;
 
 public class InlineMethodProcessor extends BaseRefactoringProcessor {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.inline.InlineMethodProcessor");
+  private static final Logger LOG = Logger.getInstance(InlineMethodProcessor.class);
 
   private PsiMethod myMethod;
   private PsiJavaCodeReferenceElement myReference;
diff --git a/java/java-impl/src/com/intellij/refactoring/inline/InlineParameterExpressionProcessor.java b/java/java-impl/src/com/intellij/refactoring/inline/InlineParameterExpressionProcessor.java
index 6f0379083e3c..e3b56281bf67 100644
--- a/java/java-impl/src/com/intellij/refactoring/inline/InlineParameterExpressionProcessor.java
+++ b/java/java-impl/src/com/intellij/refactoring/inline/InlineParameterExpressionProcessor.java
@@ -50,7 +50,7 @@ import java.util.*;
  * @author yole
  */
 public class InlineParameterExpressionProcessor extends BaseRefactoringProcessor {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.inline.InlineParameterExpressionProcessor");
+  private static final Logger LOG = Logger.getInstance(InlineParameterExpressionProcessor.class);
   public static final Key<Boolean> CREATE_LOCAL_FOR_TESTS = Key.create("CREATE_INLINE_PARAMETER_LOCAL_FOR_TESTS");
 
   private final PsiCallExpression myMethodCall;
diff --git a/java/java-impl/src/com/intellij/refactoring/inline/InlineToAnonymousClassProcessor.java b/java/java-impl/src/com/intellij/refactoring/inline/InlineToAnonymousClassProcessor.java
index ad0996dcf668..81f0a2bb13c1 100644
--- a/java/java-impl/src/com/intellij/refactoring/inline/InlineToAnonymousClassProcessor.java
+++ b/java/java-impl/src/com/intellij/refactoring/inline/InlineToAnonymousClassProcessor.java
@@ -42,7 +42,7 @@ import java.util.*;
  * @author yole
  */
 public class InlineToAnonymousClassProcessor extends BaseRefactoringProcessor {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.inline.InlineToAnonymousClassProcessor");
+  private static final Logger LOG = Logger.getInstance(InlineToAnonymousClassProcessor.class);
 
   private PsiClass myClass;
   private final PsiCall myCallToInline;
diff --git a/java/java-impl/src/com/intellij/refactoring/inline/InlineToAnonymousConstructorProcessor.java b/java/java-impl/src/com/intellij/refactoring/inline/InlineToAnonymousConstructorProcessor.java
index d5a5243bf0a4..0ef6477dc89a 100644
--- a/java/java-impl/src/com/intellij/refactoring/inline/InlineToAnonymousConstructorProcessor.java
+++ b/java/java-impl/src/com/intellij/refactoring/inline/InlineToAnonymousConstructorProcessor.java
@@ -46,7 +46,7 @@ import static com.intellij.patterns.PsiJavaPatterns.psiExpressionStatement;
  * @author yole
 */
 class InlineToAnonymousConstructorProcessor {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.inline.InlineToAnonymousConstructorProcessor");
+  private static final Logger LOG = Logger.getInstance(InlineToAnonymousConstructorProcessor.class);
 
   private static final Key<PsiAssignmentExpression> ourAssignmentKey = Key.create("assignment");
   private static final Key<PsiCallExpression> ourCallKey = Key.create("call");
diff --git a/java/java-impl/src/com/intellij/refactoring/introduceField/BaseExpressionToFieldHandler.java b/java/java-impl/src/com/intellij/refactoring/introduceField/BaseExpressionToFieldHandler.java
index 5c635cbd1b5a..e78f8d06436f 100644
--- a/java/java-impl/src/com/intellij/refactoring/introduceField/BaseExpressionToFieldHandler.java
+++ b/java/java-impl/src/com/intellij/refactoring/introduceField/BaseExpressionToFieldHandler.java
@@ -57,7 +57,7 @@ import java.util.HashMap;
 import java.util.List;
 
 public abstract class BaseExpressionToFieldHandler extends IntroduceHandlerBase {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.introduceField.BaseExpressionToFieldHandler");
+  private static final Logger LOG = Logger.getInstance(BaseExpressionToFieldHandler.class);
 
   public enum InitializationPlace {
     IN_CURRENT_METHOD,
diff --git a/java/java-impl/src/com/intellij/refactoring/introduceField/IntroduceConstantDialog.java b/java/java-impl/src/com/intellij/refactoring/introduceField/IntroduceConstantDialog.java
index d77e33715977..02c6a0de3a72 100644
--- a/java/java-impl/src/com/intellij/refactoring/introduceField/IntroduceConstantDialog.java
+++ b/java/java-impl/src/com/intellij/refactoring/introduceField/IntroduceConstantDialog.java
@@ -55,7 +55,7 @@ import java.util.Set;
 import static com.intellij.codeInsight.AnnotationUtil.CHECK_EXTERNAL;
 
 class IntroduceConstantDialog extends DialogWrapper {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.introduceField.IntroduceConstantDialog");
+  private static final Logger LOG = Logger.getInstance(IntroduceConstantDialog.class);
   @NonNls private static final String RECENTS_KEY = "IntroduceConstantDialog.RECENTS_KEY";
   @NonNls protected static final String NONNLS_SELECTED_PROPERTY = "INTRODUCE_CONSTANT_NONNLS";
 
diff --git a/java/java-impl/src/com/intellij/refactoring/introduceField/IntroduceFieldCentralPanel.java b/java/java-impl/src/com/intellij/refactoring/introduceField/IntroduceFieldCentralPanel.java
index 824ce5b3ef31..986f072e265d 100644
--- a/java/java-impl/src/com/intellij/refactoring/introduceField/IntroduceFieldCentralPanel.java
+++ b/java/java-impl/src/com/intellij/refactoring/introduceField/IntroduceFieldCentralPanel.java
@@ -40,7 +40,7 @@ import java.util.HashSet;
 import java.util.Set;
 
 public abstract class IntroduceFieldCentralPanel {
-   protected static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.introduceField.IntroduceFieldDialog");
+  protected static final Logger LOG = Logger.getInstance(IntroduceFieldDialog.class);
 
   private static final String INTRODUCE_FIELD_FINAL_CHECKBOX = "introduce.final.checkbox";
   public static boolean ourLastCbFinalState = PropertiesComponent.getInstance().getBoolean(INTRODUCE_FIELD_FINAL_CHECKBOX, true);
diff --git a/java/java-impl/src/com/intellij/refactoring/introduceField/LocalToFieldHandler.java b/java/java-impl/src/com/intellij/refactoring/introduceField/LocalToFieldHandler.java
index 72791afce3f2..6464a6fcccc9 100644
--- a/java/java-impl/src/com/intellij/refactoring/introduceField/LocalToFieldHandler.java
+++ b/java/java-impl/src/com/intellij/refactoring/introduceField/LocalToFieldHandler.java
@@ -53,7 +53,7 @@ import static com.intellij.refactoring.introduceField.BaseExpressionToFieldHandl
 import static com.intellij.refactoring.introduceField.BaseExpressionToFieldHandler.InitializationPlace.IN_FIELD_DECLARATION;
 
 public abstract class LocalToFieldHandler {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.introduceField.LocalToFieldHandler");
+  private static final Logger LOG = Logger.getInstance(LocalToFieldHandler.class);
 
   private static final String REFACTORING_NAME = RefactoringBundle.message("convert.local.to.field.title");
   private final Project myProject;
diff --git a/java/java-impl/src/com/intellij/refactoring/introduceParameter/IntroduceParameterHandler.java b/java/java-impl/src/com/intellij/refactoring/introduceParameter/IntroduceParameterHandler.java
index d958aa6b76f4..2225a2588d04 100644
--- a/java/java-impl/src/com/intellij/refactoring/introduceParameter/IntroduceParameterHandler.java
+++ b/java/java-impl/src/com/intellij/refactoring/introduceParameter/IntroduceParameterHandler.java
@@ -76,7 +76,7 @@ import java.util.*;
 
 
 public class IntroduceParameterHandler extends IntroduceHandlerBase {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.introduceParameter.IntroduceParameterHandler");
+  private static final Logger LOG = Logger.getInstance(IntroduceParameterHandler.class);
   static final String REFACTORING_NAME = RefactoringBundle.message("introduce.parameter.title");
   private JBPopup myEnclosingMethodsPopup;
   private InplaceIntroduceParameterPopup myInplaceIntroduceParameterPopup;
diff --git a/java/java-impl/src/com/intellij/refactoring/introduceParameter/IntroduceParameterProcessor.java b/java/java-impl/src/com/intellij/refactoring/introduceParameter/IntroduceParameterProcessor.java
index 980746131ddc..96f4ace59598 100644
--- a/java/java-impl/src/com/intellij/refactoring/introduceParameter/IntroduceParameterProcessor.java
+++ b/java/java-impl/src/com/intellij/refactoring/introduceParameter/IntroduceParameterProcessor.java
@@ -62,7 +62,7 @@ import java.util.Set;
  * @author dsl
  */
 public class IntroduceParameterProcessor extends BaseRefactoringProcessor implements IntroduceParameterData {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.introduceParameter.IntroduceParameterProcessor");
+  private static final Logger LOG = Logger.getInstance(IntroduceParameterProcessor.class);
 
   private final PsiMethod myMethodToReplaceIn;
   private final PsiMethod myMethodToSearchFor;
diff --git a/java/java-impl/src/com/intellij/refactoring/introduceParameter/JavaIntroduceParameterMethodUsagesProcessor.java b/java/java-impl/src/com/intellij/refactoring/introduceParameter/JavaIntroduceParameterMethodUsagesProcessor.java
index d4ff89de3d9a..ef109bbe14f1 100644
--- a/java/java-impl/src/com/intellij/refactoring/introduceParameter/JavaIntroduceParameterMethodUsagesProcessor.java
+++ b/java/java-impl/src/com/intellij/refactoring/introduceParameter/JavaIntroduceParameterMethodUsagesProcessor.java
@@ -49,7 +49,7 @@ import org.jetbrains.annotations.Nullable;
  */
 public class JavaIntroduceParameterMethodUsagesProcessor implements IntroduceParameterMethodUsagesProcessor {
   private static final Logger LOG =
-    Logger.getInstance("#com.intellij.refactoring.introduceParameter.JavaIntroduceParameterMethodUsagesProcessor");
+    Logger.getInstance(JavaIntroduceParameterMethodUsagesProcessor.class);
   private static final JavaLanguage myLanguage = Language.findInstance(JavaLanguage.class);
 
   private static boolean isJavaUsage(UsageInfo usage) {
diff --git a/java/java-impl/src/com/intellij/refactoring/introduceParameter/OldReferenceResolver.java b/java/java-impl/src/com/intellij/refactoring/introduceParameter/OldReferenceResolver.java
index 21571907ecdb..631e106f6aa9 100644
--- a/java/java-impl/src/com/intellij/refactoring/introduceParameter/OldReferenceResolver.java
+++ b/java/java-impl/src/com/intellij/refactoring/introduceParameter/OldReferenceResolver.java
@@ -38,7 +38,7 @@ import java.util.Set;
  * @author Maxim.Medvedev
  */
 public class OldReferenceResolver {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.introduceParameter.OldReferenceResolver");
+  private static final Logger LOG = Logger.getInstance(OldReferenceResolver.class);
 
   private final PsiCall myContext;
   private final PsiExpression myExpr;
diff --git a/java/java-impl/src/com/intellij/refactoring/introduceVariable/IntroduceVariableBase.java b/java/java-impl/src/com/intellij/refactoring/introduceVariable/IntroduceVariableBase.java
index 5b5ac8d2cbeb..9db29940e5af 100644
--- a/java/java-impl/src/com/intellij/refactoring/introduceVariable/IntroduceVariableBase.java
+++ b/java/java-impl/src/com/intellij/refactoring/introduceVariable/IntroduceVariableBase.java
@@ -120,7 +120,7 @@ public abstract class IntroduceVariableBase extends IntroduceHandlerBase {
     }
   }
 
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.introduceVariable.IntroduceVariableBase");
+  private static final Logger LOG = Logger.getInstance(IntroduceVariableBase.class);
   @NonNls private static final String PREFER_STATEMENTS_OPTION = "introduce.variable.prefer.statements";
   @NonNls private static final String REFACTORING_ID = "refactoring.extractVariable";
 
diff --git a/java/java-impl/src/com/intellij/refactoring/introduceVariable/VariableExtractor.java b/java/java-impl/src/com/intellij/refactoring/introduceVariable/VariableExtractor.java
index 1e569948c893..e473d466401c 100644
--- a/java/java-impl/src/com/intellij/refactoring/introduceVariable/VariableExtractor.java
+++ b/java/java-impl/src/com/intellij/refactoring/introduceVariable/VariableExtractor.java
@@ -39,7 +39,7 @@ import java.util.*;
  * No user interaction is performed here.
  */
 class VariableExtractor {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.introduceVariable.VariableExtractor");
+  private static final Logger LOG = Logger.getInstance(VariableExtractor.class);
 
   private final Project myProject;
   private final Editor myEditor;
diff --git a/java/java-impl/src/com/intellij/refactoring/migration/MigrationDialog.java b/java/java-impl/src/com/intellij/refactoring/migration/MigrationDialog.java
index 9d98850d6eae..3bb078e9c009 100644
--- a/java/java-impl/src/com/intellij/refactoring/migration/MigrationDialog.java
+++ b/java/java-impl/src/com/intellij/refactoring/migration/MigrationDialog.java
@@ -14,7 +14,7 @@ import java.awt.event.KeyEvent;
 import java.io.IOException;
 
 public class MigrationDialog extends DialogWrapper {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.migration.MigrationDialog");
+  private static final Logger LOG = Logger.getInstance(MigrationDialog.class);
 
   private JPanel myPanel;
   private JComboBox<MigrationMap> myMapComboBox;
diff --git a/java/java-impl/src/com/intellij/refactoring/migration/MigrationMapSet.java b/java/java-impl/src/com/intellij/refactoring/migration/MigrationMapSet.java
index 99ac8d47f409..c11ee2ae304e 100644
--- a/java/java-impl/src/com/intellij/refactoring/migration/MigrationMapSet.java
+++ b/java/java-impl/src/com/intellij/refactoring/migration/MigrationMapSet.java
@@ -30,7 +30,7 @@ import java.util.Set;
 import java.util.TreeSet;
 
 public class MigrationMapSet {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.migration.MigrationMapSet");
+  private static final Logger LOG = Logger.getInstance(MigrationMapSet.class);
 
   private ArrayList<MigrationMap> myMaps;
   @NonNls private static final String MIGRATION_MAP = "migrationMap";
diff --git a/java/java-impl/src/com/intellij/refactoring/migration/MigrationUtil.java b/java/java-impl/src/com/intellij/refactoring/migration/MigrationUtil.java
index 0474ff4504b0..3e64f9e17a34 100644
--- a/java/java-impl/src/com/intellij/refactoring/migration/MigrationUtil.java
+++ b/java/java-impl/src/com/intellij/refactoring/migration/MigrationUtil.java
@@ -34,7 +34,7 @@ import java.util.Comparator;
 import java.util.List;
 
 public class MigrationUtil {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.migration.MigrationUtil");
+  private static final Logger LOG = Logger.getInstance(MigrationUtil.class);
 
   private MigrationUtil() {
   }
diff --git a/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassToInnerProcessor.java b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassToInnerProcessor.java
index e62cff5fe4bd..ef6ec098e71e 100644
--- a/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassToInnerProcessor.java
+++ b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassToInnerProcessor.java
@@ -49,7 +49,7 @@ import java.util.*;
  * @author yole
  */
 public class MoveClassToInnerProcessor extends BaseRefactoringProcessor {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.move.moveClassesOrPackages.MoveClassToInnerProcessor");
+  private static final Logger LOG = Logger.getInstance(MoveClassToInnerProcessor.class);
   public static final Key<List<NonCodeUsageInfo>> ourNonCodeUsageKey = Key.create("MoveClassToInner.NonCodeUsage");
 
   private PsiClass[] myClassesToMove;
diff --git a/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesDialog.java b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesDialog.java
index a4745f6c22cc..5ef44262b25b 100644
--- a/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesDialog.java
+++ b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesDialog.java
@@ -46,7 +46,7 @@ import java.util.Set;
 
 public class MoveClassesOrPackagesDialog extends MoveDialogBase {
   private static final String RECENTS_KEY = "MoveClassesOrPackagesDialog.RECENTS_KEY";
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.move.moveClassesOrPackages.MoveClassesOrPackagesDialog");
+  private static final Logger LOG = Logger.getInstance(MoveClassesOrPackagesDialog.class);
 
   private final PsiElement[] myElementsToMove;
   private final MoveCallback myMoveCallback;
diff --git a/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesImpl.java b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesImpl.java
index d23cf0430ce2..9b383b637ee7 100644
--- a/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesImpl.java
+++ b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesImpl.java
@@ -32,7 +32,7 @@ import java.util.List;
 import java.util.stream.Stream;
 
 public class MoveClassesOrPackagesImpl {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.move.moveClassesOrPackages.MoveClassesOrPackagesImpl");
+  private static final Logger LOG = Logger.getInstance(MoveClassesOrPackagesImpl.class);
 
   public static void doMove(Project project, PsiElement[] adjustedElements, PsiElement initialTargetElement, MoveCallback moveCallback) {
     if (!CommonRefactoringUtil.checkReadOnlyStatusRecursively(project, Arrays.asList(adjustedElements), true)) {
diff --git a/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesProcessor.java b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesProcessor.java
index ff204dbb0af1..07d0f27d3c44 100644
--- a/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesProcessor.java
+++ b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesProcessor.java
@@ -51,8 +51,7 @@ import java.util.*;
  * @author Jeka,dsl
  */
 public class MoveClassesOrPackagesProcessor extends BaseRefactoringProcessor {
-  private static final Logger LOG = Logger.getInstance(
-    "#com.intellij.refactoring.move.moveClassesOrPackages.MoveClassesOrPackagesProcessor");
+  private static final Logger LOG = Logger.getInstance(MoveClassesOrPackagesProcessor.class);
 
   private final PsiElement[] myElementsToMove;
   private boolean mySearchInComments;
diff --git a/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesUtil.java b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesUtil.java
index a2e6eabd2288..913b57e587f8 100644
--- a/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesUtil.java
+++ b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesUtil.java
@@ -35,8 +35,7 @@ import java.io.File;
 import java.util.*;
 
 public class MoveClassesOrPackagesUtil {
-  private static final Logger LOG = Logger.getInstance(
-    "#com.intellij.refactoring.move.moveClassesOrPackages.MoveClassesOrPackagesUtil");
+  private static final Logger LOG = Logger.getInstance(MoveClassesOrPackagesUtil.class);
 
   private MoveClassesOrPackagesUtil() {
   }
diff --git a/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveJavaClassHandler.java b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveJavaClassHandler.java
index 6551351d5630..e3b59d933982 100644
--- a/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveJavaClassHandler.java
+++ b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveJavaClassHandler.java
@@ -33,7 +33,7 @@ import java.util.Set;
  * @author Maxim.Medvedev
  */
 public class MoveJavaClassHandler implements MoveClassHandler {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.move.moveClassesOrPackages.MoveJavaClassHandler");
+  private static final Logger LOG = Logger.getInstance(MoveJavaClassHandler.class);
 
   @Override
   public void finishMoveClass(@NotNull PsiClass aClass) {
diff --git a/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveJavaFileHandler.java b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveJavaFileHandler.java
index d05bbfd98b66..ffa82e0baa97 100644
--- a/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveJavaFileHandler.java
+++ b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveJavaFileHandler.java
@@ -33,7 +33,7 @@ import java.util.List;
 import java.util.Map;
 
 public class MoveJavaFileHandler extends MoveFileHandler {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.move.moveClassesOrPackages.MoveJavaFileHandler");
+  private static final Logger LOG = Logger.getInstance(MoveJavaFileHandler.class);
 
   @Override
   public boolean canProcessElement(PsiFile element) {
diff --git a/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MultipleRootsMoveDestination.java b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MultipleRootsMoveDestination.java
index ac77f75acc5e..5c74e9574093 100644
--- a/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MultipleRootsMoveDestination.java
+++ b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MultipleRootsMoveDestination.java
@@ -36,8 +36,7 @@ import java.util.*;
  *  @author dsl
  */
 public class MultipleRootsMoveDestination extends AutocreatingMoveDestination {
-  private static final Logger LOG = Logger.getInstance(
-    "#com.intellij.refactoring.move.moveClassesOrPackages.MultipleRootsMoveDestination");
+  private static final Logger LOG = Logger.getInstance(MultipleRootsMoveDestination.class);
 
   public MultipleRootsMoveDestination(PackageWrapper aPackage) {
     super(aPackage);
diff --git a/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/SingleSourceRootMoveDestination.java b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/SingleSourceRootMoveDestination.java
index 38471d52b10f..84d0ab93d38b 100644
--- a/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/SingleSourceRootMoveDestination.java
+++ b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/SingleSourceRootMoveDestination.java
@@ -22,8 +22,7 @@ import java.util.Collection;
  *  @author dsl
  */
 public class SingleSourceRootMoveDestination implements MoveDestination {
-  private static final Logger LOG = Logger.getInstance(
-    "#com.intellij.refactoring.move.moveClassesOrPackages.SingleSourceRootMoveDestination");
+  private static final Logger LOG = Logger.getInstance(SingleSourceRootMoveDestination.class);
   @NotNull
   private final PackageWrapper myPackage;
   @NotNull
diff --git a/java/java-impl/src/com/intellij/refactoring/move/moveInner/MoveInnerImpl.java b/java/java-impl/src/com/intellij/refactoring/move/moveInner/MoveInnerImpl.java
index 3eb40a600c9e..67d89b1ffbbf 100644
--- a/java/java-impl/src/com/intellij/refactoring/move/moveInner/MoveInnerImpl.java
+++ b/java/java-impl/src/com/intellij/refactoring/move/moveInner/MoveInnerImpl.java
@@ -26,7 +26,7 @@ import com.intellij.refactoring.util.CommonRefactoringUtil;
 import org.jetbrains.annotations.Nullable;
 
 public class MoveInnerImpl {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.move.moveInner.MoveInnerImpl");
+  private static final Logger LOG = Logger.getInstance(MoveInnerImpl.class);
 
   public static final String REFACTORING_NAME = RefactoringBundle.message("move.inner.to.upper.level.title");
 
diff --git a/java/java-impl/src/com/intellij/refactoring/move/moveInner/MoveInnerProcessor.java b/java/java-impl/src/com/intellij/refactoring/move/moveInner/MoveInnerProcessor.java
index d2d262706717..ccfd8d815f99 100644
--- a/java/java-impl/src/com/intellij/refactoring/move/moveInner/MoveInnerProcessor.java
+++ b/java/java-impl/src/com/intellij/refactoring/move/moveInner/MoveInnerProcessor.java
@@ -42,7 +42,7 @@ import java.util.*;
  * @author Jeka
  */
 public class MoveInnerProcessor extends BaseRefactoringProcessor {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.move.moveInner.MoveInnerProcessor");
+  private static final Logger LOG = Logger.getInstance(MoveInnerProcessor.class);
 
   private MoveCallback myMoveCallback;
 
diff --git a/java/java-impl/src/com/intellij/refactoring/move/moveInstanceMethod/InternalUsageInfo.java b/java/java-impl/src/com/intellij/refactoring/move/moveInstanceMethod/InternalUsageInfo.java
index 57eed4ef4773..10fc282fd1b0 100644
--- a/java/java-impl/src/com/intellij/refactoring/move/moveInstanceMethod/InternalUsageInfo.java
+++ b/java/java-impl/src/com/intellij/refactoring/move/moveInstanceMethod/InternalUsageInfo.java
@@ -26,7 +26,7 @@ import com.intellij.openapi.diagnostic.Logger;
  * @author ven
  */
 public class InternalUsageInfo extends UsageInfo {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.move.moveInstanceMethod.InternalUsageInfo");
+  private static final Logger LOG = Logger.getInstance(InternalUsageInfo.class);
   public InternalUsageInfo(final PsiElement referenceElement) {
     super(referenceElement);
     LOG.assertTrue(referenceElement instanceof PsiReferenceExpression || referenceElement instanceof PsiNewExpression);
diff --git a/java/java-impl/src/com/intellij/refactoring/move/moveInstanceMethod/MoveInstanceMethodHandler.java b/java/java-impl/src/com/intellij/refactoring/move/moveInstanceMethod/MoveInstanceMethodHandler.java
index c58d485f3557..5225fc754ece 100644
--- a/java/java-impl/src/com/intellij/refactoring/move/moveInstanceMethod/MoveInstanceMethodHandler.java
+++ b/java/java-impl/src/com/intellij/refactoring/move/moveInstanceMethod/MoveInstanceMethodHandler.java
@@ -47,7 +47,7 @@ import java.util.*;
  * @author ven
  */
 public class MoveInstanceMethodHandler implements RefactoringActionHandler {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.move.moveInstanceMethod.MoveInstanceMethodHandler");
+  private static final Logger LOG = Logger.getInstance(MoveInstanceMethodHandler.class);
   static final String REFACTORING_NAME = RefactoringBundle.message("move.instance.method.title");
 
   @Override
diff --git a/java/java-impl/src/com/intellij/refactoring/move/moveInstanceMethod/MoveInstanceMethodProcessor.java b/java/java-impl/src/com/intellij/refactoring/move/moveInstanceMethod/MoveInstanceMethodProcessor.java
index e85a79ba2ba1..50827fa18c97 100644
--- a/java/java-impl/src/com/intellij/refactoring/move/moveInstanceMethod/MoveInstanceMethodProcessor.java
+++ b/java/java-impl/src/com/intellij/refactoring/move/moveInstanceMethod/MoveInstanceMethodProcessor.java
@@ -51,7 +51,7 @@ import java.util.*;
  * @author ven
  */
 public class MoveInstanceMethodProcessor extends BaseRefactoringProcessor{
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.move.moveInstanceMethod.MoveInstanceMethodProcessor");
+  private static final Logger LOG = Logger.getInstance(MoveInstanceMethodProcessor.class);
 
   public PsiMethod getMethod() {
     return myMethod;
diff --git a/java/java-impl/src/com/intellij/refactoring/move/moveMembers/MoveMembersProcessor.java b/java/java-impl/src/com/intellij/refactoring/move/moveMembers/MoveMembersProcessor.java
index c8b8244c8d50..ff723eb26165 100644
--- a/java/java-impl/src/com/intellij/refactoring/move/moveMembers/MoveMembersProcessor.java
+++ b/java/java-impl/src/com/intellij/refactoring/move/moveMembers/MoveMembersProcessor.java
@@ -51,7 +51,7 @@ import java.util.*;
  * @author Jeka
  */
 public class MoveMembersProcessor extends BaseRefactoringProcessor {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.move.moveMembers.MoveMembersProcessor");
+  private static final Logger LOG = Logger.getInstance(MoveMembersProcessor.class);
 
   private PsiClass myTargetClass;
   private final Set<PsiMember> myMembersToMove = new LinkedHashSet<>();
diff --git a/java/java-impl/src/com/intellij/refactoring/openapi/impl/JavaRefactoringFactoryImpl.java b/java/java-impl/src/com/intellij/refactoring/openapi/impl/JavaRefactoringFactoryImpl.java
index 965fa272c6b8..f0100484fefe 100644
--- a/java/java-impl/src/com/intellij/refactoring/openapi/impl/JavaRefactoringFactoryImpl.java
+++ b/java/java-impl/src/com/intellij/refactoring/openapi/impl/JavaRefactoringFactoryImpl.java
@@ -17,7 +17,7 @@ import org.jetbrains.annotations.NotNull;
  * @author dsl
  */
 public class JavaRefactoringFactoryImpl extends JavaRefactoringFactory {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.openapi.impl.JavaRefactoringFactoryImpl");
+  private static final Logger LOG = Logger.getInstance(JavaRefactoringFactoryImpl.class);
   private final Project myProject;
 
   public JavaRefactoringFactoryImpl(Project project) {
diff --git a/java/java-impl/src/com/intellij/refactoring/rename/JavaUnresolvableLocalCollisionDetector.java b/java/java-impl/src/com/intellij/refactoring/rename/JavaUnresolvableLocalCollisionDetector.java
index 1f7e31aeaa53..dac504b439e9 100644
--- a/java/java-impl/src/com/intellij/refactoring/rename/JavaUnresolvableLocalCollisionDetector.java
+++ b/java/java-impl/src/com/intellij/refactoring/rename/JavaUnresolvableLocalCollisionDetector.java
@@ -24,7 +24,7 @@ import com.intellij.usageView.UsageInfo;
 import java.util.List;
 
 public class JavaUnresolvableLocalCollisionDetector {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.rename.JavaUnresolvableLocalCollisionDetector");
+  private static final Logger LOG = Logger.getInstance(JavaUnresolvableLocalCollisionDetector.class);
 
   private JavaUnresolvableLocalCollisionDetector() {
   }
diff --git a/java/java-impl/src/com/intellij/refactoring/rename/RenameJavaClassProcessor.java b/java/java-impl/src/com/intellij/refactoring/rename/RenameJavaClassProcessor.java
index cc3e359d466d..7ba24e5c544b 100644
--- a/java/java-impl/src/com/intellij/refactoring/rename/RenameJavaClassProcessor.java
+++ b/java/java-impl/src/com/intellij/refactoring/rename/RenameJavaClassProcessor.java
@@ -38,7 +38,7 @@ import java.util.regex.Pattern;
  * @author yole
  */
 public class RenameJavaClassProcessor extends RenamePsiElementProcessor {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.rename.RenameJavaClassProcessor");
+  private static final Logger LOG = Logger.getInstance(RenameJavaClassProcessor.class);
 
   @Override
   public boolean canProcessElement(@NotNull final PsiElement element) {
diff --git a/java/java-impl/src/com/intellij/refactoring/rename/RenameJavaMemberProcessor.java b/java/java-impl/src/com/intellij/refactoring/rename/RenameJavaMemberProcessor.java
index 6f5cf17540a4..1b4ddf169621 100644
--- a/java/java-impl/src/com/intellij/refactoring/rename/RenameJavaMemberProcessor.java
+++ b/java/java-impl/src/com/intellij/refactoring/rename/RenameJavaMemberProcessor.java
@@ -35,7 +35,7 @@ import java.util.Set;
  * @author yole
  */
 public abstract class RenameJavaMemberProcessor extends RenamePsiElementProcessor {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.rename.RenameJavaMemberProcessor");
+  private static final Logger LOG = Logger.getInstance(RenameJavaMemberProcessor.class);
 
   public static void qualifyMember(PsiMember member, PsiElement occurence, String newName) throws IncorrectOperationException {
     final PsiClass containingClass = member.getContainingClass();
diff --git a/java/java-impl/src/com/intellij/refactoring/rename/RenameJavaMethodProcessor.java b/java/java-impl/src/com/intellij/refactoring/rename/RenameJavaMethodProcessor.java
index c83a3bf11214..e3750b96c69c 100644
--- a/java/java-impl/src/com/intellij/refactoring/rename/RenameJavaMethodProcessor.java
+++ b/java/java-impl/src/com/intellij/refactoring/rename/RenameJavaMethodProcessor.java
@@ -32,7 +32,7 @@ import org.jetbrains.annotations.Nullable;
 import java.util.*;
 
 public class RenameJavaMethodProcessor extends RenameJavaMemberProcessor {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.rename.RenameJavaMethodProcessor");
+  private static final Logger LOG = Logger.getInstance(RenameJavaMethodProcessor.class);
 
   @Override
   public boolean canProcessElement(@NotNull final PsiElement element) {
diff --git a/java/java-impl/src/com/intellij/refactoring/rename/RenameJavaVariableProcessor.java b/java/java-impl/src/com/intellij/refactoring/rename/RenameJavaVariableProcessor.java
index 9fba2968af0b..148528e7b88d 100644
--- a/java/java-impl/src/com/intellij/refactoring/rename/RenameJavaVariableProcessor.java
+++ b/java/java-impl/src/com/intellij/refactoring/rename/RenameJavaVariableProcessor.java
@@ -38,7 +38,7 @@ import java.util.List;
 import java.util.Map;
 
 public class RenameJavaVariableProcessor extends RenameJavaMemberProcessor {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.rename.RenameJavaVariableProcessor");
+  private static final Logger LOG = Logger.getInstance(RenameJavaVariableProcessor.class);
 
   @Override
   public boolean canProcessElement(@NotNull final PsiElement element) {
diff --git a/java/java-impl/src/com/intellij/refactoring/rename/RenamePsiPackageProcessor.java b/java/java-impl/src/com/intellij/refactoring/rename/RenamePsiPackageProcessor.java
index 29fcd9617e9c..71ecc6c1baa0 100644
--- a/java/java-impl/src/com/intellij/refactoring/rename/RenamePsiPackageProcessor.java
+++ b/java/java-impl/src/com/intellij/refactoring/rename/RenamePsiPackageProcessor.java
@@ -29,7 +29,7 @@ import java.util.Map;
  * @author yole
  */
 public class RenamePsiPackageProcessor extends RenamePsiElementProcessor {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.rename.RenamePsiPackageProcessor");
+  private static final Logger LOG = Logger.getInstance(RenamePsiPackageProcessor.class);
 
   @Override
   public boolean canProcessElement(@NotNull final PsiElement element) {
diff --git a/java/java-impl/src/com/intellij/refactoring/rename/inplace/JavaResolveSnapshot.java b/java/java-impl/src/com/intellij/refactoring/rename/inplace/JavaResolveSnapshot.java
index 2fa01d9b7d37..970149588dc4 100644
--- a/java/java-impl/src/com/intellij/refactoring/rename/inplace/JavaResolveSnapshot.java
+++ b/java/java-impl/src/com/intellij/refactoring/rename/inplace/JavaResolveSnapshot.java
@@ -29,7 +29,7 @@ import java.util.Map;
  * @author ven
  */
 class JavaResolveSnapshot extends ResolveSnapshotProvider.ResolveSnapshot {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.rename.inplace.JavaResolveSnapshot");
+  private static final Logger LOG = Logger.getInstance(JavaResolveSnapshot.class);
 
   private final Map<SmartPsiElementPointer, SmartPsiElementPointer> myReferencesMap = new HashMap<>();
   private final Project myProject;
diff --git a/java/java-impl/src/com/intellij/refactoring/rename/naming/AutomaticUsageRenamingDialog.java b/java/java-impl/src/com/intellij/refactoring/rename/naming/AutomaticUsageRenamingDialog.java
index 9bed35e396c1..ca98f25997e3 100644
--- a/java/java-impl/src/com/intellij/refactoring/rename/naming/AutomaticUsageRenamingDialog.java
+++ b/java/java-impl/src/com/intellij/refactoring/rename/naming/AutomaticUsageRenamingDialog.java
@@ -8,6 +8,7 @@ import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.DialogWrapper;
 import com.intellij.openapi.wm.IdeFocusManager;
 import com.intellij.refactoring.RefactoringBundle;
+import com.intellij.refactoring.rename.AutomaticRenamingDialog;
 import com.intellij.ui.*;
 import com.intellij.ui.components.panels.ValidatingComponent;
 import com.intellij.ui.table.JBTable;
@@ -27,7 +28,7 @@ import java.util.List;
  * @author dsl
  */
 public class AutomaticUsageRenamingDialog<T> extends DialogWrapper {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.rename.AutomaticRenamingDialog");
+  private static final Logger LOG = Logger.getInstance(AutomaticRenamingDialog.class);
   private static final int CHECK_COLUMN = 0;
   private static final int OLD_NAME_COLUMN = 1;
   private static final int NEW_NAME_COLUMN = 2;
diff --git a/java/java-impl/src/com/intellij/refactoring/rename/naming/PsiNamedElementAutomaticRenamer.java b/java/java-impl/src/com/intellij/refactoring/rename/naming/PsiNamedElementAutomaticRenamer.java
index e7cdfcf718c3..2d9cc3aa1462 100644
--- a/java/java-impl/src/com/intellij/refactoring/rename/naming/PsiNamedElementAutomaticRenamer.java
+++ b/java/java-impl/src/com/intellij/refactoring/rename/naming/PsiNamedElementAutomaticRenamer.java
@@ -25,7 +25,7 @@ import java.util.List;
  * @author peter
  */
 public abstract class PsiNamedElementAutomaticRenamer<T extends PsiNamedElement> extends AutomaticUsageRenamer<T> {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.rename.naming.PsiNamedElementAutomaticRenamer");
+  private static final Logger LOG = Logger.getInstance(PsiNamedElementAutomaticRenamer.class);
 
   protected PsiNamedElementAutomaticRenamer(List<? extends T> elements, String oldName, String newName) {
     super(elements, oldName, newName);
diff --git a/java/java-impl/src/com/intellij/refactoring/replaceConstructorWithFactory/ReplaceConstructorWithFactoryProcessor.java b/java/java-impl/src/com/intellij/refactoring/replaceConstructorWithFactory/ReplaceConstructorWithFactoryProcessor.java
index 9813eebe41f6..162e618dbffe 100644
--- a/java/java-impl/src/com/intellij/refactoring/replaceConstructorWithFactory/ReplaceConstructorWithFactoryProcessor.java
+++ b/java/java-impl/src/com/intellij/refactoring/replaceConstructorWithFactory/ReplaceConstructorWithFactoryProcessor.java
@@ -46,8 +46,7 @@ import java.util.List;
  * @author dsl
  */
 public class ReplaceConstructorWithFactoryProcessor extends BaseRefactoringProcessor {
-  private static final Logger LOG = Logger.getInstance(
-    "#com.intellij.refactoring.replaceConstructorWithFactory.ReplaceConstructorWithFactoryProcessor");
+  private static final Logger LOG = Logger.getInstance(ReplaceConstructorWithFactoryProcessor.class);
   private final PsiMethod myConstructor;
   private final String myFactoryName;
   private final PsiElementFactory myFactory;
diff --git a/java/java-impl/src/com/intellij/refactoring/safeDelete/JavaSafeDeleteProcessor.java b/java/java-impl/src/com/intellij/refactoring/safeDelete/JavaSafeDeleteProcessor.java
index 01d08e42f55c..0997cb0b822a 100644
--- a/java/java-impl/src/com/intellij/refactoring/safeDelete/JavaSafeDeleteProcessor.java
+++ b/java/java-impl/src/com/intellij/refactoring/safeDelete/JavaSafeDeleteProcessor.java
@@ -50,7 +50,7 @@ import org.jetbrains.annotations.Nullable;
 import java.util.*;
 
 public class JavaSafeDeleteProcessor extends SafeDeleteProcessorDelegateBase {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.safeDelete.JavaSafeDeleteProcessor");
+  private static final Logger LOG = Logger.getInstance(JavaSafeDeleteProcessor.class);
 
   @Override
   public boolean handlesElement(final PsiElement element) {
diff --git a/java/java-impl/src/com/intellij/refactoring/safeDelete/usageInfo/SafeDeleteExtendsClassUsageInfo.java b/java/java-impl/src/com/intellij/refactoring/safeDelete/usageInfo/SafeDeleteExtendsClassUsageInfo.java
index 3104ba7fdead..78308b3e04a8 100644
--- a/java/java-impl/src/com/intellij/refactoring/safeDelete/usageInfo/SafeDeleteExtendsClassUsageInfo.java
+++ b/java/java-impl/src/com/intellij/refactoring/safeDelete/usageInfo/SafeDeleteExtendsClassUsageInfo.java
@@ -27,7 +27,7 @@ import org.jetbrains.annotations.Nullable;
  * @author ven
  */
 public class SafeDeleteExtendsClassUsageInfo extends SafeDeleteReferenceUsageInfo {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.safeDelete.usageInfo.SafeDeleteExtendsClassUsageInfo");
+  private static final Logger LOG = Logger.getInstance(SafeDeleteExtendsClassUsageInfo.class);
   private final PsiClass myExtendingClass;
   private final PsiSubstitutor mySubstitutor;
 
diff --git a/java/java-impl/src/com/intellij/refactoring/safeDelete/usageInfo/SafeDeleteReferenceJavaDeleteUsageInfo.java b/java/java-impl/src/com/intellij/refactoring/safeDelete/usageInfo/SafeDeleteReferenceJavaDeleteUsageInfo.java
index 2488ec416241..40819a29d262 100644
--- a/java/java-impl/src/com/intellij/refactoring/safeDelete/usageInfo/SafeDeleteReferenceJavaDeleteUsageInfo.java
+++ b/java/java-impl/src/com/intellij/refactoring/safeDelete/usageInfo/SafeDeleteReferenceJavaDeleteUsageInfo.java
@@ -28,7 +28,7 @@ import java.util.ArrayList;
  * @author yole
  */
 public class SafeDeleteReferenceJavaDeleteUsageInfo extends SafeDeleteReferenceSimpleDeleteUsageInfo {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.safeDelete.usageInfo.SafeDeleteReferenceJavaDeleteUsageInfo");
+  private static final Logger LOG = Logger.getInstance(SafeDeleteReferenceJavaDeleteUsageInfo.class);
 
   public SafeDeleteReferenceJavaDeleteUsageInfo(PsiElement element, PsiElement referencedElement, boolean isSafeDelete) {
     super(element, referencedElement, isSafeDelete);
diff --git a/java/java-impl/src/com/intellij/refactoring/tempWithQuery/TempWithQueryHandler.java b/java/java-impl/src/com/intellij/refactoring/tempWithQuery/TempWithQueryHandler.java
index 245e1a1bcce1..ab8d3d7e8b7b 100644
--- a/java/java-impl/src/com/intellij/refactoring/tempWithQuery/TempWithQueryHandler.java
+++ b/java/java-impl/src/com/intellij/refactoring/tempWithQuery/TempWithQueryHandler.java
@@ -48,7 +48,7 @@ import org.jetbrains.annotations.NotNull;
 import java.util.ArrayList;
 
 public class TempWithQueryHandler implements RefactoringActionHandler {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.tempWithQuery.TempWithQueryHandler");
+  private static final Logger LOG = Logger.getInstance(TempWithQueryHandler.class);
 
   private static final String REFACTORING_NAME = RefactoringBundle.message("replace.temp.with.query.title");
 
diff --git a/java/java-impl/src/com/intellij/refactoring/turnRefsToSuper/TurnRefsToSuperProcessor.java b/java/java-impl/src/com/intellij/refactoring/turnRefsToSuper/TurnRefsToSuperProcessor.java
index 7bb236ab462d..69b2e837fb06 100644
--- a/java/java-impl/src/com/intellij/refactoring/turnRefsToSuper/TurnRefsToSuperProcessor.java
+++ b/java/java-impl/src/com/intellij/refactoring/turnRefsToSuper/TurnRefsToSuperProcessor.java
@@ -24,7 +24,7 @@ import java.util.Collection;
 import java.util.Collections;
 
 public class TurnRefsToSuperProcessor extends TurnRefsToSuperProcessorBase {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.turnRefsToSuper.TurnRefsToSuperProcessor");
+  private static final Logger LOG = Logger.getInstance(TurnRefsToSuperProcessor.class);
 
   private PsiClass mySuper;
   public TurnRefsToSuperProcessor(Project project,
diff --git a/java/java-impl/src/com/intellij/refactoring/turnRefsToSuper/TurnRefsToSuperProcessorBase.java b/java/java-impl/src/com/intellij/refactoring/turnRefsToSuper/TurnRefsToSuperProcessorBase.java
index d580f21b63e5..0d591f40bd5c 100644
--- a/java/java-impl/src/com/intellij/refactoring/turnRefsToSuper/TurnRefsToSuperProcessorBase.java
+++ b/java/java-impl/src/com/intellij/refactoring/turnRefsToSuper/TurnRefsToSuperProcessorBase.java
@@ -38,7 +38,7 @@ import java.util.*;
  * @author dsl
  */
 public abstract class TurnRefsToSuperProcessorBase extends BaseRefactoringProcessor {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.turnRefsToSuper.TurnRefsToSuperProcessorBase");
+  private static final Logger LOG = Logger.getInstance(TurnRefsToSuperProcessorBase.class);
   protected PsiClass myClass;
   protected final boolean myReplaceInstanceOf;
   protected PsiManager myManager;
diff --git a/java/java-impl/src/com/intellij/refactoring/typeCook/Util.java b/java/java-impl/src/com/intellij/refactoring/typeCook/Util.java
index e94a4b6edc77..f29c550ec4a5 100644
--- a/java/java-impl/src/com/intellij/refactoring/typeCook/Util.java
+++ b/java/java-impl/src/com/intellij/refactoring/typeCook/Util.java
@@ -28,7 +28,7 @@ import java.util.HashSet;
 import java.util.Set;
 
 public class Util {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.typeCook.Util");
+  private static final Logger LOG = Logger.getInstance(Util.class);
 
   public static PsiType createArrayType(PsiType theType, int level) {
     while (level-- > 0) {
diff --git a/java/java-impl/src/com/intellij/refactoring/typeCook/deductive/builder/Constraint.java b/java/java-impl/src/com/intellij/refactoring/typeCook/deductive/builder/Constraint.java
index afb4691c2ad9..c815712332ad 100644
--- a/java/java-impl/src/com/intellij/refactoring/typeCook/deductive/builder/Constraint.java
+++ b/java/java-impl/src/com/intellij/refactoring/typeCook/deductive/builder/Constraint.java
@@ -23,7 +23,7 @@ import com.intellij.refactoring.typeCook.deductive.resolver.Binding;
  * @author db
  */
 public abstract class Constraint {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.typeCook.deductive.builder.Constraint");
+  private static final Logger LOG = Logger.getInstance(Constraint.class);
 
   PsiType myLeft;
   PsiType myRight;
diff --git a/java/java-impl/src/com/intellij/refactoring/typeCook/deductive/builder/Result.java b/java/java-impl/src/com/intellij/refactoring/typeCook/deductive/builder/Result.java
index 931a1d89b47c..b67b8bcdd96b 100644
--- a/java/java-impl/src/com/intellij/refactoring/typeCook/deductive/builder/Result.java
+++ b/java/java-impl/src/com/intellij/refactoring/typeCook/deductive/builder/Result.java
@@ -33,7 +33,7 @@ import java.util.Set;
  * @author db
  */
 public class Result {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.typeCook.deductive.builder.Result");
+  private static final Logger LOG = Logger.getInstance(Result.class);
 
   private final Set<PsiElement> myVictims;
   private final Map<PsiElement, PsiType> myTypes;
diff --git a/java/java-impl/src/com/intellij/refactoring/typeCook/deductive/builder/SystemBuilder.java b/java/java-impl/src/com/intellij/refactoring/typeCook/deductive/builder/SystemBuilder.java
index da1b64d15696..9b9aaa3fa968 100644
--- a/java/java-impl/src/com/intellij/refactoring/typeCook/deductive/builder/SystemBuilder.java
+++ b/java/java-impl/src/com/intellij/refactoring/typeCook/deductive/builder/SystemBuilder.java
@@ -26,7 +26,7 @@ import java.util.Map;
 import java.util.Set;
 
 public class SystemBuilder {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.typeCook.deductive.builder.SystemBuilder");
+  private static final Logger LOG = Logger.getInstance(SystemBuilder.class);
 
   private final PsiManager myManager;
   private final Map<PsiElement, Boolean> myMethodCache;
diff --git a/java/java-impl/src/com/intellij/refactoring/typeCook/deductive/resolver/BindingFactory.java b/java/java-impl/src/com/intellij/refactoring/typeCook/deductive/resolver/BindingFactory.java
index fb50205aaad2..534250b5d4b6 100644
--- a/java/java-impl/src/com/intellij/refactoring/typeCook/deductive/resolver/BindingFactory.java
+++ b/java/java-impl/src/com/intellij/refactoring/typeCook/deductive/resolver/BindingFactory.java
@@ -42,7 +42,7 @@ import java.util.Set;
  */
 @SuppressWarnings({"SuspiciousNameCombination"})
 public class BindingFactory {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.typeCook.deductive.resolver.BindingFactory");
+  private static final Logger LOG = Logger.getInstance(BindingFactory.class);
 
   private final Set<PsiTypeVariable> myBoundVariables;
   private final Project myProject;
diff --git a/java/java-impl/src/com/intellij/refactoring/typeCook/deductive/resolver/ResolverTree.java b/java/java-impl/src/com/intellij/refactoring/typeCook/deductive/resolver/ResolverTree.java
index b5b81af71462..385b75773ce0 100644
--- a/java/java-impl/src/com/intellij/refactoring/typeCook/deductive/resolver/ResolverTree.java
+++ b/java/java-impl/src/com/intellij/refactoring/typeCook/deductive/resolver/ResolverTree.java
@@ -41,7 +41,7 @@ import java.util.*;
  * @author db
  */
 public class ResolverTree {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.typeCook.deductive.resolver.ResolverTree");
+  private static final Logger LOG = Logger.getInstance(ResolverTree.class);
 
   private ResolverTree[] mySons = new ResolverTree[0];
   private final BindingFactory myBindingFactory;
diff --git a/java/java-impl/src/com/intellij/refactoring/typeMigration/TypeEvaluator.java b/java/java-impl/src/com/intellij/refactoring/typeMigration/TypeEvaluator.java
index 4eb3b39ed388..186b17e92b59 100644
--- a/java/java-impl/src/com/intellij/refactoring/typeMigration/TypeEvaluator.java
+++ b/java/java-impl/src/com/intellij/refactoring/typeMigration/TypeEvaluator.java
@@ -31,7 +31,7 @@ import java.util.Map;
  * @author db
  */
 public class TypeEvaluator {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.typeMigration.TypeEvaluator");
+  private static final Logger LOG = Logger.getInstance(TypeEvaluator.class);
 
   private final HashMap<TypeMigrationUsageInfo, LinkedList<PsiType>> myTypeMap;
   private final TypeMigrationRules myRules;
diff --git a/java/java-impl/src/com/intellij/refactoring/typeMigration/TypeMigrationLabeler.java b/java/java-impl/src/com/intellij/refactoring/typeMigration/TypeMigrationLabeler.java
index 31d3b01b039d..cd759fa350b2 100644
--- a/java/java-impl/src/com/intellij/refactoring/typeMigration/TypeMigrationLabeler.java
+++ b/java/java-impl/src/com/intellij/refactoring/typeMigration/TypeMigrationLabeler.java
@@ -47,7 +47,7 @@ import java.util.*;
  * @author db
  */
 public class TypeMigrationLabeler {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.typeMigration.TypeMigrationLabeler");
+  private static final Logger LOG = Logger.getInstance(TypeMigrationLabeler.class);
   private boolean myShowWarning = true;
   private volatile MigrateException myException;
   private final Semaphore myDialogSemaphore = new Semaphore();
diff --git a/java/java-impl/src/com/intellij/refactoring/util/FieldConflictsResolver.java b/java/java-impl/src/com/intellij/refactoring/util/FieldConflictsResolver.java
index 83dbace861fc..77c0aa196bfa 100644
--- a/java/java-impl/src/com/intellij/refactoring/util/FieldConflictsResolver.java
+++ b/java/java-impl/src/com/intellij/refactoring/util/FieldConflictsResolver.java
@@ -31,7 +31,7 @@ import java.util.List;
  *  @author dsl
  */
 public class FieldConflictsResolver {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.util.FieldConflictsResolver");
+  private static final Logger LOG = Logger.getInstance(FieldConflictsResolver.class);
   private final PsiElement myScope;
   private final PsiField myField;
   private final List<PsiReferenceExpression> myReferenceExpressions;
diff --git a/java/java-impl/src/com/intellij/refactoring/util/RefactoringHierarchyUtil.java b/java/java-impl/src/com/intellij/refactoring/util/RefactoringHierarchyUtil.java
index b5b53425e10d..b7efafd5ebbe 100644
--- a/java/java-impl/src/com/intellij/refactoring/util/RefactoringHierarchyUtil.java
+++ b/java/java-impl/src/com/intellij/refactoring/util/RefactoringHierarchyUtil.java
@@ -30,7 +30,7 @@ import org.jetbrains.annotations.Nullable;
 import java.util.*;
 
 public class RefactoringHierarchyUtil {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.util.RefactoringHierarchyUtil");
+  private static final Logger LOG = Logger.getInstance(RefactoringHierarchyUtil.class);
 
   private static final List<? extends PsiType> PRIMITIVE_TYPES = Arrays.asList(
       PsiType.BYTE, PsiType.CHAR, PsiType.SHORT, PsiType.INT, PsiType.LONG, PsiType.FLOAT, PsiType.DOUBLE
diff --git a/java/java-impl/src/com/intellij/refactoring/util/RefactoringUtil.java b/java/java-impl/src/com/intellij/refactoring/util/RefactoringUtil.java
index 1264536dea96..850f2b1ee5cd 100644
--- a/java/java-impl/src/com/intellij/refactoring/util/RefactoringUtil.java
+++ b/java/java-impl/src/com/intellij/refactoring/util/RefactoringUtil.java
@@ -47,7 +47,7 @@ import org.jetbrains.annotations.Nullable;
 import java.util.*;
 
 public class RefactoringUtil {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.util.RefactoringUtil");
+  private static final Logger LOG = Logger.getInstance(RefactoringUtil.class);
   public static final int EXPR_COPY_SAFE = 0;
   public static final int EXPR_COPY_UNSAFE = 1;
   public static final int EXPR_COPY_PROHIBITED = 2;
diff --git a/java/java-impl/src/com/intellij/refactoring/util/classRefs/ClassInstanceScanner.java b/java/java-impl/src/com/intellij/refactoring/util/classRefs/ClassInstanceScanner.java
index 39884e2d97c8..38ad3713ca61 100644
--- a/java/java-impl/src/com/intellij/refactoring/util/classRefs/ClassInstanceScanner.java
+++ b/java/java-impl/src/com/intellij/refactoring/util/classRefs/ClassInstanceScanner.java
@@ -26,7 +26,7 @@ import com.intellij.refactoring.util.RefactoringUtil;
  * @author dsl
  */
 public class ClassInstanceScanner extends DelegatingClassReferenceVisitor {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.util.classRefs.ClassInstanceScanner");
+  private static final Logger LOG = Logger.getInstance(ClassInstanceScanner.class);
   private final PsiClass myClass;
   private final ClassInstanceReferenceVisitor myVisitor;
 
diff --git a/java/java-impl/src/com/intellij/refactoring/util/duplicates/DuplicatesImpl.java b/java/java-impl/src/com/intellij/refactoring/util/duplicates/DuplicatesImpl.java
index 57bbb734eaf8..5022ed953413 100644
--- a/java/java-impl/src/com/intellij/refactoring/util/duplicates/DuplicatesImpl.java
+++ b/java/java-impl/src/com/intellij/refactoring/util/duplicates/DuplicatesImpl.java
@@ -54,7 +54,7 @@ import java.util.List;
  * @author dsl
  */
 public class DuplicatesImpl {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.util.duplicates.DuplicatesImpl");
+  private static final Logger LOG = Logger.getInstance(DuplicatesImpl.class);
 
   private DuplicatesImpl() {}
 
diff --git a/java/java-impl/src/com/intellij/refactoring/util/javadoc/MethodJavaDocHelper.java b/java/java-impl/src/com/intellij/refactoring/util/javadoc/MethodJavaDocHelper.java
index c93db162cad6..784b6bc6951c 100644
--- a/java/java-impl/src/com/intellij/refactoring/util/javadoc/MethodJavaDocHelper.java
+++ b/java/java-impl/src/com/intellij/refactoring/util/javadoc/MethodJavaDocHelper.java
@@ -28,7 +28,7 @@ import com.intellij.util.IncorrectOperationException;
  *  @author dsl
  */
 public class MethodJavaDocHelper {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.util.javadoc.MethodJavaDocHelper");
+  private static final Logger LOG = Logger.getInstance(MethodJavaDocHelper.class);
   private final PsiMethod myMethod;
   private final boolean myDoCorrectJavaDoc;
   private final PsiDocComment myDocComment;
diff --git a/java/java-indexing-impl/src/com/intellij/psi/impl/file/impl/JavaFileManagerImpl.java b/java/java-indexing-impl/src/com/intellij/psi/impl/file/impl/JavaFileManagerImpl.java
index 4f8a2b3eec62..10682d7fb9c4 100644
--- a/java/java-indexing-impl/src/com/intellij/psi/impl/file/impl/JavaFileManagerImpl.java
+++ b/java/java-indexing-impl/src/com/intellij/psi/impl/file/impl/JavaFileManagerImpl.java
@@ -39,7 +39,7 @@ import static java.util.Objects.requireNonNull;
  * @author dmitry lomov
  */
 public final class JavaFileManagerImpl implements JavaFileManager, Disposable {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.file.impl.JavaFileManagerImpl");
+  private static final Logger LOG = Logger.getInstance(JavaFileManagerImpl.class);
 
   private final PsiManagerEx myManager;
   private volatile Set<String> myNontrivialPackagePrefixes;
diff --git a/java/java-indexing-impl/src/com/intellij/psi/impl/search/AnnotatedPackagesSearcher.java b/java/java-indexing-impl/src/com/intellij/psi/impl/search/AnnotatedPackagesSearcher.java
index 7ab82cd7f717..56760725e20b 100644
--- a/java/java-indexing-impl/src/com/intellij/psi/impl/search/AnnotatedPackagesSearcher.java
+++ b/java/java-indexing-impl/src/com/intellij/psi/impl/search/AnnotatedPackagesSearcher.java
@@ -22,7 +22,7 @@ import org.jetbrains.annotations.NotNull;
 import java.util.Collection;
 
 public class AnnotatedPackagesSearcher implements QueryExecutor<PsiPackage, AnnotatedPackagesSearch.Parameters> {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.search.AnnotatedPackagesSearcher");
+  private static final Logger LOG = Logger.getInstance(AnnotatedPackagesSearcher.class);
 
   @Override
   public boolean execute(@NotNull final AnnotatedPackagesSearch.Parameters p, @NotNull final Processor<? super PsiPackage> consumer) {
diff --git a/java/java-indexing-impl/src/com/intellij/psi/impl/search/JavaFunctionalExpressionSearcher.java b/java/java-indexing-impl/src/com/intellij/psi/impl/search/JavaFunctionalExpressionSearcher.java
index 4a4b685609ee..ede210cd7709 100644
--- a/java/java-indexing-impl/src/com/intellij/psi/impl/search/JavaFunctionalExpressionSearcher.java
+++ b/java/java-indexing-impl/src/com/intellij/psi/impl/search/JavaFunctionalExpressionSearcher.java
@@ -50,7 +50,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 import static com.intellij.util.ObjectUtils.assertNotNull;
 
 public class JavaFunctionalExpressionSearcher extends QueryExecutorBase<PsiFunctionalExpression, SearchParameters> {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.search.JavaFunctionalExpressionSearcher");
+  private static final Logger LOG = Logger.getInstance(JavaFunctionalExpressionSearcher.class);
   public static final int SMART_SEARCH_THRESHOLD = 5;
 
   @Override
diff --git a/java/java-psi-api/src/com/intellij/psi/util/PsiUtil.java b/java/java-psi-api/src/com/intellij/psi/util/PsiUtil.java
index 8679bc6a5358..54455f2d12c6 100644
--- a/java/java-psi-api/src/com/intellij/psi/util/PsiUtil.java
+++ b/java/java-psi-api/src/com/intellij/psi/util/PsiUtil.java
@@ -40,7 +40,7 @@ import java.util.function.Predicate;
 import java.util.regex.Pattern;
 
 public final class PsiUtil extends PsiUtilCore {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.util.PsiUtil");
+  private static final Logger LOG = Logger.getInstance(PsiUtil.class);
 
   public static final int ACCESS_LEVEL_PUBLIC = 4;
   public static final int ACCESS_LEVEL_PROTECTED = 3;
diff --git a/java/java-psi-api/src/com/intellij/psi/util/TypeConversionUtil.java b/java/java-psi-api/src/com/intellij/psi/util/TypeConversionUtil.java
index f7b5c3467ed9..77cce81234ee 100644
--- a/java/java-psi-api/src/com/intellij/psi/util/TypeConversionUtil.java
+++ b/java/java-psi-api/src/com/intellij/psi/util/TypeConversionUtil.java
@@ -24,7 +24,7 @@ import java.util.*;
 import static com.intellij.psi.CommonClassNames.*;
 
 public class TypeConversionUtil {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.util.TypeConversionUtil");
+  private static final Logger LOG = Logger.getInstance(TypeConversionUtil.class);
 
   private static final boolean[][] IS_ASSIGNABLE_BIT_SET = {
     {true, true, false, true, true, true, true}, // byte
diff --git a/java/java-psi-impl/src/com/intellij/codeInsight/BaseExternalAnnotationsManager.java b/java/java-psi-impl/src/com/intellij/codeInsight/BaseExternalAnnotationsManager.java
index ef30d4c7a6d0..79d1d801b5b2 100644
--- a/java/java-psi-impl/src/com/intellij/codeInsight/BaseExternalAnnotationsManager.java
+++ b/java/java-psi-impl/src/com/intellij/codeInsight/BaseExternalAnnotationsManager.java
@@ -38,7 +38,7 @@ import java.util.concurrent.ConcurrentMap;
 import java.util.function.Supplier;
 
 public abstract class BaseExternalAnnotationsManager extends ExternalAnnotationsManager {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.BaseExternalAnnotationsManager");
+  private static final Logger LOG = Logger.getInstance(BaseExternalAnnotationsManager.class);
   private static final Key<Boolean> EXTERNAL_ANNO_MARKER = Key.create("EXTERNAL_ANNO_MARKER");
   private static final List<PsiFile> NULL_LIST = Collections.emptyList();
 
diff --git a/java/java-psi-impl/src/com/intellij/codeInsight/ChangeContextUtil.java b/java/java-psi-impl/src/com/intellij/codeInsight/ChangeContextUtil.java
index da997e971ab0..bad040e3a2f3 100644
--- a/java/java-psi-impl/src/com/intellij/codeInsight/ChangeContextUtil.java
+++ b/java/java-psi-impl/src/com/intellij/codeInsight/ChangeContextUtil.java
@@ -28,7 +28,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 public class ChangeContextUtil {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.ChangeContextUtil");
+  private static final Logger LOG = Logger.getInstance(ChangeContextUtil.class);
 
   private static final Key<ASTNode> HARD_REF_TO_AST = Key.create("HARD_REF_TO_AST");
   private static final Key<String> ENCODED_KEY = Key.create("ENCODED_KEY");
diff --git a/java/java-psi-impl/src/com/intellij/codeInsight/folding/impl/JavaFoldingBuilderBase.java b/java/java-psi-impl/src/com/intellij/codeInsight/folding/impl/JavaFoldingBuilderBase.java
index 0afcd94d2f12..43b5de50c6ff 100644
--- a/java/java-psi-impl/src/com/intellij/codeInsight/folding/impl/JavaFoldingBuilderBase.java
+++ b/java/java-psi-impl/src/com/intellij/codeInsight/folding/impl/JavaFoldingBuilderBase.java
@@ -48,7 +48,7 @@ import org.jetbrains.annotations.Nullable;
 import java.util.*;
 
 public abstract class JavaFoldingBuilderBase extends CustomFoldingBuilder implements DumbAware {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.folding.impl.JavaFoldingBuilder");
+  private static final Logger LOG = Logger.getInstance(JavaFoldingBuilderBase.class);
 
   private static String getCodeBlockPlaceholder(PsiElement codeBlock) {
     return codeBlock instanceof PsiCodeBlock && ((PsiCodeBlock)codeBlock).isEmpty() ? "{}" : "{...}";
diff --git a/java/java-psi-impl/src/com/intellij/codeInsight/javadoc/JavaDocUtil.java b/java/java-psi-impl/src/com/intellij/codeInsight/javadoc/JavaDocUtil.java
index 03e93ade227a..6c26605cf7d9 100644
--- a/java/java-psi-impl/src/com/intellij/codeInsight/javadoc/JavaDocUtil.java
+++ b/java/java-psi-impl/src/com/intellij/codeInsight/javadoc/JavaDocUtil.java
@@ -25,7 +25,7 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 public class JavaDocUtil {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.javadoc.JavaDocUtil");
+  private static final Logger LOG = Logger.getInstance(JavaDocUtil.class);
 
   @NonNls private static final Pattern ourTypePattern = Pattern.compile("[ ]+[^ ^\\[^\\]]");
 
diff --git a/java/java-psi-impl/src/com/intellij/core/CoreJavaDirectoryService.java b/java/java-psi-impl/src/com/intellij/core/CoreJavaDirectoryService.java
index 76867d07e050..dbb79d8ed0d1 100644
--- a/java/java-psi-impl/src/com/intellij/core/CoreJavaDirectoryService.java
+++ b/java/java-psi-impl/src/com/intellij/core/CoreJavaDirectoryService.java
@@ -35,7 +35,7 @@ import java.util.Map;
  * @author yole
  */
 public class CoreJavaDirectoryService extends JavaDirectoryService {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.core.CoreJavaDirectoryService");
+  private static final Logger LOG = Logger.getInstance(CoreJavaDirectoryService.class);
 
   @Override
   public PsiPackage getPackage(@NotNull PsiDirectory dir) {
diff --git a/java/java-psi-impl/src/com/intellij/core/CoreJavaFileManager.java b/java/java-psi-impl/src/com/intellij/core/CoreJavaFileManager.java
index 2bfa8aa7c976..a587229042ca 100644
--- a/java/java-psi-impl/src/com/intellij/core/CoreJavaFileManager.java
+++ b/java/java-psi-impl/src/com/intellij/core/CoreJavaFileManager.java
@@ -33,7 +33,7 @@ import java.util.*;
  * @author yole
  */
 public class CoreJavaFileManager implements JavaFileManager {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.core.CoreJavaFileManager");
+  private static final Logger LOG = Logger.getInstance(CoreJavaFileManager.class);
 
   private final List<VirtualFile> myClasspath = new ArrayList<>();
   private final PsiManager myPsiManager;
diff --git a/java/java-psi-impl/src/com/intellij/core/CorePackageIndex.java b/java/java-psi-impl/src/com/intellij/core/CorePackageIndex.java
index 1215ca58fe03..915b97038b4d 100644
--- a/java/java-psi-impl/src/com/intellij/core/CorePackageIndex.java
+++ b/java/java-psi-impl/src/com/intellij/core/CorePackageIndex.java
@@ -26,7 +26,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class CorePackageIndex extends PackageIndex {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.core.CorePackageIndex");
+  private static final Logger LOG = Logger.getInstance(CorePackageIndex.class);
 
   private final List<VirtualFile> myClasspath = new ArrayList<>();
 
diff --git a/java/java-psi-impl/src/com/intellij/psi/NonClasspathClassFinder.java b/java/java-psi-impl/src/com/intellij/psi/NonClasspathClassFinder.java
index 10803642dace..06290c25fb08 100644
--- a/java/java-psi-impl/src/com/intellij/psi/NonClasspathClassFinder.java
+++ b/java/java-psi-impl/src/com/intellij/psi/NonClasspathClassFinder.java
@@ -33,7 +33,7 @@ import java.util.Set;
  * @author peter
  */
 public abstract class NonClasspathClassFinder extends PsiElementFinder {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.NonClasspathClassFinder");
+  private static final Logger LOG = Logger.getInstance(NonClasspathClassFinder.class);
   private static final EverythingGlobalScope ALL_SCOPE = new EverythingGlobalScope();
   protected final Project myProject;
   private volatile PackageDirectoryCache myCache;
diff --git a/java/java-psi-impl/src/com/intellij/psi/PsiTypeMapper.java b/java/java-psi-impl/src/com/intellij/psi/PsiTypeMapper.java
index 742f1a328f7a..291ff8075920 100644
--- a/java/java-psi-impl/src/com/intellij/psi/PsiTypeMapper.java
+++ b/java/java-psi-impl/src/com/intellij/psi/PsiTypeMapper.java
@@ -14,7 +14,7 @@ import java.util.List;
  * @author peter
  */
 public abstract class PsiTypeMapper extends PsiTypeVisitorEx<PsiType> {
-  protected static final Logger LOG = Logger.getInstance("#com.intellij.psi.PsiTypeMapper");
+  protected static final Logger LOG = Logger.getInstance(PsiTypeMapper.class);
 
   @Nullable
   public <T extends PsiType> T mapType(@NotNull T type) {
diff --git a/java/java-psi-impl/src/com/intellij/psi/controlFlow/ConditionalBranchingInstruction.java b/java/java-psi-impl/src/com/intellij/psi/controlFlow/ConditionalBranchingInstruction.java
index 1aad2602c1ca..5e0fcbd2d88d 100644
--- a/java/java-psi-impl/src/com/intellij/psi/controlFlow/ConditionalBranchingInstruction.java
+++ b/java/java-psi-impl/src/com/intellij/psi/controlFlow/ConditionalBranchingInstruction.java
@@ -24,7 +24,7 @@ import org.jetbrains.annotations.Nullable;
  * Author: msk
  */
 public abstract class ConditionalBranchingInstruction extends BranchingInstruction {
-  protected static final Logger LOG = Logger.getInstance("#com.intellij.psi.controlFlow.ConditionalGoToInstruction");
+  protected static final Logger LOG = Logger.getInstance(ConditionalGoToInstruction.class);
   public final PsiExpression expression;
 
   ConditionalBranchingInstruction(int offset, @Nullable PsiExpression expression, @NotNull Role role) {
diff --git a/java/java-psi-impl/src/com/intellij/psi/controlFlow/ControlFlowAnalyzer.java b/java/java-psi-impl/src/com/intellij/psi/controlFlow/ControlFlowAnalyzer.java
index 522e3b333405..8f3dcb73108d 100644
--- a/java/java-psi-impl/src/com/intellij/psi/controlFlow/ControlFlowAnalyzer.java
+++ b/java/java-psi-impl/src/com/intellij/psi/controlFlow/ControlFlowAnalyzer.java
@@ -21,7 +21,7 @@ import org.jetbrains.annotations.Nullable;
 import java.util.*;
 
 class ControlFlowAnalyzer extends JavaElementVisitor {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.controlFlow.ControlFlowAnalyzer");
+  private static final Logger LOG = Logger.getInstance(ControlFlowAnalyzer.class);
 
   private final PsiElement myCodeFragment;
   private final ControlFlowPolicy myPolicy;
diff --git a/java/java-psi-impl/src/com/intellij/psi/controlFlow/ControlFlowImpl.java b/java/java-psi-impl/src/com/intellij/psi/controlFlow/ControlFlowImpl.java
index b9e1daa9434f..9a2d193a470b 100644
--- a/java/java-psi-impl/src/com/intellij/psi/controlFlow/ControlFlowImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/controlFlow/ControlFlowImpl.java
@@ -12,7 +12,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 class ControlFlowImpl implements ControlFlow {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.controlFlow.ControlFlowImpl");
+  private static final Logger LOG = Logger.getInstance(ControlFlowImpl.class);
 
   private final List<Instruction> myInstructions = new ArrayList<>();
   private final ObjectIntHashMap<PsiElement> myElementToStartOffsetMap = new ObjectIntHashMap<>();
diff --git a/java/java-psi-impl/src/com/intellij/psi/controlFlow/ControlFlowUtil.java b/java/java-psi-impl/src/com/intellij/psi/controlFlow/ControlFlowUtil.java
index 20eafb1cce1f..e90e188e4a16 100644
--- a/java/java-psi-impl/src/com/intellij/psi/controlFlow/ControlFlowUtil.java
+++ b/java/java-psi-impl/src/com/intellij/psi/controlFlow/ControlFlowUtil.java
@@ -20,7 +20,7 @@ import org.jetbrains.annotations.Nullable;
 import java.util.*;
 
 public class ControlFlowUtil {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.controlFlow.ControlFlowUtil");
+  private static final Logger LOG = Logger.getInstance(ControlFlowUtil.class);
 
   private static class SSAInstructionState implements Cloneable {
     private final int myWriteCount;
diff --git a/java/java-psi-impl/src/com/intellij/psi/controlFlow/GoToInstruction.java b/java/java-psi-impl/src/com/intellij/psi/controlFlow/GoToInstruction.java
index 3152e0f21aa6..4d033d7c6fee 100644
--- a/java/java-psi-impl/src/com/intellij/psi/controlFlow/GoToInstruction.java
+++ b/java/java-psi-impl/src/com/intellij/psi/controlFlow/GoToInstruction.java
@@ -19,7 +19,7 @@ import com.intellij.openapi.diagnostic.Logger;
 import org.jetbrains.annotations.NotNull;
 
 public class GoToInstruction extends BranchingInstruction {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.controlFlow.GoToInstruction");
+  private static final Logger LOG = Logger.getInstance(GoToInstruction.class);
 
   public final boolean isReturn; //true if goto has been generated as a result of return statement
 
diff --git a/java/java-psi-impl/src/com/intellij/psi/controlFlow/ReturnInstruction.java b/java/java-psi-impl/src/com/intellij/psi/controlFlow/ReturnInstruction.java
index 4506c9723628..09dccec590b9 100644
--- a/java/java-psi-impl/src/com/intellij/psi/controlFlow/ReturnInstruction.java
+++ b/java/java-psi-impl/src/com/intellij/psi/controlFlow/ReturnInstruction.java
@@ -20,7 +20,7 @@ import org.jetbrains.annotations.NotNull;
 
 
 public class ReturnInstruction extends GoToInstruction {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.controlFlow.ReturnInstruction");
+  private static final Logger LOG = Logger.getInstance(ReturnInstruction.class);
 
   @NotNull private CallInstruction myCallInstruction;
   private boolean myRethrowFromFinally;
diff --git a/java/java-psi-impl/src/com/intellij/psi/controlFlow/SimpleInstruction.java b/java/java-psi-impl/src/com/intellij/psi/controlFlow/SimpleInstruction.java
index a1b0a95857e5..530100611dac 100644
--- a/java/java-psi-impl/src/com/intellij/psi/controlFlow/SimpleInstruction.java
+++ b/java/java-psi-impl/src/com/intellij/psi/controlFlow/SimpleInstruction.java
@@ -20,7 +20,7 @@ import com.intellij.openapi.diagnostic.Logger;
 import org.jetbrains.annotations.NotNull;
 
 public abstract class SimpleInstruction extends InstructionBase {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.controlFlow.SimpleInstruction");
+  private static final Logger LOG = Logger.getInstance(SimpleInstruction.class);
 
   @Override
   public int nNext() { return 1; }
diff --git a/java/java-psi-impl/src/com/intellij/psi/controlFlow/ThrowToInstruction.java b/java/java-psi-impl/src/com/intellij/psi/controlFlow/ThrowToInstruction.java
index 4837771f8176..d7c44f688d2f 100644
--- a/java/java-psi-impl/src/com/intellij/psi/controlFlow/ThrowToInstruction.java
+++ b/java/java-psi-impl/src/com/intellij/psi/controlFlow/ThrowToInstruction.java
@@ -21,7 +21,7 @@ import org.jetbrains.annotations.NotNull;
 
 public class ThrowToInstruction extends BranchingInstruction {
 
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.controlFlow.ThrowToInstruction");
+  private static final Logger LOG = Logger.getInstance(ThrowToInstruction.class);
 
   ThrowToInstruction(int offset) {
     super(offset, Role.END);
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/EmptySubstitutorImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/EmptySubstitutorImpl.java
index a0c04cebbc6c..2f937903362f 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/EmptySubstitutorImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/EmptySubstitutorImpl.java
@@ -27,7 +27,7 @@ import java.util.Map;
  *  @author dsl
  */
 public final class EmptySubstitutorImpl extends EmptySubstitutor {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.EmptySubstitutorImpl");
+  private static final Logger LOG = Logger.getInstance(EmptySubstitutorImpl.class);
   @Override
   public PsiType substitute(@NotNull PsiTypeParameter typeParameter){
     return JavaPsiFacade.getElementFactory(typeParameter.getProject()).createType(typeParameter);
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/InheritanceImplUtil.java b/java/java-psi-impl/src/com/intellij/psi/impl/InheritanceImplUtil.java
index c74a44d36e21..056a4324d1cb 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/InheritanceImplUtil.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/InheritanceImplUtil.java
@@ -29,7 +29,7 @@ import org.jetbrains.annotations.Nullable;
 import java.util.Set;
 
 public class InheritanceImplUtil {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.InheritanceImplUtil");
+  private static final Logger LOG = Logger.getInstance(InheritanceImplUtil.class);
 
   public static boolean isInheritor(@NotNull final PsiClass candidateClass, @NotNull PsiClass baseClass, final boolean checkDeep) {
     if (baseClass instanceof PsiAnonymousClass || baseClass.getManager().areElementsEquivalent(baseClass, candidateClass)) return false;
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/JavaClassSupersImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/JavaClassSupersImpl.java
index cae5f0b5894e..e76de6d05ff0 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/JavaClassSupersImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/JavaClassSupersImpl.java
@@ -24,7 +24,7 @@ import java.util.Set;
  * @author peter
  */
 public class JavaClassSupersImpl extends JavaClassSupers {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.JavaClassSupersImpl");
+  private static final Logger LOG = Logger.getInstance(JavaClassSupersImpl.class);
 
   @Override
   @Nullable
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/PsiClassImplUtil.java b/java/java-psi-impl/src/com/intellij/psi/impl/PsiClassImplUtil.java
index a4089596292d..f3b26378b8fc 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/PsiClassImplUtil.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/PsiClassImplUtil.java
@@ -48,7 +48,7 @@ import java.util.concurrent.ConcurrentMap;
  * @author ik
  */
 public class PsiClassImplUtil {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.PsiClassImplUtil");
+  private static final Logger LOG = Logger.getInstance(PsiClassImplUtil.class);
   private static final Key<ParameterizedCachedValue<Map<GlobalSearchScope, MembersMap>, PsiClass>> MAP_IN_CLASS_KEY = Key.create("MAP_KEY");
   private static final String VALUES_METHOD = "values";
   private static final String VALUE_OF_METHOD = "valueOf";
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/PsiImplUtil.java b/java/java-psi-impl/src/com/intellij/psi/impl/PsiImplUtil.java
index e3f9a7a4a954..e5ac466ba711 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/PsiImplUtil.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/PsiImplUtil.java
@@ -47,7 +47,7 @@ import java.util.Arrays;
 import java.util.List;
 
 public class PsiImplUtil {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.PsiImplUtil");
+  private static final Logger LOG = Logger.getInstance(PsiImplUtil.class);
 
   private PsiImplUtil() { }
 
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/PsiSubstitutorImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/PsiSubstitutorImpl.java
index e609f773b06f..6b822651d05e 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/PsiSubstitutorImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/PsiSubstitutorImpl.java
@@ -39,7 +39,7 @@ import java.util.Set;
  * @author ik, dsl
  */
 public class PsiSubstitutorImpl implements PsiSubstitutor {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.PsiSubstitutorImpl");
+  private static final Logger LOG = Logger.getInstance(PsiSubstitutorImpl.class);
 
   private static final TObjectHashingStrategy<PsiTypeParameter> PSI_EQUIVALENCE = new TObjectHashingStrategy<PsiTypeParameter>() {
     @Override
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/PsiSuperMethodImplUtil.java b/java/java-psi-impl/src/com/intellij/psi/impl/PsiSuperMethodImplUtil.java
index 81085f4d0a8f..a7cc4571810f 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/PsiSuperMethodImplUtil.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/PsiSuperMethodImplUtil.java
@@ -27,7 +27,7 @@ import java.util.*;
 import java.util.concurrent.ConcurrentMap;
 
 public class PsiSuperMethodImplUtil {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.PsiSuperMethodImplUtil");
+  private static final Logger LOG = Logger.getInstance(PsiSuperMethodImplUtil.class);
   private static final PsiCacheKey<Map<MethodSignature, HierarchicalMethodSignature>, PsiClass> SIGNATURES_FOR_CLASS_KEY = PsiCacheKey
     .create("SIGNATURES_FOR_CLASS_KEY",
             (NotNullFunction<PsiClass, Map<MethodSignature, HierarchicalMethodSignature>>)dom -> buildMethodHierarchy(dom, null, PsiSubstitutor.EMPTY, true, new THashSet<PsiClass>(), false, dom.getResolveScope()));
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClassFileStubBuilder.java b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClassFileStubBuilder.java
index f1eeb8ea9707..87489e67a52a 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClassFileStubBuilder.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClassFileStubBuilder.java
@@ -21,7 +21,7 @@ import static com.intellij.psi.compiled.ClassFileDecompilers.Full;
  * @author max
  */
 public class ClassFileStubBuilder implements BinaryFileStubBuilder {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.compiled.ClassFileStubBuilder");
+  private static final Logger LOG = Logger.getInstance(ClassFileStubBuilder.class);
 
   public static final int STUB_VERSION = 23;
 
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsElementImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsElementImpl.java
index 82caa740ad18..696ca997d763 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsElementImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsElementImpl.java
@@ -30,7 +30,7 @@ import java.util.List;
 public abstract class ClsElementImpl extends PsiElementBase implements PsiCompiledElement {
   public static final Key<PsiCompiledElement> COMPILED_ELEMENT = Key.create("COMPILED_ELEMENT");
 
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.compiled.ClsElementImpl");
+  private static final Logger LOG = Logger.getInstance(ClsElementImpl.class);
 
   private volatile Pair<TextRange, Identikit.ByType> myMirror;
 
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsFileImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsFileImpl.java
index ec63fe2b2657..8cbfe71e71b8 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsFileImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsFileImpl.java
@@ -70,7 +70,7 @@ import java.util.Set;
 
 public class ClsFileImpl extends PsiBinaryFileImpl
                          implements PsiJavaFile, PsiFileWithStubSupport, PsiFileEx, Queryable, PsiClassOwnerEx, PsiCompiledFile {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.compiled.ClsFileImpl");
+  private static final Logger LOG = Logger.getInstance(ClsFileImpl.class);
 
   private static final String BANNER =
     "\n" +
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiAnnotationStubImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiAnnotationStubImpl.java
index 09ee475510bd..d1287084b52c 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiAnnotationStubImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/impl/PsiAnnotationStubImpl.java
@@ -38,7 +38,7 @@ import org.jetbrains.annotations.NotNull;
  * @author max
  */
 public class PsiAnnotationStubImpl extends StubBase<PsiAnnotation> implements PsiAnnotationStub {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.java.stubs.impl.PsiAnnotationStubImpl");
+  private static final Logger LOG = Logger.getInstance(PsiAnnotationStubImpl.class);
 
   static {
     CharTableImpl.addStringsFromClassToStatics(AnnotationUtil.class);
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/search/MethodSuperSearcher.java b/java/java-psi-impl/src/com/intellij/psi/impl/search/MethodSuperSearcher.java
index 1577d4018fe4..fc3d069dfa18 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/search/MethodSuperSearcher.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/search/MethodSuperSearcher.java
@@ -17,7 +17,7 @@ import java.util.List;
  * @author ven
  */
 public class MethodSuperSearcher extends QueryExecutorBase<MethodSignatureBackedByPsiMethod, SuperMethodsSearch.SearchParameters> {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.search.MethodSuperSearcher");
+  private static final Logger LOG = Logger.getInstance(MethodSuperSearcher.class);
 
   public MethodSuperSearcher() {
     super(true);
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/JavaStubPsiElement.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/JavaStubPsiElement.java
index f212b620ed47..391fd264a176 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/JavaStubPsiElement.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/JavaStubPsiElement.java
@@ -26,7 +26,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 public abstract class JavaStubPsiElement<T extends StubElement> extends StubBasedPsiElementBase<T> implements StubBasedPsiElement<T> {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.JavaStubPsiElement");
+  private static final Logger LOG = Logger.getInstance(JavaStubPsiElement.class);
 
   public JavaStubPsiElement(@NotNull T stub, @NotNull IStubElementType nodeType) {
     super(stub, nodeType);
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiClassImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiClassImpl.java
index 964cfcbe5398..1d6b9da5020d 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiClassImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiClassImpl.java
@@ -52,7 +52,7 @@ import java.util.List;
 import java.util.Map;
 
 public class PsiClassImpl extends JavaStubPsiElement<PsiClassStub<?>> implements PsiExtensibleClass, Queryable {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.PsiClassImpl");
+  private static final Logger LOG = Logger.getInstance(PsiClassImpl.class);
 
   private final ClassInnerStuffCache myInnersCache = new ClassInnerStuffCache(this);
   private volatile String myCachedName;
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiEnumConstantImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiEnumConstantImpl.java
index 13f130b53df1..42f59b4e106a 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiEnumConstantImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiEnumConstantImpl.java
@@ -31,7 +31,7 @@ import javax.swing.*;
  * @author dsl
  */
 public class PsiEnumConstantImpl extends JavaStubPsiElement<PsiFieldStub> implements PsiEnumConstant {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.PsiEnumConstantImpl");
+  private static final Logger LOG = Logger.getInstance(PsiEnumConstantImpl.class);
   private final MyReference myReference = new MyReference();
 
   public PsiEnumConstantImpl(final PsiFieldStub stub) {
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiEnumConstantInitializerImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiEnumConstantInitializerImpl.java
index f17523e3b5f8..ea25ec02fcad 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiEnumConstantInitializerImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiEnumConstantInitializerImpl.java
@@ -24,7 +24,7 @@ import com.intellij.psi.impl.light.LightClassReference;
 import org.jetbrains.annotations.NotNull;
 
 public class PsiEnumConstantInitializerImpl extends PsiClassImpl implements PsiEnumConstantInitializer {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.PsiEnumConstantInitializerImpl");
+  private static final Logger LOG = Logger.getInstance(PsiEnumConstantInitializerImpl.class);
   private PsiClassType myCachedBaseType;
 
   public PsiEnumConstantInitializerImpl(final PsiClassStub stub) {
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiImportStaticReferenceElementImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiImportStaticReferenceElementImpl.java
index ee4f157ac2a9..40301d7f64eb 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiImportStaticReferenceElementImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiImportStaticReferenceElementImpl.java
@@ -37,7 +37,7 @@ import org.jetbrains.annotations.NotNull;
  * @author dsl
  */
 public class PsiImportStaticReferenceElementImpl extends CompositePsiElement implements PsiImportStaticReferenceElement {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.PsiImportStaticReferenceElementImpl");
+  private static final Logger LOG = Logger.getInstance(PsiImportStaticReferenceElementImpl.class);
   private volatile String myCanonicalText;
 
   public PsiImportStaticReferenceElementImpl() {
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiJShellHolderMethodImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiJShellHolderMethodImpl.java
index 465276d95150..b8480d1a7286 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiJShellHolderMethodImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiJShellHolderMethodImpl.java
@@ -23,7 +23,7 @@ import java.util.List;
  * @author Eugene Zhuravlev
  */
 public class PsiJShellHolderMethodImpl extends ASTWrapperPsiElement implements PsiJShellHolderMethod {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.PsiJShellHolderMethodImpl");
+  private static final Logger LOG = Logger.getInstance(PsiJShellHolderMethodImpl.class);
 
   private final String myName;
   private PsiParameterList myParameterList;
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiJavaCodeReferenceElementImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiJavaCodeReferenceElementImpl.java
index b21d0392fcbc..98d2ecf24b00 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiJavaCodeReferenceElementImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiJavaCodeReferenceElementImpl.java
@@ -42,7 +42,7 @@ import java.util.List;
 import static com.intellij.patterns.PsiJavaPatterns.psiElement;
 
 public class PsiJavaCodeReferenceElementImpl extends CompositePsiElement implements PsiAnnotatedJavaCodeReferenceElement, SourceJavaCodeReference {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.PsiJavaCodeReferenceElementImpl");
+  private static final Logger LOG = Logger.getInstance(PsiJavaCodeReferenceElementImpl.class);
 
   private volatile String myCachedQName;
   private volatile String myCachedNormalizedText;
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiJavaFileBaseImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiJavaFileBaseImpl.java
index c666687102ab..c9d086d82d74 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiJavaFileBaseImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiJavaFileBaseImpl.java
@@ -38,7 +38,7 @@ import java.util.HashSet;
 import java.util.List;
 
 public abstract class PsiJavaFileBaseImpl extends PsiFileImpl implements PsiJavaFile {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.PsiJavaFileBaseImpl");
+  private static final Logger LOG = Logger.getInstance(PsiJavaFileBaseImpl.class);
   private static final String[] IMPLICIT_IMPORTS = { CommonClassNames.DEFAULT_PACKAGE };
 
   private final CachedValue<MostlySingularMultiMap<String, SymbolCollectingProcessor.ResultWithContext>> myResolveCache;
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiParameterImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiParameterImpl.java
index fb9603d6941e..5e1c96596589 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiParameterImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiParameterImpl.java
@@ -31,7 +31,7 @@ import java.lang.ref.Reference;
 import java.util.Arrays;
 
 public class PsiParameterImpl extends JavaStubPsiElement<PsiParameterStub> implements PsiParameter {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.PsiParameterImpl");
+  private static final Logger LOG = Logger.getInstance(PsiParameterImpl.class);
 
   private volatile Reference<PsiType> myCachedType;
 
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiParameterListImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiParameterListImpl.java
index 6f8542e5d7b8..cf54b0456d69 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiParameterListImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiParameterListImpl.java
@@ -31,7 +31,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 public class PsiParameterListImpl extends JavaStubPsiElement<PsiParameterListStub> implements PsiParameterList {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.PsiParameterListImpl");
+  private static final Logger LOG = Logger.getInstance(PsiParameterListImpl.class);
 
   public PsiParameterListImpl(@NotNull PsiParameterListStub stub) {
     super(stub, JavaStubElementTypes.PARAMETER_LIST);
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/javadoc/PsiDocCommentImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/javadoc/PsiDocCommentImpl.java
index 2e430790b541..d9fde16251bb 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/javadoc/PsiDocCommentImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/javadoc/PsiDocCommentImpl.java
@@ -26,7 +26,7 @@ import java.util.List;
 import java.util.regex.Pattern;
 
 public class PsiDocCommentImpl extends LazyParseablePsiElement implements PsiDocComment, JavaTokenType, Constants {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.javadoc.PsiDocCommentImpl");
+  private static final Logger LOG = Logger.getInstance(PsiDocCommentImpl.class);
 
   private static final TokenSet TAG_BIT_SET = TokenSet.create(DOC_TAG);
   private static final ArrayFactory<PsiDocTag> ARRAY_FACTORY = count -> count == 0 ? PsiDocTag.EMPTY_ARRAY : new PsiDocTag[count];
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/ClassResolverProcessor.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/ClassResolverProcessor.java
index 8fe4ff0edcbf..6e1b3222a062 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/ClassResolverProcessor.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/ClassResolverProcessor.java
@@ -20,7 +20,7 @@ import java.util.Iterator;
 import java.util.List;
 
 public class ClassResolverProcessor implements PsiScopeProcessor, NameHint, ElementClassHint {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.resolve.ClassResolverProcessor");
+  private static final Logger LOG = Logger.getInstance(ClassResolverProcessor.class);
   private static final String[] DEFAULT_PACKAGES = {CommonClassNames.DEFAULT_PACKAGE};
 
   private final String myClassName;
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/JavaSharedImplUtil.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/JavaSharedImplUtil.java
index b1231a95c1e7..8d3788cb4d1b 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/JavaSharedImplUtil.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/JavaSharedImplUtil.java
@@ -24,7 +24,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class JavaSharedImplUtil {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.tree.JavaSharedImplUtil");
+  private static final Logger LOG = Logger.getInstance(JavaSharedImplUtil.class);
 
   private static final TokenSet BRACKETS = TokenSet.create(JavaTokenType.LBRACKET, JavaTokenType.RBRACKET);
 
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/JavaSourceUtil.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/JavaSourceUtil.java
index 00f596852f87..cef355822a8d 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/JavaSourceUtil.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/JavaSourceUtil.java
@@ -19,7 +19,7 @@ import com.intellij.util.IncorrectOperationException;
 import org.jetbrains.annotations.NotNull;
 
 public class JavaSourceUtil {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.tree.JavaSourceUtil");
+  private static final Logger LOG = Logger.getInstance(JavaSourceUtil.class);
 
   private static final TokenSet REF_FILTER = TokenSet.orSet(
     ElementType.JAVA_COMMENT_OR_WHITESPACE_BIT_SET, TokenSet.create(JavaElementType.ANNOTATION));
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/JavaTreeGenerator.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/JavaTreeGenerator.java
index 1abc0f591337..0cc1f28c4dfc 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/JavaTreeGenerator.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/JavaTreeGenerator.java
@@ -40,7 +40,7 @@ import org.jetbrains.annotations.Nullable;
  * @author max
  */
 public class JavaTreeGenerator implements TreeGenerator {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.tree.JavaTreeGenerator");
+  private static final Logger LOG = Logger.getInstance(JavaTreeGenerator.class);
 
   private static final JavaParserUtil.ParserWrapper MOD_LIST =
     builder -> JavaParser.INSTANCE.getDeclarationParser().parseModifierList(builder);
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/AnnotationElement.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/AnnotationElement.java
index 46c86b3ebec4..5a6797298546 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/AnnotationElement.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/AnnotationElement.java
@@ -29,7 +29,7 @@ import org.jetbrains.annotations.NotNull;
  * @author ven
  */
 public class AnnotationElement extends CompositeElement implements Constants {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.tree.java.AnnotationElement");
+  private static final Logger LOG = Logger.getInstance(AnnotationElement.class);
 
   public AnnotationElement() {
     super(ANNOTATION);
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/AnnotationParamListElement.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/AnnotationParamListElement.java
index d6cf5b359552..c9e0f3cf057f 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/AnnotationParamListElement.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/AnnotationParamListElement.java
@@ -16,7 +16,7 @@ import org.jetbrains.annotations.NotNull;
  * @author ven
  */
 public class AnnotationParamListElement extends CompositeElement {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.tree.java.AnnotationParamListElement");
+  private static final Logger LOG = Logger.getInstance(AnnotationParamListElement.class);
   private static final TokenSet NAME_VALUE_PAIR_BIT_SET = TokenSet.create(JavaElementType.NAME_VALUE_PAIR);
 
   public AnnotationParamListElement() {
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/AnonymousClassElementBase.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/AnonymousClassElementBase.java
index 789ad5217e8b..1c3985edd6f9 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/AnonymousClassElementBase.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/AnonymousClassElementBase.java
@@ -25,7 +25,7 @@ import com.intellij.lang.ASTNode;
 import org.jetbrains.annotations.NotNull;
 
 public abstract class AnonymousClassElementBase extends ClassElement {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.tree.java.AnonymousClassElement");
+  private static final Logger LOG = Logger.getInstance(AnonymousClassElement.class);
 
   public AnonymousClassElementBase(IElementType type) {
     super(type);
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/ClassElement.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/ClassElement.java
index 1a0e50fd6539..824a6d58d150 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/ClassElement.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/ClassElement.java
@@ -33,7 +33,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 public class ClassElement extends CompositeElement implements Constants {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.tree.java.ClassElement");
+  private static final Logger LOG = Logger.getInstance(ClassElement.class);
 
   private static final TokenSet MODIFIERS_TO_REMOVE_IN_INTERFACE_BIT_SET = TokenSet.create(
     PUBLIC_KEYWORD, ABSTRACT_KEYWORD, STATIC_KEYWORD, FINAL_KEYWORD, NATIVE_KEYWORD);
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/ClassInitializerElement.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/ClassInitializerElement.java
index 8ab274fbbe10..40ec929a0950 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/ClassInitializerElement.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/ClassInitializerElement.java
@@ -25,7 +25,7 @@ import com.intellij.psi.tree.IElementType;
 import org.jetbrains.annotations.NotNull;
 
 public class ClassInitializerElement extends CompositeElement implements Constants {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.tree.java.ClassInitializerElement");
+  private static final Logger LOG = Logger.getInstance(ClassInitializerElement.class);
 
   public ClassInitializerElement() {
     super(CLASS_INITIALIZER);
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/EnumConstantElement.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/EnumConstantElement.java
index 4ff82b254e3c..15b35fe01a9a 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/EnumConstantElement.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/EnumConstantElement.java
@@ -29,7 +29,7 @@ import org.jetbrains.annotations.NotNull;
  * @author dsl
  */
 public class EnumConstantElement extends CompositeElement implements Constants {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.tree.java.EnumConstantElement");
+  private static final Logger LOG = Logger.getInstance(EnumConstantElement.class);
   public EnumConstantElement() {
     super(ENUM_CONSTANT);
   }
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/ImportStatementBaseElement.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/ImportStatementBaseElement.java
index 0b6face169f9..21715a27be1c 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/ImportStatementBaseElement.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/ImportStatementBaseElement.java
@@ -30,7 +30,7 @@ import org.jetbrains.annotations.NotNull;
  * @author dsl
  */
 public class ImportStatementBaseElement extends CompositeElement {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.tree.java.ImportStatementBaseElement");
+  private static final Logger LOG = Logger.getInstance(ImportStatementBaseElement.class);
 
   protected ImportStatementBaseElement(IElementType type) {
     super(type);
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/JavaFileElement.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/JavaFileElement.java
index c4abe03ebf9b..1d6f3616aa12 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/JavaFileElement.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/JavaFileElement.java
@@ -31,7 +31,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 public class JavaFileElement extends FileElement {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.tree.java.JavaFileElement");
+  private static final Logger LOG = Logger.getInstance(JavaFileElement.class);
 
   public JavaFileElement(CharSequence text) {
     super(JavaParserDefinition.JAVA_FILE, text);
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/MethodElement.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/MethodElement.java
index 209fc869baac..25424e17d877 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/MethodElement.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/MethodElement.java
@@ -29,7 +29,7 @@ import com.intellij.util.CharTable;
 import org.jetbrains.annotations.NotNull;
 
 public class MethodElement extends CompositeElement implements Constants {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.tree.java.MethodElement");
+  private static final Logger LOG = Logger.getInstance(MethodElement.class);
 
   public MethodElement() {
     super(METHOD);
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/ModifierListElement.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/ModifierListElement.java
index 9b9da7248f64..9ed10f4d0e18 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/ModifierListElement.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/ModifierListElement.java
@@ -29,7 +29,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 public class ModifierListElement extends CompositeElement {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.tree.java.ModifierListElement");
+  private static final Logger LOG = Logger.getInstance(ModifierListElement.class);
 
   public ModifierListElement() {
     super(JavaElementType.MODIFIER_LIST);
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/ParameterElement.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/ParameterElement.java
index 0ceefe4f5d9c..5127ffb93509 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/ParameterElement.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/ParameterElement.java
@@ -26,7 +26,7 @@ import com.intellij.psi.tree.IElementType;
 import org.jetbrains.annotations.NotNull;
 
 public class ParameterElement extends CompositeElement {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.tree.java.ParameterElement");
+  private static final Logger LOG = Logger.getInstance(ParameterElement.class);
 
   public ParameterElement(@NotNull IElementType type) {
     super(type);
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/ParameterListElement.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/ParameterListElement.java
index 0cb573ec1e48..48739201859a 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/ParameterListElement.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/ParameterListElement.java
@@ -29,7 +29,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 public class ParameterListElement extends CompositeElement implements Constants {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.tree.java.ParameterListElement");
+  private static final Logger LOG = Logger.getInstance(ParameterListElement.class);
 
   private static final TokenSet PARAMETER_SET = TokenSet.create(JavaElementType.PARAMETER, JavaElementType.RECEIVER_PARAMETER);
 
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiArrayAccessExpressionImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiArrayAccessExpressionImpl.java
index 834b639a20ec..c0fd61baa495 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiArrayAccessExpressionImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiArrayAccessExpressionImpl.java
@@ -26,7 +26,7 @@ import com.intellij.psi.util.PsiUtil;
 import org.jetbrains.annotations.NotNull;
 
 public class PsiArrayAccessExpressionImpl extends ExpressionPsiElement implements PsiArrayAccessExpression, Constants {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.tree.java.PsiArrayAccessExpressionImpl");
+  private static final Logger LOG = Logger.getInstance(PsiArrayAccessExpressionImpl.class);
 
   public PsiArrayAccessExpressionImpl() {
     super(ARRAY_ACCESS_EXPRESSION);
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiArrayInitializerExpressionImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiArrayInitializerExpressionImpl.java
index 88e83580ed9f..2effb13be942 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiArrayInitializerExpressionImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiArrayInitializerExpressionImpl.java
@@ -25,7 +25,7 @@ import com.intellij.util.CharTable;
 import org.jetbrains.annotations.NotNull;
 
 public class PsiArrayInitializerExpressionImpl extends ExpressionPsiElement implements PsiArrayInitializerExpression {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.tree.java.PsiArrayInitializerExpressionImpl");
+  private static final Logger LOG = Logger.getInstance(PsiArrayInitializerExpressionImpl.class);
 
   public PsiArrayInitializerExpressionImpl() {
     super(JavaElementType.ARRAY_INITIALIZER_EXPRESSION);
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiAssertStatementImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiAssertStatementImpl.java
index bf991369fbdc..f24e0ee306d1 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiAssertStatementImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiAssertStatementImpl.java
@@ -29,7 +29,7 @@ import com.intellij.psi.tree.ChildRoleBase;
 import org.jetbrains.annotations.NotNull;
 
 public class PsiAssertStatementImpl extends CompositePsiElement implements PsiAssertStatement, Constants {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.tree.java.PsiAssertStatementImpl");
+  private static final Logger LOG = Logger.getInstance(PsiAssertStatementImpl.class);
 
   public PsiAssertStatementImpl() {
     super(ASSERT_STATEMENT);
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiAssignmentExpressionImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiAssignmentExpressionImpl.java
index 47042f763e9b..b5e20f132c72 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiAssignmentExpressionImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiAssignmentExpressionImpl.java
@@ -28,7 +28,7 @@ import com.intellij.psi.util.PsiUtil;
 import org.jetbrains.annotations.NotNull;
 
 public class PsiAssignmentExpressionImpl extends ExpressionPsiElement implements PsiAssignmentExpression {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.tree.java.PsiAssignmentExpressionImpl");
+  private static final Logger LOG = Logger.getInstance(PsiAssignmentExpressionImpl.class);
 
   public PsiAssignmentExpressionImpl() {
     super(JavaElementType.ASSIGNMENT_EXPRESSION);
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiBinaryExpressionImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiBinaryExpressionImpl.java
index 7ed98b832544..dc26eee45a6b 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiBinaryExpressionImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiBinaryExpressionImpl.java
@@ -30,7 +30,7 @@ import com.intellij.util.Function;
 import org.jetbrains.annotations.NotNull;
 
 public class PsiBinaryExpressionImpl extends ExpressionPsiElement implements PsiBinaryExpression {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.tree.java.PsiBinaryExpressionImpl");
+  private static final Logger LOG = Logger.getInstance(PsiBinaryExpressionImpl.class);
 
   public PsiBinaryExpressionImpl() {
     this(JavaElementType.BINARY_EXPRESSION);
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiBlockStatementImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiBlockStatementImpl.java
index bde4a4c568d2..9a56e4c17adc 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiBlockStatementImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiBlockStatementImpl.java
@@ -28,7 +28,7 @@ import com.intellij.psi.impl.source.tree.CompositePsiElement;
 import org.jetbrains.annotations.NotNull;
 
 public class PsiBlockStatementImpl extends CompositePsiElement implements PsiBlockStatement {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.tree.java.PsiBlockStatementImpl");
+  private static final Logger LOG = Logger.getInstance(PsiBlockStatementImpl.class);
 
   public PsiBlockStatementImpl() {
     super(JavaElementType.BLOCK_STATEMENT);
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiBreakStatementImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiBreakStatementImpl.java
index a871dd9dd96c..1da9edab0ceb 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiBreakStatementImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiBreakStatementImpl.java
@@ -13,7 +13,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 public class PsiBreakStatementImpl extends CompositePsiElement implements PsiBreakStatement {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.tree.java.PsiBreakStatementImpl");
+  private static final Logger LOG = Logger.getInstance(PsiBreakStatementImpl.class);
 
   public PsiBreakStatementImpl() {
     super(JavaElementType.BREAK_STATEMENT);
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiCatchSectionImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiCatchSectionImpl.java
index 37e6721cb40b..8948c3edd37a 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiCatchSectionImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiCatchSectionImpl.java
@@ -29,7 +29,7 @@ import java.util.List;
  * @author ven
  */
 public class PsiCatchSectionImpl extends CompositePsiElement implements PsiCatchSection, Constants {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.tree.java.PsiCatchSectionImpl");
+  private static final Logger LOG = Logger.getInstance(PsiCatchSectionImpl.class);
 
   private final Object myTypesCacheLock = new Object();
   private CachedValue<List<PsiType>> myTypesCache;
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiClassObjectAccessExpressionImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiClassObjectAccessExpressionImpl.java
index 25f0a239064d..50917edaff3c 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiClassObjectAccessExpressionImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiClassObjectAccessExpressionImpl.java
@@ -17,7 +17,7 @@ import org.jetbrains.annotations.NotNull;
 import javax.swing.*;
 
 public class PsiClassObjectAccessExpressionImpl extends ExpressionPsiElement implements PsiClassObjectAccessExpression, Constants {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.tree.java.PsiClassObjectAccessExpressionImpl");
+  private static final Logger LOG = Logger.getInstance(PsiClassObjectAccessExpressionImpl.class);
 
   public PsiClassObjectAccessExpressionImpl() {
     super(CLASS_OBJECT_ACCESS_EXPRESSION);
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiCodeBlockImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiCodeBlockImpl.java
index a4130583a7a3..c94e8886cc9e 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiCodeBlockImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiCodeBlockImpl.java
@@ -24,7 +24,7 @@ import java.util.Collections;
 import java.util.Set;
 
 public class PsiCodeBlockImpl extends LazyParseablePsiElement implements PsiCodeBlock {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.tree.java.PsiCodeBlockImpl");
+  private static final Logger LOG = Logger.getInstance(PsiCodeBlockImpl.class);
 
   public PsiCodeBlockImpl(CharSequence text) {
     super(JavaElementType.CODE_BLOCK, text);
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiConditionalExpressionImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiConditionalExpressionImpl.java
index c731b54c0c9d..8ca652c5b07a 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiConditionalExpressionImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiConditionalExpressionImpl.java
@@ -30,7 +30,7 @@ import com.intellij.psi.util.TypeConversionUtil;
 import org.jetbrains.annotations.NotNull;
 
 public class PsiConditionalExpressionImpl extends ExpressionPsiElement implements PsiConditionalExpression {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.tree.java.PsiConditionalExpressionImpl");
+  private static final Logger LOG = Logger.getInstance(PsiConditionalExpressionImpl.class);
 
   public PsiConditionalExpressionImpl() {
     super(JavaElementType.CONDITIONAL_EXPRESSION);
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiContinueStatementImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiContinueStatementImpl.java
index cdb5d0f5cbf1..b410f9e8610f 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiContinueStatementImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiContinueStatementImpl.java
@@ -15,7 +15,7 @@ import com.intellij.psi.tree.IElementType;
 import org.jetbrains.annotations.NotNull;
 
 public class PsiContinueStatementImpl extends CompositePsiElement implements PsiContinueStatement {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.tree.java.PsiContinueStatementImpl");
+  private static final Logger LOG = Logger.getInstance(PsiContinueStatementImpl.class);
 
   public PsiContinueStatementImpl() {
     super(JavaElementType.CONTINUE_STATEMENT);
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiDoWhileStatementImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiDoWhileStatementImpl.java
index faf12bdba627..ff40682a7f17 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiDoWhileStatementImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiDoWhileStatementImpl.java
@@ -27,7 +27,7 @@ import com.intellij.psi.tree.IElementType;
 import org.jetbrains.annotations.NotNull;
 
 public class PsiDoWhileStatementImpl extends PsiLoopStatementImpl implements PsiDoWhileStatement, Constants {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.tree.java.PsiDoWhileStatementImpl");
+  private static final Logger LOG = Logger.getInstance(PsiDoWhileStatementImpl.class);
 
   public PsiDoWhileStatementImpl() {
     super(DO_WHILE_STATEMENT);
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiExpressionListImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiExpressionListImpl.java
index c0dff4768aa9..c9548dea8d4b 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiExpressionListImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiExpressionListImpl.java
@@ -25,7 +25,7 @@ import com.intellij.util.CharTable;
 import org.jetbrains.annotations.NotNull;
 
 public class PsiExpressionListImpl extends CompositePsiElement implements PsiExpressionList {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.tree.java.PsiExpressionListImpl");
+  private static final Logger LOG = Logger.getInstance(PsiExpressionListImpl.class);
   private volatile PsiExpression[] myExpressions;
 
   public PsiExpressionListImpl() {
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiExpressionListStatementImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiExpressionListStatementImpl.java
index fd5b1086940a..5e3e8b20b727 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiExpressionListStatementImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiExpressionListStatementImpl.java
@@ -30,7 +30,7 @@ import com.intellij.psi.tree.ChildRoleBase;
 import org.jetbrains.annotations.NotNull;
 
 public class PsiExpressionListStatementImpl extends CompositePsiElement implements PsiExpressionListStatement, Constants {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.tree.java.PsiExpressionListStatementImpl");
+  private static final Logger LOG = Logger.getInstance(PsiExpressionListStatementImpl.class);
 
   public PsiExpressionListStatementImpl() {
     super(EXPRESSION_LIST_STATEMENT);
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiExpressionStatementImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiExpressionStatementImpl.java
index 6e6d18d48ff2..b669835c0002 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiExpressionStatementImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiExpressionStatementImpl.java
@@ -26,7 +26,7 @@ import com.intellij.psi.tree.IElementType;
 import org.jetbrains.annotations.NotNull;
 
 public class PsiExpressionStatementImpl extends CompositePsiElement implements PsiExpressionStatement {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.tree.java.PsiExpressionStatementImpl");
+  private static final Logger LOG = Logger.getInstance(PsiExpressionStatementImpl.class);
 
   public PsiExpressionStatementImpl() {
     super(JavaElementType.EXPRESSION_STATEMENT);
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiForStatementImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiForStatementImpl.java
index 01c2eb73f370..5b563bfd540d 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiForStatementImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiForStatementImpl.java
@@ -29,7 +29,7 @@ import com.intellij.psi.tree.IElementType;
 import org.jetbrains.annotations.NotNull;
 
 public class PsiForStatementImpl extends PsiLoopStatementImpl implements PsiForStatement, Constants {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.tree.java.PsiForStatementImpl");
+  private static final Logger LOG = Logger.getInstance(PsiForStatementImpl.class);
 
   public PsiForStatementImpl() {
     super(FOR_STATEMENT);
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiForeachStatementImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiForeachStatementImpl.java
index 8d8a32b0fbf4..6017c0c8b025 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiForeachStatementImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiForeachStatementImpl.java
@@ -30,7 +30,7 @@ import org.jetbrains.annotations.NotNull;
  * @author dsl
  */
 public class PsiForeachStatementImpl extends PsiLoopStatementImpl implements PsiForeachStatement, Constants {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.tree.java.PsiForeachStatementImpl");
+  private static final Logger LOG = Logger.getInstance(PsiForeachStatementImpl.class);
   public PsiForeachStatementImpl() {
     super(FOREACH_STATEMENT);
   }
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiIfStatementImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiIfStatementImpl.java
index 892d3c55cd07..54a4d9352f61 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiIfStatementImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiIfStatementImpl.java
@@ -30,7 +30,7 @@ import com.intellij.util.IncorrectOperationException;
 import org.jetbrains.annotations.NotNull;
 
 public class PsiIfStatementImpl extends CompositePsiElement implements PsiIfStatement, Constants {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.tree.java.PsiIfStatementImpl");
+  private static final Logger LOG = Logger.getInstance(PsiIfStatementImpl.class);
 
   public PsiIfStatementImpl() {
     super(IF_STATEMENT);
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiInstanceOfExpressionImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiInstanceOfExpressionImpl.java
index f3f9f437a0e2..c72844e0886f 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiInstanceOfExpressionImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiInstanceOfExpressionImpl.java
@@ -25,7 +25,7 @@ import com.intellij.psi.tree.ChildRoleBase;
 import org.jetbrains.annotations.NotNull;
 
 public class PsiInstanceOfExpressionImpl extends ExpressionPsiElement implements PsiInstanceOfExpression, Constants {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.tree.java.PsiInstanceOfExpressionImpl");
+  private static final Logger LOG = Logger.getInstance(PsiInstanceOfExpressionImpl.class);
 
   public PsiInstanceOfExpressionImpl() {
     super(INSTANCE_OF_EXPRESSION);
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiLabeledStatementImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiLabeledStatementImpl.java
index f917d9a7bd5e..14dee8b04c57 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiLabeledStatementImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiLabeledStatementImpl.java
@@ -32,7 +32,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 public class PsiLabeledStatementImpl extends CompositePsiElement implements PsiLabeledStatement, Constants {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.tree.java.PsiLabeledStatementImpl");
+  private static final Logger LOG = Logger.getInstance(PsiLabeledStatementImpl.class);
 
   public PsiLabeledStatementImpl() {
     super(LABELED_STATEMENT);
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiLocalVariableImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiLocalVariableImpl.java
index a95c22c8bddc..7d3b04a69030 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiLocalVariableImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiLocalVariableImpl.java
@@ -30,7 +30,7 @@ import java.util.Arrays;
 import java.util.Set;
 
 public class PsiLocalVariableImpl extends CompositePsiElement implements PsiLocalVariable, PsiVariableEx {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.tree.java.PsiLocalVariableImpl");
+  private static final Logger LOG = Logger.getInstance(PsiLocalVariableImpl.class);
 
   private volatile String myCachedName;
 
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiMethodCallExpressionImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiMethodCallExpressionImpl.java
index ed70bf84889d..7beb2aa67b68 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiMethodCallExpressionImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiMethodCallExpressionImpl.java
@@ -30,7 +30,7 @@ import org.jetbrains.annotations.Nullable;
 import java.util.Arrays;
 
 public class PsiMethodCallExpressionImpl extends ExpressionPsiElement implements PsiMethodCallExpression {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.tree.java.PsiMethodCallExpressionImpl");
+  private static final Logger LOG = Logger.getInstance(PsiMethodCallExpressionImpl.class);
 
   public PsiMethodCallExpressionImpl() {
     super(JavaElementType.METHOD_CALL_EXPRESSION);
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiMethodReferenceExpressionImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiMethodReferenceExpressionImpl.java
index d3a540f69b97..8d3ce21316b9 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiMethodReferenceExpressionImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiMethodReferenceExpressionImpl.java
@@ -34,7 +34,7 @@ import java.util.List;
 
 public class PsiMethodReferenceExpressionImpl extends JavaStubPsiElement<FunctionalExpressionStub<PsiMethodReferenceExpression>>
   implements PsiMethodReferenceExpression {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.tree.java.PsiMethodReferenceExpressionImpl");
+  private static final Logger LOG = Logger.getInstance(PsiMethodReferenceExpressionImpl.class);
   private static final MethodReferenceResolver RESOLVER = new MethodReferenceResolver();
 
   public PsiMethodReferenceExpressionImpl(@NotNull FunctionalExpressionStub<PsiMethodReferenceExpression> stub) {
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiNameValuePairImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiNameValuePairImpl.java
index 959ab2992b8b..e48dc5589ecd 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiNameValuePairImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiNameValuePairImpl.java
@@ -202,6 +202,6 @@ public class PsiNameValuePairImpl extends JavaStubPsiElement<PsiNameValuePairStu
     return "PsiNameValuePair";
   }
 
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.tree.java.PsiNameValuePairImpl");
+  private static final Logger LOG = Logger.getInstance(PsiNameValuePairImpl.class);
 
 }
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiNewExpressionImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiNewExpressionImpl.java
index 2c44cc54fac3..12fed3902caa 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiNewExpressionImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiNewExpressionImpl.java
@@ -37,7 +37,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 public class PsiNewExpressionImpl extends ExpressionPsiElement implements PsiNewExpression {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.tree.java.PsiNewExpressionImpl");
+  private static final Logger LOG = Logger.getInstance(PsiNewExpressionImpl.class);
 
   public PsiNewExpressionImpl() {
     super(JavaElementType.NEW_EXPRESSION);
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiPackageStatementImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiPackageStatementImpl.java
index 20aaba1869ff..099160794e29 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiPackageStatementImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiPackageStatementImpl.java
@@ -24,7 +24,7 @@ import com.intellij.psi.tree.IElementType;
 import org.jetbrains.annotations.NotNull;
 
 public class PsiPackageStatementImpl extends CompositePsiElement implements PsiPackageStatement {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.tree.java.PsiPackageStatementImpl");
+  private static final Logger LOG = Logger.getInstance(PsiPackageStatementImpl.class);
 
   public PsiPackageStatementImpl() {
     super(JavaElementType.PACKAGE_STATEMENT);
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiParenthesizedExpressionImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiParenthesizedExpressionImpl.java
index 7703a725e5c3..4e05f1136bae 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiParenthesizedExpressionImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiParenthesizedExpressionImpl.java
@@ -26,7 +26,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 public class PsiParenthesizedExpressionImpl extends ExpressionPsiElement implements PsiParenthesizedExpression, Constants {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.tree.java.PsiParenthesizedExpressionImpl");
+  private static final Logger LOG = Logger.getInstance(PsiParenthesizedExpressionImpl.class);
 
   public PsiParenthesizedExpressionImpl() {
     super(PARENTH_EXPRESSION);
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiPolyadicExpressionImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiPolyadicExpressionImpl.java
index d3249803cd20..99b319200c59 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiPolyadicExpressionImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiPolyadicExpressionImpl.java
@@ -32,7 +32,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 public class PsiPolyadicExpressionImpl extends ExpressionPsiElement implements PsiPolyadicExpression {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.tree.java.PsiPolyadicExpressionImpl");
+  private static final Logger LOG = Logger.getInstance(PsiPolyadicExpressionImpl.class);
 
   public PsiPolyadicExpressionImpl() {
     super(JavaElementType.POLYADIC_EXPRESSION);
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiPostfixExpressionImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiPostfixExpressionImpl.java
index 72b488b7a56d..1615f09cc975 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiPostfixExpressionImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiPostfixExpressionImpl.java
@@ -25,7 +25,7 @@ import com.intellij.psi.tree.IElementType;
 import org.jetbrains.annotations.NotNull;
 
 public class PsiPostfixExpressionImpl extends ExpressionPsiElement implements PsiPostfixExpression {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.tree.java.PsiPostfixExpressionImpl");
+  private static final Logger LOG = Logger.getInstance(PsiPostfixExpressionImpl.class);
 
   public PsiPostfixExpressionImpl() {
     super(JavaElementType.POSTFIX_EXPRESSION);
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiPrefixExpressionImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiPrefixExpressionImpl.java
index 5e95a05f631b..14f79cfeac49 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiPrefixExpressionImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiPrefixExpressionImpl.java
@@ -26,7 +26,7 @@ import com.intellij.psi.tree.IElementType;
 import org.jetbrains.annotations.NotNull;
 
 public class PsiPrefixExpressionImpl extends ExpressionPsiElement implements PsiPrefixExpression {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.tree.java.PsiPrefixExpressionImpl");
+  private static final Logger LOG = Logger.getInstance(PsiPrefixExpressionImpl.class);
 
   public PsiPrefixExpressionImpl() {
     super(JavaElementType.PREFIX_EXPRESSION);
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiReferenceExpressionImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiReferenceExpressionImpl.java
index b50608d338db..2673e54b2a89 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiReferenceExpressionImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiReferenceExpressionImpl.java
@@ -48,7 +48,7 @@ import org.jetbrains.annotations.Nullable;
 import java.util.*;
 
 public class PsiReferenceExpressionImpl extends ExpressionPsiElement implements PsiReferenceExpression, SourceJavaCodeReference {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.tree.java.PsiReferenceExpressionImpl");
+  private static final Logger LOG = Logger.getInstance(PsiReferenceExpressionImpl.class);
   private static final ThreadLocal<Map<PsiReferenceExpression, ResolveResult[]>> ourQualifierCache = ThreadLocal.withInitial(() -> new HashMap<>());
 
   private volatile String myCachedQName;
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiReferenceParameterListImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiReferenceParameterListImpl.java
index e679cf8d0d8a..b46b38201a4d 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiReferenceParameterListImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiReferenceParameterListImpl.java
@@ -30,7 +30,7 @@ import org.jetbrains.annotations.NotNull;
  *  @author dsl
  */
 public class PsiReferenceParameterListImpl extends CompositePsiElement implements PsiReferenceParameterList {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.tree.java.PsiReferenceParameterListImpl");
+  private static final Logger LOG = Logger.getInstance(PsiReferenceParameterListImpl.class);
   private static final TokenSet TYPE_SET = TokenSet.create(JavaElementType.TYPE);
 
   public PsiReferenceParameterListImpl() {
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiReturnStatementImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiReturnStatementImpl.java
index 84125be9e597..f6a2b6af143b 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiReturnStatementImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiReturnStatementImpl.java
@@ -30,7 +30,7 @@ import com.intellij.psi.tree.ChildRoleBase;
 import org.jetbrains.annotations.NotNull;
 
 public class PsiReturnStatementImpl extends CompositePsiElement implements PsiReturnStatement, Constants {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.tree.java.PsiReturnStatementImpl");
+  private static final Logger LOG = Logger.getInstance(PsiReturnStatementImpl.class);
 
   public PsiReturnStatementImpl() {
     super(RETURN_STATEMENT);
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiSuperExpressionImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiSuperExpressionImpl.java
index de8afd9dc90d..4f4cbdb7b69b 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiSuperExpressionImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiSuperExpressionImpl.java
@@ -28,7 +28,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 public class PsiSuperExpressionImpl extends ExpressionPsiElement implements PsiSuperExpression, Constants {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.tree.java.PsiSuperExpressionImpl");
+  private static final Logger LOG = Logger.getInstance(PsiSuperExpressionImpl.class);
 
   public PsiSuperExpressionImpl() {
     super(SUPER_EXPRESSION);
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiSwitchLabelStatementImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiSwitchLabelStatementImpl.java
index 9f01b21c62c7..1687fdc6b74c 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiSwitchLabelStatementImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiSwitchLabelStatementImpl.java
@@ -15,7 +15,7 @@ import com.intellij.psi.tree.IElementType;
 import org.jetbrains.annotations.NotNull;
 
 public class PsiSwitchLabelStatementImpl extends PsiSwitchLabelStatementBaseImpl implements PsiSwitchLabelStatement {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.tree.java.PsiSwitchLabelStatementImpl");
+  private static final Logger LOG = Logger.getInstance(PsiSwitchLabelStatementImpl.class);
 
   public PsiSwitchLabelStatementImpl() {
     super(JavaElementType.SWITCH_LABEL_STATEMENT);
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiSynchronizedStatementImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiSynchronizedStatementImpl.java
index da4c2cdb2b92..8ab272f2f1cc 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiSynchronizedStatementImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiSynchronizedStatementImpl.java
@@ -26,7 +26,7 @@ import com.intellij.psi.tree.ChildRoleBase;
 import org.jetbrains.annotations.NotNull;
 
 public class PsiSynchronizedStatementImpl extends CompositePsiElement implements PsiSynchronizedStatement, Constants {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.tree.java.PsiSynchronizedStatementImpl");
+  private static final Logger LOG = Logger.getInstance(PsiSynchronizedStatementImpl.class);
 
   public PsiSynchronizedStatementImpl() {
     super(SYNCHRONIZED_STATEMENT);
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiThisExpressionImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiThisExpressionImpl.java
index a820294c961b..1c017b392acf 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiThisExpressionImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiThisExpressionImpl.java
@@ -27,7 +27,7 @@ import com.intellij.psi.tree.ChildRoleBase;
 import org.jetbrains.annotations.NotNull;
 
 public class PsiThisExpressionImpl extends ExpressionPsiElement implements PsiThisExpression, Constants {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.tree.java.PsiThisExpressionImpl");
+  private static final Logger LOG = Logger.getInstance(PsiThisExpressionImpl.class);
 
   public PsiThisExpressionImpl() {
     super(THIS_EXPRESSION);
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiThrowStatementImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiThrowStatementImpl.java
index e5c78f1198a4..c7ab599ecd0d 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiThrowStatementImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiThrowStatementImpl.java
@@ -30,7 +30,7 @@ import com.intellij.psi.tree.ChildRoleBase;
 import org.jetbrains.annotations.NotNull;
 
 public class PsiThrowStatementImpl extends CompositePsiElement implements PsiThrowStatement, Constants {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.tree.java.PsiThrowStatementImpl");
+  private static final Logger LOG = Logger.getInstance(PsiThrowStatementImpl.class);
 
   public PsiThrowStatementImpl() {
     super(THROW_STATEMENT);
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiTryStatementImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiTryStatementImpl.java
index 7c4bc1de8269..467f6a477e92 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiTryStatementImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiTryStatementImpl.java
@@ -33,7 +33,7 @@ import org.jetbrains.annotations.NotNull;
 import java.util.ArrayList;
 
 public class PsiTryStatementImpl extends CompositePsiElement implements PsiTryStatement, Constants {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.tree.java.PsiTryStatementImpl");
+  private static final Logger LOG = Logger.getInstance(PsiTryStatementImpl.class);
 
   private volatile PsiParameter[] myCachedCatchParameters;
 
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiTypeCastExpressionImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiTypeCastExpressionImpl.java
index e93f063ef5fc..c7fdcef1f636 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiTypeCastExpressionImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiTypeCastExpressionImpl.java
@@ -27,7 +27,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 public class PsiTypeCastExpressionImpl extends ExpressionPsiElement implements PsiTypeCastExpression, Constants {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.tree.java.PsiTypeCastExpressionImpl");
+  private static final Logger LOG = Logger.getInstance(PsiTypeCastExpressionImpl.class);
 
   public PsiTypeCastExpressionImpl() {
     super(TYPE_CAST_EXPRESSION);
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiTypeParameterListImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiTypeParameterListImpl.java
index 8df052be5e8f..094a00be1e00 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiTypeParameterListImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiTypeParameterListImpl.java
@@ -29,7 +29,7 @@ import org.jetbrains.annotations.NotNull;
  *  @author dsl
  */
 public class PsiTypeParameterListImpl extends JavaStubPsiElement<PsiTypeParameterListStub> implements PsiTypeParameterList {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.tree.java.PsiTypeParameterListImpl");
+  private static final Logger LOG = Logger.getInstance(PsiTypeParameterListImpl.class);
 
   public PsiTypeParameterListImpl(final PsiTypeParameterListStub stub) {
     super(stub, JavaStubElementTypes.TYPE_PARAMETER_LIST);
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiWhileStatementImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiWhileStatementImpl.java
index e350cf7f9615..fff7075dfddb 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiWhileStatementImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiWhileStatementImpl.java
@@ -26,7 +26,7 @@ import com.intellij.psi.tree.IElementType;
 import org.jetbrains.annotations.NotNull;
 
 public class PsiWhileStatementImpl extends PsiLoopStatementImpl implements PsiWhileStatement, Constants {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.tree.java.PsiWhileStatementImpl");
+  private static final Logger LOG = Logger.getInstance(PsiWhileStatementImpl.class);
 
   public PsiWhileStatementImpl() {
     super(WHILE_STATEMENT);
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/ReplaceExpressionUtil.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/ReplaceExpressionUtil.java
index c390122014bd..5e8528515797 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/ReplaceExpressionUtil.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/ReplaceExpressionUtil.java
@@ -14,7 +14,7 @@ import com.intellij.psi.impl.source.tree.JavaElementType;
 import com.intellij.psi.tree.IElementType;
 
 public class ReplaceExpressionUtil {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.tree.java.ReplaceExpressionUtil");
+  private static final Logger LOG = Logger.getInstance(ReplaceExpressionUtil.class);
 
   public static boolean isNeedParenthesis(ASTNode oldExpr, ASTNode newExpr) {
     final ASTNode oldParent = oldExpr.getTreeParent();
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/TypeParameterElement.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/TypeParameterElement.java
index b1b2fbc75f18..192bdf967886 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/TypeParameterElement.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/TypeParameterElement.java
@@ -27,7 +27,7 @@ import org.jetbrains.annotations.NotNull;
  * @author max
  */
 public class TypeParameterElement extends CompositeElement {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.tree.java.TypeParameterElement");
+  private static final Logger LOG = Logger.getInstance(TypeParameterElement.class);
 
   public TypeParameterElement() {
     super(JavaElementType.TYPE_PARAMETER);
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/TypeParameterListElement.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/TypeParameterListElement.java
index 17561d582fe0..971ab25b4242 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/TypeParameterListElement.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/TypeParameterListElement.java
@@ -30,7 +30,7 @@ import org.jetbrains.annotations.NotNull;
  * @author max
  */
 public class TypeParameterListElement extends CompositeElement {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.tree.java.TypeParameterListElement");
+  private static final Logger LOG = Logger.getInstance(TypeParameterListElement.class);
   private static final TokenSet TYPE_PARAMETER_SET = TokenSet.create(JavaElementType.TYPE_PARAMETER);
 
   public TypeParameterListElement() {
diff --git a/java/java-psi-impl/src/com/intellij/psi/scope/conflictResolvers/JavaMethodsConflictResolver.java b/java/java-psi-impl/src/com/intellij/psi/scope/conflictResolvers/JavaMethodsConflictResolver.java
index be5d804dba2a..11e56d1a0ca0 100644
--- a/java/java-psi-impl/src/com/intellij/psi/scope/conflictResolvers/JavaMethodsConflictResolver.java
+++ b/java/java-psi-impl/src/com/intellij/psi/scope/conflictResolvers/JavaMethodsConflictResolver.java
@@ -28,7 +28,7 @@ import org.jetbrains.annotations.Nullable;
 import java.util.*;
 
 public class JavaMethodsConflictResolver implements PsiConflictResolver{
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.scope.conflictResolvers.JavaMethodsConflictResolver");
+  private static final Logger LOG = Logger.getInstance(JavaMethodsConflictResolver.class);
 
   private final PsiElement myArgumentsList;
   private final PsiType[] myActualParameterTypes;
diff --git a/java/java-psi-impl/src/com/intellij/psi/scope/util/PsiScopesUtil.java b/java/java-psi-impl/src/com/intellij/psi/scope/util/PsiScopesUtil.java
index 45276fcf55b9..fd822472d0d7 100644
--- a/java/java-psi-impl/src/com/intellij/psi/scope/util/PsiScopesUtil.java
+++ b/java/java-psi-impl/src/com/intellij/psi/scope/util/PsiScopesUtil.java
@@ -40,7 +40,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class PsiScopesUtil {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.scope.util.PsiScopesUtil");
+  private static final Logger LOG = Logger.getInstance(PsiScopesUtil.class);
 
   private PsiScopesUtil() {
   }
diff --git a/java/java-structure-view/src/com/intellij/ide/structureView/impl/java/VisibilityComparator.java b/java/java-structure-view/src/com/intellij/ide/structureView/impl/java/VisibilityComparator.java
index 33605228a6d5..80283dc93041 100644
--- a/java/java-structure-view/src/com/intellij/ide/structureView/impl/java/VisibilityComparator.java
+++ b/java/java-structure-view/src/com/intellij/ide/structureView/impl/java/VisibilityComparator.java
@@ -22,7 +22,7 @@ import org.jetbrains.annotations.NotNull;
 import java.util.Comparator;
 
 public class VisibilityComparator implements Comparator {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.ide.structureView.impl.java.VisibilityComparator");
+  private static final Logger LOG = Logger.getInstance(VisibilityComparator.class);
   private static final int GROUP_ACCESS_SUBLEVEL = 1;
   public static Comparator IMSTANCE = new VisibilityComparator(null);
 
diff --git a/java/java-tests/testSrc/com/intellij/psi/impl/file/impl/FileManagerTest.java b/java/java-tests/testSrc/com/intellij/psi/impl/file/impl/FileManagerTest.java
index ed8cd21d0844..eca530bce010 100644
--- a/java/java-tests/testSrc/com/intellij/psi/impl/file/impl/FileManagerTest.java
+++ b/java/java-tests/testSrc/com/intellij/psi/impl/file/impl/FileManagerTest.java
@@ -34,7 +34,7 @@ import java.util.jar.JarOutputStream;
 import java.util.zip.ZipEntry;
 
 public class FileManagerTest extends JavaPsiTestCase {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.file.impl.FileManagerTest");
+  private static final Logger LOG = Logger.getInstance(FileManagerTest.class);
 
   private VirtualFile myPrjDir1;
   private VirtualFile myPrjDir2;
diff --git a/java/openapi/src/com/intellij/ide/util/projectWizard/JavaModuleBuilder.java b/java/openapi/src/com/intellij/ide/util/projectWizard/JavaModuleBuilder.java
index 391451b05026..b1dbd967e0d2 100644
--- a/java/openapi/src/com/intellij/ide/util/projectWizard/JavaModuleBuilder.java
+++ b/java/openapi/src/com/intellij/ide/util/projectWizard/JavaModuleBuilder.java
@@ -31,7 +31,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class JavaModuleBuilder extends ModuleBuilder implements SourcePathsBuilder {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.ide.util.projectWizard.JavaModuleBuilder");
+  private static final Logger LOG = Logger.getInstance(JavaModuleBuilder.class);
   private String myCompilerOutputPath;
   // Pair<Source Path, Package Prefix>
   private List<Pair<String,String>> mySourcePaths;
diff --git a/java/openapi/src/com/intellij/psi/statistics/JavaStatisticsManager.java b/java/openapi/src/com/intellij/psi/statistics/JavaStatisticsManager.java
index 0508e3c6b41a..b94b0ad8e192 100644
--- a/java/openapi/src/com/intellij/psi/statistics/JavaStatisticsManager.java
+++ b/java/openapi/src/com/intellij/psi/statistics/JavaStatisticsManager.java
@@ -17,7 +17,7 @@ import java.util.List;
  * @author yole
  */
 public abstract class JavaStatisticsManager {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.statistics.JavaStatisticsManager");
+  private static final Logger LOG = Logger.getInstance(JavaStatisticsManager.class);
   @NonNls public static final String CLASS_PREFIX = "class#";
 
   @NotNull
diff --git a/java/openapi/src/com/intellij/ui/classFilter/ClassFilter.java b/java/openapi/src/com/intellij/ui/classFilter/ClassFilter.java
index 053b3e509870..53ca494a96ae 100644
--- a/java/openapi/src/com/intellij/ui/classFilter/ClassFilter.java
+++ b/java/openapi/src/com/intellij/ui/classFilter/ClassFilter.java
@@ -17,7 +17,7 @@ import java.util.regex.Matcher;
 
 @Tag("class-filter")
 public class ClassFilter implements JDOMExternalizable, Cloneable{
-  private static final Logger LOG = Logger.getInstance("#com.intellij.ui.classFilter.ClassFilter");
+  private static final Logger LOG = Logger.getInstance(ClassFilter.class);
   public static final ClassFilter[] EMPTY_ARRAY = new ClassFilter[0];
 
   @Attribute("pattern")
diff --git a/java/openapi/src/com/intellij/util/descriptors/ConfigFileMetaData.java b/java/openapi/src/com/intellij/util/descriptors/ConfigFileMetaData.java
index ea3930d60cd7..69ce68eb1d8e 100644
--- a/java/openapi/src/com/intellij/util/descriptors/ConfigFileMetaData.java
+++ b/java/openapi/src/com/intellij/util/descriptors/ConfigFileMetaData.java
@@ -26,7 +26,7 @@ import java.util.Arrays;
  * @author nik
  */
 public class ConfigFileMetaData {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.util.descriptors.ConfigFileMetaData");
+  private static final Logger LOG = Logger.getInstance(ConfigFileMetaData.class);
   private final String myTitle;
   private final String myId;
   private final String myFileName;
diff --git a/java/typeMigration/src/com/intellij/refactoring/typeMigration/intentions/ChangeClassParametersIntention.java b/java/typeMigration/src/com/intellij/refactoring/typeMigration/intentions/ChangeClassParametersIntention.java
index ff4290254180..1a31403baa6a 100644
--- a/java/typeMigration/src/com/intellij/refactoring/typeMigration/intentions/ChangeClassParametersIntention.java
+++ b/java/typeMigration/src/com/intellij/refactoring/typeMigration/intentions/ChangeClassParametersIntention.java
@@ -29,7 +29,7 @@ import org.jetbrains.annotations.NotNull;
  */
 public class ChangeClassParametersIntention extends PsiElementBaseIntentionAction {
 
-  private static final Logger LOG = Logger.getInstance("#" + ChangeClassParametersIntention.class);
+  private static final Logger LOG = Logger.getInstance(ChangeClassParametersIntention.class);
 
   @NotNull
   @Override
diff --git a/jps/jps-builders/src/org/jetbrains/jps/builders/java/JavaBuilderUtil.java b/jps/jps-builders/src/org/jetbrains/jps/builders/java/JavaBuilderUtil.java
index 7ea38b185a3e..8f909502cb80 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/builders/java/JavaBuilderUtil.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/builders/java/JavaBuilderUtil.java
@@ -50,7 +50,7 @@ import java.util.*;
 public class JavaBuilderUtil {
   public static final Key<Callbacks.ConstantAffectionResolver> CONSTANT_SEARCH_SERVICE = Key.create("_constant_search_service_");
 
-  private static final Logger LOG = Logger.getInstance("#org.jetbrains.jps.incremental.Builder");
+  private static final Logger LOG = Logger.getInstance(Builder.class);
   private static final Key<Set<File>> ALL_AFFECTED_FILES_KEY = Key.create("_all_affected_files_");
   private static final Key<Set<File>> ALL_COMPILED_FILES_KEY = Key.create("_all_compiled_files_");
   private static final Key<Set<File>> FILES_TO_COMPILE_KEY = Key.create("_files_to_compile_");
diff --git a/jps/jps-builders/src/org/jetbrains/jps/builders/java/dependencyView/ClassfileAnalyzer.java b/jps/jps-builders/src/org/jetbrains/jps/builders/java/dependencyView/ClassfileAnalyzer.java
index e82e4dc2bb64..398eeee43fcb 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/builders/java/dependencyView/ClassfileAnalyzer.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/builders/java/dependencyView/ClassfileAnalyzer.java
@@ -20,7 +20,7 @@ import java.util.*;
  * @author: db
  */
 class ClassfileAnalyzer {
-  private final static Logger LOG = Logger.getInstance("#org.jetbrains.jps.builders.java.dependencyView.ClassfileAnalyzer");
+  private final static Logger LOG = Logger.getInstance(ClassfileAnalyzer.class);
   public static final String LAMBDA_FACTORY_CLASS = "java/lang/invoke/LambdaMetafactory";
   private static final int ASM_API_VERSION = Opcodes.API_VERSION;
 
diff --git a/jps/jps-builders/src/org/jetbrains/jps/client/SimpleProtobufClient.java b/jps/jps-builders/src/org/jetbrains/jps/client/SimpleProtobufClient.java
index f60157bf034c..f149d225ed89 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/client/SimpleProtobufClient.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/client/SimpleProtobufClient.java
@@ -36,7 +36,7 @@ import java.util.concurrent.atomic.AtomicReference;
  * @author Eugene Zhuravlev
  */
 public class SimpleProtobufClient<T extends ProtobufResponseHandler> {
-  private static final Logger LOG = Logger.getInstance("#org.jetbrains.jps.client.SimpleProtobufClient");
+  private static final Logger LOG = Logger.getInstance(SimpleProtobufClient.class);
 
   private enum State {
     DISCONNECTED, CONNECTING, CONNECTED, DISCONNECTING
diff --git a/jps/jps-builders/src/org/jetbrains/jps/cmdline/BuildMain.java b/jps/jps-builders/src/org/jetbrains/jps/cmdline/BuildMain.java
index 0db3b63f56ae..0893ecde3f8c 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/cmdline/BuildMain.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/cmdline/BuildMain.java
@@ -59,7 +59,7 @@ public class BuildMain {
   private static final Logger LOG;
   static {
     LogSetup.initLoggers();
-    LOG = Logger.getInstance("#org.jetbrains.jps.cmdline.BuildMain");
+    LOG = Logger.getInstance(BuildMain.class);
   }
 
   private static final int HOST_ARG = 0;
diff --git a/jps/jps-builders/src/org/jetbrains/jps/cmdline/BuildRunner.java b/jps/jps-builders/src/org/jetbrains/jps/cmdline/BuildRunner.java
index b1ec1db12932..3ea821f894a9 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/cmdline/BuildRunner.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/cmdline/BuildRunner.java
@@ -53,7 +53,7 @@ import static org.jetbrains.jps.api.CmdlineRemoteProto.Message.ControllerMessage
  * @author nik
  */
 public class BuildRunner {
-  private static final Logger LOG = Logger.getInstance("#org.jetbrains.jps.cmdline.BuildRunner");
+  private static final Logger LOG = Logger.getInstance(BuildRunner.class);
   public static final boolean PARALLEL_BUILD_ENABLED = Boolean.parseBoolean(System.getProperty(GlobalOptions.COMPILE_PARALLEL_OPTION, "false"));
   public static final boolean PARALLEL_BUILD_AUTOMAKE_ENABLED = PARALLEL_BUILD_ENABLED && Boolean.parseBoolean(System.getProperty(GlobalOptions.ALLOW_PARALLEL_AUTOMAKE_OPTION, "true"));
   private static final boolean STORE_TEMP_CACHES_IN_MEMORY = true;
diff --git a/jps/jps-builders/src/org/jetbrains/jps/cmdline/BuildSession.java b/jps/jps-builders/src/org/jetbrains/jps/cmdline/BuildSession.java
index 82704430004f..769d019fdc7e 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/cmdline/BuildSession.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/cmdline/BuildSession.java
@@ -42,7 +42,7 @@ import static org.jetbrains.jps.api.CmdlineRemoteProto.Message.ControllerMessage
 * @author Eugene Zhuravlev
 */
 final class BuildSession implements Runnable, CanceledStatus {
-  private static final Logger LOG = Logger.getInstance("#org.jetbrains.jps.cmdline.BuildSession");
+  private static final Logger LOG = Logger.getInstance(BuildSession.class);
   public static final String FS_STATE_FILE = "fs_state.dat";
   private static final Boolean REPORT_BUILD_STATISTICS = Boolean.valueOf(System.getProperty(GlobalOptions.REPORT_BUILD_STATISTICS, "false"));
 
diff --git a/jps/jps-builders/src/org/jetbrains/jps/cmdline/ClasspathBootstrap.java b/jps/jps-builders/src/org/jetbrains/jps/cmdline/ClasspathBootstrap.java
index 38a8d0dd01bf..3b64c3a64e19 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/cmdline/ClasspathBootstrap.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/cmdline/ClasspathBootstrap.java
@@ -38,7 +38,7 @@ import java.util.*;
  * @author Eugene Zhuravlev
  */
 public class ClasspathBootstrap {
-  private static final Logger LOG = Logger.getInstance("#org.jetbrains.jps.cmdline.ClasspathBootstrap");
+  private static final Logger LOG = Logger.getInstance(ClasspathBootstrap.class);
 
   private ClasspathBootstrap() {
   }
diff --git a/jps/jps-builders/src/org/jetbrains/jps/cmdline/JpsModelLoaderImpl.java b/jps/jps-builders/src/org/jetbrains/jps/cmdline/JpsModelLoaderImpl.java
index 94abd776a9ab..c8aa0b9a0dbe 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/cmdline/JpsModelLoaderImpl.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/cmdline/JpsModelLoaderImpl.java
@@ -27,7 +27,7 @@ import java.io.IOException;
  * @author nik
  */
 public class JpsModelLoaderImpl implements JpsModelLoader {
-  private static final Logger LOG = Logger.getInstance("#org.jetbrains.jps.cmdline.JpsModelLoaderImpl");
+  private static final Logger LOG = Logger.getInstance(JpsModelLoaderImpl.class);
   private final String myProjectPath;
   private final String myGlobalOptionsPath;
   private final boolean myLoadUnloadedModules;
diff --git a/jps/jps-builders/src/org/jetbrains/jps/incremental/BuilderRegistry.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/BuilderRegistry.java
index 235f874759bc..7e9943b261aa 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/incremental/BuilderRegistry.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/incremental/BuilderRegistry.java
@@ -32,7 +32,7 @@ import java.util.*;
  * @author Eugene Zhuravlev
  */
 public class BuilderRegistry {
-  private static final Logger LOG = Logger.getInstance("#org.jetbrains.jps.incremental.BuilderRegistry");
+  private static final Logger LOG = Logger.getInstance(BuilderRegistry.class);
   private static class Holder {
     static final BuilderRegistry ourInstance = new BuilderRegistry();
   }
diff --git a/jps/jps-builders/src/org/jetbrains/jps/incremental/ExternalProcessUtil.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/ExternalProcessUtil.java
index fc40eaa6174c..c53f8bdfa5e0 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/incremental/ExternalProcessUtil.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/incremental/ExternalProcessUtil.java
@@ -32,7 +32,7 @@ import java.util.jar.Manifest;
  * @author Eugene Zhuravlev
  */
 public class ExternalProcessUtil {
-  private static final Logger LOG = Logger.getInstance("#org.jetbrains.jps.incremental.ExternalProcessUtil");
+  private static final Logger LOG = Logger.getInstance(ExternalProcessUtil.class);
 
   private static class CommandLineWrapperClassHolder {
     static final Class ourWrapperClass;
diff --git a/jps/jps-builders/src/org/jetbrains/jps/incremental/FSOperations.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/FSOperations.java
index c2d9b8d43030..95523120a9e8 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/incremental/FSOperations.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/incremental/FSOperations.java
@@ -50,7 +50,7 @@ import java.util.Set;
  * @author Eugene Zhuravlev
  */
 public class FSOperations {
-  private static final Logger LOG = Logger.getInstance("#org.jetbrains.jps.incremental.FSOperations");
+  private static final Logger LOG = Logger.getInstance(FSOperations.class);
   public static final GlobalContextKey<Set<File>> ALL_OUTPUTS_KEY = GlobalContextKey.create("_all_project_output_dirs_");
   private static final GlobalContextKey<Set<BuildTarget<?>>> TARGETS_COMPLETELY_MARKED_DIRTY = GlobalContextKey.create("_targets_completely_marked_dirty_");
 
diff --git a/jps/jps-builders/src/org/jetbrains/jps/incremental/IncProjectBuilder.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/IncProjectBuilder.java
index 1f8097c32662..3718f302809d 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/incremental/IncProjectBuilder.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/incremental/IncProjectBuilder.java
@@ -68,7 +68,7 @@ import java.util.concurrent.atomic.AtomicReference;
  * @author Eugene Zhuravlev
  */
 public class IncProjectBuilder {
-  private static final Logger LOG = Logger.getInstance("#org.jetbrains.jps.incremental.IncProjectBuilder");
+  private static final Logger LOG = Logger.getInstance(IncProjectBuilder.class);
 
   private static final String CLASSPATH_INDEX_FILE_NAME = "classpath.index";
   //private static final boolean GENERATE_CLASSPATH_INDEX = Boolean.parseBoolean(System.getProperty(GlobalOptions.GENERATE_CLASSPATH_INDEX_OPTION, "false"));
diff --git a/jps/jps-builders/src/org/jetbrains/jps/incremental/TargetTypeRegistry.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/TargetTypeRegistry.java
index 3c9787d3de07..805cc0280322 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/incremental/TargetTypeRegistry.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/incremental/TargetTypeRegistry.java
@@ -25,7 +25,7 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 public class TargetTypeRegistry {
-  private static final Logger LOG = Logger.getInstance("#org.jetbrains.jps.incremental.TargetTypeRegistry");
+  private static final Logger LOG = Logger.getInstance(TargetTypeRegistry.class);
   private static class Holder {
     static final TargetTypeRegistry ourInstance = new TargetTypeRegistry();
   }
diff --git a/jps/jps-builders/src/org/jetbrains/jps/incremental/artifacts/builders/LayoutElementBuildersRegistry.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/artifacts/builders/LayoutElementBuildersRegistry.java
index 0e1ca6dfe085..c8078fe86d37 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/incremental/artifacts/builders/LayoutElementBuildersRegistry.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/incremental/artifacts/builders/LayoutElementBuildersRegistry.java
@@ -46,7 +46,7 @@ import java.util.Set;
  * @author nik
  */
 public class LayoutElementBuildersRegistry {
-  private static final Logger LOG = Logger.getInstance("#org.jetbrains.jps.incremental.artifacts.builders.LayoutElementBuildersRegistry");
+  private static final Logger LOG = Logger.getInstance(LayoutElementBuildersRegistry.class);
 
   private static class InstanceHolder {
 
diff --git a/jps/jps-builders/src/org/jetbrains/jps/incremental/artifacts/instructions/JarDestinationInfo.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/artifacts/instructions/JarDestinationInfo.java
index cf7807359934..bfc98aa0e9b9 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/incremental/artifacts/instructions/JarDestinationInfo.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/incremental/artifacts/instructions/JarDestinationInfo.java
@@ -23,7 +23,7 @@ import com.intellij.openapi.util.text.StringUtil;
  * @author nik
  */
 public class JarDestinationInfo extends DestinationInfo {
-  private static final Logger LOG = Logger.getInstance("#org.jetbrains.jps.incremental.artifacts.instructions.JarDestinationInfo");
+  private static final Logger LOG = Logger.getInstance(JarDestinationInfo.class);
   private final String myPathInJar;
   private final JarInfo myJarInfo;
 
diff --git a/jps/jps-builders/src/org/jetbrains/jps/incremental/dependencies/DependencyResolvingBuilder.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/dependencies/DependencyResolvingBuilder.java
index 1a18050e6ebc..c81e520532fc 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/incremental/dependencies/DependencyResolvingBuilder.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/incremental/dependencies/DependencyResolvingBuilder.java
@@ -43,7 +43,7 @@ import java.util.concurrent.ConcurrentMap;
  * @author Eugene Zhuravlev
  */
 public class DependencyResolvingBuilder extends ModuleLevelBuilder{
-  private static final Logger LOG = Logger.getInstance("#org.jetbrains.jps.incremental.dependencies.DependencyResolvingBuilder");
+  private static final Logger LOG = Logger.getInstance(DependencyResolvingBuilder.class);
   private static final String NAME = "Maven Dependency Resolver";
   private static final String MAVEN_REPOSITORY_PATH_VAR = "MAVEN_REPOSITORY";
   private static final String DEFAULT_MAVEN_REPOSITORY_PATH = ".m2/repository";
diff --git a/jps/jps-builders/src/org/jetbrains/jps/incremental/fs/BuildFSState.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/fs/BuildFSState.java
index 10de4100da23..f2e288669098 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/incremental/fs/BuildFSState.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/incremental/fs/BuildFSState.java
@@ -30,7 +30,7 @@ import java.util.*;
  */
 public class BuildFSState {
   public static final int VERSION = 3;
-  private static final Logger LOG = Logger.getInstance("#org.jetbrains.jps.incremental.fs.BuildFSState");
+  private static final Logger LOG = Logger.getInstance(BuildFSState.class);
   private static final Key<Set<? extends BuildTarget<?>>> CONTEXT_TARGETS_KEY = Key.create("_fssfate_context_targets_");
   private static final Key<FilesDelta> NEXT_ROUND_DELTA_KEY = Key.create("_next_round_delta_");
   private static final Key<FilesDelta> CURRENT_ROUND_DELTA_KEY = Key.create("_current_round_delta_");
diff --git a/jps/jps-builders/src/org/jetbrains/jps/incremental/fs/FilesDelta.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/fs/FilesDelta.java
index b1870669e8e6..2a732e81a4a4 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/incremental/fs/FilesDelta.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/incremental/fs/FilesDelta.java
@@ -35,7 +35,7 @@ import java.util.concurrent.locks.ReentrantLock;
 
 /** */
 public final class FilesDelta {
-  private static final Logger LOG = Logger.getInstance("#org.jetbrains.jps.incremental.fs.FilesDelta");
+  private static final Logger LOG = Logger.getInstance(FilesDelta.class);
   private final ReentrantLock myDataLock = new ReentrantLock();
 
   private final Set<String> myDeletedPaths = new ObjectLinkedOpenHashSet<>(FileUtil.PATH_HASHING_STRATEGY);
diff --git a/jps/jps-builders/src/org/jetbrains/jps/incremental/instrumentation/BaseInstrumentingBuilder.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/instrumentation/BaseInstrumentingBuilder.java
index 2aff12b27417..1ef2061c0834 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/incremental/instrumentation/BaseInstrumentingBuilder.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/incremental/instrumentation/BaseInstrumentingBuilder.java
@@ -19,7 +19,7 @@ import org.jetbrains.org.objectweb.asm.ClassWriter;
  * @author Eugene Zhuravlev
  */
 public abstract class BaseInstrumentingBuilder extends ClassProcessingBuilder {
-  private static final Logger LOG = Logger.getInstance("#org.jetbrains.jps.incremental.instrumentation.BaseInstrumentingBuilder");
+  private static final Logger LOG = Logger.getInstance(BaseInstrumentingBuilder.class);
 
   // every instance of builder must have its own marker!
   private final Key<Boolean> IS_INSTRUMENTED_KEY = Key.create("_instrumentation_marker_" + getPresentableName());
diff --git a/jps/jps-builders/src/org/jetbrains/jps/incremental/instrumentation/NotNullInstrumentingBuilder.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/instrumentation/NotNullInstrumentingBuilder.java
index 6b79415ed539..bc602d3e17c5 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/incremental/instrumentation/NotNullInstrumentingBuilder.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/incremental/instrumentation/NotNullInstrumentingBuilder.java
@@ -29,7 +29,7 @@ import java.util.List;
  * @author Eugene Zhuravlev
  */
 public class NotNullInstrumentingBuilder extends BaseInstrumentingBuilder{
-  private static final Logger LOG = Logger.getInstance("#org.jetbrains.jps.incremental.instrumentation.NotNullInstrumentingBuilder");
+  private static final Logger LOG = Logger.getInstance(NotNullInstrumentingBuilder.class);
 
   public NotNullInstrumentingBuilder() {
   }
diff --git a/jps/jps-builders/src/org/jetbrains/jps/incremental/java/FormsParsing.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/java/FormsParsing.java
index 71b17ddf3de8..acc36c6be557 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/incremental/java/FormsParsing.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/incremental/java/FormsParsing.java
@@ -15,7 +15,7 @@ import java.util.Properties;
  * @author Eugene Zhuravlev
  */
 public class FormsParsing {
-  private static final Logger LOG = Logger.getInstance("#org.jetbrains.jps.incremental.java.FormsParsing");
+  private static final Logger LOG = Logger.getInstance(FormsParsing.class);
   private static final String FORM_TAG = "form";
 
   private FormsParsing() {
diff --git a/jps/jps-builders/src/org/jetbrains/jps/incremental/java/JavaBuilder.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/java/JavaBuilder.java
index 06390151f640..6ba614caf085 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/incremental/java/JavaBuilder.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/incremental/java/JavaBuilder.java
@@ -76,7 +76,7 @@ import static com.intellij.openapi.util.Pair.pair;
  * @author Eugene Zhuravlev
  */
 public class JavaBuilder extends ModuleLevelBuilder {
-  private static final Logger LOG = Logger.getInstance("#org.jetbrains.jps.incremental.java.JavaBuilder");
+  private static final Logger LOG = Logger.getInstance(JavaBuilder.class);
   private static final String JAVA_EXTENSION = "java";
 
   private static final String USE_MODULE_PATH_ONLY_OPTION = "compiler.force.module.path";
diff --git a/jps/jps-builders/src/org/jetbrains/jps/incremental/java/OutputFilesSink.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/java/OutputFilesSink.java
index 7d9d613388a4..a8ba18a0e150 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/incremental/java/OutputFilesSink.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/incremental/java/OutputFilesSink.java
@@ -29,7 +29,7 @@ import java.util.Set;
 * @author Eugene Zhuravlev
 */
 class OutputFilesSink implements OutputFileConsumer {
-  private static final Logger LOG = Logger.getInstance("#org.jetbrains.jps.incremental.java.OutputFilesSink");
+  private static final Logger LOG = Logger.getInstance(OutputFilesSink.class);
   private final CompileContext myContext;
   private final ModuleLevelBuilder.OutputConsumer myOutputConsumer;
   private final Callbacks.Backend myMappingsCallback;
diff --git a/jps/jps-builders/src/org/jetbrains/jps/incremental/messages/FileGeneratedEvent.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/messages/FileGeneratedEvent.java
index dac5c03786ce..015e4d120297 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/incremental/messages/FileGeneratedEvent.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/incremental/messages/FileGeneratedEvent.java
@@ -29,7 +29,7 @@ import java.util.Collections;
  * @author Eugene Zhuravlev
  */
 public class FileGeneratedEvent extends BuildMessage {
-  private static final Logger LOG = Logger.getInstance("#org.jetbrains.jps.incremental.messages.FileGeneratedEvent");
+  private static final Logger LOG = Logger.getInstance(FileGeneratedEvent.class);
 
   private final Collection<Pair<String, String>> myPaths = new ArrayList<>();
   private final BuildTarget<?> mySourceTarget;
diff --git a/jps/jps-builders/src/org/jetbrains/jps/incremental/resources/ResourcesBuilder.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/resources/ResourcesBuilder.java
index f987d1b595ee..1daf64c1167d 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/incremental/resources/ResourcesBuilder.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/incremental/resources/ResourcesBuilder.java
@@ -23,7 +23,7 @@ import java.util.*;
  * @author Eugene Zhuravlev
  */
 public class ResourcesBuilder extends TargetBuilder<ResourceRootDescriptor, ResourcesTarget> {
-  private static final Logger LOG = Logger.getInstance("#org.jetbrains.jps.incremental.resources.ResourcesBuilder");
+  private static final Logger LOG = Logger.getInstance(ResourcesBuilder.class);
 
   public static final String BUILDER_NAME = "Resource Compiler";
 
diff --git a/jps/jps-builders/src/org/jetbrains/jps/incremental/storage/BuildDataManager.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/storage/BuildDataManager.java
index 44fb29cba070..e00ce7a24c9e 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/incremental/storage/BuildDataManager.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/incremental/storage/BuildDataManager.java
@@ -31,7 +31,7 @@ import java.util.concurrent.ConcurrentMap;
  */
 public class BuildDataManager implements StorageOwner {
   private static final int VERSION = 39 + (PersistentHashMapValueStorage.COMPRESSION_ENABLED ? 1:0);
-  private static final Logger LOG = Logger.getInstance("#org.jetbrains.jps.incremental.storage.BuildDataManager");
+  private static final Logger LOG = Logger.getInstance(BuildDataManager.class);
   private static final String SRC_TO_FORM_STORAGE = "src-form";
   private static final String SRC_TO_OUTPUT_STORAGE = "src-out";
   private static final String OUT_TARGET_STORAGE = "out-target";
diff --git a/jps/jps-builders/src/org/jetbrains/jps/incremental/storage/BuildTargetTypeState.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/storage/BuildTargetTypeState.java
index 8497805103bd..f65373a09935 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/incremental/storage/BuildTargetTypeState.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/incremental/storage/BuildTargetTypeState.java
@@ -36,7 +36,7 @@ import java.util.concurrent.ConcurrentMap;
  */
 public class BuildTargetTypeState {
   private static final int VERSION = 1;
-  private static final Logger LOG = Logger.getInstance("#org.jetbrains.jps.incremental.storage.BuildTargetTypeState");
+  private static final Logger LOG = Logger.getInstance(BuildTargetTypeState.class);
   private final Map<BuildTarget<?>, Integer> myTargetIds;
   private final List<Pair<String, Integer>> myStaleTargetIds;
   private final ConcurrentMap<BuildTarget<?>, BuildTargetConfiguration> myConfigurations;
diff --git a/jps/jps-builders/src/org/jetbrains/jps/incremental/storage/BuildTargetsState.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/storage/BuildTargetsState.java
index ddabe10df49f..640aa3d10864 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/incremental/storage/BuildTargetsState.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/incremental/storage/BuildTargetsState.java
@@ -36,7 +36,7 @@ import java.util.concurrent.atomic.AtomicInteger;
  * @author nik
  */
 public class BuildTargetsState {
-  private static final Logger LOG = Logger.getInstance("#org.jetbrains.jps.incremental.storage.BuildTargetsState");
+  private static final Logger LOG = Logger.getInstance(BuildTargetsState.class);
   private final BuildDataPaths myDataPaths;
   private final AtomicInteger myMaxTargetId = new AtomicInteger(0);
   private final ConcurrentMap<BuildTargetType<?>, BuildTargetTypeState> myTypeStates = new ConcurrentHashMap<>(16, 0.75f, 1);
diff --git a/jps/jps-builders/src/org/jetbrains/jps/incremental/storage/ProjectStamps.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/storage/ProjectStamps.java
index c542764254a3..e695c8885e9e 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/incremental/storage/ProjectStamps.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/incremental/storage/ProjectStamps.java
@@ -29,7 +29,7 @@ import java.io.IOException;
 public class ProjectStamps {
   public static final boolean PORTABLE_CACHES = Boolean.getBoolean("org.jetbrains.jps.portable.caches");
 
-  private static final Logger LOG = Logger.getInstance("#org.jetbrains.jps.incremental.storage.ProjectStamps");
+  private static final Logger LOG = Logger.getInstance(ProjectStamps.class);
 
   private final TimestampStorage<? extends StampsStorage.Stamp> myStampsStorage;
 
diff --git a/jps/model-impl/src/org/jetbrains/jps/model/java/impl/JdkVersionDetectorImpl.java b/jps/model-impl/src/org/jetbrains/jps/model/java/impl/JdkVersionDetectorImpl.java
index 51e89f6b2466..ccc568ea7c34 100644
--- a/jps/model-impl/src/org/jetbrains/jps/model/java/impl/JdkVersionDetectorImpl.java
+++ b/jps/model-impl/src/org/jetbrains/jps/model/java/impl/JdkVersionDetectorImpl.java
@@ -29,7 +29,7 @@ import java.util.jar.Manifest;
  * @author nik
  */
 public class JdkVersionDetectorImpl extends JdkVersionDetector {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.projectRoots.impl.SdkVersionUtil");
+  private static final Logger LOG = Logger.getInstance(JdkVersionDetectorImpl.class);
 
   @Nullable
   @Override
diff --git a/jps/model-impl/src/org/jetbrains/jps/model/java/impl/compiler/ResourcePatterns.java b/jps/model-impl/src/org/jetbrains/jps/model/java/impl/compiler/ResourcePatterns.java
index a9f569a09afb..084bfb9e24d3 100644
--- a/jps/model-impl/src/org/jetbrains/jps/model/java/impl/compiler/ResourcePatterns.java
+++ b/jps/model-impl/src/org/jetbrains/jps/model/java/impl/compiler/ResourcePatterns.java
@@ -19,7 +19,7 @@ import java.util.regex.Pattern;
  * @author Eugene Zhuravlev
  */
 public class ResourcePatterns {
-  private static final Logger LOG = Logger.getInstance("#org.jetbrains.jps.model.java.impl.compiler.ResourcePatterns");
+  private static final Logger LOG = Logger.getInstance(ResourcePatterns.class);
 
   private final List<CompiledPattern> myCompiledPatterns = new ArrayList<>();
   private final List<CompiledPattern> myNegatedCompiledPatterns = new ArrayList<>();
diff --git a/platform/analysis-api/src/com/intellij/analysis/AnalysisScope.java b/platform/analysis-api/src/com/intellij/analysis/AnalysisScope.java
index f3db97d4fb38..52e18fdeed6c 100644
--- a/platform/analysis-api/src/com/intellij/analysis/AnalysisScope.java
+++ b/platform/analysis-api/src/com/intellij/analysis/AnalysisScope.java
@@ -41,7 +41,7 @@ import java.util.*;
  * @author max
  */
 public class AnalysisScope {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.analysis.AnalysisScope");
+  private static final Logger LOG = Logger.getInstance(AnalysisScope.class);
 
   public static final int PROJECT = 1;
   public static final int DIRECTORY = 2;
diff --git a/platform/analysis-api/src/com/intellij/codeInsight/daemon/HighlightDisplayKey.java b/platform/analysis-api/src/com/intellij/codeInsight/daemon/HighlightDisplayKey.java
index bda767ca9b60..590330062923 100644
--- a/platform/analysis-api/src/com/intellij/codeInsight/daemon/HighlightDisplayKey.java
+++ b/platform/analysis-api/src/com/intellij/codeInsight/daemon/HighlightDisplayKey.java
@@ -12,7 +12,7 @@ import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
 public class HighlightDisplayKey {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.daemon.HighlightDisplayKey");
+  private static final Logger LOG = Logger.getInstance(HighlightDisplayKey.class);
 
   private static final Map<String,HighlightDisplayKey> ourNameToKeyMap = new ConcurrentHashMap<>();
   private static final Map<String,HighlightDisplayKey> ourIdToKeyMap = new ConcurrentHashMap<>();
diff --git a/platform/analysis-api/src/com/intellij/codeInspection/ProblemsHolder.java b/platform/analysis-api/src/com/intellij/codeInspection/ProblemsHolder.java
index d8bade0b1d76..ab2e3ebfecda 100644
--- a/platform/analysis-api/src/com/intellij/codeInspection/ProblemsHolder.java
+++ b/platform/analysis-api/src/com/intellij/codeInspection/ProblemsHolder.java
@@ -40,7 +40,7 @@ import java.util.List;
  * @author max
  */
 public class ProblemsHolder {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInspection.ProblemsHolder");
+  private static final Logger LOG = Logger.getInstance(ProblemsHolder.class);
 
   private final InspectionManager myManager;
   private final PsiFile myFile;
diff --git a/platform/analysis-api/src/com/intellij/codeInspection/ex/InspectionToolWrapper.java b/platform/analysis-api/src/com/intellij/codeInspection/ex/InspectionToolWrapper.java
index 35279152fa77..6f98d57f3e7b 100644
--- a/platform/analysis-api/src/com/intellij/codeInspection/ex/InspectionToolWrapper.java
+++ b/platform/analysis-api/src/com/intellij/codeInspection/ex/InspectionToolWrapper.java
@@ -25,7 +25,7 @@ import java.io.InputStream;
 public abstract class InspectionToolWrapper<T extends InspectionProfileEntry, E extends InspectionEP> {
   public static final InspectionToolWrapper[] EMPTY_ARRAY = new InspectionToolWrapper[0];
 
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInspection.ex.InspectionToolWrapper");
+  private static final Logger LOG = Logger.getInstance(InspectionToolWrapper.class);
 
   protected T myTool;
   protected final E myEP;
diff --git a/platform/analysis-api/src/com/intellij/codeInspection/ex/InspectionToolsRegistrarCore.java b/platform/analysis-api/src/com/intellij/codeInspection/ex/InspectionToolsRegistrarCore.java
index 5acd410b3dd2..a06e69cd9853 100644
--- a/platform/analysis-api/src/com/intellij/codeInspection/ex/InspectionToolsRegistrarCore.java
+++ b/platform/analysis-api/src/com/intellij/codeInspection/ex/InspectionToolsRegistrarCore.java
@@ -20,7 +20,7 @@ import com.intellij.util.ReflectionUtil;
 import org.jetbrains.annotations.NotNull;
 
 public class InspectionToolsRegistrarCore {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInspection.ex.InspectionToolsRegistrarCore");
+  private static final Logger LOG = Logger.getInstance(InspectionToolsRegistrarCore.class);
   static <T> T instantiateTool(@NotNull Class<T> toolClass) {
     try {
       return ReflectionUtil.newInstance(toolClass);
diff --git a/platform/analysis-api/src/com/intellij/openapi/vfs/VfsUtil.java b/platform/analysis-api/src/com/intellij/openapi/vfs/VfsUtil.java
index 9ae4f0ffb367..b0546a10c12e 100644
--- a/platform/analysis-api/src/com/intellij/openapi/vfs/VfsUtil.java
+++ b/platform/analysis-api/src/com/intellij/openapi/vfs/VfsUtil.java
@@ -31,7 +31,7 @@ import java.nio.file.Path;
 import java.util.*;
 
 public class VfsUtil extends VfsUtilCore {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.vfs.VfsUtil");
+  private static final Logger LOG = Logger.getInstance(VfsUtil.class);
 
   /**
    * Specifies an average delay between a file system event and a moment the IDE gets pinged about it by fsnotifier.
diff --git a/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/AnnotationHolderImpl.java b/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/AnnotationHolderImpl.java
index 2cae524bfcc9..254ce8ef5d63 100644
--- a/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/AnnotationHolderImpl.java
+++ b/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/AnnotationHolderImpl.java
@@ -38,7 +38,7 @@ import org.jetbrains.annotations.Nullable;
  * @author max
  */
 public class AnnotationHolderImpl extends SmartList<Annotation> implements AnnotationHolder {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.daemon.impl.AnnotationHolderImpl");
+  private static final Logger LOG = Logger.getInstance(AnnotationHolderImpl.class);
   private final AnnotationSession myAnnotationSession;
 
   private final boolean myBatchMode;
diff --git a/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/DaemonCodeAnalyzerEx.java b/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/DaemonCodeAnalyzerEx.java
index 193c96633ef4..97f6f7377b0c 100644
--- a/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/DaemonCodeAnalyzerEx.java
+++ b/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/DaemonCodeAnalyzerEx.java
@@ -21,7 +21,7 @@ import org.jetbrains.annotations.TestOnly;
 import java.util.List;
 
 public abstract class DaemonCodeAnalyzerEx extends DaemonCodeAnalyzer {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.daemon.impl.DaemonCodeAnalyzerEx");
+  private static final Logger LOG = Logger.getInstance(DaemonCodeAnalyzerEx.class);
   public static DaemonCodeAnalyzerEx getInstanceEx(Project project) {
     return (DaemonCodeAnalyzerEx)project.getComponent(DaemonCodeAnalyzer.class);
   }
diff --git a/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/FileStatusMap.java b/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/FileStatusMap.java
index 994df34be9c7..1f2b00c3e446 100644
--- a/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/FileStatusMap.java
+++ b/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/FileStatusMap.java
@@ -29,7 +29,7 @@ import java.util.StringJoiner;
 import java.util.concurrent.ConcurrentMap;
 
 public final class FileStatusMap implements Disposable {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.daemon.impl.FileStatusMap");
+  private static final Logger LOG = Logger.getInstance(FileStatusMap.class);
   public static final String CHANGES_NOT_ALLOWED_DURING_HIGHLIGHTING =
     "PSI/document/model changes are not allowed during highlighting";
   private final Project myProject;
diff --git a/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/GeneralHighlightingPass.java b/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/GeneralHighlightingPass.java
index 39f25c9fc150..6da28e463274 100644
--- a/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/GeneralHighlightingPass.java
+++ b/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/GeneralHighlightingPass.java
@@ -54,7 +54,7 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
 public class GeneralHighlightingPass extends ProgressableTextEditorHighlightingPass {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.daemon.impl.GeneralHighlightingPass");
+  private static final Logger LOG = Logger.getInstance(GeneralHighlightingPass.class);
   private static final String PRESENTABLE_NAME = DaemonBundle.message("pass.syntax");
   private static final Key<Boolean> HAS_ERROR_ELEMENT = Key.create("HAS_ERROR_ELEMENT");
   static final Condition<PsiFile> SHOULD_HIGHLIGHT_FILTER = file -> HighlightingLevelManager.getInstance(file.getProject()).shouldHighlight(file);
diff --git a/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/HighlightInfo.java b/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/HighlightInfo.java
index da8d07761ebf..526fc423bab3 100644
--- a/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/HighlightInfo.java
+++ b/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/HighlightInfo.java
@@ -43,7 +43,7 @@ import java.util.*;
 import java.util.List;
 
 public class HighlightInfo implements Segment {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.daemon.impl.HighlightInfo");
+  private static final Logger LOG = Logger.getInstance(HighlightInfo.class);
 
   // optimization: if tooltip contains this marker object, then it replaced with description field in getTooltip()
   private static final String DESCRIPTION_PLACEHOLDER = "\u0000";
diff --git a/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/HighlightInfoType.java b/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/HighlightInfoType.java
index ead21a467038..5658722844f7 100644
--- a/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/HighlightInfoType.java
+++ b/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/HighlightInfoType.java
@@ -190,7 +190,7 @@ public interface HighlightInfoType {
 
   class HighlightInfoTypeSeverityByKey implements HighlightInfoType {
     @SuppressWarnings("unused")
-    static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.daemon.impl.HighlightInfoType.HighlightInfoTypeSeverityByKey");
+    static final Logger LOG = Logger.getInstance(HighlightInfoTypeSeverityByKey.class);
 
     private final TextAttributesKey myAttributesKey;
     private final HighlightDisplayKey myToolKey;
diff --git a/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/TextEditorBackgroundHighlighter.java b/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/TextEditorBackgroundHighlighter.java
index d5ce6036791c..63825c99b69a 100644
--- a/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/TextEditorBackgroundHighlighter.java
+++ b/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/TextEditorBackgroundHighlighter.java
@@ -21,7 +21,7 @@ import java.util.Collections;
 import java.util.List;
 
 public class TextEditorBackgroundHighlighter implements BackgroundEditorHighlighter {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.daemon.impl.TextEditorBackgroundHighlighter");
+  private static final Logger LOG = Logger.getInstance(TextEditorBackgroundHighlighter.class);
   private static final int[] EXCEPT_OVERRIDDEN = {
     Pass.UPDATE_FOLDING,
     Pass.POPUP_HINTS,
diff --git a/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightInfoHolder.java b/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightInfoHolder.java
index 407d32e4d247..1756d2aad3d9 100644
--- a/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightInfoHolder.java
+++ b/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightInfoHolder.java
@@ -32,7 +32,7 @@ import java.util.Collection;
 import java.util.List;
 
 public class HighlightInfoHolder {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.daemon.impl.analysis.HighlightInfoHolder");
+  private static final Logger LOG = Logger.getInstance(HighlightInfoHolder.class);
 
   private final PsiFile myContextFile;
   private final HighlightInfoFilter[] myFilters;
diff --git a/platform/analysis-impl/src/com/intellij/codeInspection/InspectionEngine.java b/platform/analysis-impl/src/com/intellij/codeInspection/InspectionEngine.java
index dff5b0d4e56c..ded2e0a28f1d 100644
--- a/platform/analysis-impl/src/com/intellij/codeInspection/InspectionEngine.java
+++ b/platform/analysis-impl/src/com/intellij/codeInspection/InspectionEngine.java
@@ -39,7 +39,7 @@ import java.util.Map.Entry;
 import java.util.concurrent.ConcurrentHashMap;
 
 public class InspectionEngine {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInspection.InspectionEngine");
+  private static final Logger LOG = Logger.getInstance(InspectionEngine.class);
   private static final Set<Class<? extends LocalInspectionTool>> RECURSIVE_VISITOR_TOOL_CLASSES = ContainerUtil.newConcurrentSet();
 
   @NotNull
diff --git a/platform/analysis-impl/src/com/intellij/codeInspection/ProblemDescriptorBase.java b/platform/analysis-impl/src/com/intellij/codeInspection/ProblemDescriptorBase.java
index 7cf1a47bb168..e4e9caa54e47 100644
--- a/platform/analysis-impl/src/com/intellij/codeInspection/ProblemDescriptorBase.java
+++ b/platform/analysis-impl/src/com/intellij/codeInspection/ProblemDescriptorBase.java
@@ -17,7 +17,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 public class ProblemDescriptorBase extends CommonProblemDescriptorImpl implements ProblemDescriptor {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInspection.ex.ProblemDescriptorImpl");
+  private static final Logger LOG = Logger.getInstance(ProblemDescriptorBase.class);
 
   @NotNull private final SmartPsiElementPointer myStartSmartPointer;
   @Nullable private final SmartPsiElementPointer myEndSmartPointer;
diff --git a/platform/analysis-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextBase.java b/platform/analysis-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextBase.java
index 1f4dc4512205..4054dd73a59d 100644
--- a/platform/analysis-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextBase.java
+++ b/platform/analysis-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextBase.java
@@ -38,7 +38,7 @@ import java.util.*;
 import java.util.function.Predicate;
 
 public class GlobalInspectionContextBase extends UserDataHolderBase implements GlobalInspectionContext {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInspection.ex.GlobalInspectionContextImpl");
+  private static final Logger LOG = Logger.getInstance(GlobalInspectionContextBase.class);
   private static final TObjectHashingStrategy<Tools> TOOLS_HASHING_STRATEGY = new TObjectHashingStrategy<Tools>() {
     @Override
     public int computeHashCode(Tools object) {
diff --git a/platform/analysis-impl/src/com/intellij/codeInspection/ex/InspectionProfileWrapper.java b/platform/analysis-impl/src/com/intellij/codeInspection/ex/InspectionProfileWrapper.java
index d22a20183235..fe711ac29ace 100644
--- a/platform/analysis-impl/src/com/intellij/codeInspection/ex/InspectionProfileWrapper.java
+++ b/platform/analysis-impl/src/com/intellij/codeInspection/ex/InspectionProfileWrapper.java
@@ -29,7 +29,7 @@ import java.util.Set;
 import java.util.function.Function;
 
 public class InspectionProfileWrapper {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInspection.ex.InspectionProfileWrapper");
+  private static final Logger LOG = Logger.getInstance(InspectionProfileWrapper.class);
 
   /**
    * Key that is assumed to hold strategy that customizes {@link InspectionProfileWrapper} object to use.
diff --git a/platform/analysis-impl/src/com/intellij/codeInspection/reference/RefElementImpl.java b/platform/analysis-impl/src/com/intellij/codeInspection/reference/RefElementImpl.java
index faa4fda996c0..33e6d0335865 100644
--- a/platform/analysis-impl/src/com/intellij/codeInspection/reference/RefElementImpl.java
+++ b/platform/analysis-impl/src/com/intellij/codeInspection/reference/RefElementImpl.java
@@ -38,7 +38,7 @@ import java.util.Collection;
 import java.util.List;
 
 public abstract class RefElementImpl extends RefEntityImpl implements RefElement, WritableRefElement {
-  protected static final Logger LOG = Logger.getInstance("#com.intellij.codeInspection.reference.RefElement");
+  protected static final Logger LOG = Logger.getInstance(RefElement.class);
 
   private static final int IS_ENTRY_MASK = 0x80;
   private static final int IS_PERMANENT_ENTRY_MASK = 0x100;
diff --git a/platform/analysis-impl/src/com/intellij/codeInspection/reference/RefManagerImpl.java b/platform/analysis-impl/src/com/intellij/codeInspection/reference/RefManagerImpl.java
index 5df86f688468..5b6d53169046 100644
--- a/platform/analysis-impl/src/com/intellij/codeInspection/reference/RefManagerImpl.java
+++ b/platform/analysis-impl/src/com/intellij/codeInspection/reference/RefManagerImpl.java
@@ -54,7 +54,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.stream.Stream;
 
 public class RefManagerImpl extends RefManager {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInspection.reference.RefManager");
+  private static final Logger LOG = Logger.getInstance(RefManager.class);
 
   private long myLastUsedMask = 0x0800_0000; // guarded by this
 
diff --git a/platform/analysis-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/FileReference.java b/platform/analysis-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/FileReference.java
index e10c45eab4e4..82c5fde55aad 100644
--- a/platform/analysis-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/FileReference.java
+++ b/platform/analysis-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/FileReference.java
@@ -46,7 +46,7 @@ public class FileReference implements PsiFileReference, FileReferenceOwner, PsiP
                                       LocalQuickFixProvider,
                                       EmptyResolveMessageProvider, BindablePsiReference {
 
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.resolve.reference.impl.providers.FileReference");
+  private static final Logger LOG = Logger.getInstance(FileReference.class);
 
   public static final FileReference[] EMPTY = new FileReference[0];
 
diff --git a/platform/analysis-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/FileReferenceSet.java b/platform/analysis-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/FileReferenceSet.java
index c80f6d67e794..99aa667e9bc7 100644
--- a/platform/analysis-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/FileReferenceSet.java
+++ b/platform/analysis-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/FileReferenceSet.java
@@ -29,7 +29,7 @@ import static java.util.Collections.*;
  * @author Maxim.Mossienko
  */
 public class FileReferenceSet {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.resolve.reference.impl.providers.FileReferenceSet");
+  private static final Logger LOG = Logger.getInstance(FileReferenceSet.class);
 
   private static final FileType[] EMPTY_FILE_TYPES = {};
 
diff --git a/platform/core-api/src/com/intellij/codeInsight/PsiEquivalenceUtil.java b/platform/core-api/src/com/intellij/codeInsight/PsiEquivalenceUtil.java
index 802e1c9d7703..886ae01e311c 100644
--- a/platform/core-api/src/com/intellij/codeInsight/PsiEquivalenceUtil.java
+++ b/platform/core-api/src/com/intellij/codeInsight/PsiEquivalenceUtil.java
@@ -39,7 +39,7 @@ import java.util.List;
  * @author ven
  */
 public class PsiEquivalenceUtil {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.PsiEquivalenceUtil");
+  private static final Logger LOG = Logger.getInstance(PsiEquivalenceUtil.class);
 
   public static boolean areElementsEquivalent(@NotNull PsiElement element1,
                                               @NotNull PsiElement element2,
diff --git a/platform/core-api/src/com/intellij/lexer/LayeredLexer.java b/platform/core-api/src/com/intellij/lexer/LayeredLexer.java
index 9407a4ab4457..e8a7d63c7bf6 100644
--- a/platform/core-api/src/com/intellij/lexer/LayeredLexer.java
+++ b/platform/core-api/src/com/intellij/lexer/LayeredLexer.java
@@ -16,7 +16,7 @@ import java.util.Map;
 public class LayeredLexer extends DelegateLexer {
   public static final ThreadLocal<Boolean> ourDisableLayersFlag = new ThreadLocal<>();
 
-  private static final Logger LOG = Logger.getInstance("#com.intellij.lexer.LayeredLexer");
+  private static final Logger LOG = Logger.getInstance(LayeredLexer.class);
   private static final int IN_LAYER_STATE = 1024; // TODO: Other value?
   private static final int IN_LAYER_LEXER_FINISHED_STATE = 2048;
 
diff --git a/platform/core-api/src/com/intellij/lexer/StringLiteralLexer.java b/platform/core-api/src/com/intellij/lexer/StringLiteralLexer.java
index d3d5741268e3..ab44af598320 100644
--- a/platform/core-api/src/com/intellij/lexer/StringLiteralLexer.java
+++ b/platform/core-api/src/com/intellij/lexer/StringLiteralLexer.java
@@ -11,7 +11,7 @@ import org.jetbrains.annotations.NotNull;
  * @author max
  */
 public class StringLiteralLexer extends LexerBase {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.lexer.StringLiteralLexer");
+  private static final Logger LOG = Logger.getInstance(StringLiteralLexer.class);
 
   private static final short AFTER_FIRST_QUOTE = 1;
   private static final short AFTER_LAST_QUOTE = 2;
diff --git a/platform/core-api/src/com/intellij/openapi/application/WriteAction.java b/platform/core-api/src/com/intellij/openapi/application/WriteAction.java
index 5135204bf80e..1af14bf5b483 100644
--- a/platform/core-api/src/com/intellij/openapi/application/WriteAction.java
+++ b/platform/core-api/src/com/intellij/openapi/application/WriteAction.java
@@ -18,7 +18,7 @@ import java.util.concurrent.atomic.AtomicReference;
  * @see ReadAction
  */
 public abstract class WriteAction<T> extends BaseActionRunnable<T> {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.application.WriteAction");
+  private static final Logger LOG = Logger.getInstance(WriteAction.class);
 
   /**
    * @deprecated use {@link #run(ThrowableRunnable)}
diff --git a/platform/core-api/src/com/intellij/openapi/command/WriteCommandAction.java b/platform/core-api/src/com/intellij/openapi/command/WriteCommandAction.java
index 279ca145c2d7..18a9bdf04b62 100644
--- a/platform/core-api/src/com/intellij/openapi/command/WriteCommandAction.java
+++ b/platform/core-api/src/com/intellij/openapi/command/WriteCommandAction.java
@@ -21,7 +21,7 @@ import org.jetbrains.annotations.TestOnly;
 import java.util.Arrays;
 
 public abstract class WriteCommandAction<T> extends BaseActionRunnable<T> {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.command.WriteCommandAction");
+  private static final Logger LOG = Logger.getInstance(WriteCommandAction.class);
 
   private static final String DEFAULT_COMMAND_NAME = "Undefined";
   private static final String DEFAULT_GROUP_ID = null;
diff --git a/platform/core-api/src/com/intellij/openapi/editor/markup/TextAttributes.java b/platform/core-api/src/com/intellij/openapi/editor/markup/TextAttributes.java
index 5a431fc252eb..e34cb0531d5b 100644
--- a/platform/core-api/src/com/intellij/openapi/editor/markup/TextAttributes.java
+++ b/platform/core-api/src/com/intellij/openapi/editor/markup/TextAttributes.java
@@ -32,7 +32,7 @@ import java.util.function.BiConsumer;
  * Defines the visual representation (colors and effects) of text.
  */
 public class TextAttributes implements Cloneable {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.editor.markup.TextAttributes");
+  private static final Logger LOG = Logger.getInstance(TextAttributes.class);
   private static final AttributesFlyweight DEFAULT_FLYWEIGHT = AttributesFlyweight
     .create(null, null, Font.PLAIN, null, EffectType.BOXED, Collections.emptyMap(), null);
 
diff --git a/platform/core-api/src/com/intellij/openapi/progress/Task.java b/platform/core-api/src/com/intellij/openapi/progress/Task.java
index 19ca68464868..9a1633cfa63d 100644
--- a/platform/core-api/src/com/intellij/openapi/progress/Task.java
+++ b/platform/core-api/src/com/intellij/openapi/progress/Task.java
@@ -46,7 +46,7 @@ import org.jetbrains.annotations.Nullable;
  * @see ProgressManager#run(Task)
  */
 public abstract class Task implements TaskInfo, Progressive {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.progress.Task");
+  private static final Logger LOG = Logger.getInstance(Task.class);
 
   protected final Project myProject;
   protected String myTitle;
diff --git a/platform/core-api/src/com/intellij/openapi/vfs/VfsUtilCore.java b/platform/core-api/src/com/intellij/openapi/vfs/VfsUtilCore.java
index 50010792a083..981aa31f8ec5 100644
--- a/platform/core-api/src/com/intellij/openapi/vfs/VfsUtilCore.java
+++ b/platform/core-api/src/com/intellij/openapi/vfs/VfsUtilCore.java
@@ -32,7 +32,7 @@ import java.util.Set;
  * Various utility methods for working with {@link VirtualFile}.
  */
 public class VfsUtilCore {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.vfs.VfsUtilCore");
+  private static final Logger LOG = Logger.getInstance(VfsUtilCore.class);
 
   private static final String MAILTO = "mailto";
 
diff --git a/platform/core-api/src/com/intellij/openapi/vfs/VirtualFile.java b/platform/core-api/src/com/intellij/openapi/vfs/VirtualFile.java
index a61f7ecf26b6..59c671a1ff14 100644
--- a/platform/core-api/src/com/intellij/openapi/vfs/VirtualFile.java
+++ b/platform/core-api/src/com/intellij/openapi/vfs/VirtualFile.java
@@ -92,7 +92,7 @@ public abstract class VirtualFile extends UserDataHolderBase implements Modifica
   @MagicConstant(stringValues = {PROP_NAME, PROP_ENCODING, PROP_HIDDEN, PROP_WRITABLE, PROP_SYMLINK_TARGET})
   public @interface PropName {}
 
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.vfs.VirtualFile");
+  private static final Logger LOG = Logger.getInstance(VirtualFile.class);
   private static final Key<byte[]> BOM_KEY = Key.create("BOM");
   private static final Key<Charset> CHARSET_KEY = Key.create("CHARSET");
 
diff --git a/platform/core-api/src/com/intellij/patterns/PatternCondition.java b/platform/core-api/src/com/intellij/patterns/PatternCondition.java
index d360b18c9f72..9decace1c289 100644
--- a/platform/core-api/src/com/intellij/patterns/PatternCondition.java
+++ b/platform/core-api/src/com/intellij/patterns/PatternCondition.java
@@ -30,7 +30,7 @@ import java.util.Collection;
  * @author peter
 */
 public abstract class PatternCondition<T> {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.patterns.PatternCondition");
+  private static final Logger LOG = Logger.getInstance(PatternCondition.class);
   @NonNls private static final String PARAMETER_FIELD_PREFIX = "val$";
   private final String myDebugMethodName;
 
diff --git a/platform/core-api/src/com/intellij/psi/ElementManipulators.java b/platform/core-api/src/com/intellij/psi/ElementManipulators.java
index 78f65f994b76..9b5b8380c86a 100644
--- a/platform/core-api/src/com/intellij/psi/ElementManipulators.java
+++ b/platform/core-api/src/com/intellij/psi/ElementManipulators.java
@@ -16,7 +16,7 @@ public class ElementManipulators extends ClassExtension<ElementManipulator> {
   public static final ElementManipulators INSTANCE = new ElementManipulators();
 
 
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.ElementManipulators");
+  private static final Logger LOG = Logger.getInstance(ElementManipulators.class);
 
   private ElementManipulators() {
     super(EP_NAME);
diff --git a/platform/core-api/src/com/intellij/psi/PsiReferenceBase.java b/platform/core-api/src/com/intellij/psi/PsiReferenceBase.java
index cc40f0917efd..e3f900a43c00 100644
--- a/platform/core-api/src/com/intellij/psi/PsiReferenceBase.java
+++ b/platform/core-api/src/com/intellij/psi/PsiReferenceBase.java
@@ -12,7 +12,7 @@ import org.jetbrains.annotations.Nullable;
  * @author Dmitry Avdeev
  */
 public abstract class PsiReferenceBase<T extends PsiElement> implements PsiReference {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.PsiReferenceBase");
+  private static final Logger LOG = Logger.getInstance(PsiReferenceBase.class);
 
   protected final T myElement;
   private TextRange myRangeInElement;
diff --git a/platform/core-api/src/com/intellij/psi/PsiReferenceProviderBean.java b/platform/core-api/src/com/intellij/psi/PsiReferenceProviderBean.java
index 7b8e2a1d84b7..cb01f53f2085 100644
--- a/platform/core-api/src/com/intellij/psi/PsiReferenceProviderBean.java
+++ b/platform/core-api/src/com/intellij/psi/PsiReferenceProviderBean.java
@@ -49,7 +49,7 @@ public class PsiReferenceProviderBean extends AbstractExtensionPointBean impleme
     return description;
   }
 
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.PsiReferenceProviderBean");
+  private static final Logger LOG = Logger.getInstance(PsiReferenceProviderBean.class);
 
   public PsiReferenceProvider instantiate() {
     try {
diff --git a/platform/core-api/src/com/intellij/psi/PsiWalkingState.java b/platform/core-api/src/com/intellij/psi/PsiWalkingState.java
index 5068757c437e..352dbf7f07aa 100644
--- a/platform/core-api/src/com/intellij/psi/PsiWalkingState.java
+++ b/platform/core-api/src/com/intellij/psi/PsiWalkingState.java
@@ -25,7 +25,7 @@ import org.jetbrains.annotations.NotNull;
  * @author cdr
  */
 public abstract class PsiWalkingState extends WalkingState<PsiElement> {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.PsiWalkingState");
+  private static final Logger LOG = Logger.getInstance(PsiWalkingState.class);
   private final PsiElementVisitor myVisitor;
 
   private static class PsiTreeGuide implements TreeGuide<PsiElement> {
diff --git a/platform/core-api/src/com/intellij/psi/ReferenceProviderType.java b/platform/core-api/src/com/intellij/psi/ReferenceProviderType.java
index ca1e17c81d28..bc06aeba63bc 100644
--- a/platform/core-api/src/com/intellij/psi/ReferenceProviderType.java
+++ b/platform/core-api/src/com/intellij/psi/ReferenceProviderType.java
@@ -17,7 +17,7 @@ import java.util.List;
  */
 public class ReferenceProviderType {
   @NonNls public static final String EP_NAME = "com.intellij.referenceProviderType";
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.ReferenceProviderType");
+  private static final Logger LOG = Logger.getInstance(ReferenceProviderType.class);
   private static final KeyedExtensionCollector<PsiReferenceProvider,ReferenceProviderType> COLLECTOR =
     new KeyedExtensionCollector<PsiReferenceProvider, ReferenceProviderType>(EP_NAME) {
     @NotNull
diff --git a/platform/core-api/src/com/intellij/psi/stubs/IStubElementType.java b/platform/core-api/src/com/intellij/psi/stubs/IStubElementType.java
index 1ebf1020e402..b8693aa6d7d4 100644
--- a/platform/core-api/src/com/intellij/psi/stubs/IStubElementType.java
+++ b/platform/core-api/src/com/intellij/psi/stubs/IStubElementType.java
@@ -20,7 +20,7 @@ import java.util.*;
 public abstract class IStubElementType<StubT extends StubElement, PsiT extends PsiElement> extends IElementType implements StubSerializer<StubT> {
   private static volatile boolean ourInitializedStubs;
   private static volatile Set<String> ourLazyExternalIds = Collections.emptySet();
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.stubs.IStubElementType");
+  private static final Logger LOG = Logger.getInstance(IStubElementType.class);
 
   public IStubElementType(@NotNull @NonNls final String debugName, @Nullable final Language language) {
     super(debugName, language);
diff --git a/platform/core-api/src/com/intellij/psi/stubs/StubElementTypeHolderEP.java b/platform/core-api/src/com/intellij/psi/stubs/StubElementTypeHolderEP.java
index ddafeacdba4a..939db405f39d 100644
--- a/platform/core-api/src/com/intellij/psi/stubs/StubElementTypeHolderEP.java
+++ b/platform/core-api/src/com/intellij/psi/stubs/StubElementTypeHolderEP.java
@@ -39,7 +39,7 @@ import java.util.List;
  * @author yole
  */
 public class StubElementTypeHolderEP extends AbstractExtensionPointBean {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.stubs.StubElementTypeHolderEP");
+  private static final Logger LOG = Logger.getInstance(StubElementTypeHolderEP.class);
 
   public static final ExtensionPointName<StubElementTypeHolderEP> EP_NAME = ExtensionPointName.create("com.intellij.stubElementTypeHolder");
 
diff --git a/platform/core-api/src/com/intellij/psi/tree/IElementType.java b/platform/core-api/src/com/intellij/psi/tree/IElementType.java
index fb12d752f16b..cb1127927802 100644
--- a/platform/core-api/src/com/intellij/psi/tree/IElementType.java
+++ b/platform/core-api/src/com/intellij/psi/tree/IElementType.java
@@ -25,7 +25,7 @@ import java.util.stream.Stream;
  * @see com.intellij.lang.ASTNode#getElementType()
  */
 public class IElementType {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.tree.IElementType");
+  private static final Logger LOG = Logger.getInstance(IElementType.class);
 
   public static final IElementType[] EMPTY_ARRAY = new IElementType[0];
   public static final ArrayFactory<IElementType> ARRAY_FACTORY = count -> count == 0 ? EMPTY_ARRAY : new IElementType[count];
diff --git a/platform/core-api/src/com/intellij/psi/util/CachedValueProvider.java b/platform/core-api/src/com/intellij/psi/util/CachedValueProvider.java
index 416944269359..24c0b7e6f545 100644
--- a/platform/core-api/src/com/intellij/psi/util/CachedValueProvider.java
+++ b/platform/core-api/src/com/intellij/psi/util/CachedValueProvider.java
@@ -28,7 +28,7 @@ public interface CachedValueProvider<T> {
    * @param <T> the type of the cached value
    */
   class Result<T> {
-    private static final Logger LOG = Logger.getInstance("#com.intellij.psi.util.CachedValueProvider.Result");
+    private static final Logger LOG = Logger.getInstance(Result.class);
     private final T myValue;
     private final Object[] myDependencyItems;
 
diff --git a/platform/core-api/src/com/intellij/psi/util/PsiTreeUtil.java b/platform/core-api/src/com/intellij/psi/util/PsiTreeUtil.java
index b70a3eb118e9..035a661126ce 100644
--- a/platform/core-api/src/com/intellij/psi/util/PsiTreeUtil.java
+++ b/platform/core-api/src/com/intellij/psi/util/PsiTreeUtil.java
@@ -31,7 +31,7 @@ import java.util.*;
 import java.util.function.Predicate;
 
 public class PsiTreeUtil {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.util.PsiTreeUtil");
+  private static final Logger LOG = Logger.getInstance(PsiTreeUtil.class);
 
   private static final Key<Object> MARKER = Key.create("PsiTreeUtil.copyElements.MARKER");
   @SuppressWarnings("unchecked")
diff --git a/platform/core-api/src/com/intellij/psi/util/PsiUtilCore.java b/platform/core-api/src/com/intellij/psi/util/PsiUtilCore.java
index 344d598a2ac8..2fe9d8e95b89 100644
--- a/platform/core-api/src/com/intellij/psi/util/PsiUtilCore.java
+++ b/platform/core-api/src/com/intellij/psi/util/PsiUtilCore.java
@@ -44,7 +44,7 @@ import java.util.stream.Collectors;
  * @author yole
  */
 public class PsiUtilCore {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.util.PsiUtilCore");
+  private static final Logger LOG = Logger.getInstance(PsiUtilCore.class);
   public static final PsiElement NULL_PSI_ELEMENT = new NullPsiElement();
   protected static class NullPsiElement implements PsiElement {
     @Override
diff --git a/platform/core-api/src/com/intellij/usageView/UsageInfo.java b/platform/core-api/src/com/intellij/usageView/UsageInfo.java
index 4bb0940440f8..ae9c790bbd79 100644
--- a/platform/core-api/src/com/intellij/usageView/UsageInfo.java
+++ b/platform/core-api/src/com/intellij/usageView/UsageInfo.java
@@ -27,7 +27,7 @@ import org.jetbrains.annotations.Nullable;
 
 public class UsageInfo {
   public static final UsageInfo[] EMPTY_ARRAY = new UsageInfo[0];
-  private static final Logger LOG = Logger.getInstance("#com.intellij.usageView.UsageInfo");
+  private static final Logger LOG = Logger.getInstance(UsageInfo.class);
   private final SmartPsiElementPointer<?> mySmartPointer;
   private final SmartPsiFileRange myPsiFileRange;
 
diff --git a/platform/core-api/src/com/intellij/util/ExecutorsQuery.java b/platform/core-api/src/com/intellij/util/ExecutorsQuery.java
index e49d065ba554..59d0522d1e00 100644
--- a/platform/core-api/src/com/intellij/util/ExecutorsQuery.java
+++ b/platform/core-api/src/com/intellij/util/ExecutorsQuery.java
@@ -13,7 +13,7 @@ import java.util.List;
  * @author max
  */
 public final class ExecutorsQuery<Result, Parameter> extends AbstractQuery<Result> {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.util.ExecutorsQuery"); 
+  private static final Logger LOG = Logger.getInstance(ExecutorsQuery.class);
 
   private final List<? extends QueryExecutor<Result, Parameter>> myExecutors;
   private final Parameter myParameters;
diff --git a/platform/core-api/src/com/intellij/util/messages/impl/MessageBusConnectionImpl.java b/platform/core-api/src/com/intellij/util/messages/impl/MessageBusConnectionImpl.java
index 90b5b56a31c1..e6954e5d545a 100644
--- a/platform/core-api/src/com/intellij/util/messages/impl/MessageBusConnectionImpl.java
+++ b/platform/core-api/src/com/intellij/util/messages/impl/MessageBusConnectionImpl.java
@@ -16,7 +16,7 @@ import java.util.List;
 import java.util.Queue;
 
 final class MessageBusConnectionImpl implements MessageBusConnection {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.util.messages.impl.MessageBusConnectionImpl");
+  private static final Logger LOG = Logger.getInstance(MessageBusConnectionImpl.class);
 
   private final MessageBusImpl myBus;
   @SuppressWarnings("SSBasedInspection")
diff --git a/platform/core-api/src/com/intellij/util/messages/impl/MessageBusImpl.java b/platform/core-api/src/com/intellij/util/messages/impl/MessageBusImpl.java
index f1847d3369f0..46dd11364826 100644
--- a/platform/core-api/src/com/intellij/util/messages/impl/MessageBusImpl.java
+++ b/platform/core-api/src/com/intellij/util/messages/impl/MessageBusImpl.java
@@ -28,7 +28,7 @@ import java.util.concurrent.ConcurrentMap;
  * @author max
  */
 public class MessageBusImpl implements MessageBus {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.util.messages.impl.MessageBusImpl");
+  private static final Logger LOG = Logger.getInstance(MessageBusImpl.class);
   private static final Comparator<MessageBusImpl> MESSAGE_BUS_COMPARATOR = (bus1, bus2) -> ArrayUtil.lexicographicCompare(bus1.myOrder, bus2.myOrder);
   @SuppressWarnings("SSBasedInspection") private final ThreadLocal<Queue<DeliveryJob>> myMessageQueue = createThreadLocalQueue();
 
diff --git a/platform/core-impl/src/com/intellij/codeInsight/daemon/impl/CollectHighlightsUtil.java b/platform/core-impl/src/com/intellij/codeInsight/daemon/impl/CollectHighlightsUtil.java
index 14e4f3f8316e..63732b0c5b16 100644
--- a/platform/core-impl/src/com/intellij/codeInsight/daemon/impl/CollectHighlightsUtil.java
+++ b/platform/core-impl/src/com/intellij/codeInsight/daemon/impl/CollectHighlightsUtil.java
@@ -21,7 +21,7 @@ import java.util.List;
 public class CollectHighlightsUtil {
   private static final ExtensionPointName<Condition<PsiElement>> EP_NAME = ExtensionPointName.create("com.intellij.elementsToHighlightFilter");
 
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.daemon.impl.CollectHighlightsUtil");
+  private static final Logger LOG = Logger.getInstance(CollectHighlightsUtil.class);
 
   private CollectHighlightsUtil() { }
 
diff --git a/platform/core-impl/src/com/intellij/extapi/psi/ASTDelegatePsiElement.java b/platform/core-impl/src/com/intellij/extapi/psi/ASTDelegatePsiElement.java
index 517a65bc1939..33ee09bead04 100644
--- a/platform/core-impl/src/com/intellij/extapi/psi/ASTDelegatePsiElement.java
+++ b/platform/core-impl/src/com/intellij/extapi/psi/ASTDelegatePsiElement.java
@@ -51,7 +51,7 @@ import java.util.Collections;
 import java.util.List;
 
 public abstract class ASTDelegatePsiElement extends PsiElementBase {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.extapi.psi.ASTDelegatePsiElement");
+  private static final Logger LOG = Logger.getInstance(ASTDelegatePsiElement.class);
 
   private static final List EMPTY = Collections.emptyList();
 
diff --git a/platform/core-impl/src/com/intellij/ide/plugins/PluginManagerCore.java b/platform/core-impl/src/com/intellij/ide/plugins/PluginManagerCore.java
index 973fe4aef8b8..89f870b94900 100644
--- a/platform/core-impl/src/com/intellij/ide/plugins/PluginManagerCore.java
+++ b/platform/core-impl/src/com/intellij/ide/plugins/PluginManagerCore.java
@@ -1949,7 +1949,7 @@ public final class PluginManagerCore {
 
   @NotNull
   public static Logger getLogger() {
-    return Logger.getInstance("#com.intellij.ide.plugins.PluginManager");
+    return Logger.getInstance(PluginManager.class);
   }
 
   public static final class EssentialPluginMissingException extends RuntimeException {
diff --git a/platform/core-impl/src/com/intellij/lang/impl/MarkerProduction.java b/platform/core-impl/src/com/intellij/lang/impl/MarkerProduction.java
index a84e81b74475..f748225b695b 100644
--- a/platform/core-impl/src/com/intellij/lang/impl/MarkerProduction.java
+++ b/platform/core-impl/src/com/intellij/lang/impl/MarkerProduction.java
@@ -26,7 +26,7 @@ import org.jetbrains.annotations.Nullable;
  * @author peter
  */
 final class MarkerProduction extends TIntArrayList {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.lang.impl.MarkerProduction");
+  private static final Logger LOG = Logger.getInstance(MarkerProduction.class);
   private static final int LINEAR_SEARCH_LIMIT = 20;
   private final MarkerPool myPool;
   private final MarkerOptionalData myOptionalData;
diff --git a/platform/core-impl/src/com/intellij/lang/impl/PsiBuilderImpl.java b/platform/core-impl/src/com/intellij/lang/impl/PsiBuilderImpl.java
index 2762db819633..1fa24465c1c4 100644
--- a/platform/core-impl/src/com/intellij/lang/impl/PsiBuilderImpl.java
+++ b/platform/core-impl/src/com/intellij/lang/impl/PsiBuilderImpl.java
@@ -47,7 +47,7 @@ import static com.intellij.lang.WhitespacesBinders.DEFAULT_RIGHT_BINDER;
  * @author max
  */
 public class PsiBuilderImpl extends UnprotectedUserDataHolder implements PsiBuilder {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.lang.impl.PsiBuilderImpl");
+  private static final Logger LOG = Logger.getInstance(PsiBuilderImpl.class);
 
   // function stored in PsiBuilderImpl' user data that is called during reparse when the algorithm is not sure what to merge
   public static final Key<TripleFunction<ASTNode, LighterASTNode, FlyweightCapableTreeStructure<LighterASTNode>, ThreeState>>
diff --git a/platform/core-impl/src/com/intellij/lang/impl/TokenSequence.java b/platform/core-impl/src/com/intellij/lang/impl/TokenSequence.java
index e6076019a7db..01d25c041b7f 100644
--- a/platform/core-impl/src/com/intellij/lang/impl/TokenSequence.java
+++ b/platform/core-impl/src/com/intellij/lang/impl/TokenSequence.java
@@ -23,7 +23,7 @@ import com.intellij.util.ArrayUtil;
 import org.jetbrains.annotations.NotNull;
 
 class TokenSequence {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.lang.impl.TokenSequence");
+  private static final Logger LOG = Logger.getInstance(TokenSequence.class);
   
   final int[] lexStarts;
   final IElementType[] lexTypes;
diff --git a/platform/core-impl/src/com/intellij/mock/MockProject.java b/platform/core-impl/src/com/intellij/mock/MockProject.java
index f91c80fcd351..4397c77f131c 100644
--- a/platform/core-impl/src/com/intellij/mock/MockProject.java
+++ b/platform/core-impl/src/com/intellij/mock/MockProject.java
@@ -24,7 +24,7 @@ import java.util.List;
  * @author yole
  */
 public class MockProject extends MockComponentManager implements Project {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.mock.MockProject");
+  private static final Logger LOG = Logger.getInstance(MockProject.class);
   private VirtualFile myBaseDir;
 
   public MockProject(PicoContainer parent, @NotNull Disposable parentDisposable) {
diff --git a/platform/core-impl/src/com/intellij/openapi/application/TransactionGuardImpl.java b/platform/core-impl/src/com/intellij/openapi/application/TransactionGuardImpl.java
index 91aa2774003d..8bac42760f32 100644
--- a/platform/core-impl/src/com/intellij/openapi/application/TransactionGuardImpl.java
+++ b/platform/core-impl/src/com/intellij/openapi/application/TransactionGuardImpl.java
@@ -33,7 +33,7 @@ import static com.intellij.util.ReflectionUtil.getField;
  * @author peter
  */
 public class TransactionGuardImpl extends TransactionGuard {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.application.TransactionGuardImpl");
+  private static final Logger LOG = Logger.getInstance(TransactionGuardImpl.class);
   private final Queue<Transaction> myQueue = new LinkedBlockingQueue<>();
   private final Map<ModalityState, TransactionIdImpl> myModality2Transaction = ContainerUtil.createConcurrentWeakMap();
 
diff --git a/platform/core-impl/src/com/intellij/openapi/editor/ex/util/SegmentArray.java b/platform/core-impl/src/com/intellij/openapi/editor/ex/util/SegmentArray.java
index 562bb7919d3a..ab4d06097334 100644
--- a/platform/core-impl/src/com/intellij/openapi/editor/ex/util/SegmentArray.java
+++ b/platform/core-impl/src/com/intellij/openapi/editor/ex/util/SegmentArray.java
@@ -27,7 +27,7 @@ import org.jetbrains.annotations.NotNull;
  * Not thread-safe.
  */
 public class SegmentArray {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.editor.ex.util.SegmentArray");
+  private static final Logger LOG = Logger.getInstance(SegmentArray.class);
   protected int[] myStarts;
   protected int[] myEnds;
 
diff --git a/platform/core-impl/src/com/intellij/openapi/editor/impl/DocumentImpl.java b/platform/core-impl/src/com/intellij/openapi/editor/impl/DocumentImpl.java
index d4e355ea966a..9d81567ba1f8 100644
--- a/platform/core-impl/src/com/intellij/openapi/editor/impl/DocumentImpl.java
+++ b/platform/core-impl/src/com/intellij/openapi/editor/impl/DocumentImpl.java
@@ -57,7 +57,7 @@ import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 
 public class DocumentImpl extends UserDataHolderBase implements DocumentEx {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.editor.impl.DocumentImpl");
+  private static final Logger LOG = Logger.getInstance(DocumentImpl.class);
   private static final int STRIP_TRAILING_SPACES_BULK_MODE_LINES_LIMIT = 1000;
 
   private final LockFreeCOWSortedArray<DocumentListener> myDocumentListeners =
diff --git a/platform/core-impl/src/com/intellij/openapi/editor/impl/IntervalTreeImpl.java b/platform/core-impl/src/com/intellij/openapi/editor/impl/IntervalTreeImpl.java
index ff8f7fc5690c..56f7830d75df 100644
--- a/platform/core-impl/src/com/intellij/openapi/editor/impl/IntervalTreeImpl.java
+++ b/platform/core-impl/src/com/intellij/openapi/editor/impl/IntervalTreeImpl.java
@@ -30,7 +30,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
 import java.util.function.Predicate;
 
 abstract class IntervalTreeImpl<T> extends RedBlackTree<T> implements IntervalTree<T> {
-  static final Logger LOG = Logger.getInstance("#com.intellij.openapi.editor.impl.RangeMarkerTree");
+  static final Logger LOG = Logger.getInstance(RangeMarkerTree.class);
   static final boolean DEBUG = LOG.isDebugEnabled() || ApplicationManager.getApplication() != null && ApplicationManager.getApplication().isUnitTestMode();
   private int keySize; // number of all intervals, counting all duplicates, some of them maybe gced
   final ReadWriteLock l = new ReentrantReadWriteLock();
diff --git a/platform/core-impl/src/com/intellij/openapi/editor/impl/RangeMarkerImpl.java b/platform/core-impl/src/com/intellij/openapi/editor/impl/RangeMarkerImpl.java
index 91387bb488ab..961b3b404252 100644
--- a/platform/core-impl/src/com/intellij/openapi/editor/impl/RangeMarkerImpl.java
+++ b/platform/core-impl/src/com/intellij/openapi/editor/impl/RangeMarkerImpl.java
@@ -23,7 +23,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 public class RangeMarkerImpl extends UserDataHolderBase implements RangeMarkerEx {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.editor.impl.RangeMarkerImpl");
+  private static final Logger LOG = Logger.getInstance(RangeMarkerImpl.class);
 
   @NotNull
   private final Object myDocumentOrFile; // either VirtualFile (if any) or DocumentEx if no file associated
diff --git a/platform/core-impl/src/com/intellij/openapi/fileEditor/impl/LoadTextUtil.java b/platform/core-impl/src/com/intellij/openapi/fileEditor/impl/LoadTextUtil.java
index 2386ee025d40..264a3573f6aa 100644
--- a/platform/core-impl/src/com/intellij/openapi/fileEditor/impl/LoadTextUtil.java
+++ b/platform/core-impl/src/com/intellij/openapi/fileEditor/impl/LoadTextUtil.java
@@ -35,7 +35,7 @@ import java.nio.charset.CharsetEncoder;
 import java.nio.charset.StandardCharsets;
 
 public final class LoadTextUtil {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.fileEditor.impl.LoadTextUtil");
+  private static final Logger LOG = Logger.getInstance(LoadTextUtil.class);
 
   public enum AutoDetectionReason { FROM_BOM, FROM_BYTES }
 
diff --git a/platform/core-impl/src/com/intellij/openapi/progress/impl/CoreProgressManager.java b/platform/core-impl/src/com/intellij/openapi/progress/impl/CoreProgressManager.java
index 86c57ac0a3cd..c132c2dc5c63 100644
--- a/platform/core-impl/src/com/intellij/openapi/progress/impl/CoreProgressManager.java
+++ b/platform/core-impl/src/com/intellij/openapi/progress/impl/CoreProgressManager.java
@@ -35,7 +35,7 @@ import java.util.concurrent.atomic.AtomicReference;
 import java.util.concurrent.locks.LockSupport;
 
 public class CoreProgressManager extends ProgressManager implements Disposable {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.progress.impl.CoreProgressManager");
+  private static final Logger LOG = Logger.getInstance(CoreProgressManager.class);
 
   static final int CHECK_CANCELED_DELAY_MILLIS = 10;
   private final AtomicInteger myUnsafeProgressCount = new AtomicInteger(0);
diff --git a/platform/core-impl/src/com/intellij/openapi/roots/impl/PackageDirectoryCache.java b/platform/core-impl/src/com/intellij/openapi/roots/impl/PackageDirectoryCache.java
index 7f205277e6b4..6a42aec6e354 100644
--- a/platform/core-impl/src/com/intellij/openapi/roots/impl/PackageDirectoryCache.java
+++ b/platform/core-impl/src/com/intellij/openapi/roots/impl/PackageDirectoryCache.java
@@ -21,7 +21,7 @@ import java.util.*;
  * @author peter
  */
 public class PackageDirectoryCache {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.roots.impl.PackageDirectoryCache");
+  private static final Logger LOG = Logger.getInstance(PackageDirectoryCache.class);
   private final MultiMap<String, VirtualFile> myRootsByPackagePrefix = MultiMap.create();
   private final Map<String, PackageInfo> myDirectoriesByPackageNameCache = ContainerUtil.newConcurrentMap();
   private final Set<String> myNonExistentPackages = ContainerUtil.newConcurrentSet();
diff --git a/platform/core-impl/src/com/intellij/openapi/vfs/impl/VirtualFileManagerImpl.java b/platform/core-impl/src/com/intellij/openapi/vfs/impl/VirtualFileManagerImpl.java
index 2f047ba84db6..c4e13db98113 100644
--- a/platform/core-impl/src/com/intellij/openapi/vfs/impl/VirtualFileManagerImpl.java
+++ b/platform/core-impl/src/com/intellij/openapi/vfs/impl/VirtualFileManagerImpl.java
@@ -35,7 +35,7 @@ import java.util.Collections;
 import java.util.List;
 
 public class  VirtualFileManagerImpl extends VirtualFileManagerEx implements Disposable {
-  protected static final Logger LOG = Logger.getInstance("#com.intellij.openapi.vfs.impl.VirtualFileManagerImpl");
+  protected static final Logger LOG = Logger.getInstance(VirtualFileManagerImpl.class);
 
   // do not use extension point name to avoid map lookup on each event publishing
   private static final ExtensionPointImpl<VirtualFileManagerListener>
diff --git a/platform/core-impl/src/com/intellij/openapi/vfs/impl/VirtualFilePointerContainerImpl.java b/platform/core-impl/src/com/intellij/openapi/vfs/impl/VirtualFilePointerContainerImpl.java
index f34b05feb9cc..8fca7bc8decc 100644
--- a/platform/core-impl/src/com/intellij/openapi/vfs/impl/VirtualFilePointerContainerImpl.java
+++ b/platform/core-impl/src/com/intellij/openapi/vfs/impl/VirtualFilePointerContainerImpl.java
@@ -33,7 +33,7 @@ import java.util.function.Predicate;
  * @author dsl
  */
 public class VirtualFilePointerContainerImpl extends TraceableDisposable implements VirtualFilePointerContainer, Disposable {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.vfs.pointers.VirtualFilePointerContainer");
+  private static final Logger LOG = Logger.getInstance(VirtualFilePointerContainer.class);
   private static final int UNINITIALIZED = -1;
   @NotNull private final ConcurrentList<VirtualFilePointer> myList = ContainerUtil.createConcurrentList();
   @NotNull private final ConcurrentList<VirtualFilePointer> myJarDirectories = ContainerUtil.createConcurrentList();
diff --git a/platform/core-impl/src/com/intellij/psi/AbstractFileViewProvider.java b/platform/core-impl/src/com/intellij/psi/AbstractFileViewProvider.java
index 5d474efc5b76..8693ccf72608 100644
--- a/platform/core-impl/src/com/intellij/psi/AbstractFileViewProvider.java
+++ b/platform/core-impl/src/com/intellij/psi/AbstractFileViewProvider.java
@@ -51,7 +51,7 @@ import java.util.Set;
 import java.util.function.Consumer;
 
 public abstract class AbstractFileViewProvider extends UserDataHolderBase implements FileViewProvider {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.AbstractFileViewProvider");
+  private static final Logger LOG = Logger.getInstance(AbstractFileViewProvider.class);
   public static final Key<Object> FREE_THREADED = Key.create("FREE_THREADED");
   private static final Key<Set<AbstractFileViewProvider>> KNOWN_COPIES = Key.create("KNOWN_COPIES");
   @NotNull
diff --git a/platform/core-impl/src/com/intellij/psi/PsiAnchor.java b/platform/core-impl/src/com/intellij/psi/PsiAnchor.java
index f76dde59f1c4..7e4f9252b941 100644
--- a/platform/core-impl/src/com/intellij/psi/PsiAnchor.java
+++ b/platform/core-impl/src/com/intellij/psi/PsiAnchor.java
@@ -37,7 +37,7 @@ import java.util.Set;
  * @author db
  */
 public abstract class PsiAnchor {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.PsiAnchor");
+  private static final Logger LOG = Logger.getInstance(PsiAnchor.class);
   @Nullable
   public abstract PsiElement retrieve();
   public abstract PsiFile getFile();
diff --git a/platform/core-impl/src/com/intellij/psi/SingleRootFileViewProvider.java b/platform/core-impl/src/com/intellij/psi/SingleRootFileViewProvider.java
index ebdf64341f06..f81b30fc0533 100644
--- a/platform/core-impl/src/com/intellij/psi/SingleRootFileViewProvider.java
+++ b/platform/core-impl/src/com/intellij/psi/SingleRootFileViewProvider.java
@@ -43,7 +43,7 @@ import java.util.Set;
 
 public class SingleRootFileViewProvider extends AbstractFileViewProvider implements FileViewProvider {
   private static final Key<Boolean> OUR_NO_SIZE_LIMIT_KEY = Key.create("no.size.limit");
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.SingleRootFileViewProvider");
+  private static final Logger LOG = Logger.getInstance(SingleRootFileViewProvider.class);
   @SuppressWarnings("unused")
   private volatile PsiFile myPsiFile;
   private static final AtomicFieldUpdater<SingleRootFileViewProvider, PsiFile> myPsiFileUpdater = AtomicFieldUpdater.forFieldOfType(SingleRootFileViewProvider.class, PsiFile.class);
diff --git a/platform/core-impl/src/com/intellij/psi/impl/DebugUtil.java b/platform/core-impl/src/com/intellij/psi/impl/DebugUtil.java
index 5148a96aee7b..966ee4d37266 100644
--- a/platform/core-impl/src/com/intellij/psi/impl/DebugUtil.java
+++ b/platform/core-impl/src/com/intellij/psi/impl/DebugUtil.java
@@ -37,7 +37,7 @@ import java.util.Set;
 
 @SuppressWarnings({"HardCodedStringLiteral", "UtilityClassWithoutPrivateConstructor", "UnusedDeclaration", "TestOnlyProblems"})
 public class DebugUtil {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.DebugUtil");
+  private static final Logger LOG = Logger.getInstance(DebugUtil.class);
 
   public static /*final*/ boolean CHECK = false;
   public static final boolean DO_EXPENSIVE_CHECKS;
diff --git a/platform/core-impl/src/com/intellij/psi/impl/DocumentCommitThread.java b/platform/core-impl/src/com/intellij/psi/impl/DocumentCommitThread.java
index d1bc4c68cfa0..166fe223f315 100644
--- a/platform/core-impl/src/com/intellij/psi/impl/DocumentCommitThread.java
+++ b/platform/core-impl/src/com/intellij/psi/impl/DocumentCommitThread.java
@@ -45,7 +45,7 @@ import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
 public final class DocumentCommitThread implements Runnable, Disposable, DocumentCommitProcessor {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.DocumentCommitThread");
+  private static final Logger LOG = Logger.getInstance(DocumentCommitThread.class);
   private static final String SYNC_COMMIT_REASON = "Sync commit";
 
   private final ExecutorService executor = AppExecutorUtil.createBoundedApplicationPoolExecutor("Document Committing Pool", PooledThreadExecutor.INSTANCE, 1, this);
diff --git a/platform/core-impl/src/com/intellij/psi/impl/ElementBase.java b/platform/core-impl/src/com/intellij/psi/impl/ElementBase.java
index 3e4686a99621..5b87fcd54dc9 100644
--- a/platform/core-impl/src/com/intellij/psi/impl/ElementBase.java
+++ b/platform/core-impl/src/com/intellij/psi/impl/ElementBase.java
@@ -31,7 +31,7 @@ import javax.swing.*;
 import java.util.function.Function;
 
 public abstract class ElementBase extends UserDataHolderBase implements Iconable {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.ElementBase");
+  private static final Logger LOG = Logger.getInstance(ElementBase.class);
 
   public static final int FLAGS_LOCKED = 0x800;
   private static final Function<ElementIconRequest,Icon> ICON_COMPUTE = request -> {
diff --git a/platform/core-impl/src/com/intellij/psi/impl/PsiDocumentManagerBase.java b/platform/core-impl/src/com/intellij/psi/impl/PsiDocumentManagerBase.java
index 4724243dc1a1..918f7580113c 100644
--- a/platform/core-impl/src/com/intellij/psi/impl/PsiDocumentManagerBase.java
+++ b/platform/core-impl/src/com/intellij/psi/impl/PsiDocumentManagerBase.java
@@ -44,7 +44,7 @@ import java.util.*;
 import java.util.concurrent.ConcurrentMap;
 
 public abstract class PsiDocumentManagerBase extends PsiDocumentManager implements DocumentListener, Disposable {
-  static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.PsiDocumentManagerImpl");
+  static final Logger LOG = Logger.getInstance(PsiDocumentManagerBase.class);
   private static final Key<Document> HARD_REF_TO_DOCUMENT = Key.create("HARD_REFERENCE_TO_DOCUMENT");
   private static final Key<List<Runnable>> ACTION_AFTER_COMMIT = Key.create("ACTION_AFTER_COMMIT");
 
diff --git a/platform/core-impl/src/com/intellij/psi/impl/PsiElementBase.java b/platform/core-impl/src/com/intellij/psi/impl/PsiElementBase.java
index a95d1c098884..5e2dc11e39a6 100644
--- a/platform/core-impl/src/com/intellij/psi/impl/PsiElementBase.java
+++ b/platform/core-impl/src/com/intellij/psi/impl/PsiElementBase.java
@@ -36,7 +36,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 public abstract class PsiElementBase extends ElementBase implements NavigatablePsiElement, Cloneable {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.PsiElementBase");
+  private static final Logger LOG = Logger.getInstance(PsiElementBase.class);
 
   @Override
   public PsiElement getFirstChild() {
diff --git a/platform/core-impl/src/com/intellij/psi/impl/PsiToDocumentSynchronizer.java b/platform/core-impl/src/com/intellij/psi/impl/PsiToDocumentSynchronizer.java
index 7daacdc1ff31..b0e693fecd74 100644
--- a/platform/core-impl/src/com/intellij/psi/impl/PsiToDocumentSynchronizer.java
+++ b/platform/core-impl/src/com/intellij/psi/impl/PsiToDocumentSynchronizer.java
@@ -43,7 +43,7 @@ import java.util.Map;
 import java.util.TreeMap;
 
 public class PsiToDocumentSynchronizer extends PsiTreeChangeAdapter {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.PsiToDocumentSynchronizer");
+  private static final Logger LOG = Logger.getInstance(PsiToDocumentSynchronizer.class);
   private static final Key<Boolean> PSI_DOCUMENT_ATOMIC_ACTION = Key.create("PSI_DOCUMENT_ATOMIC_ACTION");
 
   private final PsiDocumentManagerBase myPsiDocumentManager;
diff --git a/platform/core-impl/src/com/intellij/psi/impl/SharedPsiElementImplUtil.java b/platform/core-impl/src/com/intellij/psi/impl/SharedPsiElementImplUtil.java
index 97c1dff2533d..5f96a82689e5 100644
--- a/platform/core-impl/src/com/intellij/psi/impl/SharedPsiElementImplUtil.java
+++ b/platform/core-impl/src/com/intellij/psi/impl/SharedPsiElementImplUtil.java
@@ -16,7 +16,7 @@ import java.util.Collection;
 import java.util.List;
 
 public class SharedPsiElementImplUtil {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.SharedPsiElementImplUtil");
+  private static final Logger LOG = Logger.getInstance(SharedPsiElementImplUtil.class);
 
   private SharedPsiElementImplUtil() { }
 
diff --git a/platform/core-impl/src/com/intellij/psi/impl/file/PsiDirectoryImpl.java b/platform/core-impl/src/com/intellij/psi/impl/file/PsiDirectoryImpl.java
index db11bb34b6c5..ba8c3e19880f 100644
--- a/platform/core-impl/src/com/intellij/psi/impl/file/PsiDirectoryImpl.java
+++ b/platform/core-impl/src/com/intellij/psi/impl/file/PsiDirectoryImpl.java
@@ -40,7 +40,7 @@ import java.util.ArrayList;
 import java.util.Map;
 
 public class PsiDirectoryImpl extends PsiElementBase implements PsiDirectory, Queryable {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.file.PsiDirectoryImpl");
+  private static final Logger LOG = Logger.getInstance(PsiDirectoryImpl.class);
 
   private final PsiManagerImpl myManager;
   private final VirtualFile myFile;
diff --git a/platform/core-impl/src/com/intellij/psi/impl/file/PsiPackageBase.java b/platform/core-impl/src/com/intellij/psi/impl/file/PsiPackageBase.java
index 4ecb3be58595..229d15fcfdcc 100644
--- a/platform/core-impl/src/com/intellij/psi/impl/file/PsiPackageBase.java
+++ b/platform/core-impl/src/com/intellij/psi/impl/file/PsiPackageBase.java
@@ -26,7 +26,7 @@ import java.util.List;
 import java.util.Map;
 
 public abstract class PsiPackageBase extends PsiElementBase implements PsiDirectoryContainer, Queryable {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.file.PsiPackageBase");
+  private static final Logger LOG = Logger.getInstance(PsiPackageBase.class);
 
   private final PsiManager myManager;
   private final String myQualifiedName;
diff --git a/platform/core-impl/src/com/intellij/psi/impl/file/impl/FileManagerImpl.java b/platform/core-impl/src/com/intellij/psi/impl/file/impl/FileManagerImpl.java
index 7beb8012d19b..5f1fc51f79c6 100644
--- a/platform/core-impl/src/com/intellij/psi/impl/file/impl/FileManagerImpl.java
+++ b/platform/core-impl/src/com/intellij/psi/impl/file/impl/FileManagerImpl.java
@@ -36,7 +36,7 @@ import java.util.concurrent.atomic.AtomicReference;
 
 public final class FileManagerImpl implements FileManager {
   private static final Key<Boolean> IN_COMA = Key.create("IN_COMA");
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.file.impl.FileManagerImpl");
+  private static final Logger LOG = Logger.getInstance(FileManagerImpl.class);
   private final Key<FileViewProvider> myPsiHardRefKey = Key.create("HARD_REFERENCE_TO_PSI"); //non-static!
 
   private final PsiManagerImpl myManager;
diff --git a/platform/core-impl/src/com/intellij/psi/impl/smartPointers/SmartPointerManagerImpl.java b/platform/core-impl/src/com/intellij/psi/impl/smartPointers/SmartPointerManagerImpl.java
index 8e4b9352eabd..34c3409975ca 100644
--- a/platform/core-impl/src/com/intellij/psi/impl/smartPointers/SmartPointerManagerImpl.java
+++ b/platform/core-impl/src/com/intellij/psi/impl/smartPointers/SmartPointerManagerImpl.java
@@ -24,7 +24,7 @@ import java.lang.ref.Reference;
 import java.util.List;
 
 public final class SmartPointerManagerImpl extends SmartPointerManager {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.smartPointers.SmartPointerManagerImpl");
+  private static final Logger LOG = Logger.getInstance(SmartPointerManagerImpl.class);
   private final Project myProject;
   private final Key<SmartPointerTracker> POINTERS_KEY;
   private final PsiDocumentManagerBase myPsiDocManager;
diff --git a/platform/core-impl/src/com/intellij/psi/impl/smartPointers/SmartPsiElementPointerImpl.java b/platform/core-impl/src/com/intellij/psi/impl/smartPointers/SmartPsiElementPointerImpl.java
index 002238b75868..70e6504d20f5 100644
--- a/platform/core-impl/src/com/intellij/psi/impl/smartPointers/SmartPsiElementPointerImpl.java
+++ b/platform/core-impl/src/com/intellij/psi/impl/smartPointers/SmartPsiElementPointerImpl.java
@@ -40,7 +40,7 @@ import java.lang.ref.SoftReference;
 import java.lang.ref.WeakReference;
 
 class SmartPsiElementPointerImpl<E extends PsiElement> implements SmartPointerEx<E> {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.smartPointers.SmartPsiElementPointerImpl");
+  private static final Logger LOG = Logger.getInstance(SmartPsiElementPointerImpl.class);
 
   private Reference<E> myElement;
   private final SmartPointerElementInfo myElementInfo;
diff --git a/platform/core-impl/src/com/intellij/psi/impl/source/FileTrees.java b/platform/core-impl/src/com/intellij/psi/impl/source/FileTrees.java
index c34caa155049..0a7e0b8f38e0 100644
--- a/platform/core-impl/src/com/intellij/psi/impl/source/FileTrees.java
+++ b/platform/core-impl/src/com/intellij/psi/impl/source/FileTrees.java
@@ -41,7 +41,7 @@ import java.util.stream.IntStream;
  * @author peter
  */
 final class FileTrees {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.FileTrees");
+  private static final Logger LOG = Logger.getInstance(FileTrees.class);
   private static final int firstNonFilePsiIndex = 1;
   private final PsiFileImpl myFile;
   private final Reference<StubTree> myStub;
diff --git a/platform/core-impl/src/com/intellij/psi/impl/source/SubstrateRef.java b/platform/core-impl/src/com/intellij/psi/impl/source/SubstrateRef.java
index f862caa7d683..c0561bf6a331 100644
--- a/platform/core-impl/src/com/intellij/psi/impl/source/SubstrateRef.java
+++ b/platform/core-impl/src/com/intellij/psi/impl/source/SubstrateRef.java
@@ -36,7 +36,7 @@ import org.jetbrains.annotations.Nullable;
  * @author peter
  */
 public abstract class SubstrateRef {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.SubstrateRef");
+  private static final Logger LOG = Logger.getInstance(SubstrateRef.class);
 
   @NotNull
   public abstract ASTNode getNode();
diff --git a/platform/core-impl/src/com/intellij/psi/impl/source/resolve/reference/PsiReferenceRegistrarImpl.java b/platform/core-impl/src/com/intellij/psi/impl/source/resolve/reference/PsiReferenceRegistrarImpl.java
index 60b7b5c0f2f8..225808347ddc 100644
--- a/platform/core-impl/src/com/intellij/psi/impl/source/resolve/reference/PsiReferenceRegistrarImpl.java
+++ b/platform/core-impl/src/com/intellij/psi/impl/source/resolve/reference/PsiReferenceRegistrarImpl.java
@@ -29,7 +29,7 @@ import java.util.concurrent.ConcurrentMap;
  * @author Dmitry Avdeev
  */
 public class PsiReferenceRegistrarImpl extends PsiReferenceRegistrar {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.resolve.reference.PsiReferenceRegistrarImpl");
+  private static final Logger LOG = Logger.getInstance(PsiReferenceRegistrarImpl.class);
   private final Map<Class<?>, SimpleProviderBinding> myBindingsMap = new THashMap<>();
   private final Map<Class<?>, NamedObjectProviderBinding> myNamedBindingsMap = new THashMap<>();
   private final ConcurrentMap<Class, ProviderBinding[]> myBindingCache;
diff --git a/platform/core-impl/src/com/intellij/psi/impl/source/tree/CompositeElement.java b/platform/core-impl/src/com/intellij/psi/impl/source/tree/CompositeElement.java
index 3195280bcb91..a24395521797 100644
--- a/platform/core-impl/src/com/intellij/psi/impl/source/tree/CompositeElement.java
+++ b/platform/core-impl/src/com/intellij/psi/impl/source/tree/CompositeElement.java
@@ -44,7 +44,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 public class CompositeElement extends TreeElement {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.tree.CompositeElement");
+  private static final Logger LOG = Logger.getInstance(CompositeElement.class);
   public static final CompositeElement[] EMPTY_ARRAY = new CompositeElement[0];
 
   private TreeElement firstChild;
diff --git a/platform/core-impl/src/com/intellij/psi/impl/source/tree/CompositePsiElement.java b/platform/core-impl/src/com/intellij/psi/impl/source/tree/CompositePsiElement.java
index 99c804a4a5ca..284c926f3cd7 100644
--- a/platform/core-impl/src/com/intellij/psi/impl/source/tree/CompositePsiElement.java
+++ b/platform/core-impl/src/com/intellij/psi/impl/source/tree/CompositePsiElement.java
@@ -39,7 +39,7 @@ import com.intellij.util.IncorrectOperationException;
 import org.jetbrains.annotations.NotNull;
 
 public abstract class CompositePsiElement extends CompositeElement implements PsiElement, NavigationItem {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.tree.CompositePsiElement");
+  private static final Logger LOG = Logger.getInstance(CompositePsiElement.class);
 
   protected static int ourHC;
 
diff --git a/platform/core-impl/src/com/intellij/psi/impl/source/tree/LazyParseableElement.java b/platform/core-impl/src/com/intellij/psi/impl/source/tree/LazyParseableElement.java
index 1f309d6ab8e9..e585d3feb8eb 100644
--- a/platform/core-impl/src/com/intellij/psi/impl/source/tree/LazyParseableElement.java
+++ b/platform/core-impl/src/com/intellij/psi/impl/source/tree/LazyParseableElement.java
@@ -38,7 +38,7 @@ import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.TestOnly;
 
 public class LazyParseableElement extends CompositeElement {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.tree.LazyParseableElement");
+  private static final Logger LOG = Logger.getInstance(LazyParseableElement.class);
   private static final StaticGetter<CharSequence> NO_TEXT = new StaticGetter<>(null);
 
   private static class ChameleonLock {
diff --git a/platform/core-impl/src/com/intellij/psi/impl/source/tree/LazyParseablePsiElement.java b/platform/core-impl/src/com/intellij/psi/impl/source/tree/LazyParseablePsiElement.java
index 97e533592291..b76e2bd45935 100644
--- a/platform/core-impl/src/com/intellij/psi/impl/source/tree/LazyParseablePsiElement.java
+++ b/platform/core-impl/src/com/intellij/psi/impl/source/tree/LazyParseablePsiElement.java
@@ -47,7 +47,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class LazyParseablePsiElement extends LazyParseableElement implements PsiElement, NavigationItem {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.tree.LazyParseablePsiElement");
+  private static final Logger LOG = Logger.getInstance(LazyParseablePsiElement.class);
 
   public LazyParseablePsiElement(@NotNull IElementType type, @Nullable CharSequence buffer) {
     super(type, buffer);
diff --git a/platform/core-impl/src/com/intellij/psi/impl/source/tree/LeafPsiElement.java b/platform/core-impl/src/com/intellij/psi/impl/source/tree/LeafPsiElement.java
index 1580b3e394f4..5641a10d1c4f 100644
--- a/platform/core-impl/src/com/intellij/psi/impl/source/tree/LeafPsiElement.java
+++ b/platform/core-impl/src/com/intellij/psi/impl/source/tree/LeafPsiElement.java
@@ -40,7 +40,7 @@ import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
 
 public class LeafPsiElement extends LeafElement implements PsiElement, NavigationItem {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.tree.LeafPsiElement");
+  private static final Logger LOG = Logger.getInstance(LeafPsiElement.class);
 
   public LeafPsiElement(@NotNull IElementType type, CharSequence text) {
     super(type, text);
diff --git a/platform/core-impl/src/com/intellij/psi/impl/source/tree/OwnBufferLeafPsiElement.java b/platform/core-impl/src/com/intellij/psi/impl/source/tree/OwnBufferLeafPsiElement.java
index a531de7ba1e5..e22d89d5f44e 100644
--- a/platform/core-impl/src/com/intellij/psi/impl/source/tree/OwnBufferLeafPsiElement.java
+++ b/platform/core-impl/src/com/intellij/psi/impl/source/tree/OwnBufferLeafPsiElement.java
@@ -33,7 +33,7 @@ import com.intellij.util.IncorrectOperationException;
 import org.jetbrains.annotations.NotNull;
 
 public class OwnBufferLeafPsiElement extends LeafElement implements PsiElement {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.tree.LeafPsiElement");
+  private static final Logger LOG = Logger.getInstance(LeafPsiElement.class);
 
   public OwnBufferLeafPsiElement(@NotNull IElementType type, @NotNull CharSequence text) {
     super(type, text);
diff --git a/platform/core-impl/src/com/intellij/psi/impl/source/tree/SharedImplUtil.java b/platform/core-impl/src/com/intellij/psi/impl/source/tree/SharedImplUtil.java
index ae784041cb9e..edecb985b15f 100644
--- a/platform/core-impl/src/com/intellij/psi/impl/source/tree/SharedImplUtil.java
+++ b/platform/core-impl/src/com/intellij/psi/impl/source/tree/SharedImplUtil.java
@@ -34,7 +34,7 @@ import org.jetbrains.annotations.Nullable;
 //TODO: rename/regroup?
 
 public class SharedImplUtil {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.tree.SharedImplUtil");
+  private static final Logger LOG = Logger.getInstance(SharedImplUtil.class);
   private static final boolean CHECK_FOR_READ_ACTION = DebugUtil.DO_EXPENSIVE_CHECKS || ApplicationManager.getApplication().isInternal();
 
   private SharedImplUtil() {
diff --git a/platform/core-impl/src/com/intellij/psi/stubs/DefaultStubBuilder.java b/platform/core-impl/src/com/intellij/psi/stubs/DefaultStubBuilder.java
index c6b105ca4461..81d42c3b5000 100644
--- a/platform/core-impl/src/com/intellij/psi/stubs/DefaultStubBuilder.java
+++ b/platform/core-impl/src/com/intellij/psi/stubs/DefaultStubBuilder.java
@@ -32,7 +32,7 @@ import org.jetbrains.annotations.Nullable;
  * @author max
  */
 public class DefaultStubBuilder implements StubBuilder {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.stubs.DefaultStubBuilder");
+  private static final Logger LOG = Logger.getInstance(DefaultStubBuilder.class);
 
   @Override
   public StubElement buildStubTree(@NotNull PsiFile file) {
diff --git a/platform/core-impl/src/com/intellij/psi/stubs/LightStubBuilder.java b/platform/core-impl/src/com/intellij/psi/stubs/LightStubBuilder.java
index 8aa2c1ae9b61..cf1dd6429e3f 100644
--- a/platform/core-impl/src/com/intellij/psi/stubs/LightStubBuilder.java
+++ b/platform/core-impl/src/com/intellij/psi/stubs/LightStubBuilder.java
@@ -34,7 +34,7 @@ import org.jetbrains.annotations.NotNull;
 import java.util.List;
 
 public class LightStubBuilder implements StubBuilder {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.stubs.LightStubBuilder");
+  private static final Logger LOG = Logger.getInstance(LightStubBuilder.class);
   public static final ThreadLocal<LighterAST> FORCED_AST = new ThreadLocal<>();
 
   @Override
diff --git a/platform/core-impl/src/com/intellij/util/graph/impl/KShortestPathsFinder.java b/platform/core-impl/src/com/intellij/util/graph/impl/KShortestPathsFinder.java
index 848c3ed42967..98028ad56201 100644
--- a/platform/core-impl/src/com/intellij/util/graph/impl/KShortestPathsFinder.java
+++ b/platform/core-impl/src/com/intellij/util/graph/impl/KShortestPathsFinder.java
@@ -20,7 +20,7 @@ import java.util.*;
  * @author nik
  */
 public class KShortestPathsFinder<Node> {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.util.graph.impl.KShortestPathsFinder");
+  private static final Logger LOG = Logger.getInstance(KShortestPathsFinder.class);
   private final InboundSemiGraph<Node> myGraph;
   private final Node myStart;
   private final Node myFinish;
diff --git a/platform/diff-impl/src/com/intellij/openapi/vcs/ex/LineStatusTrackerBase.kt b/platform/diff-impl/src/com/intellij/openapi/vcs/ex/LineStatusTrackerBase.kt
index 694c678ccc14..0686980a8d34 100644
--- a/platform/diff-impl/src/com/intellij/openapi/vcs/ex/LineStatusTrackerBase.kt
+++ b/platform/diff-impl/src/com/intellij/openapi/vcs/ex/LineStatusTrackerBase.kt
@@ -407,7 +407,7 @@ abstract class LineStatusTrackerBase<R : Range> : LineStatusTrackerI<R> {
 
 
   companion object {
-    @JvmStatic protected val LOG: Logger = Logger.getInstance("#com.intellij.openapi.vcs.ex.LineStatusTracker")
+    @JvmStatic protected val LOG: Logger = Logger.getInstance(LineStatusTrackerBase::class.java)
 
     @JvmStatic protected val Block.start: Int get() = range.start2
     @JvmStatic protected val Block.end: Int get() = range.end2
diff --git a/platform/duplicates-analysis/src/com/intellij/dupLocator/DefaultDuplocatorState.java b/platform/duplicates-analysis/src/com/intellij/dupLocator/DefaultDuplocatorState.java
index ed7b618cd7eb..bde84aaa7dbb 100644
--- a/platform/duplicates-analysis/src/com/intellij/dupLocator/DefaultDuplocatorState.java
+++ b/platform/duplicates-analysis/src/com/intellij/dupLocator/DefaultDuplocatorState.java
@@ -7,7 +7,7 @@ import org.jetbrains.annotations.NotNull;
  * @author Eugene.Kudelevsky
  */
 public class DefaultDuplocatorState implements ExternalizableDuplocatorState {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.dupLocator.DefaultDuplocatorState");
+  private static final Logger LOG = Logger.getInstance(DefaultDuplocatorState.class);
 
   public boolean DISTINGUISH_VARIABLES = false;
   public boolean DISTINGUISH_FUNCTIONS = true;
diff --git a/platform/duplicates-analysis/src/com/intellij/dupLocator/treeHash/DuplocatorHashCallback.java b/platform/duplicates-analysis/src/com/intellij/dupLocator/treeHash/DuplocatorHashCallback.java
index 19cb06b1056d..3b0ca3ba28a3 100644
--- a/platform/duplicates-analysis/src/com/intellij/dupLocator/treeHash/DuplocatorHashCallback.java
+++ b/platform/duplicates-analysis/src/com/intellij/dupLocator/treeHash/DuplocatorHashCallback.java
@@ -28,7 +28,7 @@ import java.nio.file.Path;
 import java.util.*;
 
 public class DuplocatorHashCallback implements FragmentsCollector {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.dupLocator.treeHash.DuplocatorHashCallback");
+  private static final Logger LOG = Logger.getInstance(DuplocatorHashCallback.class);
 
   private TIntObjectHashMap<List<List<PsiFragment>>> myDuplicates;
   private final int myBound;
diff --git a/platform/editor-ui-ex/src/com/intellij/codeStyle/AbstractConvertLineSeparatorsAction.java b/platform/editor-ui-ex/src/com/intellij/codeStyle/AbstractConvertLineSeparatorsAction.java
index 4dccf958658f..3e6e1b1694dd 100644
--- a/platform/editor-ui-ex/src/com/intellij/codeStyle/AbstractConvertLineSeparatorsAction.java
+++ b/platform/editor-ui-ex/src/com/intellij/codeStyle/AbstractConvertLineSeparatorsAction.java
@@ -39,7 +39,7 @@ import java.io.IOException;
  * @author Nikolai Matveev
  */
 public abstract class AbstractConvertLineSeparatorsAction extends AnAction {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeStyle.AbstractConvertLineSeparatorsAction");
+  private static final Logger LOG = Logger.getInstance(AbstractConvertLineSeparatorsAction.class);
 
   @NotNull
   private final String mySeparator;
diff --git a/platform/editor-ui-ex/src/com/intellij/openapi/editor/ex/util/LayeredLexerEditorHighlighter.java b/platform/editor-ui-ex/src/com/intellij/openapi/editor/ex/util/LayeredLexerEditorHighlighter.java
index bae88ff3c0d8..3e32e20fb520 100644
--- a/platform/editor-ui-ex/src/com/intellij/openapi/editor/ex/util/LayeredLexerEditorHighlighter.java
+++ b/platform/editor-ui-ex/src/com/intellij/openapi/editor/ex/util/LayeredLexerEditorHighlighter.java
@@ -35,7 +35,7 @@ import java.util.*;
  * @author max
  */
 public class LayeredLexerEditorHighlighter extends LexerEditorHighlighter {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.editor.ex.util.LayeredLexerEditorHighlighter");
+  private static final Logger LOG = Logger.getInstance(LayeredLexerEditorHighlighter.class);
   private final Map<IElementType, LayerDescriptor> myTokensToLayer = new HashMap<>();
 
   public LayeredLexerEditorHighlighter(@NotNull SyntaxHighlighter highlighter, @NotNull EditorColorsScheme scheme) {
diff --git a/platform/editor-ui-ex/src/com/intellij/openapi/editor/ex/util/LexerEditorHighlighter.java b/platform/editor-ui-ex/src/com/intellij/openapi/editor/ex/util/LexerEditorHighlighter.java
index 24c268dbcf69..4dc2215d98da 100644
--- a/platform/editor-ui-ex/src/com/intellij/openapi/editor/ex/util/LexerEditorHighlighter.java
+++ b/platform/editor-ui-ex/src/com/intellij/openapi/editor/ex/util/LexerEditorHighlighter.java
@@ -37,7 +37,7 @@ import org.jetbrains.annotations.Nullable;
 import java.util.*;
 
 public class LexerEditorHighlighter implements EditorHighlighter, PrioritizedDocumentListener {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.editor.ex.util.LexerEditorHighlighter");
+  private static final Logger LOG = Logger.getInstance(LexerEditorHighlighter.class);
   private static final int LEXER_INCREMENTALITY_THRESHOLD = 200;
   private static final Set<Class> ourNonIncrementalLexers = new HashSet<>();
   private HighlighterClient myEditor;
diff --git a/platform/editor-ui-ex/src/com/intellij/openapi/editor/highlighter/EditorHighlighterFactoryImpl.java b/platform/editor-ui-ex/src/com/intellij/openapi/editor/highlighter/EditorHighlighterFactoryImpl.java
index 098ba5f4cac4..2da0f917c41b 100644
--- a/platform/editor-ui-ex/src/com/intellij/openapi/editor/highlighter/EditorHighlighterFactoryImpl.java
+++ b/platform/editor-ui-ex/src/com/intellij/openapi/editor/highlighter/EditorHighlighterFactoryImpl.java
@@ -19,7 +19,7 @@ import org.jetbrains.annotations.Nullable;
  * @author yole
  */
 public class EditorHighlighterFactoryImpl extends EditorHighlighterFactory {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.editor.highlighter.EditorHighlighterFactoryImpl");
+  private static final Logger LOG = Logger.getInstance(EditorHighlighterFactoryImpl.class);
 
   @NotNull
   @Override
diff --git a/platform/editor-ui-ex/src/com/intellij/openapi/editor/impl/MarkupModelImpl.java b/platform/editor-ui-ex/src/com/intellij/openapi/editor/impl/MarkupModelImpl.java
index 7c37ebc8d710..b15be61cd9d1 100644
--- a/platform/editor-ui-ex/src/com/intellij/openapi/editor/impl/MarkupModelImpl.java
+++ b/platform/editor-ui-ex/src/com/intellij/openapi/editor/impl/MarkupModelImpl.java
@@ -39,7 +39,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class MarkupModelImpl extends UserDataHolderBase implements MarkupModelEx {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.editor.impl.MarkupModelImpl");
+  private static final Logger LOG = Logger.getInstance(MarkupModelImpl.class);
   private final DocumentEx myDocument;
 
   private RangeHighlighter[] myCachedHighlighters;
diff --git a/platform/editor-ui-ex/src/com/intellij/psi/impl/search/TodoItemsCreator.java b/platform/editor-ui-ex/src/com/intellij/psi/impl/search/TodoItemsCreator.java
index e9344eb33b90..78cb690746df 100644
--- a/platform/editor-ui-ex/src/com/intellij/psi/impl/search/TodoItemsCreator.java
+++ b/platform/editor-ui-ex/src/com/intellij/psi/impl/search/TodoItemsCreator.java
@@ -15,7 +15,7 @@ import org.jetbrains.annotations.NotNull;
  * moved from PsiSearchHelperImpl
  */
 public class TodoItemsCreator {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.search.TodoItemsCreator");
+  private static final Logger LOG = Logger.getInstance(TodoItemsCreator.class);
   private final TodoPattern[] myTodoPatterns;
 
   public TodoItemsCreator() {
diff --git a/platform/extensions/src/com/intellij/openapi/extensions/AbstractExtensionPointBean.java b/platform/extensions/src/com/intellij/openapi/extensions/AbstractExtensionPointBean.java
index c3e46ece2123..af0e8abc4d81 100644
--- a/platform/extensions/src/com/intellij/openapi/extensions/AbstractExtensionPointBean.java
+++ b/platform/extensions/src/com/intellij/openapi/extensions/AbstractExtensionPointBean.java
@@ -10,7 +10,7 @@ import org.picocontainer.ComponentAdapter;
 import org.picocontainer.PicoContainer;
 
 public abstract class AbstractExtensionPointBean implements PluginAware {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.extensions.AbstractExtensionPointBean");
+  private static final Logger LOG = Logger.getInstance(AbstractExtensionPointBean.class);
 
   protected PluginDescriptor myPluginDescriptor;
 
diff --git a/platform/extensions/src/com/intellij/openapi/extensions/impl/ExtensionPointImpl.java b/platform/extensions/src/com/intellij/openapi/extensions/impl/ExtensionPointImpl.java
index 7b9bf95144d2..a9637ee506e7 100644
--- a/platform/extensions/src/com/intellij/openapi/extensions/impl/ExtensionPointImpl.java
+++ b/platform/extensions/src/com/intellij/openapi/extensions/impl/ExtensionPointImpl.java
@@ -32,7 +32,7 @@ import java.util.stream.Stream;
 
 @SuppressWarnings({"SynchronizeOnThis"})
 public abstract class ExtensionPointImpl<T> implements ExtensionPoint<T>, Iterable<T> {
-  static final Logger LOG = Logger.getInstance("#com.intellij.openapi.extensions.impl.ExtensionPointImpl");
+  static final Logger LOG = Logger.getInstance(ExtensionPointImpl.class);
 
   // test-only
   private static Set<ExtensionPointImpl<?>> POINTS_IN_READONLY_MODE;
diff --git a/platform/indexing-api/src/com/intellij/psi/search/TodoPattern.java b/platform/indexing-api/src/com/intellij/psi/search/TodoPattern.java
index 75ff94bbc878..3f5ac6abf55c 100644
--- a/platform/indexing-api/src/com/intellij/psi/search/TodoPattern.java
+++ b/platform/indexing-api/src/com/intellij/psi/search/TodoPattern.java
@@ -12,7 +12,7 @@ import org.jetbrains.annotations.Nullable;
 import java.util.regex.Pattern;
 
 public class TodoPattern implements Cloneable {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.search.TodoPattern");
+  private static final Logger LOG = Logger.getInstance(TodoPattern.class);
 
   private IndexPattern myIndexPattern;
 
diff --git a/platform/indexing-api/src/com/intellij/util/xml/NanoXmlUtil.java b/platform/indexing-api/src/com/intellij/util/xml/NanoXmlUtil.java
index cb6f34675ee2..11c4b5344881 100644
--- a/platform/indexing-api/src/com/intellij/util/xml/NanoXmlUtil.java
+++ b/platform/indexing-api/src/com/intellij/util/xml/NanoXmlUtil.java
@@ -25,7 +25,7 @@ import java.util.Properties;
  * @author mike
  */
 public class NanoXmlUtil {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.util.xml.NanoXmlUtil");
+  private static final Logger LOG = Logger.getInstance(NanoXmlUtil.class);
 
   private NanoXmlUtil() {
   }
diff --git a/platform/indexing-impl/src/com/intellij/ide/highlighter/custom/tokens/KeywordParser.java b/platform/indexing-impl/src/com/intellij/ide/highlighter/custom/tokens/KeywordParser.java
index 7b86693b899e..7c19aa059f8a 100644
--- a/platform/indexing-impl/src/com/intellij/ide/highlighter/custom/tokens/KeywordParser.java
+++ b/platform/indexing-impl/src/com/intellij/ide/highlighter/custom/tokens/KeywordParser.java
@@ -34,7 +34,7 @@ import java.util.Set;
  * @author peter
  */
 public class KeywordParser {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.ide.highlighter.custom.tokens.KeywordParser");
+  private static final Logger LOG = Logger.getInstance(KeywordParser.class);
   private final List<Set<String>> myKeywordSets = new ArrayList<>();
   private final CharTrie myTrie = new CharTrie();
   private final TIntHashSet myHashCodes = new TIntHashSet();
diff --git a/platform/indexing-impl/src/com/intellij/ide/highlighter/custom/tokens/QuotedStringParser.java b/platform/indexing-impl/src/com/intellij/ide/highlighter/custom/tokens/QuotedStringParser.java
index 9e087951f336..61bde2b53c64 100644
--- a/platform/indexing-impl/src/com/intellij/ide/highlighter/custom/tokens/QuotedStringParser.java
+++ b/platform/indexing-impl/src/com/intellij/ide/highlighter/custom/tokens/QuotedStringParser.java
@@ -23,7 +23,7 @@ import com.intellij.psi.tree.IElementType;
  * @author dsl
  */
 public class QuotedStringParser extends PrefixedTokenParser {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.ide.highlighter.custom.tokens.QuotedStringParser");
+  private static final Logger LOG = Logger.getInstance(QuotedStringParser.class);
   private final char myQuote;
   private final boolean myAllowEscapes;
 
diff --git a/platform/indexing-impl/src/com/intellij/ide/todo/TodoFilter.java b/platform/indexing-impl/src/com/intellij/ide/todo/TodoFilter.java
index 50de1bfd0891..0bed393801b9 100644
--- a/platform/indexing-impl/src/com/intellij/ide/todo/TodoFilter.java
+++ b/platform/indexing-impl/src/com/intellij/ide/todo/TodoFilter.java
@@ -30,7 +30,7 @@ import java.util.List;
 import java.util.Set;
 
 public class TodoFilter implements Cloneable {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.ide.todo.TodoFilter");
+  private static final Logger LOG = Logger.getInstance(TodoFilter.class);
 
   private static final String ATTRIBUTE_NAME = "name";
   private static final String ELEMENT_PATTERN = "pattern";
diff --git a/platform/indexing-impl/src/com/intellij/psi/impl/search/LowLevelSearchUtil.java b/platform/indexing-impl/src/com/intellij/psi/impl/search/LowLevelSearchUtil.java
index fc0af321a86f..48f51fd0986a 100644
--- a/platform/indexing-impl/src/com/intellij/psi/impl/search/LowLevelSearchUtil.java
+++ b/platform/indexing-impl/src/com/intellij/psi/impl/search/LowLevelSearchUtil.java
@@ -32,7 +32,7 @@ import java.util.concurrent.ConcurrentMap;
 import static com.intellij.openapi.util.text.StringUtil.isEscapedBackslash;
 
 public class LowLevelSearchUtil {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.search.LowLevelSearchUtil");
+  private static final Logger LOG = Logger.getInstance(LowLevelSearchUtil.class);
 
   // TRUE/FALSE -> injected psi has been discovered and processor returned true/false;
   // null -> there were nothing injected found
diff --git a/platform/indexing-impl/src/com/intellij/psi/impl/search/PsiSearchHelperImpl.java b/platform/indexing-impl/src/com/intellij/psi/impl/search/PsiSearchHelperImpl.java
index f28bcbff48b6..42449d8f9d04 100644
--- a/platform/indexing-impl/src/com/intellij/psi/impl/search/PsiSearchHelperImpl.java
+++ b/platform/indexing-impl/src/com/intellij/psi/impl/search/PsiSearchHelperImpl.java
@@ -54,7 +54,7 @@ import java.util.concurrent.atomic.AtomicLong;
 public class PsiSearchHelperImpl implements PsiSearchHelper {
   private static final ExtensionPointName<ScopeOptimizer> USE_SCOPE_OPTIMIZER_EP_NAME = ExtensionPointName.create("com.intellij.useScopeOptimizer");
 
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.search.PsiSearchHelperImpl");
+  private static final Logger LOG = Logger.getInstance(PsiSearchHelperImpl.class);
   private final PsiManagerEx myManager;
   private final DumbService myDumbService;
 
diff --git a/platform/indexing-impl/src/com/intellij/psi/stubs/StubProcessingHelperBase.java b/platform/indexing-impl/src/com/intellij/psi/stubs/StubProcessingHelperBase.java
index d7074f7f629f..46f0538f8162 100644
--- a/platform/indexing-impl/src/com/intellij/psi/stubs/StubProcessingHelperBase.java
+++ b/platform/indexing-impl/src/com/intellij/psi/stubs/StubProcessingHelperBase.java
@@ -38,7 +38,7 @@ import java.util.List;
  * Author: dmitrylomov
  */
 public abstract class StubProcessingHelperBase {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.stubs.StubProcessingHelperBase");
+  private static final Logger LOG = Logger.getInstance(StubProcessingHelperBase.class);
 
   public <Psi extends PsiElement> boolean processStubsInFile(@NotNull Project project,
                                                              @NotNull VirtualFile file,
diff --git a/platform/lang-api/src/com/intellij/diagnostic/logging/LogFilter.java b/platform/lang-api/src/com/intellij/diagnostic/logging/LogFilter.java
index fdc3b95756a2..37ec0eaec840 100644
--- a/platform/lang-api/src/com/intellij/diagnostic/logging/LogFilter.java
+++ b/platform/lang-api/src/com/intellij/diagnostic/logging/LogFilter.java
@@ -31,7 +31,7 @@ import java.io.File;
 import java.io.IOException;
 
 public class LogFilter implements JDOMExternalizable {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.diagnostic.logging.LogFilter");
+  private static final Logger LOG = Logger.getInstance(LogFilter.class);
 
   public String myName;
   public String myIconPath;
diff --git a/platform/lang-api/src/com/intellij/execution/PsiLocation.java b/platform/lang-api/src/com/intellij/execution/PsiLocation.java
index fbb228f0cd33..f9518310b857 100644
--- a/platform/lang-api/src/com/intellij/execution/PsiLocation.java
+++ b/platform/lang-api/src/com/intellij/execution/PsiLocation.java
@@ -27,7 +27,7 @@ import java.util.Iterator;
 import java.util.NoSuchElementException;
 
 public class PsiLocation<E extends PsiElement> extends Location<E> {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.execution.PsiLocation");
+  private static final Logger LOG = Logger.getInstance(PsiLocation.class);
   private final E myPsiElement;
   private final Project myProject;
   private final Module myModule;
diff --git a/platform/lang-api/src/com/intellij/execution/actions/ConfigurationContext.java b/platform/lang-api/src/com/intellij/execution/actions/ConfigurationContext.java
index 930f066a21c7..06af3b4d539e 100644
--- a/platform/lang-api/src/com/intellij/execution/actions/ConfigurationContext.java
+++ b/platform/lang-api/src/com/intellij/execution/actions/ConfigurationContext.java
@@ -41,7 +41,7 @@ import java.util.List;
  * @see RunConfigurationProducer
  */
 public class ConfigurationContext {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.execution.actions.ConfigurationContext");
+  private static final Logger LOG = Logger.getInstance(ConfigurationContext.class);
   private final Location<PsiElement> myLocation;
   private RunnerAndConfigurationSettings myConfiguration;
   private boolean myInitialized = false;
diff --git a/platform/lang-api/src/com/intellij/execution/actions/PreferredProducerFind.java b/platform/lang-api/src/com/intellij/execution/actions/PreferredProducerFind.java
index 1f4b1db8dabe..fe823a1ad31a 100644
--- a/platform/lang-api/src/com/intellij/execution/actions/PreferredProducerFind.java
+++ b/platform/lang-api/src/com/intellij/execution/actions/PreferredProducerFind.java
@@ -23,7 +23,7 @@ import java.util.Iterator;
 import java.util.List;
 
 class PreferredProducerFind {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.execution.actions.PreferredProducerFind");
+  private static final Logger LOG = Logger.getInstance(PreferredProducerFind.class);
 
   private PreferredProducerFind() {}
 
diff --git a/platform/lang-api/src/com/intellij/facet/ui/FacetBasedFrameworkSupportProvider.java b/platform/lang-api/src/com/intellij/facet/ui/FacetBasedFrameworkSupportProvider.java
index 742f8d974d28..671af31d23f6 100644
--- a/platform/lang-api/src/com/intellij/facet/ui/FacetBasedFrameworkSupportProvider.java
+++ b/platform/lang-api/src/com/intellij/facet/ui/FacetBasedFrameworkSupportProvider.java
@@ -38,7 +38,7 @@ import java.util.List;
  * @author nik
  */
 public abstract class FacetBasedFrameworkSupportProvider<F extends Facet> extends FrameworkSupportProviderBase {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.facet.ui.FacetBasedFrameworkSupportProvider");
+  private static final Logger LOG = Logger.getInstance(FacetBasedFrameworkSupportProvider.class);
   @NonNls private static final String FACET_SUPPORT_PREFIX = "facet:";
   private final FacetType<F, ?> myFacetType;
 
diff --git a/platform/lang-api/src/com/intellij/facet/ui/libraries/RemoteRepositoryInfo.java b/platform/lang-api/src/com/intellij/facet/ui/libraries/RemoteRepositoryInfo.java
index 842dc4a7be8c..660eeb7b4cfd 100644
--- a/platform/lang-api/src/com/intellij/facet/ui/libraries/RemoteRepositoryInfo.java
+++ b/platform/lang-api/src/com/intellij/facet/ui/libraries/RemoteRepositoryInfo.java
@@ -25,7 +25,7 @@ import com.intellij.openapi.diagnostic.Logger;
  * @author nik
  */
 public class RemoteRepositoryInfo {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.facet.ui.libraries.RemoteRepositoryInfo");
+  private static final Logger LOG = Logger.getInstance(RemoteRepositoryInfo.class);
   private final String myId;
   private final String myPresentableName;
   private final String[] myMirrors;
diff --git a/platform/lang-api/src/com/intellij/ide/actions/ElementCreator.java b/platform/lang-api/src/com/intellij/ide/actions/ElementCreator.java
index 6f9a575007ed..ff7bf052e48e 100644
--- a/platform/lang-api/src/com/intellij/ide/actions/ElementCreator.java
+++ b/platform/lang-api/src/com/intellij/ide/actions/ElementCreator.java
@@ -43,7 +43,7 @@ import java.util.List;
  * @author peter
  */
 public abstract class ElementCreator implements WriteActionAware {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.ide.actions.ElementCreator");
+  private static final Logger LOG = Logger.getInstance(ElementCreator.class);
   private final Project myProject;
   private final String myErrorTitle;
 
diff --git a/platform/lang-api/src/com/intellij/ide/projectView/ProjectViewNode.java b/platform/lang-api/src/com/intellij/ide/projectView/ProjectViewNode.java
index 5f32c07672c6..883913768254 100644
--- a/platform/lang-api/src/com/intellij/ide/projectView/ProjectViewNode.java
+++ b/platform/lang-api/src/com/intellij/ide/projectView/ProjectViewNode.java
@@ -46,7 +46,7 @@ import java.util.List;
 
 public abstract class ProjectViewNode <Value> extends AbstractTreeNode<Value> implements RootsProvider, SettingsProvider {
 
-  protected static final Logger LOG = Logger.getInstance("#com.intellij.ide.projectView.ProjectViewNode");
+  protected static final Logger LOG = Logger.getInstance(ProjectViewNode.class);
 
   private final ViewSettings mySettings;
   private boolean myValidating;
diff --git a/platform/lang-api/src/com/intellij/ide/util/projectWizard/ModuleBuilder.java b/platform/lang-api/src/com/intellij/ide/util/projectWizard/ModuleBuilder.java
index a4b6008f6b9b..a47e2f9cb143 100644
--- a/platform/lang-api/src/com/intellij/ide/util/projectWizard/ModuleBuilder.java
+++ b/platform/lang-api/src/com/intellij/ide/util/projectWizard/ModuleBuilder.java
@@ -43,7 +43,7 @@ public abstract class ModuleBuilder extends AbstractModuleBuilder {
 
   public static final ExtensionPointName<ModuleBuilderFactory> EP_NAME = ExtensionPointName.create("com.intellij.moduleBuilder");
 
-  private static final Logger LOG = Logger.getInstance("#com.intellij.ide.util.projectWizard.ModuleBuilder");
+  private static final Logger LOG = Logger.getInstance(ModuleBuilder.class);
   private final Set<ModuleConfigurationUpdater> myUpdaters = new HashSet<>();
   private final EventDispatcher<ModuleBuilderListener> myDispatcher = EventDispatcher.create(ModuleBuilderListener.class);
   protected Sdk myJdk;
diff --git a/platform/lang-api/src/com/intellij/lang/cacheBuilder/CacheBuilderEP.java b/platform/lang-api/src/com/intellij/lang/cacheBuilder/CacheBuilderEP.java
index 420b5a053c38..a6e936d60634 100644
--- a/platform/lang-api/src/com/intellij/lang/cacheBuilder/CacheBuilderEP.java
+++ b/platform/lang-api/src/com/intellij/lang/cacheBuilder/CacheBuilderEP.java
@@ -26,7 +26,7 @@ import com.intellij.util.xmlb.annotations.Attribute;
  * @author yole
  */
 public class CacheBuilderEP extends AbstractExtensionPointBean {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.lang.cacheBuilder.CacheBuilderEP");
+  private static final Logger LOG = Logger.getInstance(CacheBuilderEP.class);
 
   public static final ExtensionPointName<CacheBuilderEP> EP_NAME = new ExtensionPointName<>("com.intellij.cacheBuilder");
 
diff --git a/platform/lang-api/src/com/intellij/openapi/module/ModuleTypeEP.java b/platform/lang-api/src/com/intellij/openapi/module/ModuleTypeEP.java
index c7b2b69ea12e..1ed2f709997b 100644
--- a/platform/lang-api/src/com/intellij/openapi/module/ModuleTypeEP.java
+++ b/platform/lang-api/src/com/intellij/openapi/module/ModuleTypeEP.java
@@ -26,7 +26,7 @@ import com.intellij.util.xmlb.annotations.Attribute;
  * @author yole
  */
 public class ModuleTypeEP extends AbstractExtensionPointBean {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.module.ModuleTypeEP");
+  private static final Logger LOG = Logger.getInstance(ModuleTypeEP.class);
 
   public static final ExtensionPointName<ModuleTypeEP> EP_NAME = ExtensionPointName.create("com.intellij.moduleType");
 
diff --git a/platform/lang-api/src/com/intellij/openapi/projectRoots/ui/PathEditor.java b/platform/lang-api/src/com/intellij/openapi/projectRoots/ui/PathEditor.java
index 8b7c30881903..3b692cb63065 100644
--- a/platform/lang-api/src/com/intellij/openapi/projectRoots/ui/PathEditor.java
+++ b/platform/lang-api/src/com/intellij/openapi/projectRoots/ui/PathEditor.java
@@ -38,7 +38,7 @@ import java.util.*;
  * @author MYakovlev
  */
 public class PathEditor {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.projectRoots.ui.PathEditor");
+  private static final Logger LOG = Logger.getInstance(PathEditor.class);
 
   public static final Color INVALID_COLOR = new JBColor(new Color(210, 0, 0), JBColor.RED);
 
diff --git a/platform/lang-api/src/com/intellij/psi/codeStyle/ProjectCodeStyleSettingsManager.java b/platform/lang-api/src/com/intellij/psi/codeStyle/ProjectCodeStyleSettingsManager.java
index e9b0c26cc19a..6c82d1f0c16c 100644
--- a/platform/lang-api/src/com/intellij/psi/codeStyle/ProjectCodeStyleSettingsManager.java
+++ b/platform/lang-api/src/com/intellij/psi/codeStyle/ProjectCodeStyleSettingsManager.java
@@ -30,7 +30,7 @@ import java.util.Map;
   storages = @Storage(value = "codeStyles", stateSplitter = ProjectCodeStyleSettingsManager.StateSplitter.class)
 )
 public class ProjectCodeStyleSettingsManager extends CodeStyleSettingsManager {
-  private static final Logger LOG = Logger.getInstance("#" + ProjectCodeStyleSettingsManager.class);
+  private static final Logger LOG = Logger.getInstance(ProjectCodeStyleSettingsManager.class);
 
   private static final String MAIN_PROJECT_CODE_STYLE_NAME = "Project";
   private static final String PROJECT_CODE_STYLE_CONFIG_FILE_NAME = "codeStyleConfig";
diff --git a/platform/lang-api/src/com/intellij/psi/util/PsiUtilBase.java b/platform/lang-api/src/com/intellij/psi/util/PsiUtilBase.java
index dc9c8d574bdf..3c48f5a15ad1 100644
--- a/platform/lang-api/src/com/intellij/psi/util/PsiUtilBase.java
+++ b/platform/lang-api/src/com/intellij/psi/util/PsiUtilBase.java
@@ -31,7 +31,7 @@ import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeoutException;
 
 public class PsiUtilBase extends PsiUtilCore implements PsiEditorUtil {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.util.PsiUtilBase");
+  private static final Logger LOG = Logger.getInstance(PsiUtilBase.class);
   public static final Comparator<Language> LANGUAGE_COMPARATOR = Comparator.comparing(Language::getID);
 
   public static boolean isUnderPsiRoot(@NotNull PsiFile root, @NotNull PsiElement element) {
diff --git a/platform/lang-impl/src/com/intellij/application/options/CodeStyleAbstractPanel.java b/platform/lang-impl/src/com/intellij/application/options/CodeStyleAbstractPanel.java
index ce6edfd56c6d..e912761e8c5e 100644
--- a/platform/lang-impl/src/com/intellij/application/options/CodeStyleAbstractPanel.java
+++ b/platform/lang-impl/src/com/intellij/application/options/CodeStyleAbstractPanel.java
@@ -60,7 +60,7 @@ public abstract class CodeStyleAbstractPanel implements Disposable, ComponentHig
 
   private static final long TIME_TO_HIGHLIGHT_PREVIEW_CHANGES_IN_MILLIS = TimeUnit.SECONDS.toMillis(3);
 
-  private static final Logger LOG = Logger.getInstance("#com.intellij.application.options.CodeStyleXmlPanel");
+  private static final Logger LOG = Logger.getInstance(CodeStyleAbstractPanel.class);
 
   private final List<TextRange>       myPreviewRangesToHighlight = new ArrayList<>();
 
diff --git a/platform/lang-impl/src/com/intellij/application/options/GeneralCodeStylePanel.java b/platform/lang-impl/src/com/intellij/application/options/GeneralCodeStylePanel.java
index a71c758d3ef1..5044b0f1d6ec 100644
--- a/platform/lang-impl/src/com/intellij/application/options/GeneralCodeStylePanel.java
+++ b/platform/lang-impl/src/com/intellij/application/options/GeneralCodeStylePanel.java
@@ -63,7 +63,7 @@ import java.util.regex.PatternSyntaxException;
 
 public class GeneralCodeStylePanel extends CodeStyleAbstractPanel {
   @SuppressWarnings("UnusedDeclaration")
-  private static final Logger LOG = Logger.getInstance("#com.intellij.application.options.GeneralCodeStylePanel");
+  private static final Logger LOG = Logger.getInstance(GeneralCodeStylePanel.class);
 
   private static final String SYSTEM_DEPENDANT_STRING = ApplicationBundle.message("combobox.crlf.system.dependent");
   private static final String UNIX_STRING = ApplicationBundle.message("combobox.crlf.unix");
diff --git a/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleBlankLinesPanel.java b/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleBlankLinesPanel.java
index c81eb0d7d489..63bd95f997b4 100644
--- a/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleBlankLinesPanel.java
+++ b/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleBlankLinesPanel.java
@@ -43,7 +43,7 @@ import java.util.*;
 
 public class CodeStyleBlankLinesPanel extends CustomizableLanguageCodeStylePanel {
 
-  private static final Logger LOG = Logger.getInstance("#com.intellij.application.options.codeStyle.CodeStyleBlankLinesPanel");
+  private static final Logger LOG = Logger.getInstance(CodeStyleBlankLinesPanel.class);
 
   private final List<IntOption> myOptions = new ArrayList<>();
   private final Set<String> myAllowedOptions = new HashSet<>();
diff --git a/platform/lang-impl/src/com/intellij/codeEditor/printing/ExportToHTMLManager.java b/platform/lang-impl/src/com/intellij/codeEditor/printing/ExportToHTMLManager.java
index 01cfdb0deb04..9cc55461c62c 100644
--- a/platform/lang-impl/src/com/intellij/codeEditor/printing/ExportToHTMLManager.java
+++ b/platform/lang-impl/src/com/intellij/codeEditor/printing/ExportToHTMLManager.java
@@ -24,7 +24,7 @@ import java.nio.charset.StandardCharsets;
 import java.util.*;
 
 class ExportToHTMLManager {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeEditor.printing.ExportToHTMLManager");
+  private static final Logger LOG = Logger.getInstance(ExportToHTMLManager.class);
   private static FileNotFoundException myLastException;
 
   private ExportToHTMLManager() {
diff --git a/platform/lang-impl/src/com/intellij/codeEditor/printing/HTMLTextPainter.java b/platform/lang-impl/src/com/intellij/codeEditor/printing/HTMLTextPainter.java
index 31ce9225bea5..cdac1a61b521 100644
--- a/platform/lang-impl/src/com/intellij/codeEditor/printing/HTMLTextPainter.java
+++ b/platform/lang-impl/src/com/intellij/codeEditor/printing/HTMLTextPainter.java
@@ -32,7 +32,7 @@ import java.io.Writer;
 import java.util.*;
 
 public class HTMLTextPainter {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeEditor.printing.HTMLTextPainter");
+  private static final Logger LOG = Logger.getInstance(HTMLTextPainter.class);
 
   private int myOffset = 0;
   private final EditorHighlighter myHighlighter;
diff --git a/platform/lang-impl/src/com/intellij/codeEditor/printing/PageSizes.java b/platform/lang-impl/src/com/intellij/codeEditor/printing/PageSizes.java
index b6a6b5a5c0ac..747888aa076b 100644
--- a/platform/lang-impl/src/com/intellij/codeEditor/printing/PageSizes.java
+++ b/platform/lang-impl/src/com/intellij/codeEditor/printing/PageSizes.java
@@ -11,7 +11,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 
 class PageSizes {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeEditor.printing.PageSizes");
+  private static final Logger LOG = Logger.getInstance(PageSizes.class);
   private static ArrayList<PageSize> myPageSizes = null;
   private static HashMap<String, PageSize> myNamesToPageSizes = null;
   private static final double MM_TO_INCH = 1/25.4;
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/CodeInsightSettings.java b/platform/lang-impl/src/com/intellij/codeInsight/CodeInsightSettings.java
index bcb4b1a8ca63..bcb2b71da5b8 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/CodeInsightSettings.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/CodeInsightSettings.java
@@ -37,7 +37,7 @@ import java.util.concurrent.CopyOnWriteArrayList;
   @Storage(value = "editor.codeinsight.xml", deprecated = true),
 })
 public class CodeInsightSettings implements PersistentStateComponent<Element>, Cloneable {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.CodeInsightSettings");
+  private static final Logger LOG = Logger.getInstance(CodeInsightSettings.class);
   private final List<PropertyChangeListener> myListeners = new CopyOnWriteArrayList<>();
 
   public static CodeInsightSettings getInstance() {
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/actions/AbstractLayoutCodeProcessor.java b/platform/lang-impl/src/com/intellij/codeInsight/actions/AbstractLayoutCodeProcessor.java
index e513c961aedb..bf61cf18cde0 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/actions/AbstractLayoutCodeProcessor.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/actions/AbstractLayoutCodeProcessor.java
@@ -54,7 +54,7 @@ import java.util.concurrent.ExecutionException;
 import java.util.concurrent.FutureTask;
 
 public abstract class AbstractLayoutCodeProcessor {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.actions.AbstractLayoutCodeProcessor");
+  private static final Logger LOG = Logger.getInstance(AbstractLayoutCodeProcessor.class);
 
   @NotNull
   protected final Project myProject;
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/actions/FormatChangedTextUtil.java b/platform/lang-impl/src/com/intellij/codeInsight/actions/FormatChangedTextUtil.java
index 3371277c8b6f..c1d4282f607f 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/actions/FormatChangedTextUtil.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/actions/FormatChangedTextUtil.java
@@ -30,7 +30,7 @@ import java.util.stream.Collectors;
 
 public class FormatChangedTextUtil {
   public static final Key<CharSequence> TEST_REVISION_CONTENT = Key.create("test.revision.content");
-  protected static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.actions.FormatChangedTextUtil");
+  protected static final Logger LOG = Logger.getInstance(FormatChangedTextUtil.class);
 
   protected FormatChangedTextUtil() {
   }
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/actions/ReformatCodeAction.java b/platform/lang-impl/src/com/intellij/codeInsight/actions/ReformatCodeAction.java
index 8d2a92c62222..2ecba6659a53 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/actions/ReformatCodeAction.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/actions/ReformatCodeAction.java
@@ -32,7 +32,7 @@ import java.util.List;
 import java.util.regex.PatternSyntaxException;
 
 public class ReformatCodeAction extends AnAction implements DumbAware {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.actions.ReformatCodeAction");
+  private static final Logger LOG = Logger.getInstance(ReformatCodeAction.class);
 
   protected static ReformatFilesOptions myTestOptions;
 
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/actions/ReformatCodeProcessor.java b/platform/lang-impl/src/com/intellij/codeInsight/actions/ReformatCodeProcessor.java
index 4bb41a12698d..54d018e854f1 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/actions/ReformatCodeProcessor.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/actions/ReformatCodeProcessor.java
@@ -29,8 +29,8 @@ import java.util.concurrent.FutureTask;
 public class ReformatCodeProcessor extends AbstractLayoutCodeProcessor {
   
   public static final String COMMAND_NAME = CodeInsightBundle.message("process.reformat.code");
-  
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.actions.ReformatCodeProcessor");
+
+  private static final Logger LOG = Logger.getInstance(ReformatCodeProcessor.class);
 
   private static final String PROGRESS_TEXT = CodeInsightBundle.message("reformat.progress.common.text");
   private final Collection<TextRange> myRanges = new ArrayList<>();
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/completion/CodeCompletionHandlerBase.java b/platform/lang-impl/src/com/intellij/codeInsight/completion/CodeCompletionHandlerBase.java
index 1f6f4b21ce52..8589a8f0b4b9 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/completion/CodeCompletionHandlerBase.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/completion/CodeCompletionHandlerBase.java
@@ -57,7 +57,7 @@ import java.util.concurrent.Future;
 
 @SuppressWarnings("deprecation")
 public class CodeCompletionHandlerBase {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.completion.CodeCompletionHandlerBase");
+  private static final Logger LOG = Logger.getInstance(CodeCompletionHandlerBase.class);
   private static final Key<Boolean> CARET_PROCESSED = Key.create("CodeCompletionHandlerBase.caretProcessed");
 
   /**
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionData.java b/platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionData.java
index bafe1469992a..9494cfcaf9ab 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionData.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionData.java
@@ -35,7 +35,7 @@ import static com.intellij.patterns.StandardPatterns.not;
  */
 @Deprecated
 public class CompletionData {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.completion.CompletionData");
+  private static final Logger LOG = Logger.getInstance(CompletionData.class);
   public static final ObjectPattern.Capture<Character> NOT_JAVA_ID = not(CharPattern.javaIdentifierPartCharacter());
   private final List<CompletionVariant> myCompletionVariants = new ArrayList<>();
 
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionLookupArrangerImpl.java b/platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionLookupArrangerImpl.java
index 6b74c05a4fed..117dd6e67753 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionLookupArrangerImpl.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionLookupArrangerImpl.java
@@ -27,7 +27,7 @@ import org.jetbrains.annotations.Nullable;
 import java.util.*;
 
 public class CompletionLookupArrangerImpl extends LookupArranger implements CompletionLookupArranger {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.completion.CompletionLookupArranger");
+  private static final Logger LOG = Logger.getInstance(CompletionLookupArranger.class);
   private static final Key<PresentationInvariant> PRESENTATION_INVARIANT = Key.create("PRESENTATION_INVARIANT");
   public static final Key<Object> FORCE_MIDDLE_MATCH = Key.create("FORCE_MIDDLE_MATCH");
   private final Comparator<LookupElement> BY_PRESENTATION_COMPARATOR = (o1, o2) -> {
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionProgressIndicator.java b/platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionProgressIndicator.java
index b615b6cfa703..b3596461571a 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionProgressIndicator.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionProgressIndicator.java
@@ -74,7 +74,7 @@ import java.util.function.Supplier;
  */
 @ApiStatus.Internal
 public class CompletionProgressIndicator extends ProgressIndicatorBase implements CompletionProcessEx, Disposable {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.completion.CompletionProgressIndicator");
+  private static final Logger LOG = Logger.getInstance(CompletionProgressIndicator.class);
   private final Editor myEditor;
   @NotNull
   private final Caret myCaret;
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionThreading.java b/platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionThreading.java
index d5d884583254..36c54462e8db 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionThreading.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionThreading.java
@@ -80,7 +80,7 @@ class SyncCompletion extends CompletionThreadingBase {
 }
 
 class AsyncCompletion extends CompletionThreadingBase {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.completion.AsyncCompletion");
+  private static final Logger LOG = Logger.getInstance(AsyncCompletion.class);
   private final ArrayList<CompletionResult> myBatchList = new ArrayList<>();
   private final LinkedBlockingQueue<Computable<Boolean>> myQueue = new LinkedBlockingQueue<>();
 
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/completion/FilePathCompletionContributor.java b/platform/lang-impl/src/com/intellij/codeInsight/completion/FilePathCompletionContributor.java
index f6d5f0504479..431786676896 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/completion/FilePathCompletionContributor.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/completion/FilePathCompletionContributor.java
@@ -50,7 +50,7 @@ import static com.intellij.patterns.PlatformPatterns.psiElement;
  * @author spleaner
  */
 public class FilePathCompletionContributor extends CompletionContributor {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.completion.FilePathCompletionContributor");
+  private static final Logger LOG = Logger.getInstance(FilePathCompletionContributor.class);
 
   public FilePathCompletionContributor() {
     extend(CompletionType.BASIC, psiElement(), new CompletionProvider<CompletionParameters>() {
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/completion/LegacyCompletionContributor.java b/platform/lang-impl/src/com/intellij/codeInsight/completion/LegacyCompletionContributor.java
index 33df8dd7274f..9feb633182c4 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/completion/LegacyCompletionContributor.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/completion/LegacyCompletionContributor.java
@@ -36,7 +36,7 @@ import java.util.Set;
  * @author peter
  */
 public class LegacyCompletionContributor extends CompletionContributor {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.completion.LegacyCompletionContributor");
+  private static final Logger LOG = Logger.getInstance(LegacyCompletionContributor.class);
 
   @Override
   public void fillCompletionVariants(@NotNull CompletionParameters parameters, @NotNull CompletionResultSet _result) {
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/completion/StatisticsWeigher.java b/platform/lang-impl/src/com/intellij/codeInsight/completion/StatisticsWeigher.java
index d22280d929db..82495c951401 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/completion/StatisticsWeigher.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/completion/StatisticsWeigher.java
@@ -23,7 +23,7 @@ import java.util.*;
  * @author peter
 */
 public class StatisticsWeigher extends CompletionWeigher {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.completion.StatisticsWeigher.LookupStatisticsWeigher");
+  private static final Logger LOG = Logger.getInstance(LookupStatisticsWeigher.class);
   private static final Key<StatisticsInfo> BASE_STATISTICS_INFO = Key.create("Base statistics info");
 
   @Override
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/completion/impl/CompletionServiceImpl.java b/platform/lang-impl/src/com/intellij/codeInsight/completion/impl/CompletionServiceImpl.java
index a6eb4aaf47ad..b43724e916bb 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/completion/impl/CompletionServiceImpl.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/completion/impl/CompletionServiceImpl.java
@@ -27,7 +27,7 @@ import java.util.ArrayList;
  * @author peter
  */
 public final class CompletionServiceImpl extends CompletionService {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.completion.impl.CompletionServiceImpl");
+  private static final Logger LOG = Logger.getInstance(CompletionServiceImpl.class);
   private static volatile CompletionPhase ourPhase = CompletionPhase.NoCompletion;
   private static Throwable ourPhaseTrace;
 
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DaemonCodeAnalyzerImpl.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DaemonCodeAnalyzerImpl.java
index ec5c548482fd..bf0bc429c8c6 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DaemonCodeAnalyzerImpl.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DaemonCodeAnalyzerImpl.java
@@ -73,7 +73,7 @@ import java.util.stream.Collectors;
  */
 @State(name = "DaemonCodeAnalyzer", storages = @Storage(StoragePathMacros.WORKSPACE_FILE))
 public class DaemonCodeAnalyzerImpl extends DaemonCodeAnalyzerEx implements PersistentStateComponent<Element>, Disposable {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.daemon.impl.DaemonCodeAnalyzerImpl");
+  private static final Logger LOG = Logger.getInstance(DaemonCodeAnalyzerImpl.class);
 
   private static final Key<List<HighlightInfo>> FILE_LEVEL_HIGHLIGHTS = Key.create("FILE_LEVEL_HIGHLIGHTS");
   private final Project myProject;
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DaemonListeners.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DaemonListeners.java
index 1cfe64a9fbb3..2438c607a6ba 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DaemonListeners.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DaemonListeners.java
@@ -85,7 +85,7 @@ import java.util.Collections;
 import java.util.List;
 
 public final class DaemonListeners implements Disposable {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.daemon.impl.DaemonListeners");
+  private static final Logger LOG = Logger.getInstance(DaemonListeners.class);
 
   private final Project myProject;
   private final DaemonCodeAnalyzerImpl myDaemonCodeAnalyzer;
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DoNotShowInspectionIntentionMenuContributor.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DoNotShowInspectionIntentionMenuContributor.java
index 309c2546a452..7207a55a1e13 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DoNotShowInspectionIntentionMenuContributor.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DoNotShowInspectionIntentionMenuContributor.java
@@ -36,7 +36,7 @@ import java.util.List;
 import java.util.Set;
 
 public class DoNotShowInspectionIntentionMenuContributor implements IntentionMenuContributor {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.daemon.impl.DoNotShowInspectionIntentionMenuContributor");
+  private static final Logger LOG = Logger.getInstance(DoNotShowInspectionIntentionMenuContributor.class);
 
   @Override
   public void collectActions(@NotNull Editor hostEditor,
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/IdentifierHighlighterPass.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/IdentifierHighlighterPass.java
index 524cc1f1d643..b35ca6d3a4fe 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/IdentifierHighlighterPass.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/IdentifierHighlighterPass.java
@@ -38,7 +38,7 @@ import static com.intellij.codeInsight.daemon.impl.HighlightInfoType.ELEMENT_UND
  * @author yole
  */
 public class IdentifierHighlighterPass extends TextEditorHighlightingPass {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.daemon.impl.IdentifierHighlighterPass");
+  private static final Logger LOG = Logger.getInstance(IdentifierHighlighterPass.class);
 
   private final PsiFile myFile;
   private final Editor myEditor;
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/LineMarkersPass.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/LineMarkersPass.java
index fbe7ba354da0..8d7a335518f8 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/LineMarkersPass.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/LineMarkersPass.java
@@ -44,7 +44,7 @@ import javax.swing.*;
 import java.util.*;
 
 public class LineMarkersPass extends TextEditorHighlightingPass {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.daemon.impl.LineMarkersPass");
+  private static final Logger LOG = Logger.getInstance(LineMarkersPass.class);
 
   private volatile List<LineMarkerInfo<PsiElement>> myMarkers = Collections.emptyList();
 
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/LocalInspectionsPass.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/LocalInspectionsPass.java
index aaa9bbae04d0..7a5fbea1a9e7 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/LocalInspectionsPass.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/LocalInspectionsPass.java
@@ -60,7 +60,7 @@ import java.util.function.Function;
  * @author max
  */
 public class LocalInspectionsPass extends ProgressableTextEditorHighlightingPass {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.daemon.impl.LocalInspectionsPass");
+  private static final Logger LOG = Logger.getInstance(LocalInspectionsPass.class);
   public static final TextRange EMPTY_PRIORITY_RANGE = TextRange.EMPTY_RANGE;
   private static final Condition<PsiFile> SHOULD_INSPECT_FILTER = file -> HighlightingLevelManager.getInstance(file.getProject()).shouldInspect(file);
   private final TextRange myPriorityRange;
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/PassExecutorService.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/PassExecutorService.java
index b56f214167ae..7f40ea871820 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/PassExecutorService.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/PassExecutorService.java
@@ -51,7 +51,7 @@ import java.util.regex.Pattern;
  * @author cdr
  */
 final class PassExecutorService implements Disposable {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.daemon.impl.PassExecutorService");
+  private static final Logger LOG = Logger.getInstance(PassExecutorService.class);
   private static final boolean CHECK_CONSISTENCY = ApplicationManager.getApplication().isUnitTestMode();
 
   private final Map<ScheduledPass, Job<Void>> mySubmittedPasses = new ConcurrentHashMap<>();
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/CompletionAutoPopupHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/CompletionAutoPopupHandler.java
index f0ee8f7f8269..1314291fdd5b 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/CompletionAutoPopupHandler.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/CompletionAutoPopupHandler.java
@@ -19,7 +19,7 @@ import org.jetbrains.annotations.NotNull;
  * @author peter
  */
 public class CompletionAutoPopupHandler extends TypedHandlerDelegate {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.editorActions.CompletionAutoPopupHandler");
+  private static final Logger LOG = Logger.getInstance(CompletionAutoPopupHandler.class);
   public static volatile Key<Boolean> ourTestingAutopopup = Key.create("TestingAutopopup");
 
   @NotNull
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/EnterHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/EnterHandler.java
index f0cfae4d7c71..504d1c5e8ef3 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/EnterHandler.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/EnterHandler.java
@@ -42,7 +42,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 public class EnterHandler extends BaseEnterHandler {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.editorActions.EnterHandler");
+  private static final Logger LOG = Logger.getInstance(EnterHandler.class);
 
   private final EditorActionHandler myOriginalHandler;
   private final static Key<Language> CONTEXT_LANGUAGE = Key.create("EnterHandler.Language");
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/ExtendWordSelectionHandlerBase.java b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/ExtendWordSelectionHandlerBase.java
index 773a86b9cc7a..84fba58b8b2d 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/ExtendWordSelectionHandlerBase.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/ExtendWordSelectionHandlerBase.java
@@ -21,7 +21,7 @@ import java.util.List;
  * @author yole
  */
 public abstract class ExtendWordSelectionHandlerBase implements ExtendWordSelectionHandler {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.editorActions.ExtendWordSelectionHandlerBase");
+  private static final Logger LOG = Logger.getInstance(ExtendWordSelectionHandlerBase.class);
   @Override
   public abstract boolean canSelect(@NotNull PsiElement e);
 
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/JoinLinesHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/JoinLinesHandler.java
index 494975249c2d..ef17e7f09f9d 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/JoinLinesHandler.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/JoinLinesHandler.java
@@ -41,7 +41,7 @@ import java.util.List;
 import static com.intellij.codeInsight.editorActions.JoinLinesHandlerDelegate.CANNOT_JOIN;
 
 public class JoinLinesHandler extends EditorActionHandler {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.editorActions.JoinLinesHandler");
+  private static final Logger LOG = Logger.getInstance(JoinLinesHandler.class);
   private final EditorActionHandler myOriginalHandler;
 
   public JoinLinesHandler(EditorActionHandler originalHandler) {
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/PasteHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/PasteHandler.java
index 6992bdb90704..60e63b5921c4 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/PasteHandler.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/PasteHandler.java
@@ -38,7 +38,7 @@ import java.awt.datatransfer.Transferable;
 import java.util.*;
 
 public class PasteHandler extends EditorActionHandler implements EditorTextInsertHandler {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.editorActions.PasteHandler");
+  private static final Logger LOG = Logger.getInstance(PasteHandler.class);
   private static final ExtensionPointName<PasteProvider> EP_NAME = ExtensionPointName.create("com.intellij.customPasteProvider");
 
   private static final int LINE_LIMIT_FOR_BULK_CHANGE = 5000;
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/SelectWordHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/SelectWordHandler.java
index aee40ba270c7..183967589602 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/SelectWordHandler.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/SelectWordHandler.java
@@ -31,7 +31,7 @@ import org.jetbrains.annotations.Nullable;
 import java.util.List;
 
 public class SelectWordHandler extends EditorActionHandler {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.editorActions.SelectWordHandler");
+  private static final Logger LOG = Logger.getInstance(SelectWordHandler.class);
 
   private final EditorActionHandler myOriginalHandler;
 
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/TypedHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/TypedHandler.java
index 6c966097600e..fb9e8e38a1d4 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/TypedHandler.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/TypedHandler.java
@@ -55,7 +55,7 @@ public class TypedHandler extends TypedActionHandlerBase {
   private static final Set<Character> COMPLEX_CHARS =
     ContainerUtil.set('\n', '\t', '(', ')', '<', '>', '[', ']', '{', '}', '"', '\'');
 
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.editorActions.TypedHandler");
+  private static final Logger LOG = Logger.getInstance(TypedHandler.class);
 
   private static final KeyedExtensionCollector<QuoteHandler, String> quoteHandlers = new KeyedExtensionCollector<>(QuoteHandlerEP.EP_NAME);
 
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/enter/EnterAfterUnmatchedBraceHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/enter/EnterAfterUnmatchedBraceHandler.java
index 3217d8d561c7..3d02fe5a9a7c 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/enter/EnterAfterUnmatchedBraceHandler.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/enter/EnterAfterUnmatchedBraceHandler.java
@@ -47,7 +47,7 @@ import com.intellij.util.text.CharArrayUtil;
 import org.jetbrains.annotations.NotNull;
 
 public class EnterAfterUnmatchedBraceHandler extends EnterHandlerDelegateAdapter {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.editorActions.enter.EnterAfterUnmatchedBraceHandler");
+  private static final Logger LOG = Logger.getInstance(EnterAfterUnmatchedBraceHandler.class);
 
   @Override
   public Result preprocessEnter(@NotNull final PsiFile file,
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/enter/EnterBetweenBracesDelegate.java b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/enter/EnterBetweenBracesDelegate.java
index 742e3823247f..f86953b83236 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/enter/EnterBetweenBracesDelegate.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/enter/EnterBetweenBracesDelegate.java
@@ -15,7 +15,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 public class EnterBetweenBracesDelegate {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.editorActions.enter.EnterBetweenBracesDelegate");
+  private static final Logger LOG = Logger.getInstance(EnterBetweenBracesDelegate.class);
   static final LanguageExtension<EnterBetweenBracesDelegate> EP_NAME = new LanguageExtension<>("com.intellij.enterBetweenBracesDelegate");
 
   public boolean bracesAreInTheSameElement(@NotNull PsiFile file, @NotNull Editor editor, int lBraceOffset, int rBraceOffset) {
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/CollapseBlockHandlerImpl.java b/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/CollapseBlockHandlerImpl.java
index b158f64dfd6e..82bc1adee285 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/CollapseBlockHandlerImpl.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/CollapseBlockHandlerImpl.java
@@ -14,7 +14,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 public abstract class CollapseBlockHandlerImpl implements CollapseBlockHandler {
-  Logger LOG = Logger.getInstance("#com.intellij.codeInsight.folding.CollapseBlockHandler");
+  Logger LOG = Logger.getInstance(CollapseBlockHandler.class);
 
   @Override
   public void invoke(@NotNull final Project project, @NotNull final Editor editor, @NotNull final PsiFile file) {
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/CollapseSelectionHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/CollapseSelectionHandler.java
index 90273d22b167..d39281b88c19 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/CollapseSelectionHandler.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/CollapseSelectionHandler.java
@@ -20,7 +20,7 @@ import org.jetbrains.annotations.NotNull;
  */
 public class CollapseSelectionHandler implements CodeInsightActionHandler {
   private static final String ourPlaceHolderText = "...";
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.folding.impl.CollapseSelectionHandler");
+  private static final Logger LOG = Logger.getInstance(CollapseSelectionHandler.class);
 
   @Override
   public void invoke(@NotNull Project project, @NotNull final Editor editor, @NotNull PsiFile file) {
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/DocumentFoldingInfo.java b/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/DocumentFoldingInfo.java
index be5077c66383..4f33fc5d96ba 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/DocumentFoldingInfo.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/DocumentFoldingInfo.java
@@ -32,7 +32,7 @@ import org.jetbrains.annotations.NotNull;
 import java.util.*;
 
 class DocumentFoldingInfo implements CodeFoldingState {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.folding.impl.DocumentFoldingInfo");
+  private static final Logger LOG = Logger.getInstance(DocumentFoldingInfo.class);
   private static final Key<FoldingInfo> FOLDING_INFO_KEY = Key.create("FOLDING_INFO");
 
   @NotNull private final Project myProject;
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/FoldingPolicy.java b/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/FoldingPolicy.java
index 78a2e4131ae6..c790f195b1f6 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/FoldingPolicy.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/FoldingPolicy.java
@@ -12,7 +12,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 public class FoldingPolicy {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.folding.impl.FoldingPolicy");
+  private static final Logger LOG = Logger.getInstance(FoldingPolicy.class);
 
   private static final GenericElementSignatureProvider GENERIC_PROVIDER = new GenericElementSignatureProvider();
 
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/FoldingUpdate.java b/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/FoldingUpdate.java
index 3063733ee576..8d3cac768b1b 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/FoldingUpdate.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/FoldingUpdate.java
@@ -40,7 +40,7 @@ import java.util.*;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 public class FoldingUpdate {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.folding.impl.FoldingUpdate");
+  private static final Logger LOG = Logger.getInstance(FoldingUpdate.class);
 
   private static final Key<CachedValue<Runnable>> CODE_FOLDING_KEY = Key.create("code folding");
 
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/generation/AutoIndentLinesHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/generation/AutoIndentLinesHandler.java
index 930d180f73bb..638349a4d098 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/generation/AutoIndentLinesHandler.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/generation/AutoIndentLinesHandler.java
@@ -28,7 +28,7 @@ import com.intellij.util.IncorrectOperationException;
 import org.jetbrains.annotations.NotNull;
 
 public class AutoIndentLinesHandler implements CodeInsightActionHandler {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.generation.AutoIndentLinesHandler");
+  private static final Logger LOG = Logger.getInstance(AutoIndentLinesHandler.class);
 
   @Override
   public void invoke(@NotNull Project project, @NotNull Editor editor, @NotNull PsiFile file) {
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/hint/InspectionDescriptionLinkHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/hint/InspectionDescriptionLinkHandler.java
index e99aa7406eac..86161b09dd12 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/hint/InspectionDescriptionLinkHandler.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/hint/InspectionDescriptionLinkHandler.java
@@ -34,7 +34,7 @@ import org.jetbrains.annotations.NotNull;
  * @author peter
  */
 public class InspectionDescriptionLinkHandler extends TooltipLinkHandler {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.hint.InspectionDescriptionLinkHandler");
+  private static final Logger LOG = Logger.getInstance(InspectionDescriptionLinkHandler.class);
 
   @Override
   public String getDescription(@NotNull final String refSuffix, @NotNull final Editor editor) {
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/hint/NavigationLinkHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/hint/NavigationLinkHandler.java
index f95db2afb728..69dfc58c7707 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/hint/NavigationLinkHandler.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/hint/NavigationLinkHandler.java
@@ -15,7 +15,7 @@ import org.jetbrains.annotations.NotNull;
  * On a click opens specified file in an editor and positions caret to the given offset.
  */
 public class NavigationLinkHandler extends TooltipLinkHandler {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.hint.NavigationLinkHandler");
+  private static final Logger LOG = Logger.getInstance(NavigationLinkHandler.class);
 
   @Override
   public boolean handleLink(@NotNull String refSuffix, @NotNull Editor editor) {
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/hint/ParameterInfoController.java b/platform/lang-impl/src/com/intellij/codeInsight/hint/ParameterInfoController.java
index 522c107f9911..a9cc846d88dd 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/hint/ParameterInfoController.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/hint/ParameterInfoController.java
@@ -55,7 +55,7 @@ import java.util.concurrent.TimeoutException;
 import java.util.concurrent.locks.LockSupport;
 
 public class ParameterInfoController extends UserDataHolderBase implements VisibleAreaListener, Disposable {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.hint.ParameterInfoController");
+  private static final Logger LOG = Logger.getInstance(ParameterInfoController.class);
   private static final String WHITESPACE = " \t";
   private final Project myProject;
   @NotNull private final Editor myEditor;
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/IntentionActionWithTextCaching.java b/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/IntentionActionWithTextCaching.java
index 092c9c05d1f2..a768bf360c31 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/IntentionActionWithTextCaching.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/IntentionActionWithTextCaching.java
@@ -30,7 +30,7 @@ import java.util.function.BiConsumer;
 * @author cdr
 */
 public class IntentionActionWithTextCaching implements Comparable<IntentionActionWithTextCaching>, PossiblyDumbAware, ShortcutProvider, IntentionActionDelegate {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.intention.impl.IntentionActionWithTextCaching");
+  private static final Logger LOG = Logger.getInstance(IntentionActionWithTextCaching.class);
   private final List<IntentionAction> myOptionIntentions = new ArrayList<>();
   private final List<IntentionAction> myOptionErrorFixes = new ArrayList<>();
   private final List<IntentionAction> myOptionInspectionFixes = new ArrayList<>();
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/IntentionListStep.java b/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/IntentionListStep.java
index a18724b329bd..4f1ef835b2df 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/IntentionListStep.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/IntentionListStep.java
@@ -31,7 +31,7 @@ import java.util.stream.Collectors;
 * @author cdr
 */
 public class IntentionListStep implements ListPopupStep<IntentionActionWithTextCaching>, SpeedSearchFilter<IntentionActionWithTextCaching> {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.intention.impl.IntentionListStep");
+  private static final Logger LOG = Logger.getInstance(IntentionListStep.class);
 
   private final CachedIntentions myCachedIntentions;
   @Nullable
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/config/BeforeAfterActionMetaData.java b/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/config/BeforeAfterActionMetaData.java
index c831589eda5e..cf8717419885 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/config/BeforeAfterActionMetaData.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/config/BeforeAfterActionMetaData.java
@@ -22,7 +22,7 @@ import java.util.Set;
 
 
 public abstract class BeforeAfterActionMetaData implements BeforeAfterMetaData {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.intention.impl.config.BeforeAfterActionMetaData");
+  private static final Logger LOG = Logger.getInstance(BeforeAfterActionMetaData.class);
 
   protected static final TextDescriptor[] EMPTY_EXAMPLE = new TextDescriptor[0];
   protected static final TextDescriptor EMPTY_DESCRIPTION = new PlainTextDescriptor("", "");
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/config/IntentionDescriptionPanel.java b/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/config/IntentionDescriptionPanel.java
index 2216195218ba..5935494b3462 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/config/IntentionDescriptionPanel.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/config/IntentionDescriptionPanel.java
@@ -32,7 +32,7 @@ import java.util.List;
 
 // used in Rider
 public class IntentionDescriptionPanel {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.intention.impl.config.IntentionDescriptionPanel");
+  private static final Logger LOG = Logger.getInstance(IntentionDescriptionPanel.class);
   private JPanel myPanel;
 
   private JPanel myAfterPanel;
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupCellRenderer.java b/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupCellRenderer.java
index 1ac306fec115..5a74b6271fc4 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupCellRenderer.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupCellRenderer.java
@@ -48,7 +48,7 @@ import static com.intellij.codeInsight.documentation.DocumentationComponent.COLO
  * @author Konstantin Bulenkov
  */
 public class LookupCellRenderer implements ListCellRenderer<LookupElement> {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.lookup.impl.LookupCellRenderer");
+  private static final Logger LOG = Logger.getInstance(LookupCellRenderer.class);
 
   private Icon myEmptyIcon = EmptyIcon.ICON_0;
   private final Font myNormalFont;
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java b/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java
index 28914923776f..c43fc050c86b 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java
@@ -72,7 +72,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Supplier;
 
 public class LookupImpl extends LightweightHint implements LookupEx, Disposable, LookupElementListPresenter {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.lookup.impl.LookupImpl");
+  private static final Logger LOG = Logger.getInstance(LookupImpl.class);
   private static final Key<Font> CUSTOM_FONT_KEY = Key.create("CustomLookupElementFont");
 
   private final LookupOffsets myOffsets;
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupManagerImpl.java b/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupManagerImpl.java
index 188e406a0f54..635d653721ca 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupManagerImpl.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupManagerImpl.java
@@ -33,7 +33,7 @@ import java.beans.PropertyChangeListener;
 import java.beans.PropertyChangeSupport;
 
 public class LookupManagerImpl extends LookupManager {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.lookup.impl.LookupManagerImpl");
+  private static final Logger LOG = Logger.getInstance(LookupManagerImpl.class);
   private final Project myProject;
   private LookupImpl myActiveLookup = null;
   private Editor myActiveLookupEditor = null;
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupUi.java b/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupUi.java
index fd803800838b..b354402eb3b9 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupUi.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupUi.java
@@ -47,7 +47,7 @@ import java.util.Collection;
  * @author peter
  */
 class LookupUi {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.lookup.impl.LookupUi");
+  private static final Logger LOG = Logger.getInstance(LookupUi.class);
 
   @NotNull
   private final LookupImpl myLookup;
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/navigation/IncrementalSearchHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/navigation/IncrementalSearchHandler.java
index e8dfc77287a4..2699c1bd3666 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/navigation/IncrementalSearchHandler.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/navigation/IncrementalSearchHandler.java
@@ -48,7 +48,7 @@ import java.util.regex.PatternSyntaxException;
 public class IncrementalSearchHandler {
   private static final Key<PerEditorSearchData> SEARCH_DATA_IN_EDITOR_VIEW_KEY = Key.create("IncrementalSearchHandler.SEARCH_DATA_IN_EDITOR_VIEW_KEY");
   private static final Key<PerHintSearchData> SEARCH_DATA_IN_HINT_KEY = Key.create("IncrementalSearchHandler.SEARCH_DATA_IN_HINT_KEY");
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.navigation.IncrementalSearchHandler");
+  private static final Logger LOG = Logger.getInstance(IncrementalSearchHandler.class);
 
   private static boolean ourActionsRegistered = false;
 
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/navigation/actions/GotoDeclarationAction.java b/platform/lang-impl/src/com/intellij/codeInsight/navigation/actions/GotoDeclarationAction.java
index 6322836c7d3d..f909125c38ef 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/navigation/actions/GotoDeclarationAction.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/navigation/actions/GotoDeclarationAction.java
@@ -60,7 +60,7 @@ import java.util.Collection;
 import java.util.Collections;
 
 public class GotoDeclarationAction extends BaseCodeInsightAction implements CodeInsightActionHandler, DumbAware {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.navigation.actions.GotoDeclarationAction");
+  private static final Logger LOG = Logger.getInstance(GotoDeclarationAction.class);
 
   @NotNull
   @Override
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/MacroParser.java b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/MacroParser.java
index c7d9e73583c0..d0346c2bb8f6 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/MacroParser.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/MacroParser.java
@@ -31,7 +31,7 @@ import java.util.List;
 
 @VisibleForTesting
 public class MacroParser {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.template.impl.MacroParser");
+  private static final Logger LOG = Logger.getInstance(MacroParser.class);
   
   @NotNull
   public static Expression parse(@Nullable String expression) {
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateListPanel.java b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateListPanel.java
index 45adb7028b71..810102cf71f1 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateListPanel.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateListPanel.java
@@ -73,7 +73,7 @@ public class TemplateListPanel extends JPanel implements Disposable {
   private final Alarm myAlarm = new Alarm();
   private boolean myUpdateNeeded = false;
 
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.template.impl.TemplateListPanel");
+  private static final Logger LOG = Logger.getInstance(TemplateListPanel.class);
 
   private final Map<TemplateImpl, Map<TemplateOptionalProcessor, Boolean>> myTemplateOptions = ContainerUtil.newIdentityHashMap();
   private final Map<TemplateImpl, TemplateContext> myTemplateContext = ContainerUtil.newIdentityHashMap();
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/macro/CurrentDateMacro.java b/platform/lang-impl/src/com/intellij/codeInsight/template/macro/CurrentDateMacro.java
index c90bc9a01a51..5aba9d92a75d 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/template/macro/CurrentDateMacro.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/template/macro/CurrentDateMacro.java
@@ -30,7 +30,7 @@ import java.util.Date;
  * @author yole
  */
 public class CurrentDateMacro extends SimpleMacro {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.template.macro.CurrentDateMacro");
+  private static final Logger LOG = Logger.getInstance(CurrentDateMacro.class);
   protected CurrentDateMacro() {
     super("date");
   }
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/postfix/settings/PostfixDescriptionPanel.java b/platform/lang-impl/src/com/intellij/codeInsight/template/postfix/settings/PostfixDescriptionPanel.java
index e225691c3a91..01ac13f91e00 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/template/postfix/settings/PostfixDescriptionPanel.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/template/postfix/settings/PostfixDescriptionPanel.java
@@ -3,10 +3,7 @@ package com.intellij.codeInsight.template.postfix.settings;
 
 import com.intellij.codeInsight.CodeInsightBundle;
 import com.intellij.codeInsight.hint.HintUtil;
-import com.intellij.codeInsight.intention.impl.config.ActionUsagePanel;
-import com.intellij.codeInsight.intention.impl.config.BeforeAfterMetaData;
-import com.intellij.codeInsight.intention.impl.config.PlainTextDescriptor;
-import com.intellij.codeInsight.intention.impl.config.TextDescriptor;
+import com.intellij.codeInsight.intention.impl.config.*;
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.fileTypes.FileType;
@@ -27,7 +24,7 @@ import java.io.IOException;
 import java.io.StringReader;
 
 class PostfixDescriptionPanel implements Disposable {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.intention.impl.config.IntentionDescriptionPanel");
+  private static final Logger LOG = Logger.getInstance(IntentionDescriptionPanel.class);
   private JPanel myPanel;
 
   private JPanel myAfterPanel;
diff --git a/platform/lang-impl/src/com/intellij/codeInspection/InspectionApplication.java b/platform/lang-impl/src/com/intellij/codeInspection/InspectionApplication.java
index f59a75d05f15..5b170c9585c5 100644
--- a/platform/lang-impl/src/com/intellij/codeInspection/InspectionApplication.java
+++ b/platform/lang-impl/src/com/intellij/codeInspection/InspectionApplication.java
@@ -78,7 +78,7 @@ import java.util.concurrent.locks.LockSupport;
  */
 @SuppressWarnings("UseOfSystemOutOrSystemErr")
 public class InspectionApplication implements CommandLineInspectionProgressReporter {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInspection.InspectionApplication");
+  private static final Logger LOG = Logger.getInstance(InspectionApplication.class);
 
   public InspectionToolCmdlineOptionHelpProvider myHelpProvider;
   public String myProjectPath;
diff --git a/platform/lang-impl/src/com/intellij/codeInspection/LossyEncodingInspection.java b/platform/lang-impl/src/com/intellij/codeInspection/LossyEncodingInspection.java
index 7794a0c0d5b5..17d33e3812ac 100644
--- a/platform/lang-impl/src/com/intellij/codeInspection/LossyEncodingInspection.java
+++ b/platform/lang-impl/src/com/intellij/codeInspection/LossyEncodingInspection.java
@@ -62,7 +62,7 @@ import java.util.List;
 import java.util.Set;
 
 public class LossyEncodingInspection extends LocalInspectionTool {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInspection.LossyEncodingInspection");
+  private static final Logger LOG = Logger.getInstance(LossyEncodingInspection.class);
 
   @Override
   @Nls
diff --git a/platform/lang-impl/src/com/intellij/codeInspection/RedundantSuppressInspection.java b/platform/lang-impl/src/com/intellij/codeInspection/RedundantSuppressInspection.java
index 435d2e1c6c4a..ce7cd42bc4fa 100644
--- a/platform/lang-impl/src/com/intellij/codeInspection/RedundantSuppressInspection.java
+++ b/platform/lang-impl/src/com/intellij/codeInspection/RedundantSuppressInspection.java
@@ -28,7 +28,7 @@ import javax.swing.*;
 import java.util.*;
 
 public class RedundantSuppressInspection extends GlobalSimpleInspectionTool {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInspection.RedundantSuppressInspection");
+  private static final Logger LOG = Logger.getInstance(RedundantSuppressInspection.class);
   public static final String SHORT_NAME = "RedundantSuppression";
   public boolean IGNORE_ALL;
   private BidirectionalMap<String, QuickFix> myQuickFixes;
diff --git a/platform/lang-impl/src/com/intellij/codeInspection/ex/DescriptorComposer.java b/platform/lang-impl/src/com/intellij/codeInspection/ex/DescriptorComposer.java
index d817176332d1..5ee7e45000b4 100644
--- a/platform/lang-impl/src/com/intellij/codeInspection/ex/DescriptorComposer.java
+++ b/platform/lang-impl/src/com/intellij/codeInspection/ex/DescriptorComposer.java
@@ -25,7 +25,7 @@ import java.util.List;
  * @author max
  */
 public class DescriptorComposer extends HTMLComposerImpl {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInspection.ex.DescriptorComposer");
+  private static final Logger LOG = Logger.getInstance(DescriptorComposer.class);
   private final InspectionToolPresentation myTool;
 
   public DescriptorComposer(@NotNull InspectionToolPresentation tool) {
diff --git a/platform/lang-impl/src/com/intellij/conversion/impl/ConversionContextImpl.java b/platform/lang-impl/src/com/intellij/conversion/impl/ConversionContextImpl.java
index c4c43cc1d7bc..6e75af19f592 100644
--- a/platform/lang-impl/src/com/intellij/conversion/impl/ConversionContextImpl.java
+++ b/platform/lang-impl/src/com/intellij/conversion/impl/ConversionContextImpl.java
@@ -52,7 +52,7 @@ import java.util.concurrent.Executor;
  * @author nik
  */
 public final class ConversionContextImpl implements ConversionContext {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.conversion.impl.ConversionContextImpl");
+  private static final Logger LOG = Logger.getInstance(ConversionContextImpl.class);
   private static final String PROJECT_FILE_VERSION_COMPONENT_NAME = "ProjectFileVersion";
 
   private final Map<Path, SettingsXmlFile> mySettingsFiles = new HashMap<>();
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 a3193269f647..f56fa360bb97 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
@@ -32,7 +32,7 @@ import java.util.Set;
  * @author nik
  */
 public class ConvertProjectDialog extends DialogWrapper {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.conversion.impl.ui.ConvertProjectDialog");
+  private static final Logger LOG = Logger.getInstance(ConvertProjectDialog.class);
   private JPanel myMainPanel;
   private JTextPane myTextPane;
   private boolean myConverted;
diff --git a/platform/lang-impl/src/com/intellij/execution/impl/ConsoleViewImpl.java b/platform/lang-impl/src/com/intellij/execution/impl/ConsoleViewImpl.java
index c34bcb3ffe19..ae1cd4c2c87e 100644
--- a/platform/lang-impl/src/com/intellij/execution/impl/ConsoleViewImpl.java
+++ b/platform/lang-impl/src/com/intellij/execution/impl/ConsoleViewImpl.java
@@ -80,7 +80,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
 
 public class ConsoleViewImpl extends JPanel implements ConsoleView, ObservableConsoleView, DataProvider, OccurenceNavigator {
   @NonNls private static final String CONSOLE_VIEW_POPUP_MENU = "ConsoleView.PopupMenu";
-  private static final Logger LOG = Logger.getInstance("#com.intellij.execution.impl.ConsoleViewImpl");
+  private static final Logger LOG = Logger.getInstance(ConsoleViewImpl.class);
 
   private static final int DEFAULT_FLUSH_DELAY = SystemProperties.getIntProperty("console.flush.delay.ms", 200);
 
diff --git a/platform/lang-impl/src/com/intellij/execution/impl/DisposedPsiManagerCheck.java b/platform/lang-impl/src/com/intellij/execution/impl/DisposedPsiManagerCheck.java
index fa505cb374ea..658105d9b7fd 100644
--- a/platform/lang-impl/src/com/intellij/execution/impl/DisposedPsiManagerCheck.java
+++ b/platform/lang-impl/src/com/intellij/execution/impl/DisposedPsiManagerCheck.java
@@ -22,7 +22,7 @@ import com.intellij.openapi.util.text.StringUtil;
 import org.jetbrains.annotations.NotNull;
 
 public class DisposedPsiManagerCheck {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.execution.impl.DisposedPsiManagerCheck");
+  private static final Logger LOG = Logger.getInstance(DisposedPsiManagerCheck.class);
   private final Throwable myAllocationPlace;
   private final Project myProject;
 
diff --git a/platform/lang-impl/src/com/intellij/execution/impl/RunConfigurationRefactoringElementListenerProvider.java b/platform/lang-impl/src/com/intellij/execution/impl/RunConfigurationRefactoringElementListenerProvider.java
index 9a713784c1fe..2ef9cc1d53d9 100644
--- a/platform/lang-impl/src/com/intellij/execution/impl/RunConfigurationRefactoringElementListenerProvider.java
+++ b/platform/lang-impl/src/com/intellij/execution/impl/RunConfigurationRefactoringElementListenerProvider.java
@@ -29,7 +29,7 @@ import com.intellij.refactoring.listeners.RefactoringElementListenerProvider;
  * @author spleaner
 */
 public class RunConfigurationRefactoringElementListenerProvider implements RefactoringElementListenerProvider {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.execution.impl.RunConfigurationRefactoringElementListenerProvider");
+  private static final Logger LOG = Logger.getInstance(RunConfigurationRefactoringElementListenerProvider.class);
 
   @Override
   public RefactoringElementListener getListener(final PsiElement element) {
diff --git a/platform/lang-impl/src/com/intellij/facet/FacetManagerImpl.java b/platform/lang-impl/src/com/intellij/facet/FacetManagerImpl.java
index b2c480884a2d..a6d2eb65b73a 100644
--- a/platform/lang-impl/src/com/intellij/facet/FacetManagerImpl.java
+++ b/platform/lang-impl/src/com/intellij/facet/FacetManagerImpl.java
@@ -43,7 +43,7 @@ import java.util.function.Predicate;
  */
 @State(name = FacetManagerImpl.COMPONENT_NAME, useLoadedStateAsExisting = false)
 public final class FacetManagerImpl extends FacetManager implements ModuleComponent, PersistentStateComponent<FacetManagerState> {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.facet.FacetManagerImpl");
+  private static final Logger LOG = Logger.getInstance(FacetManagerImpl.class);
   @NonNls public static final String COMPONENT_NAME = "FacetManager";
 
   private final Module myModule;
diff --git a/platform/lang-impl/src/com/intellij/facet/impl/FacetFinderImpl.java b/platform/lang-impl/src/com/intellij/facet/impl/FacetFinderImpl.java
index 6f4d74eb582d..1dee23a74df6 100644
--- a/platform/lang-impl/src/com/intellij/facet/impl/FacetFinderImpl.java
+++ b/platform/lang-impl/src/com/intellij/facet/impl/FacetFinderImpl.java
@@ -39,7 +39,7 @@ import java.util.*;
  * @author nik
  */
 public class FacetFinderImpl extends FacetFinder {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.facet.impl.FacetFinderImpl");
+  private static final Logger LOG = Logger.getInstance(FacetFinderImpl.class);
   private final Map<FacetTypeId, AllFacetsOfTypeModificationTracker> myAllFacetTrackers = new HashMap<>();
   private final Map<FacetTypeId, CachedValue<Map<VirtualFile, List<Facet>>>> myCachedMaps =
     new HashMap<>();
diff --git a/platform/lang-impl/src/com/intellij/facet/impl/FacetModelImpl.java b/platform/lang-impl/src/com/intellij/facet/impl/FacetModelImpl.java
index e74a27388324..2b2de2009e6d 100644
--- a/platform/lang-impl/src/com/intellij/facet/impl/FacetModelImpl.java
+++ b/platform/lang-impl/src/com/intellij/facet/impl/FacetModelImpl.java
@@ -34,7 +34,7 @@ import java.util.*;
  * @author nik
  */
 public class FacetModelImpl extends FacetModelBase implements ModifiableFacetModel {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.facet.impl.FacetModelImpl");
+  private static final Logger LOG = Logger.getInstance(FacetModelImpl.class);
   private final List<Facet> myFacets = new ArrayList<>();
   private final Map<Facet, String> myFacet2NewName = new HashMap<>();
   private final FacetManagerImpl myManager;
diff --git a/platform/lang-impl/src/com/intellij/facet/impl/FacetTypeRegistryImpl.java b/platform/lang-impl/src/com/intellij/facet/impl/FacetTypeRegistryImpl.java
index 5a77316ce4b7..b0d043110a5f 100644
--- a/platform/lang-impl/src/com/intellij/facet/impl/FacetTypeRegistryImpl.java
+++ b/platform/lang-impl/src/com/intellij/facet/impl/FacetTypeRegistryImpl.java
@@ -14,7 +14,7 @@ import java.util.*;
  * @author nik
  */
 public class FacetTypeRegistryImpl extends FacetTypeRegistry {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.facet.impl.FacetTypeRegistryImpl");
+  private static final Logger LOG = Logger.getInstance(FacetTypeRegistryImpl.class);
   private static final Comparator<FacetType> FACET_TYPE_COMPARATOR =
     (o1, o2) -> o1.getPresentableName().compareToIgnoreCase(o2.getPresentableName());
   private final Map<String, FacetTypeId> myTypeIds = new HashMap<>();
diff --git a/platform/lang-impl/src/com/intellij/facet/impl/ProjectFacetManagerImpl.java b/platform/lang-impl/src/com/intellij/facet/impl/ProjectFacetManagerImpl.java
index ff3e5a82370f..8b0e55f6b4ab 100644
--- a/platform/lang-impl/src/com/intellij/facet/impl/ProjectFacetManagerImpl.java
+++ b/platform/lang-impl/src/com/intellij/facet/impl/ProjectFacetManagerImpl.java
@@ -29,7 +29,7 @@ import java.util.*;
 @State(name = ProjectFacetManagerImpl.COMPONENT_NAME)
 public class ProjectFacetManagerImpl extends ProjectFacetManagerEx implements PersistentStateComponent<ProjectFacetManagerImpl.ProjectFacetManagerState> {
   @NonNls public static final String COMPONENT_NAME = "ProjectFacetManager";
-  private static final Logger LOG = Logger.getInstance("#com.intellij.facet.impl.ProjectFacetManagerImpl");
+  private static final Logger LOG = Logger.getInstance(ProjectFacetManagerImpl.class);
   private ProjectFacetManagerState myState = new ProjectFacetManagerState();
   private final Project myProject;
   private volatile MultiMap<FacetTypeId<?>, Module> myIndex;
diff --git a/platform/lang-impl/src/com/intellij/facet/impl/ui/MultipleFacetEditorHelperImpl.java b/platform/lang-impl/src/com/intellij/facet/impl/ui/MultipleFacetEditorHelperImpl.java
index ede214c5ea59..eee01e09ef7a 100644
--- a/platform/lang-impl/src/com/intellij/facet/impl/ui/MultipleFacetEditorHelperImpl.java
+++ b/platform/lang-impl/src/com/intellij/facet/impl/ui/MultipleFacetEditorHelperImpl.java
@@ -3,6 +3,7 @@ package com.intellij.facet.impl.ui;
 
 import com.intellij.facet.ui.FacetEditor;
 import com.intellij.facet.ui.MultipleFacetEditorHelper;
+import com.intellij.facet.ui.MultipleFacetSettingsEditor;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.ui.DocumentAdapter;
 import com.intellij.util.NotNullFunction;
@@ -22,7 +23,7 @@ import java.util.List;
  * @author nik
  */
 public class MultipleFacetEditorHelperImpl implements MultipleFacetEditorHelper {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.facet.ui.MultipleFacetSettingsEditor");
+  private static final Logger LOG = Logger.getInstance(MultipleFacetSettingsEditor.class);
   private final List<AbstractBinding> myBindings = new ArrayList<>();
 
   @Override
diff --git a/platform/lang-impl/src/com/intellij/find/impl/FindInProjectTask.java b/platform/lang-impl/src/com/intellij/find/impl/FindInProjectTask.java
index 6cc84da6ed4b..8e32c1124fc6 100644
--- a/platform/lang-impl/src/com/intellij/find/impl/FindInProjectTask.java
+++ b/platform/lang-impl/src/com/intellij/find/impl/FindInProjectTask.java
@@ -67,7 +67,7 @@ class FindInProjectTask {
     Comparator.comparing((VirtualFile f) -> f instanceof VirtualFileWithId ? ((VirtualFileWithId)f).getId() : 0)
       .thenComparing(VirtualFile::getName) // in case files without id are also searched
       .thenComparing(VirtualFile::getPath);
-  private static final Logger LOG = Logger.getInstance("#com.intellij.find.impl.FindInProjectTask");
+  private static final Logger LOG = Logger.getInstance(FindInProjectTask.class);
   private static final int FILES_SIZE_LIMIT = 70 * 1024 * 1024; // megabytes.
   private final FindModel myFindModel;
   private final Project myProject;
diff --git a/platform/lang-impl/src/com/intellij/formatting/FormatProcessor.java b/platform/lang-impl/src/com/intellij/formatting/FormatProcessor.java
index 0cd2138e50ee..0a2b91ecf380 100644
--- a/platform/lang-impl/src/com/intellij/formatting/FormatProcessor.java
+++ b/platform/lang-impl/src/com/intellij/formatting/FormatProcessor.java
@@ -29,7 +29,7 @@ import java.util.List;
 import static com.intellij.formatting.InitialInfoBuilder.prepareToBuildBlocksSequentially;
 
 public class FormatProcessor {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.formatting.FormatProcessor");
+  private static final Logger LOG = Logger.getInstance(FormatProcessor.class);
   
   private final WrapBlocksState myWrapState;
   private final boolean myReformatContext;
diff --git a/platform/lang-impl/src/com/intellij/framework/detection/impl/DetectedFrameworksData.java b/platform/lang-impl/src/com/intellij/framework/detection/impl/DetectedFrameworksData.java
index 30b94741cbd0..47ad1d4f0f08 100644
--- a/platform/lang-impl/src/com/intellij/framework/detection/impl/DetectedFrameworksData.java
+++ b/platform/lang-impl/src/com/intellij/framework/detection/impl/DetectedFrameworksData.java
@@ -43,7 +43,7 @@ import java.util.Set;
  * @author nik
  */
 public class DetectedFrameworksData {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.framework.detection.impl.DetectedFrameworksData");
+  private static final Logger LOG = Logger.getInstance(DetectedFrameworksData.class);
   private PersistentHashMap<Integer,TIntHashSet> myExistentFrameworkFiles;
   private final TIntObjectHashMap<TIntHashSet> myNewFiles;
   private final MultiMap<Integer, DetectedFrameworkDescription> myDetectedFrameworks;
diff --git a/platform/lang-impl/src/com/intellij/framework/detection/impl/FacetBasedDetectedFrameworkDescription.java b/platform/lang-impl/src/com/intellij/framework/detection/impl/FacetBasedDetectedFrameworkDescription.java
index 3d3cf886cea2..aa62a7b5610d 100644
--- a/platform/lang-impl/src/com/intellij/framework/detection/impl/FacetBasedDetectedFrameworkDescription.java
+++ b/platform/lang-impl/src/com/intellij/framework/detection/impl/FacetBasedDetectedFrameworkDescription.java
@@ -35,7 +35,7 @@ import java.util.Set;
  * @author nik
  */
 public abstract class FacetBasedDetectedFrameworkDescription<F extends Facet, C extends FacetConfiguration> extends DetectedFrameworkDescription {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.framework.detection.impl.FacetBasedDetectedFrameworkDescription");
+  private static final Logger LOG = Logger.getInstance(FacetBasedDetectedFrameworkDescription.class);
   private final FacetBasedFrameworkDetector<F, C> myDetector;
   private final C myConfiguration;
   private final Set<VirtualFile> myRelatedFiles;
diff --git a/platform/lang-impl/src/com/intellij/framework/detection/impl/FrameworkDetectionIndex.java b/platform/lang-impl/src/com/intellij/framework/detection/impl/FrameworkDetectionIndex.java
index 2c8b9cdbd1d0..f06bde9c1ca1 100644
--- a/platform/lang-impl/src/com/intellij/framework/detection/impl/FrameworkDetectionIndex.java
+++ b/platform/lang-impl/src/com/intellij/framework/detection/impl/FrameworkDetectionIndex.java
@@ -35,7 +35,7 @@ import java.util.*;
  * @author nik
  */
 public class FrameworkDetectionIndex extends ScalarIndexExtension<Integer> {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.framework.detection.impl.FrameworkDetectionIndex");
+  private static final Logger LOG = Logger.getInstance(FrameworkDetectionIndex.class);
   public static final ID<Integer,Void> NAME = ID.create("FrameworkDetectionIndex");
 
   private final EventDispatcher<FrameworkDetectionIndexListener> myDispatcher = EventDispatcher.create(FrameworkDetectionIndexListener.class);
diff --git a/platform/lang-impl/src/com/intellij/framework/detection/impl/FrameworkDetectionProcessor.java b/platform/lang-impl/src/com/intellij/framework/detection/impl/FrameworkDetectionProcessor.java
index 00d120df00a0..258d5740acba 100644
--- a/platform/lang-impl/src/com/intellij/framework/detection/impl/FrameworkDetectionProcessor.java
+++ b/platform/lang-impl/src/com/intellij/framework/detection/impl/FrameworkDetectionProcessor.java
@@ -47,7 +47,7 @@ public class FrameworkDetectionProcessor {
 
   public static final Set<String> SKIPPED_DIRECTORIES = ContainerUtil.newHashSet("node_modules");
 
-  private static final Logger LOG = Logger.getInstance("#com.intellij.framework.detection.impl.FrameworkDetectionProcessor");
+  private static final Logger LOG = Logger.getInstance(FrameworkDetectionProcessor.class);
   private final ProgressIndicator myProgressIndicator;
   private final MultiMap<FileType, FrameworkDetectorData> myDetectorsByFileType;
   private Set<VirtualFile> myProcessedFiles;
diff --git a/platform/lang-impl/src/com/intellij/framework/detection/impl/FrameworkDetectorRegistryImpl.java b/platform/lang-impl/src/com/intellij/framework/detection/impl/FrameworkDetectorRegistryImpl.java
index e53ef9adf777..b0596733ec41 100644
--- a/platform/lang-impl/src/com/intellij/framework/detection/impl/FrameworkDetectorRegistryImpl.java
+++ b/platform/lang-impl/src/com/intellij/framework/detection/impl/FrameworkDetectorRegistryImpl.java
@@ -36,7 +36,7 @@ import java.util.*;
  * @author nik
  */
 public class FrameworkDetectorRegistryImpl extends FrameworkDetectorRegistry {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.framework.detection.impl.FrameworkDetectorRegistryImpl");
+  private static final Logger LOG = Logger.getInstance(FrameworkDetectorRegistryImpl.class);
   private static final int REGISTRY_VERSION = 0;
   private TObjectIntHashMap<String> myDetectorIds;
   private TIntObjectHashMap<FrameworkDetector> myDetectorById;
diff --git a/platform/lang-impl/src/com/intellij/framework/detection/impl/ui/DetectedFrameworkNode.java b/platform/lang-impl/src/com/intellij/framework/detection/impl/ui/DetectedFrameworkNode.java
index 49c3dd17c22d..6078c1f77eb8 100644
--- a/platform/lang-impl/src/com/intellij/framework/detection/impl/ui/DetectedFrameworkNode.java
+++ b/platform/lang-impl/src/com/intellij/framework/detection/impl/ui/DetectedFrameworkNode.java
@@ -33,7 +33,7 @@ import java.util.Collection;
  * @author nik
  */
 class DetectedFrameworkNode extends DetectedFrameworkTreeNodeBase {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.framework.detection.impl.ui.DetectedFrameworkNode");
+  private static final Logger LOG = Logger.getInstance(DetectedFrameworkNode.class);
   private final DetectedFrameworkDescription myDescription;
   private final FrameworkDetectionContext myContext;
 
diff --git a/platform/lang-impl/src/com/intellij/framework/detection/impl/ui/FrameworkDirectoryNode.java b/platform/lang-impl/src/com/intellij/framework/detection/impl/ui/FrameworkDirectoryNode.java
index 4d26b019373c..01dc718bea1e 100644
--- a/platform/lang-impl/src/com/intellij/framework/detection/impl/ui/FrameworkDirectoryNode.java
+++ b/platform/lang-impl/src/com/intellij/framework/detection/impl/ui/FrameworkDirectoryNode.java
@@ -29,7 +29,7 @@ import java.io.File;
  * @author nik
  */
 class FrameworkDirectoryNode extends DetectedFrameworkTreeNodeBase {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.framework.detection.impl.ui.FrameworkDirectoryNode");
+  private static final Logger LOG = Logger.getInstance(FrameworkDirectoryNode.class);
   private final VirtualFile myDirectory;
 
   FrameworkDirectoryNode(VirtualFile directory) {
diff --git a/platform/lang-impl/src/com/intellij/ide/actions/CreateFromTemplateAction.java b/platform/lang-impl/src/com/intellij/ide/actions/CreateFromTemplateAction.java
index f90605fb25b4..35091e59903e 100644
--- a/platform/lang-impl/src/com/intellij/ide/actions/CreateFromTemplateAction.java
+++ b/platform/lang-impl/src/com/intellij/ide/actions/CreateFromTemplateAction.java
@@ -27,7 +27,7 @@ import java.util.Map;
  * @author Eugene.Kudelevsky
  */
 public abstract class CreateFromTemplateAction<T extends PsiElement> extends AnAction implements WriteActionAware {
-  protected static final Logger LOG = Logger.getInstance("#com.intellij.ide.actions.CreateFromTemplateAction");
+  protected static final Logger LOG = Logger.getInstance(CreateFromTemplateAction.class);
 
   public CreateFromTemplateAction(@Nls(capitalization = Nls.Capitalization.Title) String text,
                                   @Nls(capitalization = Nls.Capitalization.Sentence) String description, Icon icon) {
diff --git a/platform/lang-impl/src/com/intellij/ide/actions/GotoActionBase.java b/platform/lang-impl/src/com/intellij/ide/actions/GotoActionBase.java
index d8dfee8f9aa7..3b90b2ee1375 100644
--- a/platform/lang-impl/src/com/intellij/ide/actions/GotoActionBase.java
+++ b/platform/lang-impl/src/com/intellij/ide/actions/GotoActionBase.java
@@ -47,7 +47,7 @@ import java.util.Map;
  * Author: msk
  */
 public abstract class GotoActionBase extends AnAction {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.ide.actions.GotoActionBase");
+  private static final Logger LOG = Logger.getInstance(GotoActionBase.class);
 
   protected static Class myInAction;
   private static final Map<Class, Pair<String, Integer>> ourLastStrings = new HashMap<>();
diff --git a/platform/lang-impl/src/com/intellij/ide/actions/GotoFileItemProvider.java b/platform/lang-impl/src/com/intellij/ide/actions/GotoFileItemProvider.java
index 18667c3e9c45..8a16446aa637 100644
--- a/platform/lang-impl/src/com/intellij/ide/actions/GotoFileItemProvider.java
+++ b/platform/lang-impl/src/com/intellij/ide/actions/GotoFileItemProvider.java
@@ -42,7 +42,7 @@ import java.util.*;
 * @author peter
 */
 public class GotoFileItemProvider extends DefaultChooseByNameItemProvider {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.ide.actions.GotoFileItemProvider");
+  private static final Logger LOG = Logger.getInstance(GotoFileItemProvider.class);
 
   private static final int EXACT_MATCH_DEGREE = 5000;
   private static final int DIRECTORY_MATCH_DEGREE = 0;
diff --git a/platform/lang-impl/src/com/intellij/ide/commander/CommanderPanel.java b/platform/lang-impl/src/com/intellij/ide/commander/CommanderPanel.java
index 0c56ae05cc40..a8bb5fb35bb4 100644
--- a/platform/lang-impl/src/com/intellij/ide/commander/CommanderPanel.java
+++ b/platform/lang-impl/src/com/intellij/ide/commander/CommanderPanel.java
@@ -54,7 +54,7 @@ import java.util.List;
  * @author Eugene Belyaev
  */
 public class CommanderPanel extends JPanel {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.ide.commander.CommanderPanel");
+  private static final Logger LOG = Logger.getInstance(CommanderPanel.class);
 
   private static final Color DARK_BLUE = new Color(55, 85, 134);
   private static final Color DARK_BLUE_BRIGHTER = new Color(58, 92, 149);
diff --git a/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/UsageFavoriteNodeProvider.java b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/UsageFavoriteNodeProvider.java
index f5e9b10c68bc..05e6fdc97240 100644
--- a/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/UsageFavoriteNodeProvider.java
+++ b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/UsageFavoriteNodeProvider.java
@@ -46,7 +46,7 @@ import java.util.*;
 public class UsageFavoriteNodeProvider extends FavoriteNodeProvider {
   private static final Map<String, TreeSet<WorkingSetSerializable>> ourSerializables = new HashMap<>();
   private static final Comparator<VirtualFile> VIRTUAL_FILE_COMPARATOR = Comparator.comparing(VirtualFile::getPath);
-  private static final Logger LOG = Logger.getInstance("#com.intellij.ide.favoritesTreeView.UsageFavoriteNodeProvider");
+  private static final Logger LOG = Logger.getInstance(UsageFavoriteNodeProvider.class);
 
   static {
     final TreeSet<WorkingSetSerializable> usageSet = createSet();
diff --git a/platform/lang-impl/src/com/intellij/ide/fileTemplates/FileTemplateUtil.java b/platform/lang-impl/src/com/intellij/ide/fileTemplates/FileTemplateUtil.java
index 89bbafd48e52..e5962d429b04 100644
--- a/platform/lang-impl/src/com/intellij/ide/fileTemplates/FileTemplateUtil.java
+++ b/platform/lang-impl/src/com/intellij/ide/fileTemplates/FileTemplateUtil.java
@@ -44,7 +44,7 @@ import java.util.regex.Pattern;
  * @author MYakovlev
  */
 public class FileTemplateUtil {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.ide.fileTemplates.FileTemplateUtil");
+  private static final Logger LOG = Logger.getInstance(FileTemplateUtil.class);
   private static final CreateFromTemplateHandler DEFAULT_HANDLER = new DefaultCreateFromTemplateHandler();
 
   @NotNull
diff --git a/platform/lang-impl/src/com/intellij/ide/fileTemplates/VelocityWrapper.java b/platform/lang-impl/src/com/intellij/ide/fileTemplates/VelocityWrapper.java
index faaf3d279a7d..9b0a639a2536 100644
--- a/platform/lang-impl/src/com/intellij/ide/fileTemplates/VelocityWrapper.java
+++ b/platform/lang-impl/src/com/intellij/ide/fileTemplates/VelocityWrapper.java
@@ -31,7 +31,7 @@ import java.io.*;
  * @author peter
  */
 class VelocityWrapper {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.ide.fileTemplates.VelocityWrapper");
+  private static final Logger LOG = Logger.getInstance(VelocityWrapper.class);
 
   static {
     try{
diff --git a/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/DefaultTemplate.java b/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/DefaultTemplate.java
index ff1e7e37ab99..3422360505dd 100644
--- a/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/DefaultTemplate.java
+++ b/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/DefaultTemplate.java
@@ -29,7 +29,7 @@ import java.net.URL;
  * @author Eugene Zhuravlev
  */
 public class DefaultTemplate {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.ide.fileTemplates.impl.DefaultTemplate");
+  private static final Logger LOG = Logger.getInstance(DefaultTemplate.class);
   
   private final String myName;
   private final String myExtension;
diff --git a/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/FTManager.java b/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/FTManager.java
index 477e84dd6fff..610be1111fba 100644
--- a/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/FTManager.java
+++ b/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/FTManager.java
@@ -28,7 +28,7 @@ import java.util.*;
  * @author Eugene Zhuravlev
  */
 public class FTManager {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.ide.fileTemplates.impl.FTManager");
+  private static final Logger LOG = Logger.getInstance(FTManager.class);
   private static final String DEFAULT_TEMPLATE_EXTENSION = "ft";
   static final String TEMPLATE_EXTENSION_SUFFIX = "." + DEFAULT_TEMPLATE_EXTENSION;
   private static final String ENCODED_NAME_EXT_DELIMITER = "\u0F0Fext\u0F0F.";
diff --git a/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/FileTemplateConfigurable.java b/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/FileTemplateConfigurable.java
index e02996137b83..3e532fb0528f 100644
--- a/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/FileTemplateConfigurable.java
+++ b/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/FileTemplateConfigurable.java
@@ -61,7 +61,7 @@ import java.net.URL;
 import java.util.List;
 
 public class FileTemplateConfigurable implements Configurable, Configurable.NoScroll {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.ide.fileTemplates.impl.FileTemplateConfigurable");
+  private static final Logger LOG = Logger.getInstance(FileTemplateConfigurable.class);
   @NonNls private static final String EMPTY_HTML = "<html></html>";
 
   private JPanel myMainPanel;
diff --git a/platform/lang-impl/src/com/intellij/ide/fileTemplates/ui/CreateFromTemplateDialog.java b/platform/lang-impl/src/com/intellij/ide/fileTemplates/ui/CreateFromTemplateDialog.java
index de1a2749a6f3..7ea23cc2a8ec 100644
--- a/platform/lang-impl/src/com/intellij/ide/fileTemplates/ui/CreateFromTemplateDialog.java
+++ b/platform/lang-impl/src/com/intellij/ide/fileTemplates/ui/CreateFromTemplateDialog.java
@@ -43,7 +43,7 @@ import java.awt.*;
 import java.util.Properties;
 
 public class CreateFromTemplateDialog extends DialogWrapper {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.ide.fileTemplates.ui.CreateFromTemplateDialog");
+  private static final Logger LOG = Logger.getInstance(CreateFromTemplateDialog.class);
   @NotNull private final PsiDirectory myDirectory;
   @NotNull private final Project myProject;
   private PsiElement myCreatedElement;
diff --git a/platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyBrowserBaseEx.java b/platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyBrowserBaseEx.java
index 08109904fb5f..de291c93f08a 100644
--- a/platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyBrowserBaseEx.java
+++ b/platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyBrowserBaseEx.java
@@ -56,7 +56,7 @@ import java.util.List;
 import java.util.*;
 
 public abstract class HierarchyBrowserBaseEx extends HierarchyBrowserBase implements OccurenceNavigator {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.ide.hierarchy.HierarchyBrowserBaseEx");
+  private static final Logger LOG = Logger.getInstance(HierarchyBrowserBaseEx.class);
 
   public static final String SCOPE_PROJECT = IdeBundle.message("hierarchy.scope.project");
   public static final String SCOPE_ALL = IdeBundle.message("hierarchy.scope.all");
diff --git a/platform/lang-impl/src/com/intellij/ide/hierarchy/actions/BrowseHierarchyActionBase.java b/platform/lang-impl/src/com/intellij/ide/hierarchy/actions/BrowseHierarchyActionBase.java
index 1f34837c6d64..b7cfa5123481 100644
--- a/platform/lang-impl/src/com/intellij/ide/hierarchy/actions/BrowseHierarchyActionBase.java
+++ b/platform/lang-impl/src/com/intellij/ide/hierarchy/actions/BrowseHierarchyActionBase.java
@@ -34,7 +34,7 @@ import java.util.List;
  * @author yole
  */
 public abstract class BrowseHierarchyActionBase extends AnAction {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.ide.hierarchy.actions.BrowseHierarchyActionBase");
+  private static final Logger LOG = Logger.getInstance(BrowseHierarchyActionBase.class);
   private final LanguageExtension<HierarchyProvider> myExtension;
 
   protected BrowseHierarchyActionBase(@NotNull LanguageExtension<HierarchyProvider> extension) {
diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/actions/ImportModuleFromImlFileAction.java b/platform/lang-impl/src/com/intellij/ide/projectView/actions/ImportModuleFromImlFileAction.java
index cb90e0df8fd8..ba3b67f932b8 100644
--- a/platform/lang-impl/src/com/intellij/ide/projectView/actions/ImportModuleFromImlFileAction.java
+++ b/platform/lang-impl/src/com/intellij/ide/projectView/actions/ImportModuleFromImlFileAction.java
@@ -26,7 +26,7 @@ import java.util.List;
  * @author nik
  */
 public class ImportModuleFromImlFileAction extends AnAction {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.ide.projectView.actions.ImportModuleFromImlFileAction");
+  private static final Logger LOG = Logger.getInstance(ImportModuleFromImlFileAction.class);
 
   @Override
   public void actionPerformed(@NotNull AnActionEvent e) {
diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewImpl.java b/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewImpl.java
index e7df4d87a686..d6939e71660a 100644
--- a/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewImpl.java
+++ b/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewImpl.java
@@ -105,7 +105,7 @@ import static com.intellij.ui.tree.TreePathUtil.toTreePathArray;
   @Storage(value = StoragePathMacros.WORKSPACE_FILE, deprecated = true)
 })
 public class ProjectViewImpl extends ProjectView implements PersistentStateComponent<Element>, Disposable, QuickActionProvider, BusyObject {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.ide.projectView.impl.ProjectViewImpl");
+  private static final Logger LOG = Logger.getInstance(ProjectViewImpl.class);
   private static final Key<String> ID_KEY = Key.create("pane-id");
   private static final Key<String> SUB_ID_KEY = Key.create("pane-sub-id");
   private final CopyPasteDelegator myCopyPasteDelegator;
diff --git a/platform/lang-impl/src/com/intellij/ide/structureView/newStructureView/StructureViewComponent.java b/platform/lang-impl/src/com/intellij/ide/structureView/newStructureView/StructureViewComponent.java
index 3e62e92746fa..40bcc654d1a8 100644
--- a/platform/lang-impl/src/com/intellij/ide/structureView/newStructureView/StructureViewComponent.java
+++ b/platform/lang-impl/src/com/intellij/ide/structureView/newStructureView/StructureViewComponent.java
@@ -77,7 +77,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 
 public class StructureViewComponent extends SimpleToolWindowPanel implements TreeActionsOwner, DataProvider, StructureView.Scrollable {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.ide.structureView.newStructureView.StructureViewComponent");
+  private static final Logger LOG = Logger.getInstance(StructureViewComponent.class);
 
   private static final Key<TreeState> STRUCTURE_VIEW_STATE_KEY = Key.create("STRUCTURE_VIEW_STATE");
   private static final Key<Boolean> STRUCTURE_VIEW_STATE_RESTORED_KEY = Key.create("STRUCTURE_VIEW_STATE_RESTORED_KEY");
diff --git a/platform/lang-impl/src/com/intellij/ide/todo/CurrentFileTodosTreeStructure.java b/platform/lang-impl/src/com/intellij/ide/todo/CurrentFileTodosTreeStructure.java
index e1463cdde3ee..b7d0194219a8 100644
--- a/platform/lang-impl/src/com/intellij/ide/todo/CurrentFileTodosTreeStructure.java
+++ b/platform/lang-impl/src/com/intellij/ide/todo/CurrentFileTodosTreeStructure.java
@@ -27,7 +27,7 @@ import com.intellij.psi.PsiFile;
 import com.intellij.psi.PsiManager;
 
 public final class CurrentFileTodosTreeStructure extends TodoTreeStructure{
-  private static final Logger LOG=Logger.getInstance("#com.intellij.ide.todo.CurrentFileTodosTreeStructure");
+  private static final Logger LOG = Logger.getInstance(CurrentFileTodosTreeStructure.class);
   private static final Object[] ourEmptyArray=new Object[]{};
 
   /**
diff --git a/platform/lang-impl/src/com/intellij/ide/todo/FileTree.java b/platform/lang-impl/src/com/intellij/ide/todo/FileTree.java
index 003aae7ff1d2..aff57306fc8b 100644
--- a/platform/lang-impl/src/com/intellij/ide/todo/FileTree.java
+++ b/platform/lang-impl/src/com/intellij/ide/todo/FileTree.java
@@ -26,7 +26,7 @@ import java.util.*;
  * @author Vladimir Kondratyev
  */
 final class FileTree {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.ide.todo.FileTree");
+  private static final Logger LOG = Logger.getInstance(FileTree.class);
 
   private final Map<VirtualFile, List<VirtualFile>> myDirectory2Children;
   private final Set<VirtualFile> myFiles;
diff --git a/platform/lang-impl/src/com/intellij/ide/todo/TodoTreeBuilder.java b/platform/lang-impl/src/com/intellij/ide/todo/TodoTreeBuilder.java
index 246fa2d273d9..0e41041b41e0 100644
--- a/platform/lang-impl/src/com/intellij/ide/todo/TodoTreeBuilder.java
+++ b/platform/lang-impl/src/com/intellij/ide/todo/TodoTreeBuilder.java
@@ -47,7 +47,7 @@ import java.util.*;
  * @author Vladimir Kondratyev
  */
 public abstract class TodoTreeBuilder implements Disposable {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.ide.todo.TodoTreeBuilder");
+  private static final Logger LOG = Logger.getInstance(TodoTreeBuilder.class);
   public static final Comparator<NodeDescriptor> NODE_DESCRIPTOR_COMPARATOR =
       Comparator.<NodeDescriptor>comparingInt(NodeDescriptor::getWeight).thenComparingInt(NodeDescriptor::getIndex);  
   protected final Project myProject;
diff --git a/platform/lang-impl/src/com/intellij/ide/util/FileStructurePopup.java b/platform/lang-impl/src/com/intellij/ide/util/FileStructurePopup.java
index 22827e7fbd46..d137062925df 100644
--- a/platform/lang-impl/src/com/intellij/ide/util/FileStructurePopup.java
+++ b/platform/lang-impl/src/com/intellij/ide/util/FileStructurePopup.java
@@ -92,7 +92,7 @@ import java.util.function.BiPredicate;
  * @author Konstantin Bulenkov
  */
 public class FileStructurePopup implements Disposable, TreeActionsOwner {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.ide.util.FileStructurePopup");
+  private static final Logger LOG = Logger.getInstance(FileStructurePopup.class);
   private static final String NARROW_DOWN_PROPERTY_KEY = "FileStructurePopup.narrowDown";
 
   private final Project myProject;
diff --git a/platform/lang-impl/src/com/intellij/ide/util/MemberChooser.java b/platform/lang-impl/src/com/intellij/ide/util/MemberChooser.java
index 4f2b1c594fb6..d54ce6c1ef26 100644
--- a/platform/lang-impl/src/com/intellij/ide/util/MemberChooser.java
+++ b/platform/lang-impl/src/com/intellij/ide/util/MemberChooser.java
@@ -40,7 +40,7 @@ import static com.intellij.openapi.keymap.KeymapUtil.getActiveKeymapShortcuts;
 import static com.intellij.ui.tree.TreePathUtil.toTreePathArray;
 
 public class MemberChooser<T extends ClassMember> extends DialogWrapper implements TypeSafeDataProvider {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.ide.util.MemberChooser");
+  private static final Logger LOG = Logger.getInstance(MemberChooser.class);
   protected Tree myTree;
   private DefaultTreeModel myTreeModel;
   protected JComponent[] myOptionControls;
diff --git a/platform/lang-impl/src/com/intellij/ide/util/PsiElementListCellRenderer.java b/platform/lang-impl/src/com/intellij/ide/util/PsiElementListCellRenderer.java
index 8c1b97dff2ea..103568c3ae24 100644
--- a/platform/lang-impl/src/com/intellij/ide/util/PsiElementListCellRenderer.java
+++ b/platform/lang-impl/src/com/intellij/ide/util/PsiElementListCellRenderer.java
@@ -43,7 +43,7 @@ import java.util.regex.Pattern;
 import static com.intellij.openapi.vfs.newvfs.VfsPresentationUtil.getFileBackgroundColor;
 
 public abstract class PsiElementListCellRenderer<T extends PsiElement> extends JPanel implements ListCellRenderer {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.ide.util.PsiElementListCellRenderer");
+  private static final Logger LOG = Logger.getInstance(PsiElementListCellRenderer.class);
   private static final String LEFT = BorderLayout.WEST;
   private static final Pattern CONTAINER_PATTERN = Pattern.compile("(\\(in |\\()?([^)]*)(\\))?");
 
diff --git a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java
index d9812f88563b..4c6a4459ce4f 100644
--- a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java
+++ b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java
@@ -86,7 +86,7 @@ import java.util.*;
 public abstract class ChooseByNameBase implements ChooseByNameViewModel {
   public static final String TEMPORARILY_FOCUSABLE_COMPONENT_KEY = "ChooseByNameBase.TemporarilyFocusableComponent";
 
-  private static final Logger LOG = Logger.getInstance("#com.intellij.ide.util.gotoByName.ChooseByNameBase");
+  private static final Logger LOG = Logger.getInstance(ChooseByNameBase.class);
 
   @Nullable
   protected final Project myProject;
diff --git a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ContributorsBasedGotoByModel.java b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ContributorsBasedGotoByModel.java
index cd9289f4bb07..de4084cb6df9 100644
--- a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ContributorsBasedGotoByModel.java
+++ b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ContributorsBasedGotoByModel.java
@@ -40,7 +40,7 @@ import java.util.concurrent.ConcurrentMap;
  * Contributor-based goto model
  */
 public abstract class ContributorsBasedGotoByModel implements ChooseByNameModelEx, PossiblyDumbAware {
-  public static final Logger LOG = Logger.getInstance("#com.intellij.ide.util.gotoByName.ContributorsBasedGotoByModel");
+  public static final Logger LOG = Logger.getInstance(ContributorsBasedGotoByModel.class);
 
   protected final Project myProject;
   private final List<ChooseByNameContributor> myContributors;
diff --git a/platform/lang-impl/src/com/intellij/ide/util/projectWizard/ExistingModuleLoader.java b/platform/lang-impl/src/com/intellij/ide/util/projectWizard/ExistingModuleLoader.java
index d6e149a4bb1c..534869f8bbd3 100644
--- a/platform/lang-impl/src/com/intellij/ide/util/projectWizard/ExistingModuleLoader.java
+++ b/platform/lang-impl/src/com/intellij/ide/util/projectWizard/ExistingModuleLoader.java
@@ -33,7 +33,7 @@ import java.util.Set;
  * @author Eugene Zhuravlev
  */
 public class ExistingModuleLoader extends ModuleBuilder {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.ide.util.projectWizard.ExistingModuleLoader");
+  private static final Logger LOG = Logger.getInstance(ExistingModuleLoader.class);
 
   public static ExistingModuleLoader setUpLoader(final String moduleFilePath) {
     final ExistingModuleLoader moduleLoader = new ExistingModuleLoader();
diff --git a/platform/lang-impl/src/com/intellij/internal/DumpInspectionDescriptionsAction.java b/platform/lang-impl/src/com/intellij/internal/DumpInspectionDescriptionsAction.java
index 93207296cace..59dfca2f5fb9 100644
--- a/platform/lang-impl/src/com/intellij/internal/DumpInspectionDescriptionsAction.java
+++ b/platform/lang-impl/src/com/intellij/internal/DumpInspectionDescriptionsAction.java
@@ -30,7 +30,7 @@ import java.util.TreeSet;
  * @author stathik
  */
 public class DumpInspectionDescriptionsAction extends AnAction implements DumbAware {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.internal.DumpInspectionDescriptionsAction");
+  private static final Logger LOG = Logger.getInstance(DumpInspectionDescriptionsAction.class);
 
   public DumpInspectionDescriptionsAction() {
     super("Dump inspection descriptions");
diff --git a/platform/lang-impl/src/com/intellij/internal/DumpLookupElementWeights.java b/platform/lang-impl/src/com/intellij/internal/DumpLookupElementWeights.java
index f844570f0623..a3f0d98354b1 100644
--- a/platform/lang-impl/src/com/intellij/internal/DumpLookupElementWeights.java
+++ b/platform/lang-impl/src/com/intellij/internal/DumpLookupElementWeights.java
@@ -40,7 +40,7 @@ import java.util.Map;
  * @author peter
  */
 public class DumpLookupElementWeights extends AnAction implements DumbAware {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.internal.DumpLookupElementWeights");
+  private static final Logger LOG = Logger.getInstance(DumpLookupElementWeights.class);
 
   @Override
   public void actionPerformed(@NotNull final AnActionEvent e) {
diff --git a/platform/lang-impl/src/com/intellij/internal/psiView/PsiViewerDialog.java b/platform/lang-impl/src/com/intellij/internal/psiView/PsiViewerDialog.java
index 5709cba8a17a..a92f58566e4b 100644
--- a/platform/lang-impl/src/com/intellij/internal/psiView/PsiViewerDialog.java
+++ b/platform/lang-impl/src/com/intellij/internal/psiView/PsiViewerDialog.java
@@ -86,7 +86,7 @@ import static com.intellij.openapi.wm.IdeFocusManager.getGlobalInstance;
 public class PsiViewerDialog extends DialogWrapper implements DataProvider, Disposable {
   private static final String REFS_CACHE = "References Resolve Cache";
   public static final Color BOX_COLOR = new JBColor(new Color(0xFC6C00), new Color(0xDE6C01));
-  public static final Logger LOG = Logger.getInstance("#com.intellij.internal.psiView.PsiViewerDialog");
+  public static final Logger LOG = Logger.getInstance(PsiViewerDialog.class);
   private final Project myProject;
 
 
diff --git a/platform/lang-impl/src/com/intellij/internal/psiView/stubtree/StubViewerPsiBasedTree.java b/platform/lang-impl/src/com/intellij/internal/psiView/stubtree/StubViewerPsiBasedTree.java
index f85fef17056c..7c1d56947639 100644
--- a/platform/lang-impl/src/com/intellij/internal/psiView/stubtree/StubViewerPsiBasedTree.java
+++ b/platform/lang-impl/src/com/intellij/internal/psiView/stubtree/StubViewerPsiBasedTree.java
@@ -1,6 +1,7 @@
 // Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package com.intellij.internal.psiView.stubtree;
 
+import com.intellij.internal.psiView.PsiViewerDialog;
 import com.intellij.internal.psiView.ViewerPsiBasedTree;
 import com.intellij.lang.ASTNode;
 import com.intellij.openapi.Disposable;
@@ -49,7 +50,7 @@ import static com.intellij.internal.psiView.PsiViewerDialog.initTree;
 
 public class StubViewerPsiBasedTree implements ViewerPsiBasedTree {
 
-  public static final Logger LOG = Logger.getInstance("#com.intellij.internal.psiView.PsiViewerDialog");
+  public static final Logger LOG = Logger.getInstance(PsiViewerDialog.class);
 
   @Nullable
   private AbstractTreeModel myTreeModel;
diff --git a/platform/lang-impl/src/com/intellij/openapi/module/impl/ModuleImpl.java b/platform/lang-impl/src/com/intellij/openapi/module/impl/ModuleImpl.java
index 9dbb4aab9977..376929e9e95d 100644
--- a/platform/lang-impl/src/com/intellij/openapi/module/impl/ModuleImpl.java
+++ b/platform/lang-impl/src/com/intellij/openapi/module/impl/ModuleImpl.java
@@ -42,7 +42,7 @@ import java.util.Map;
  * @author max
  */
 public class ModuleImpl extends PlatformComponentManagerImpl implements ModuleEx {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.module.impl.ModuleImpl");
+  private static final Logger LOG = Logger.getInstance(ModuleImpl.class);
 
   @NotNull private final Project myProject;
   private final VirtualFilePointer myImlFilePointer;
diff --git a/platform/lang-impl/src/com/intellij/openapi/module/impl/ModuleTypeManagerImpl.java b/platform/lang-impl/src/com/intellij/openapi/module/impl/ModuleTypeManagerImpl.java
index 02039b0d60d8..3ae8704d36c1 100644
--- a/platform/lang-impl/src/com/intellij/openapi/module/impl/ModuleTypeManagerImpl.java
+++ b/platform/lang-impl/src/com/intellij/openapi/module/impl/ModuleTypeManagerImpl.java
@@ -10,7 +10,7 @@ import java.util.LinkedHashMap;
 import java.util.List;
 
 public class ModuleTypeManagerImpl extends ModuleTypeManager {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.module.impl.ModuleTypeManagerImpl");
+  private static final Logger LOG = Logger.getInstance(ModuleTypeManagerImpl.class);
 
   private final LinkedHashMap<ModuleType<?>, Boolean> myModuleTypes = new LinkedHashMap<>();
 
diff --git a/platform/lang-impl/src/com/intellij/openapi/paths/PathReferenceProviderBase.java b/platform/lang-impl/src/com/intellij/openapi/paths/PathReferenceProviderBase.java
index a22dd08257c1..ce3fab74c922 100644
--- a/platform/lang-impl/src/com/intellij/openapi/paths/PathReferenceProviderBase.java
+++ b/platform/lang-impl/src/com/intellij/openapi/paths/PathReferenceProviderBase.java
@@ -16,7 +16,7 @@ import java.util.List;
  */
 public abstract class PathReferenceProviderBase implements PathReferenceProvider {
 
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.paths.PathReferenceProviderBase");
+  private static final Logger LOG = Logger.getInstance(PathReferenceProviderBase.class);
 
   @Override
   public boolean createReferences(@NotNull final PsiElement psiElement, final @NotNull List<PsiReference> references, final boolean soft) {
diff --git a/platform/lang-impl/src/com/intellij/openapi/paths/WebReferencesAnnotatorBase.java b/platform/lang-impl/src/com/intellij/openapi/paths/WebReferencesAnnotatorBase.java
index f16450b4eb5c..ade8dae524ab 100644
--- a/platform/lang-impl/src/com/intellij/openapi/paths/WebReferencesAnnotatorBase.java
+++ b/platform/lang-impl/src/com/intellij/openapi/paths/WebReferencesAnnotatorBase.java
@@ -27,7 +27,7 @@ import java.util.Map;
  * @author Eugene.Kudelevsky
  */
 public abstract class WebReferencesAnnotatorBase extends ExternalAnnotator<WebReferencesAnnotatorBase.MyInfo[], WebReferencesAnnotatorBase.MyInfo[]> {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.paths.WebReferencesAnnotatorBase");
+  private static final Logger LOG = Logger.getInstance(WebReferencesAnnotatorBase.class);
 
   private final Map<String, MyFetchCacheEntry> myFetchCache = new HashMap<>();
   private final Object myFetchCacheLock = new Object();
diff --git a/platform/lang-impl/src/com/intellij/openapi/roots/impl/PushedFilePropertiesUpdaterImpl.java b/platform/lang-impl/src/com/intellij/openapi/roots/impl/PushedFilePropertiesUpdaterImpl.java
index f5f933ca452f..9b6afc2c0ee6 100644
--- a/platform/lang-impl/src/com/intellij/openapi/roots/impl/PushedFilePropertiesUpdaterImpl.java
+++ b/platform/lang-impl/src/com/intellij/openapi/roots/impl/PushedFilePropertiesUpdaterImpl.java
@@ -38,7 +38,7 @@ import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.Future;
 
 public final class PushedFilePropertiesUpdaterImpl extends PushedFilePropertiesUpdater {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.roots.impl.PushedFilePropertiesUpdater");
+  private static final Logger LOG = Logger.getInstance(PushedFilePropertiesUpdater.class);
 
   private final Project myProject;
 
diff --git a/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/CommonContentEntriesEditor.java b/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/CommonContentEntriesEditor.java
index 26455f5ce008..f3ee8fe2a8db 100644
--- a/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/CommonContentEntriesEditor.java
+++ b/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/CommonContentEntriesEditor.java
@@ -52,7 +52,7 @@ import java.util.Map;
  * @author Eugene Zhuravlev
  */
 public class CommonContentEntriesEditor extends ModuleElementsEditor {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.roots.ui.configuration.ContentEntriesEditor");
+  private static final Logger LOG = Logger.getInstance(CommonContentEntriesEditor.class);
   public static final String NAME = ProjectBundle.message("module.paths.title");
 
   protected ContentEntryTreeEditor myRootTreeEditor;
diff --git a/platform/lang-impl/src/com/intellij/packageDependencies/ui/UsagesPanel.java b/platform/lang-impl/src/com/intellij/packageDependencies/ui/UsagesPanel.java
index e99edabdba2d..b159d48fecd7 100644
--- a/platform/lang-impl/src/com/intellij/packageDependencies/ui/UsagesPanel.java
+++ b/platform/lang-impl/src/com/intellij/packageDependencies/ui/UsagesPanel.java
@@ -37,7 +37,7 @@ import javax.swing.*;
 import java.awt.*;
 
 public abstract class UsagesPanel extends JPanel implements Disposable, DataProvider {
-  protected static final Logger LOG = Logger.getInstance("#com.intellij.packageDependencies.ui.UsagesPanel");
+  protected static final Logger LOG = Logger.getInstance(UsagesPanel.class);
 
   private final Project myProject;
   ProgressIndicator myCurrentProgress;
diff --git a/platform/lang-impl/src/com/intellij/psi/formatter/FormattingDocumentModelImpl.java b/platform/lang-impl/src/com/intellij/psi/formatter/FormattingDocumentModelImpl.java
index 7dc8107e3ca6..bde892a61697 100644
--- a/platform/lang-impl/src/com/intellij/psi/formatter/FormattingDocumentModelImpl.java
+++ b/platform/lang-impl/src/com/intellij/psi/formatter/FormattingDocumentModelImpl.java
@@ -28,7 +28,7 @@ public class FormattingDocumentModelImpl implements FormattingDocumentModel {
   @NotNull private final Document myDocument;
   @NotNull private final PsiFile myFile;
 
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.formatter.FormattingDocumentModelImpl");
+  private static final Logger LOG = Logger.getInstance(FormattingDocumentModelImpl.class);
   private final CodeStyleSettings mySettings;
 
   public FormattingDocumentModelImpl(@NotNull final Document document, @NotNull PsiFile file) {
diff --git a/platform/lang-impl/src/com/intellij/psi/formatter/PsiBasedFormattingModel.java b/platform/lang-impl/src/com/intellij/psi/formatter/PsiBasedFormattingModel.java
index ec603294c370..0e19bf969c42 100644
--- a/platform/lang-impl/src/com/intellij/psi/formatter/PsiBasedFormattingModel.java
+++ b/platform/lang-impl/src/com/intellij/psi/formatter/PsiBasedFormattingModel.java
@@ -36,7 +36,7 @@ import java.util.List;
 
 public class PsiBasedFormattingModel implements FormattingModelEx {
 
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.formatter.PsiBasedFormattingModel");
+  private static final Logger LOG = Logger.getInstance(PsiBasedFormattingModel.class);
 
   private final Project myProject;
   private final ASTNode myASTNode;
diff --git a/platform/lang-impl/src/com/intellij/psi/formatter/common/InjectedLanguageBlockBuilder.java b/platform/lang-impl/src/com/intellij/psi/formatter/common/InjectedLanguageBlockBuilder.java
index ef4461a65fdb..34ed04f10055 100644
--- a/platform/lang-impl/src/com/intellij/psi/formatter/common/InjectedLanguageBlockBuilder.java
+++ b/platform/lang-impl/src/com/intellij/psi/formatter/common/InjectedLanguageBlockBuilder.java
@@ -37,7 +37,7 @@ import java.util.List;
  * @author nik
  */
 public abstract class InjectedLanguageBlockBuilder {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.formatter.xml.XmlInjectedLanguageBlockBuilder");
+  private static final Logger LOG = Logger.getInstance(InjectedLanguageBlockBuilder.class);
 
   @NotNull
   public Block createInjectedBlock(@NotNull ASTNode node,
diff --git a/platform/lang-impl/src/com/intellij/psi/impl/file/impl/PsiVFSListener.java b/platform/lang-impl/src/com/intellij/psi/impl/file/impl/PsiVFSListener.java
index 324d9199f645..6022ba0b8ab6 100644
--- a/platform/lang-impl/src/com/intellij/psi/impl/file/impl/PsiVFSListener.java
+++ b/platform/lang-impl/src/com/intellij/psi/impl/file/impl/PsiVFSListener.java
@@ -43,7 +43,7 @@ import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 public class PsiVFSListener implements BulkFileListener {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.file.impl.PsiVFSListener");
+  private static final Logger LOG = Logger.getInstance(PsiVFSListener.class);
 
   private final FileTypeManager myFileTypeManager;
   private final ProjectRootManager myProjectRootManager;
diff --git a/platform/lang-impl/src/com/intellij/psi/impl/source/LightPsiFileImpl.java b/platform/lang-impl/src/com/intellij/psi/impl/source/LightPsiFileImpl.java
index 201c19bd5eb5..b235db9a569c 100644
--- a/platform/lang-impl/src/com/intellij/psi/impl/source/LightPsiFileImpl.java
+++ b/platform/lang-impl/src/com/intellij/psi/impl/source/LightPsiFileImpl.java
@@ -22,7 +22,7 @@ import org.jetbrains.annotations.Nullable;
 
 public abstract class LightPsiFileImpl extends PsiElementBase implements PsiFileEx {
 
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.LightPsiFileImpl");
+  private static final Logger LOG = Logger.getInstance(LightPsiFileImpl.class);
   private PsiFile myOriginalFile = null;
   private boolean myExplicitlySetAsValid = false;
   private boolean myInvalidated = false;
diff --git a/platform/lang-impl/src/com/intellij/psi/impl/source/PostprocessReformattingAspect.java b/platform/lang-impl/src/com/intellij/psi/impl/source/PostprocessReformattingAspect.java
index a532114eb99e..d2fb0053c7f7 100644
--- a/platform/lang-impl/src/com/intellij/psi/impl/source/PostprocessReformattingAspect.java
+++ b/platform/lang-impl/src/com/intellij/psi/impl/source/PostprocessReformattingAspect.java
@@ -52,7 +52,7 @@ import org.jetbrains.annotations.TestOnly;
 import java.util.*;
 
 public class PostprocessReformattingAspect implements PomModelAspect {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.PostprocessReformattingAspect");
+  private static final Logger LOG = Logger.getInstance(PostprocessReformattingAspect.class);
   private final Project myProject;
   private final PsiManager myPsiManager;
   private final TreeAspect myTreeAspect;
diff --git a/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/CodeFormatterFacade.java b/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/CodeFormatterFacade.java
index 28d9f486feac..2369e734bb3c 100644
--- a/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/CodeFormatterFacade.java
+++ b/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/CodeFormatterFacade.java
@@ -51,7 +51,7 @@ import java.util.*;
 
 public class CodeFormatterFacade {
 
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.codeStyle.CodeFormatterFacade");
+  private static final Logger LOG = Logger.getInstance(CodeFormatterFacade.class);
 
   private static final String WRAP_LINE_COMMAND_NAME = "AutoWrapLongLine";
 
diff --git a/platform/lang-impl/src/com/intellij/psi/impl/source/tree/injected/InjectedLanguageManagerImpl.java b/platform/lang-impl/src/com/intellij/psi/impl/source/tree/injected/InjectedLanguageManagerImpl.java
index 0b1223904a57..b24ab25c975a 100644
--- a/platform/lang-impl/src/com/intellij/psi/impl/source/tree/injected/InjectedLanguageManagerImpl.java
+++ b/platform/lang-impl/src/com/intellij/psi/impl/source/tree/injected/InjectedLanguageManagerImpl.java
@@ -40,7 +40,7 @@ import java.util.*;
  */
 @SuppressWarnings("deprecation")
 public class InjectedLanguageManagerImpl extends InjectedLanguageManager implements Disposable {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.tree.injected.InjectedLanguageManagerImpl");
+  private static final Logger LOG = Logger.getInstance(InjectedLanguageManagerImpl.class);
   @SuppressWarnings("RedundantStringConstructorCall")
   static final Object ourInjectionPsiLock = new String("injectionPsiLock");
   private final Project myProject;
diff --git a/platform/lang-impl/src/com/intellij/psi/search/scope/packageSet/PackageSetFactoryImpl.java b/platform/lang-impl/src/com/intellij/psi/search/scope/packageSet/PackageSetFactoryImpl.java
index 59eaaa28f224..c8ee3ee265e2 100644
--- a/platform/lang-impl/src/com/intellij/psi/search/scope/packageSet/PackageSetFactoryImpl.java
+++ b/platform/lang-impl/src/com/intellij/psi/search/scope/packageSet/PackageSetFactoryImpl.java
@@ -15,7 +15,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class PackageSetFactoryImpl extends PackageSetFactory {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.search.scope.packageSet.PackageSetFactoryImpl");
+  private static final Logger LOG = Logger.getInstance(PackageSetFactoryImpl.class);
 
   @Override
   public PackageSet compile(String text) throws ParsingException {
diff --git a/platform/lang-impl/src/com/intellij/psi/stubs/StubIndexImpl.java b/platform/lang-impl/src/com/intellij/psi/stubs/StubIndexImpl.java
index 2d440b9c513e..4d9badf76099 100644
--- a/platform/lang-impl/src/com/intellij/psi/stubs/StubIndexImpl.java
+++ b/platform/lang-impl/src/com/intellij/psi/stubs/StubIndexImpl.java
@@ -56,7 +56,7 @@ import java.util.concurrent.locks.ReadWriteLock;
 })
 public final class StubIndexImpl extends StubIndex implements PersistentStateComponent<StubIndexState> {
   private static final AtomicReference<Boolean> ourForcedClean = new AtomicReference<>(null);
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.stubs.StubIndexImpl");
+  private static final Logger LOG = Logger.getInstance(StubIndexImpl.class);
 
   private static class AsyncState {
     private final Map<StubIndexKey<?, ?>, UpdatableIndex<?, Void, FileContent>> myIndices = new THashMap<>();
diff --git a/platform/lang-impl/src/com/intellij/psi/stubs/StubTreeLoaderImpl.java b/platform/lang-impl/src/com/intellij/psi/stubs/StubTreeLoaderImpl.java
index 1129a2eb6b6d..b2f04b628d35 100644
--- a/platform/lang-impl/src/com/intellij/psi/stubs/StubTreeLoaderImpl.java
+++ b/platform/lang-impl/src/com/intellij/psi/stubs/StubTreeLoaderImpl.java
@@ -45,7 +45,7 @@ import java.util.Map;
  * @author yole
  */
 public class StubTreeLoaderImpl extends StubTreeLoader {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.stubs.StubTreeLoaderImpl");
+  private static final Logger LOG = Logger.getInstance(StubTreeLoaderImpl.class);
   private static volatile boolean ourStubReloadingProhibited;
 
   @Override
diff --git a/platform/lang-impl/src/com/intellij/refactoring/BaseRefactoringProcessor.java b/platform/lang-impl/src/com/intellij/refactoring/BaseRefactoringProcessor.java
index 45f1f1bbcd7c..44425fd6f9b9 100644
--- a/platform/lang-impl/src/com/intellij/refactoring/BaseRefactoringProcessor.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/BaseRefactoringProcessor.java
@@ -67,7 +67,7 @@ import java.lang.reflect.InvocationTargetException;
 import java.util.*;
 
 public abstract class BaseRefactoringProcessor implements Runnable {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.BaseRefactoringProcessor");
+  private static final Logger LOG = Logger.getInstance(BaseRefactoringProcessor.class);
   private static boolean PREVIEW_IN_TESTS = true;
 
   protected final Project myProject;
diff --git a/platform/lang-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureProcessorBase.java b/platform/lang-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureProcessorBase.java
index 82385d12442a..2232a5505bb7 100644
--- a/platform/lang-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureProcessorBase.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureProcessorBase.java
@@ -47,7 +47,7 @@ import java.util.*;
  * @author Maxim.Medvedev
  */
 public abstract class ChangeSignatureProcessorBase extends BaseRefactoringProcessor {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.changeSignature.ChangeSignatureProcessorBase");
+  private static final Logger LOG = Logger.getInstance(ChangeSignatureProcessorBase.class);
   protected static final String REFACTORING_ID = "refactoring.changeSignature";
 
   protected final ChangeInfo myChangeInfo;
diff --git a/platform/lang-impl/src/com/intellij/refactoring/lang/ExtractIncludeFileBase.java b/platform/lang-impl/src/com/intellij/refactoring/lang/ExtractIncludeFileBase.java
index 0b5d2c544a8a..ee958172eedd 100644
--- a/platform/lang-impl/src/com/intellij/refactoring/lang/ExtractIncludeFileBase.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/lang/ExtractIncludeFileBase.java
@@ -43,7 +43,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 public abstract class ExtractIncludeFileBase<T extends PsiElement> implements RefactoringActionHandler, TitledHandler {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.lang.ExtractIncludeFileBase");
+  private static final Logger LOG = Logger.getInstance(ExtractIncludeFileBase.class);
   private static final String REFACTORING_NAME = RefactoringBundle.message("extract.include.file.title");
   protected PsiFile myIncludingFile;
   public static final String HELP_ID = "refactoring.extractInclude";
diff --git a/platform/lang-impl/src/com/intellij/refactoring/listeners/impl/impl/RefactoringTransactionImpl.java b/platform/lang-impl/src/com/intellij/refactoring/listeners/impl/impl/RefactoringTransactionImpl.java
index e5b858cd0690..a9d62079a81f 100644
--- a/platform/lang-impl/src/com/intellij/refactoring/listeners/impl/impl/RefactoringTransactionImpl.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/listeners/impl/impl/RefactoringTransactionImpl.java
@@ -37,7 +37,7 @@ import java.util.Map;
  * @author dsl
  */
 public class RefactoringTransactionImpl implements RefactoringTransaction {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.listeners.impl.impl.RefactoringTransactionImpl");
+  private static final Logger LOG = Logger.getInstance(RefactoringTransactionImpl.class);
 
   /**
    * Actions to be performed at commit.
diff --git a/platform/lang-impl/src/com/intellij/refactoring/move/FileReferenceContextUtil.java b/platform/lang-impl/src/com/intellij/refactoring/move/FileReferenceContextUtil.java
index a462e3d3b328..6b9ad6fac87a 100644
--- a/platform/lang-impl/src/com/intellij/refactoring/move/FileReferenceContextUtil.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/move/FileReferenceContextUtil.java
@@ -33,7 +33,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 public class FileReferenceContextUtil {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.move.FileReferenceContextUtil");
+  private static final Logger LOG = Logger.getInstance(FileReferenceContextUtil.class);
   private static final Key<Pair<PsiFileSystemItem, Integer>> REF_FILE_SYSTEM_ITEM_KEY = Key.create("REF_FILE_SYSTEM_ITEM_KEY");
 
   private FileReferenceContextUtil() {
diff --git a/platform/lang-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/CommonMoveUtil.java b/platform/lang-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/CommonMoveUtil.java
index b7fbf194ebc9..0f1c8a1135a7 100644
--- a/platform/lang-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/CommonMoveUtil.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/CommonMoveUtil.java
@@ -21,7 +21,7 @@ public class CommonMoveUtil {
   private CommonMoveUtil() {
   }
 
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.move.moveClassesOrPackages.CommonMoveUtil");
+  private static final Logger LOG = Logger.getInstance(CommonMoveUtil.class);
 
   public static NonCodeUsageInfo[] retargetUsages(final UsageInfo[] usages, final Map<PsiElement, PsiElement> oldToNewElementsMapping)
     throws IncorrectOperationException {
diff --git a/platform/lang-impl/src/com/intellij/refactoring/move/moveFilesOrDirectories/MoveFilesOrDirectoriesHandler.java b/platform/lang-impl/src/com/intellij/refactoring/move/moveFilesOrDirectories/MoveFilesOrDirectoriesHandler.java
index 141674a5a43c..0edbf07b4e31 100644
--- a/platform/lang-impl/src/com/intellij/refactoring/move/moveFilesOrDirectories/MoveFilesOrDirectoriesHandler.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/move/moveFilesOrDirectories/MoveFilesOrDirectoriesHandler.java
@@ -35,7 +35,7 @@ import java.util.Arrays;
 import java.util.HashSet;
 
 public class MoveFilesOrDirectoriesHandler extends MoveHandlerDelegate {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.move.moveFilesOrDirectories.MoveFilesOrDirectoriesHandler");
+  private static final Logger LOG = Logger.getInstance(MoveFilesOrDirectoriesHandler.class);
 
   @Override
   public boolean canMove(final PsiElement[] elements, final PsiElement targetContainer, @Nullable PsiReference reference) {
diff --git a/platform/lang-impl/src/com/intellij/refactoring/move/moveFilesOrDirectories/MoveFilesOrDirectoriesProcessor.java b/platform/lang-impl/src/com/intellij/refactoring/move/moveFilesOrDirectories/MoveFilesOrDirectoriesProcessor.java
index 20b6ef543533..380281ba5b5e 100644
--- a/platform/lang-impl/src/com/intellij/refactoring/move/moveFilesOrDirectories/MoveFilesOrDirectoriesProcessor.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/move/moveFilesOrDirectories/MoveFilesOrDirectoriesProcessor.java
@@ -50,7 +50,7 @@ import java.io.IOException;
 import java.util.*;
 
 public class MoveFilesOrDirectoriesProcessor extends BaseRefactoringProcessor {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.move.moveFilesOrDirectories.MoveFilesOrDirectoriesProcessor");
+  private static final Logger LOG = Logger.getInstance(MoveFilesOrDirectoriesProcessor.class);
 
   protected final PsiElement[] myElementsToMove;
   protected final boolean mySearchForReferences;
diff --git a/platform/lang-impl/src/com/intellij/refactoring/rename/DirectoryAsPackageRenameHandlerBase.java b/platform/lang-impl/src/com/intellij/refactoring/rename/DirectoryAsPackageRenameHandlerBase.java
index ff9d2687a0e0..6e40acecaf4b 100644
--- a/platform/lang-impl/src/com/intellij/refactoring/rename/DirectoryAsPackageRenameHandlerBase.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/rename/DirectoryAsPackageRenameHandlerBase.java
@@ -44,7 +44,7 @@ import java.util.List;
  * @author yole
  */
 public abstract class DirectoryAsPackageRenameHandlerBase<T extends PsiDirectoryContainer> extends DirectoryRenameHandlerBase {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.rename.DirectoryAsPackageRenameHandler");
+  private static final Logger LOG = Logger.getInstance(DirectoryAsPackageRenameHandlerBase.class);
 
   protected abstract VirtualFile[] occursInPackagePrefixes(T aPackage);
 
diff --git a/platform/lang-impl/src/com/intellij/refactoring/rename/PsiElementRenameHandler.java b/platform/lang-impl/src/com/intellij/refactoring/rename/PsiElementRenameHandler.java
index 2e2e0f1208a9..d380a53da7ba 100644
--- a/platform/lang-impl/src/com/intellij/refactoring/rename/PsiElementRenameHandler.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/rename/PsiElementRenameHandler.java
@@ -39,7 +39,7 @@ import java.util.Arrays;
  * @author Jeka, dsl
  */
 public class PsiElementRenameHandler implements RenameHandler {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.rename.PsiElementRenameHandler");
+  private static final Logger LOG = Logger.getInstance(PsiElementRenameHandler.class);
   private static final ExtensionPointName<Condition<? super PsiElement>> VETO_RENAME_CONDITION_EP = ExtensionPointName.create("com.intellij.vetoRenameCondition");
 
   public static final DataKey<String> DEFAULT_NAME = DataKey.create("DEFAULT_NAME");
diff --git a/platform/lang-impl/src/com/intellij/refactoring/rename/RenameProcessor.java b/platform/lang-impl/src/com/intellij/refactoring/rename/RenameProcessor.java
index c8659151a0a0..94debf82ed60 100644
--- a/platform/lang-impl/src/com/intellij/refactoring/rename/RenameProcessor.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/rename/RenameProcessor.java
@@ -52,7 +52,7 @@ import javax.swing.event.HyperlinkListener;
 import java.util.*;
 
 public class RenameProcessor extends BaseRefactoringProcessor {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.rename.RenameProcessor");
+  private static final Logger LOG = Logger.getInstance(RenameProcessor.class);
 
   protected final LinkedHashMap<PsiElement, String> myAllRenames = new LinkedHashMap<>();
 
diff --git a/platform/lang-impl/src/com/intellij/refactoring/rename/RenameUtil.java b/platform/lang-impl/src/com/intellij/refactoring/rename/RenameUtil.java
index 654f1983fdab..484b60ec2649 100644
--- a/platform/lang-impl/src/com/intellij/refactoring/rename/RenameUtil.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/rename/RenameUtil.java
@@ -44,7 +44,7 @@ import org.jetbrains.annotations.Nullable;
 import java.util.*;
 
 public class RenameUtil {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.rename.RenameUtil");
+  private static final Logger LOG = Logger.getInstance(RenameUtil.class);
 
   private RenameUtil() {
   }
diff --git a/platform/lang-impl/src/com/intellij/refactoring/rename/RenameViewDescriptor.java b/platform/lang-impl/src/com/intellij/refactoring/rename/RenameViewDescriptor.java
index 7c6cc8b83f24..f080e97ee987 100644
--- a/platform/lang-impl/src/com/intellij/refactoring/rename/RenameViewDescriptor.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/rename/RenameViewDescriptor.java
@@ -19,7 +19,7 @@ import java.util.LinkedHashMap;
 import java.util.Set;
 
 public class RenameViewDescriptor implements UsageViewDescriptor{
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.rename.RenameViewDescriptor");
+  private static final Logger LOG = Logger.getInstance(RenameViewDescriptor.class);
   private final String myProcessedElementsHeader;
   private final String myCodeReferencesText;
   private final PsiElement[] myElements;
diff --git a/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/InplaceRefactoring.java b/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/InplaceRefactoring.java
index b02c384dd4f3..2a54a9189044 100644
--- a/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/InplaceRefactoring.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/InplaceRefactoring.java
@@ -78,7 +78,7 @@ import java.util.List;
 import java.util.*;
 
 public abstract class InplaceRefactoring {
-  protected static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.rename.inplace.VariableInplaceRenamer");
+  protected static final Logger LOG = Logger.getInstance(VariableInplaceRenamer.class);
   @NonNls protected static final String PRIMARY_VARIABLE_NAME = "PrimaryVariable";
   @NonNls protected static final String OTHER_VARIABLE_NAME = "OtherVariable";
   protected static final Stack<InplaceRefactoring> ourRenamersStack = new Stack<>();
diff --git a/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/VariableInplaceRenameHandler.java b/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/VariableInplaceRenameHandler.java
index f5a286467103..15b4207dcfab 100644
--- a/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/VariableInplaceRenameHandler.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/VariableInplaceRenameHandler.java
@@ -26,7 +26,7 @@ import org.jetbrains.annotations.Nullable;
 
 public class VariableInplaceRenameHandler implements RenameHandler {
   private static final ThreadLocal<String> ourPreventInlineRenameFlag = new ThreadLocal<>();
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.rename.inplace.VariableInplaceRenameHandler");
+  private static final Logger LOG = Logger.getInstance(VariableInplaceRenameHandler.class);
 
   @Override
   public final boolean isAvailableOnDataContext(@NotNull DataContext dataContext) {
diff --git a/platform/lang-impl/src/com/intellij/refactoring/rename/naming/AutomaticRenamer.java b/platform/lang-impl/src/com/intellij/refactoring/rename/naming/AutomaticRenamer.java
index bacc32ab44fe..98b18722c7ba 100644
--- a/platform/lang-impl/src/com/intellij/refactoring/rename/naming/AutomaticRenamer.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/rename/naming/AutomaticRenamer.java
@@ -18,7 +18,7 @@ import java.util.*;
  * @author dsl
  */
 public abstract class AutomaticRenamer {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.rename.naming.AutomaticRenamer");
+  private static final Logger LOG = Logger.getInstance(AutomaticRenamer.class);
 
   private final LinkedHashMap<PsiNamedElement, String> myRenames = new LinkedHashMap<>();
   protected final List<PsiNamedElement> myElements;
diff --git a/platform/lang-impl/src/com/intellij/refactoring/rename/naming/NameSuggester.java b/platform/lang-impl/src/com/intellij/refactoring/rename/naming/NameSuggester.java
index 47c8f5afe060..0bb543c08ae0 100644
--- a/platform/lang-impl/src/com/intellij/refactoring/rename/naming/NameSuggester.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/rename/naming/NameSuggester.java
@@ -16,7 +16,7 @@ import java.util.*;
  * @author dsl
  */
 public class NameSuggester {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.rename.naming.NameSuggester");
+  private static final Logger LOG = Logger.getInstance(NameSuggester.class);
   private final String[] myOldClassName;
   private final String[] myNewClassName;
   private final List<OriginalToNewChange> myChanges; // sorted from right to left
diff --git a/platform/lang-impl/src/com/intellij/refactoring/safeDelete/SafeDeleteProcessor.java b/platform/lang-impl/src/com/intellij/refactoring/safeDelete/SafeDeleteProcessor.java
index df928305ee2b..57327eda9d1f 100644
--- a/platform/lang-impl/src/com/intellij/refactoring/safeDelete/SafeDeleteProcessor.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/safeDelete/SafeDeleteProcessor.java
@@ -45,7 +45,7 @@ import java.util.*;
  * @author dsl
  */
 public class SafeDeleteProcessor extends BaseRefactoringProcessor {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.safeDelete.SafeDeleteProcessor");
+  private static final Logger LOG = Logger.getInstance(SafeDeleteProcessor.class);
   private final PsiElement[] myElements;
   private boolean mySearchInCommentsAndStrings;
   private boolean mySearchNonJava;
diff --git a/platform/lang-impl/src/com/intellij/refactoring/safeDelete/usageInfo/SafeDeleteReferenceSimpleDeleteUsageInfo.java b/platform/lang-impl/src/com/intellij/refactoring/safeDelete/usageInfo/SafeDeleteReferenceSimpleDeleteUsageInfo.java
index 968c6f462d1d..5440735d90cb 100644
--- a/platform/lang-impl/src/com/intellij/refactoring/safeDelete/usageInfo/SafeDeleteReferenceSimpleDeleteUsageInfo.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/safeDelete/usageInfo/SafeDeleteReferenceSimpleDeleteUsageInfo.java
@@ -24,7 +24,7 @@ import com.intellij.util.IncorrectOperationException;
  * @author dsl
  */
 public class SafeDeleteReferenceSimpleDeleteUsageInfo extends SafeDeleteReferenceUsageInfo {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.safeDelete.usageInfo.SafeDeleteReferenceSimpleDeleteUsageInfo");
+  private static final Logger LOG = Logger.getInstance(SafeDeleteReferenceSimpleDeleteUsageInfo.class);
   public SafeDeleteReferenceSimpleDeleteUsageInfo(PsiElement element, PsiElement referencedElement, boolean isSafeDelete) {
     super(element, referencedElement, isSafeDelete);
   }
diff --git a/platform/lang-impl/src/com/intellij/refactoring/safeDelete/usageInfo/SafeDeleteUsageInfo.java b/platform/lang-impl/src/com/intellij/refactoring/safeDelete/usageInfo/SafeDeleteUsageInfo.java
index 41d71423c559..b138beba48bc 100644
--- a/platform/lang-impl/src/com/intellij/refactoring/safeDelete/usageInfo/SafeDeleteUsageInfo.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/safeDelete/usageInfo/SafeDeleteUsageInfo.java
@@ -25,8 +25,7 @@ import org.jetbrains.annotations.NotNull;
  * @author dsl
  */
 public class SafeDeleteUsageInfo extends UsageInfo {
-  private static final Logger LOG = Logger.getInstance(
-    "#com.intellij.refactoring.safeDelete.usageInfo.SafeDeleteUsageInfo");
+  private static final Logger LOG = Logger.getInstance(SafeDeleteUsageInfo.class);
   private final PsiElement myReferencedElement;
 
   public SafeDeleteUsageInfo(@NotNull PsiElement element, PsiElement referencedElement) {
diff --git a/platform/lang-impl/src/com/intellij/refactoring/ui/RefactoringDialog.java b/platform/lang-impl/src/com/intellij/refactoring/ui/RefactoringDialog.java
index 78f94a296950..008b6b75acc0 100644
--- a/platform/lang-impl/src/com/intellij/refactoring/ui/RefactoringDialog.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/ui/RefactoringDialog.java
@@ -27,7 +27,7 @@ import java.util.List;
  * Author: msk
  */
 public abstract class RefactoringDialog extends DialogWrapper {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.ui.RefactoringDialog");
+  private static final Logger LOG = Logger.getInstance(RefactoringDialog.class);
 
   private Action myRefactorAction;
   private Action myPreviewAction;
diff --git a/platform/lang-impl/src/com/intellij/refactoring/util/DefaultNonCodeSearchElementDescriptionProvider.java b/platform/lang-impl/src/com/intellij/refactoring/util/DefaultNonCodeSearchElementDescriptionProvider.java
index d4211223365b..0efb8f89b73e 100644
--- a/platform/lang-impl/src/com/intellij/refactoring/util/DefaultNonCodeSearchElementDescriptionProvider.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/util/DefaultNonCodeSearchElementDescriptionProvider.java
@@ -12,7 +12,7 @@ import org.jetbrains.annotations.NotNull;
  * @author yole
  */
 class DefaultNonCodeSearchElementDescriptionProvider implements ElementDescriptionProvider {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.util.DefaultNonCodeSearchElementDescriptionProvider");
+  private static final Logger LOG = Logger.getInstance(DefaultNonCodeSearchElementDescriptionProvider.class);
 
   static final DefaultNonCodeSearchElementDescriptionProvider INSTANCE = new DefaultNonCodeSearchElementDescriptionProvider();
 
diff --git a/platform/lang-impl/src/com/intellij/task/impl/ProjectTaskManagerImpl.java b/platform/lang-impl/src/com/intellij/task/impl/ProjectTaskManagerImpl.java
index 2b9bbcf461f2..5955ab7e3531 100644
--- a/platform/lang-impl/src/com/intellij/task/impl/ProjectTaskManagerImpl.java
+++ b/platform/lang-impl/src/com/intellij/task/impl/ProjectTaskManagerImpl.java
@@ -51,7 +51,7 @@ import static java.util.stream.Collectors.groupingBy;
 @SuppressWarnings("deprecation")
 public class ProjectTaskManagerImpl extends ProjectTaskManager {
 
-  private static final Logger LOG = Logger.getInstance("#com.intellij.task.ProjectTaskManager");
+  private static final Logger LOG = Logger.getInstance(ProjectTaskManager.class);
   private final ProjectTaskRunner myDummyTaskRunner = new DummyTaskRunner();
   private final ProjectTaskListener myEventPublisher;
   private final List<ProjectTaskManagerListener> myListeners = new CopyOnWriteArrayList<>();
diff --git a/platform/lang-impl/src/com/intellij/tools/ScanSourceCommentsAction.java b/platform/lang-impl/src/com/intellij/tools/ScanSourceCommentsAction.java
index 9812e659aad6..4ff443152f45 100644
--- a/platform/lang-impl/src/com/intellij/tools/ScanSourceCommentsAction.java
+++ b/platform/lang-impl/src/com/intellij/tools/ScanSourceCommentsAction.java
@@ -43,7 +43,7 @@ import java.util.Map;
 import java.util.Set;
 
 public class ScanSourceCommentsAction extends AnAction {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.tools.ScanSourceCommentsAction");
+  private static final Logger LOG = Logger.getInstance(ScanSourceCommentsAction.class);
 
   @Override
   public void actionPerformed(@NotNull AnActionEvent e) {
diff --git a/platform/lang-impl/src/com/intellij/tools/Tool.java b/platform/lang-impl/src/com/intellij/tools/Tool.java
index e61abe7a67ba..da5ff3cdff10 100644
--- a/platform/lang-impl/src/com/intellij/tools/Tool.java
+++ b/platform/lang-impl/src/com/intellij/tools/Tool.java
@@ -36,7 +36,7 @@ import java.util.Arrays;
 import java.util.Collections;
 
 public class Tool implements SchemeElement {
-  private static final Logger LOG = Logger.getInstance("#" + Tool.class.getPackage().getName());
+  private static final Logger LOG = Logger.getInstance(Tool.class);
 
   @NonNls public static final String ACTION_ID_PREFIX = "Tool_";
 
diff --git a/platform/lang-impl/src/com/intellij/tools/ToolRunProfile.java b/platform/lang-impl/src/com/intellij/tools/ToolRunProfile.java
index edfc89b21447..cf4532e82605 100644
--- a/platform/lang-impl/src/com/intellij/tools/ToolRunProfile.java
+++ b/platform/lang-impl/src/com/intellij/tools/ToolRunProfile.java
@@ -29,7 +29,7 @@ import javax.swing.*;
  * @author Eugene Zhuravlev
  */
 public class ToolRunProfile implements ModuleRunProfile{
-  private static final Logger LOG = Logger.getInstance("#com.intellij.tools.ToolRunProfile");
+  private static final Logger LOG = Logger.getInstance(ToolRunProfile.class);
   private final Tool myTool;
   private final DataContext myContext;
   private final GeneralCommandLine myCommandLine;
diff --git a/platform/lang-impl/src/com/intellij/ui/DeferredIconImpl.java b/platform/lang-impl/src/com/intellij/ui/DeferredIconImpl.java
index d2a1475332a1..c0d6988e2efb 100644
--- a/platform/lang-impl/src/com/intellij/ui/DeferredIconImpl.java
+++ b/platform/lang-impl/src/com/intellij/ui/DeferredIconImpl.java
@@ -35,7 +35,7 @@ import java.util.Set;
 import java.util.concurrent.Executor;
 
 public class DeferredIconImpl<T> extends JBCachingScalableIcon<DeferredIconImpl<T>> implements DeferredIcon, RetrievableIcon {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.ui.DeferredIconImpl");
+  private static final Logger LOG = Logger.getInstance(DeferredIconImpl.class);
   private static final int MIN_AUTO_UPDATE_MILLIS = 950;
   private static final RepaintScheduler ourRepaintScheduler = new RepaintScheduler();
   @NotNull
diff --git a/platform/lang-impl/src/com/intellij/ui/debugger/extensions/FocusDebugger.java b/platform/lang-impl/src/com/intellij/ui/debugger/extensions/FocusDebugger.java
index 8cdd66b6d564..072f1bb710d8 100644
--- a/platform/lang-impl/src/com/intellij/ui/debugger/extensions/FocusDebugger.java
+++ b/platform/lang-impl/src/com/intellij/ui/debugger/extensions/FocusDebugger.java
@@ -44,7 +44,7 @@ import java.util.ArrayList;
 
 public class FocusDebugger implements UiDebuggerExtension, PropertyChangeListener, ListSelectionListener  {
 
-  private static final Logger LOG = Logger.getInstance("#com.intellij.ui.debugger.extensions.FocusDebugger");
+  private static final Logger LOG = Logger.getInstance(FocusDebugger.class);
 
   private JComponent myComponent;
 
diff --git a/platform/lang-impl/src/com/intellij/ui/debugger/extensions/PlaybackDebugger.java b/platform/lang-impl/src/com/intellij/ui/debugger/extensions/PlaybackDebugger.java
index cb69996a7d08..a0f783f2047d 100644
--- a/platform/lang-impl/src/com/intellij/ui/debugger/extensions/PlaybackDebugger.java
+++ b/platform/lang-impl/src/com/intellij/ui/debugger/extensions/PlaybackDebugger.java
@@ -45,7 +45,7 @@ import java.io.IOException;
 
 public class PlaybackDebugger implements UiDebuggerExtension, PlaybackRunner.StatusCallback {
 
-  private static final Logger LOG = Logger.getInstance("#com.intellij.ui.debugger.extensions.PlaybackDebugger");
+  private static final Logger LOG = Logger.getInstance(PlaybackDebugger.class);
 
   private static final Color ERROR_COLOR = JBColor.RED;
   private static final Color MESSAGE_COLOR = Color.BLACK;
diff --git a/platform/lang-impl/src/com/intellij/usageView/UsageViewUtil.java b/platform/lang-impl/src/com/intellij/usageView/UsageViewUtil.java
index 4779e967b0bf..43498c5907a4 100644
--- a/platform/lang-impl/src/com/intellij/usageView/UsageViewUtil.java
+++ b/platform/lang-impl/src/com/intellij/usageView/UsageViewUtil.java
@@ -45,7 +45,7 @@ import java.util.LinkedHashSet;
 import java.util.Set;
 
 public class UsageViewUtil {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.usageView.UsageViewUtil");
+  private static final Logger LOG = Logger.getInstance(UsageViewUtil.class);
 
   private UsageViewUtil() { }
 
diff --git a/platform/lang-impl/src/com/intellij/util/gist/VirtualFileGistImpl.java b/platform/lang-impl/src/com/intellij/util/gist/VirtualFileGistImpl.java
index 1c1bcfba73e4..e97d3f756ffb 100644
--- a/platform/lang-impl/src/com/intellij/util/gist/VirtualFileGistImpl.java
+++ b/platform/lang-impl/src/com/intellij/util/gist/VirtualFileGistImpl.java
@@ -39,7 +39,7 @@ import java.util.Map;
  * @author peter
  */
 class VirtualFileGistImpl<Data> implements VirtualFileGist<Data> {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.util.gist.VirtualFileGist");
+  private static final Logger LOG = Logger.getInstance(VirtualFileGist.class);
   private static final int ourInternalVersion = 2;
 
   @NotNull private final String myId;
diff --git a/platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndexImpl.java b/platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndexImpl.java
index 98a72aa309a1..344a0764dd59 100644
--- a/platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndexImpl.java
+++ b/platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndexImpl.java
@@ -111,7 +111,7 @@ public final class FileBasedIndexImpl extends FileBasedIndex {
   private static final ThreadLocal<VirtualFile> ourIndexedFile = new ThreadLocal<>();
   private static final ThreadLocal<VirtualFile> ourFileToBeIndexed = new ThreadLocal<>();
   private static final ThreadLocal<Boolean> ourDumbModeIgnored = new ThreadLocal<>();
-  static final Logger LOG = Logger.getInstance("#com.intellij.util.indexing.FileBasedIndexImpl");
+  static final Logger LOG = Logger.getInstance(FileBasedIndexImpl.class);
   private static final String CORRUPTION_MARKER_NAME = "corruption.marker";
   private static final NotificationGroup NOTIFICATIONS = new NotificationGroup("Indexing", NotificationDisplayType.BALLOON, false);
 
diff --git a/platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndexProjectHandler.java b/platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndexProjectHandler.java
index 227993ab4bbc..6207c76d1b79 100644
--- a/platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndexProjectHandler.java
+++ b/platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndexProjectHandler.java
@@ -43,7 +43,7 @@ import org.jetbrains.annotations.Nullable;
 import java.util.Collection;
 
 public class FileBasedIndexProjectHandler implements IndexableFileSet, Disposable {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.util.indexing.FileBasedIndexProjectHandler");
+  private static final Logger LOG = Logger.getInstance(FileBasedIndexProjectHandler.class);
 
   private final FileBasedIndex myIndex;
   private final FileBasedIndexScanRunnableCollector myCollector;
diff --git a/platform/lang-impl/src/com/intellij/util/indexing/SharedIndicesData.java b/platform/lang-impl/src/com/intellij/util/indexing/SharedIndicesData.java
index 925c9adf74e5..0069048df0a0 100644
--- a/platform/lang-impl/src/com/intellij/util/indexing/SharedIndicesData.java
+++ b/platform/lang-impl/src/com/intellij/util/indexing/SharedIndicesData.java
@@ -21,6 +21,7 @@ import com.intellij.openapi.util.Ref;
 import com.intellij.openapi.util.ShutDownTracker;
 import com.intellij.openapi.util.io.BufferExposingByteArrayOutputStream;
 import com.intellij.util.SystemProperties;
+import com.intellij.util.indexing.impl.MapReduceIndex;
 import com.intellij.util.io.DataOutputStream;
 import com.intellij.util.io.*;
 import gnu.trove.TIntIntHashMap;
@@ -41,7 +42,7 @@ public class SharedIndicesData {
   public static final boolean DO_CHECKS =
     ourFileSharedIndicesEnabled && SystemProperties.getBooleanProperty("idea.shared.input.index.checked", false);
 
-  private static final Logger LOG = Logger.getInstance("#com.intellij.util.indexing.impl.MapReduceIndex");
+  private static final Logger LOG = Logger.getInstance(MapReduceIndex.class);
 
   static {
     if (ourFileSharedIndicesEnabled) {
diff --git a/platform/lang-impl/src/com/intellij/util/indexing/UnindexedFilesUpdater.java b/platform/lang-impl/src/com/intellij/util/indexing/UnindexedFilesUpdater.java
index 9d19cd0994fa..533e5d460b21 100644
--- a/platform/lang-impl/src/com/intellij/util/indexing/UnindexedFilesUpdater.java
+++ b/platform/lang-impl/src/com/intellij/util/indexing/UnindexedFilesUpdater.java
@@ -31,7 +31,7 @@ import java.util.List;
  * @author Eugene Zhuravlev
  */
 public class UnindexedFilesUpdater extends DumbModeTask {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.util.indexing.UnindexedFilesUpdater");
+  private static final Logger LOG = Logger.getInstance(UnindexedFilesUpdater.class);
 
   private final FileBasedIndexImpl myIndex = (FileBasedIndexImpl)FileBasedIndex.getInstance();
   private final Project myProject;
diff --git a/platform/lang-impl/src/com/intellij/util/indexing/VfsAwareMapIndexStorage.java b/platform/lang-impl/src/com/intellij/util/indexing/VfsAwareMapIndexStorage.java
index 0f2ea33fd27b..41c87803722a 100644
--- a/platform/lang-impl/src/com/intellij/util/indexing/VfsAwareMapIndexStorage.java
+++ b/platform/lang-impl/src/com/intellij/util/indexing/VfsAwareMapIndexStorage.java
@@ -44,7 +44,7 @@ import java.io.*;
  * @author Eugene Zhuravlev
  */
 public final class VfsAwareMapIndexStorage<Key, Value> extends MapIndexStorage<Key, Value> implements VfsAwareIndexStorage<Key, Value> {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.util.indexing.impl.MapIndexStorage");
+  private static final Logger LOG = Logger.getInstance(MapIndexStorage.class);
   private static final boolean ENABLE_CACHED_HASH_IDS = SystemProperties.getBooleanProperty("idea.index.no.cashed.hashids", true);
   private final boolean myBuildKeyHashToVirtualFileMapping;
   private AppendableStorageBackedByResizableMappedFile myKeyHashToVirtualFileMapping;
diff --git a/platform/lvcs-impl/src/com/intellij/history/utils/LocalHistoryLog.java b/platform/lvcs-impl/src/com/intellij/history/utils/LocalHistoryLog.java
index 0a20cee79295..aed84616bc02 100644
--- a/platform/lvcs-impl/src/com/intellij/history/utils/LocalHistoryLog.java
+++ b/platform/lvcs-impl/src/com/intellij/history/utils/LocalHistoryLog.java
@@ -19,5 +19,5 @@ package com.intellij.history.utils;
 import com.intellij.openapi.diagnostic.Logger;
 
 public class LocalHistoryLog {
-  public static final Logger LOG = Logger.getInstance("#com.intellij.history.utils.LocalHistoryLog");
+  public static final Logger LOG = Logger.getInstance(LocalHistoryLog.class);
 }
diff --git a/platform/platform-api/src/com/intellij/execution/configurations/PtyCommandLine.java b/platform/platform-api/src/com/intellij/execution/configurations/PtyCommandLine.java
index e629fab00bb2..9db20f535324 100644
--- a/platform/platform-api/src/com/intellij/execution/configurations/PtyCommandLine.java
+++ b/platform/platform-api/src/com/intellij/execution/configurations/PtyCommandLine.java
@@ -31,7 +31,7 @@ import java.util.Map;
  * On Windows, PTY is emulated by creating an invisible console window (see Pty4j and WinPty implementation).
  */
 public class PtyCommandLine extends GeneralCommandLine {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.execution.configurations.PtyCommandLine");
+  private static final Logger LOG = Logger.getInstance(PtyCommandLine.class);
   private static final String RUN_PROCESSES_WITH_PTY = "run.processes.with.pty";
 
   private static final String UNIX_PTY_INIT = "unix.pty.init";
diff --git a/platform/platform-api/src/com/intellij/ide/dnd/DnDNativeTarget.java b/platform/platform-api/src/com/intellij/ide/dnd/DnDNativeTarget.java
index 1ccf22ec6637..56c4b03b4856 100644
--- a/platform/platform-api/src/com/intellij/ide/dnd/DnDNativeTarget.java
+++ b/platform/platform-api/src/com/intellij/ide/dnd/DnDNativeTarget.java
@@ -26,7 +26,7 @@ import java.util.Map;
 
 public interface DnDNativeTarget extends DnDTarget {
 
-  Logger LOG = Logger.getInstance("#com.intellij.ide.dnd.DnDNativeTarget");
+  Logger LOG = Logger.getInstance(DnDNativeTarget.class);
 
   String EVENT_KEY = "DnDEvent";
 
diff --git a/platform/platform-api/src/com/intellij/ide/util/treeView/AbstractTreeUi.java b/platform/platform-api/src/com/intellij/ide/util/treeView/AbstractTreeUi.java
index a2a9a885a40e..05edb4b9d85d 100644
--- a/platform/platform-api/src/com/intellij/ide/util/treeView/AbstractTreeUi.java
+++ b/platform/platform-api/src/com/intellij/ide/util/treeView/AbstractTreeUi.java
@@ -54,7 +54,7 @@ import java.util.function.Supplier;
 @ApiStatus.ScheduledForRemoval(inVersion = "2020.3")
 @Deprecated
 public class AbstractTreeUi {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.ide.util.treeView.AbstractTreeBuilder");
+  private static final Logger LOG = Logger.getInstance(AbstractTreeBuilder.class);
   protected JTree myTree;// protected for TestNG
 
   private DefaultTreeModel myTreeModel;
diff --git a/platform/platform-api/src/com/intellij/ide/util/treeView/AbstractTreeUpdater.java b/platform/platform-api/src/com/intellij/ide/util/treeView/AbstractTreeUpdater.java
index 27fc651d5561..aece74db8b27 100644
--- a/platform/platform-api/src/com/intellij/ide/util/treeView/AbstractTreeUpdater.java
+++ b/platform/platform-api/src/com/intellij/ide/util/treeView/AbstractTreeUpdater.java
@@ -27,7 +27,7 @@ import java.util.*;
 @ApiStatus.ScheduledForRemoval(inVersion = "2020.3")
 @Deprecated
 public class AbstractTreeUpdater implements Disposable, Activatable {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.ide.util.treeView.AbstractTreeUpdater");
+  private static final Logger LOG = Logger.getInstance(AbstractTreeUpdater.class);
 
   private final LinkedList<TreeUpdatePass> myNodeQueue = new LinkedList<>();
   private final AbstractTreeBuilder myTreeBuilder;
diff --git a/platform/platform-api/src/com/intellij/ide/util/treeView/TreeBuilderUtil.java b/platform/platform-api/src/com/intellij/ide/util/treeView/TreeBuilderUtil.java
index 8ae71e6fd00d..d130b5a68087 100644
--- a/platform/platform-api/src/com/intellij/ide/util/treeView/TreeBuilderUtil.java
+++ b/platform/platform-api/src/com/intellij/ide/util/treeView/TreeBuilderUtil.java
@@ -28,7 +28,7 @@ import javax.swing.tree.TreePath;
 import java.util.List;
 
 public class TreeBuilderUtil {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.ide.util.treeView.TreeBuilderUtil");
+  private static final Logger LOG = Logger.getInstance(TreeBuilderUtil.class);
 
   public static void storePaths(@NotNull AbstractTreeBuilder treeBuilder, @NotNull DefaultMutableTreeNode root, @NotNull List<Object> pathsToExpand, @NotNull List<Object> selectionPaths, boolean storeElementsOnly) {
     if (!treeBuilder.wasRootNodeInitialized()) return;
diff --git a/platform/platform-api/src/com/intellij/ide/wizard/AbstractWizard.java b/platform/platform-api/src/com/intellij/ide/wizard/AbstractWizard.java
index dba78c4bcedd..4139d0499550 100644
--- a/platform/platform-api/src/com/intellij/ide/wizard/AbstractWizard.java
+++ b/platform/platform-api/src/com/intellij/ide/wizard/AbstractWizard.java
@@ -35,7 +35,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 public abstract class AbstractWizard<T extends Step> extends DialogWrapper {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.ide.wizard.AbstractWizard");
+  private static final Logger LOG = Logger.getInstance(AbstractWizard.class);
 
   protected int myCurrentStep;
   protected final ArrayList<T> mySteps;
diff --git a/platform/platform-api/src/com/intellij/notification/Notification.java b/platform/platform-api/src/com/intellij/notification/Notification.java
index 4a7c0a1497aa..93ec5cb77eda 100644
--- a/platform/platform-api/src/com/intellij/notification/Notification.java
+++ b/platform/platform-api/src/com/intellij/notification/Notification.java
@@ -46,7 +46,7 @@ public class Notification {
    */
   public enum CollapseActionsDirection { KEEP_LEFTMOST, KEEP_RIGHTMOST }
 
-  private static final Logger LOG = Logger.getInstance("#com.intellij.notification.Notification");
+  private static final Logger LOG = Logger.getInstance(Notification.class);
   private static final DataKey<Notification> KEY = DataKey.create("Notification");
 
   public final String id;
diff --git a/platform/platform-api/src/com/intellij/notification/NotificationGroup.java b/platform/platform-api/src/com/intellij/notification/NotificationGroup.java
index 8bd5200bf84b..959bca783ed5 100644
--- a/platform/platform-api/src/com/intellij/notification/NotificationGroup.java
+++ b/platform/platform-api/src/com/intellij/notification/NotificationGroup.java
@@ -30,7 +30,7 @@ import java.util.Map;
  * @author peter
  */
 public final class NotificationGroup {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.notification.NotificationGroup");
+  private static final Logger LOG = Logger.getInstance(NotificationGroup.class);
   private static final Map<String, NotificationGroup> ourRegisteredGroups = ContainerUtil.newConcurrentMap();
 
   @NotNull private final String myDisplayId;
diff --git a/platform/platform-api/src/com/intellij/openapi/actionSystem/ActionStub.java b/platform/platform-api/src/com/intellij/openapi/actionSystem/ActionStub.java
index 32e4b0c0ca84..3424a75dfb80 100644
--- a/platform/platform-api/src/com/intellij/openapi/actionSystem/ActionStub.java
+++ b/platform/platform-api/src/com/intellij/openapi/actionSystem/ActionStub.java
@@ -17,7 +17,7 @@ import java.util.function.Supplier;
  */
 @SuppressWarnings("ComponentNotRegistered")
 public final class ActionStub extends AnAction implements ActionStubBase {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.actionSystem.ActionStub");
+  private static final Logger LOG = Logger.getInstance(ActionStub.class);
 
   private final String myClassName;
   private final String myProjectType;
diff --git a/platform/platform-api/src/com/intellij/openapi/actionSystem/DefaultActionGroup.java b/platform/platform-api/src/com/intellij/openapi/actionSystem/DefaultActionGroup.java
index d107b7318bce..070a0334dc65 100644
--- a/platform/platform-api/src/com/intellij/openapi/actionSystem/DefaultActionGroup.java
+++ b/platform/platform-api/src/com/intellij/openapi/actionSystem/DefaultActionGroup.java
@@ -29,7 +29,7 @@ import java.util.*;
  *
  */
 public class DefaultActionGroup extends ActionGroup {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.actionSystem.DefaultActionGroup");
+  private static final Logger LOG = Logger.getInstance(DefaultActionGroup.class);
   private static final String CANT_ADD_ITSELF = "Cannot add a group to itself: ";
   private static final String CANT_ADD_ACTION_TWICE = "Cannot add an action twice: ";
   /**
diff --git a/platform/platform-api/src/com/intellij/openapi/actionSystem/ex/ActionUtil.java b/platform/platform-api/src/com/intellij/openapi/actionSystem/ex/ActionUtil.java
index fac2a856ef77..2a6d9cfd7109 100644
--- a/platform/platform-api/src/com/intellij/openapi/actionSystem/ex/ActionUtil.java
+++ b/platform/platform-api/src/com/intellij/openapi/actionSystem/ex/ActionUtil.java
@@ -49,7 +49,7 @@ import java.util.List;
 import java.util.function.Predicate;
 
 public class ActionUtil {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.actionSystem.ex.ActionUtil");
+  private static final Logger LOG = Logger.getInstance(ActionUtil.class);
   @NonNls private static final String WAS_ENABLED_BEFORE_DUMB = "WAS_ENABLED_BEFORE_DUMB";
   @NonNls public static final String WOULD_BE_ENABLED_IF_NOT_DUMB_MODE = "WOULD_BE_ENABLED_IF_NOT_DUMB_MODE";
   @NonNls private static final String WOULD_BE_VISIBLE_IF_NOT_DUMB_MODE = "WOULD_BE_VISIBLE_IF_NOT_DUMB_MODE";
diff --git a/platform/platform-api/src/com/intellij/openapi/diff/SimpleContent.java b/platform/platform-api/src/com/intellij/openapi/diff/SimpleContent.java
index 372548f3d8ba..4f896283b968 100644
--- a/platform/platform-api/src/com/intellij/openapi/diff/SimpleContent.java
+++ b/platform/platform-api/src/com/intellij/openapi/diff/SimpleContent.java
@@ -27,7 +27,7 @@ import java.nio.charset.StandardCharsets;
  * @see #setReadOnly(boolean)
  */
 public class SimpleContent extends DiffContent {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.diff.SimpleContent");
+  private static final Logger LOG = Logger.getInstance(SimpleContent.class);
 
   private final byte[] myOriginalBytes;
   private final String myOriginalText;
diff --git a/platform/platform-api/src/com/intellij/openapi/editor/actionSystem/EditorTypedHandlerBean.java b/platform/platform-api/src/com/intellij/openapi/editor/actionSystem/EditorTypedHandlerBean.java
index 82785f7c2093..4b79bf3cf42e 100644
--- a/platform/platform-api/src/com/intellij/openapi/editor/actionSystem/EditorTypedHandlerBean.java
+++ b/platform/platform-api/src/com/intellij/openapi/editor/actionSystem/EditorTypedHandlerBean.java
@@ -12,7 +12,7 @@ import com.intellij.util.xmlb.annotations.Attribute;
  * @author yole
  */
 public class EditorTypedHandlerBean extends AbstractExtensionPointBean {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.editor.actionSystem.EditorActionHandlerBean");
+  private static final Logger LOG = Logger.getInstance(EditorActionHandlerBean.class);
 
   public static final ExtensionPointName<EditorTypedHandlerBean> EP_NAME = ExtensionPointName.create("com.intellij.editorTypedHandler");
   public static final ExtensionPointName<EditorTypedHandlerBean> RAW_EP_NAME = ExtensionPointName.create("com.intellij.rawEditorTypedHandler");
diff --git a/platform/platform-api/src/com/intellij/openapi/fileChooser/FileChooser.java b/platform/platform-api/src/com/intellij/openapi/fileChooser/FileChooser.java
index b1472cc26de5..108dd8a7d55a 100644
--- a/platform/platform-api/src/com/intellij/openapi/fileChooser/FileChooser.java
+++ b/platform/platform-api/src/com/intellij/openapi/fileChooser/FileChooser.java
@@ -28,7 +28,7 @@ import java.awt.*;
 import java.util.List;
 
 public class FileChooser {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.fileChooser.FileChooser");
+  private static final Logger LOG = Logger.getInstance(FileChooser.class);
 
   /**
    * Normally, callback isn't invoked if a chooser was cancelled.
diff --git a/platform/platform-api/src/com/intellij/openapi/fileEditor/TextEditorLocation.java b/platform/platform-api/src/com/intellij/openapi/fileEditor/TextEditorLocation.java
index ef1c4ed6dd23..3db5ffe19aaa 100644
--- a/platform/platform-api/src/com/intellij/openapi/fileEditor/TextEditorLocation.java
+++ b/platform/platform-api/src/com/intellij/openapi/fileEditor/TextEditorLocation.java
@@ -23,7 +23,7 @@ import org.jetbrains.annotations.NotNull;
  * @author max
  */
 public class TextEditorLocation implements FileEditorLocation {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.fileEditor.TextEditorLocation");
+  private static final Logger LOG = Logger.getInstance(TextEditorLocation.class);
 
   private final TextEditor myEditor;
   private final LogicalPosition myPosition;
diff --git a/platform/platform-api/src/com/intellij/openapi/options/ConfigurableEP.java b/platform/platform-api/src/com/intellij/openapi/options/ConfigurableEP.java
index f8945a37f883..17e2124caecc 100644
--- a/platform/platform-api/src/com/intellij/openapi/options/ConfigurableEP.java
+++ b/platform/platform-api/src/com/intellij/openapi/options/ConfigurableEP.java
@@ -32,7 +32,7 @@ import java.util.ResourceBundle;
  */
 @Tag("configurable")
 public class ConfigurableEP<T extends UnnamedConfigurable> extends AbstractExtensionPointBean {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.options.ConfigurableEP");
+  private static final Logger LOG = Logger.getInstance(ConfigurableEP.class);
 
   /**
    * This attribute specifies the setting name visible to users.
diff --git a/platform/platform-api/src/com/intellij/openapi/roots/ui/util/CompositeAppearance.java b/platform/platform-api/src/com/intellij/openapi/roots/ui/util/CompositeAppearance.java
index b324345df20e..5655ab7d66a4 100644
--- a/platform/platform-api/src/com/intellij/openapi/roots/ui/util/CompositeAppearance.java
+++ b/platform/platform-api/src/com/intellij/openapi/roots/ui/util/CompositeAppearance.java
@@ -19,7 +19,7 @@ import java.util.List;
 
 // todo: move to intellij.platform.lang.impl ?
 public class CompositeAppearance implements ModifiableCellAppearanceEx {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.roots.ui.util.CompositeAppearance");
+  private static final Logger LOG = Logger.getInstance(CompositeAppearance.class);
 
   private Icon myIcon;
   private final List<TextSection> mySections = new ArrayList<>();
diff --git a/platform/platform-api/src/com/intellij/openapi/ui/DialogBuilder.java b/platform/platform-api/src/com/intellij/openapi/ui/DialogBuilder.java
index b1dd2583e6e1..06bcc589f58a 100644
--- a/platform/platform-api/src/com/intellij/openapi/ui/DialogBuilder.java
+++ b/platform/platform-api/src/com/intellij/openapi/ui/DialogBuilder.java
@@ -22,7 +22,7 @@ import java.util.ArrayList;
  * There is no need to create a subclass (which is needed in the DialogWrapper), which can be nice for simple dialogs.
  */
 public class DialogBuilder implements Disposable {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.ui.DialogBuilder");
+  private static final Logger LOG = Logger.getInstance(DialogBuilder.class);
 
   @NonNls public static final String REQUEST_FOCUS_ENABLED = "requestFocusEnabled";
 
diff --git a/platform/platform-api/src/com/intellij/openapi/ui/DialogWrapper.java b/platform/platform-api/src/com/intellij/openapi/ui/DialogWrapper.java
index 029211a3f1d3..6fb2d431f601 100644
--- a/platform/platform-api/src/com/intellij/openapi/ui/DialogWrapper.java
+++ b/platform/platform-api/src/com/intellij/openapi/ui/DialogWrapper.java
@@ -75,7 +75,7 @@ import static javax.swing.JComponent.WHEN_IN_FOCUSED_WINDOW;
  * @see <a href="http://www.jetbrains.org/intellij/sdk/docs/user_interface_components/dialog_wrapper.html">DialogWrapper on SDK DevGuide</a>
  */
 public abstract class DialogWrapper {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.ui.DialogWrapper");
+  private static final Logger LOG = Logger.getInstance(DialogWrapper.class);
 
   public enum IdeModalityType {
     IDE,
diff --git a/platform/platform-api/src/com/intellij/openapi/ui/MasterDetailsComponent.java b/platform/platform-api/src/com/intellij/openapi/ui/MasterDetailsComponent.java
index 604cd4487911..eaac727f585a 100644
--- a/platform/platform-api/src/com/intellij/openapi/ui/MasterDetailsComponent.java
+++ b/platform/platform-api/src/com/intellij/openapi/ui/MasterDetailsComponent.java
@@ -42,7 +42,7 @@ import java.util.*;
  * @author anna
  */
 public abstract class MasterDetailsComponent implements Configurable, DetailsComponent.Facade, MasterDetails {
-  protected static final Logger LOG = Logger.getInstance("#com.intellij.openapi.ui.MasterDetailsComponent");
+  protected static final Logger LOG = Logger.getInstance(MasterDetailsComponent.class);
 
   protected static final Icon COPY_ICON = PlatformIcons.COPY_ICON;
 
diff --git a/platform/platform-api/src/com/intellij/openapi/ui/Messages.java b/platform/platform-api/src/com/intellij/openapi/ui/Messages.java
index 1d596aee3b98..f1272a83905e 100644
--- a/platform/platform-api/src/com/intellij/openapi/ui/Messages.java
+++ b/platform/platform-api/src/com/intellij/openapi/ui/Messages.java
@@ -52,7 +52,7 @@ public class Messages {
 
   private static TestDialog ourTestImplementation = TestDialog.DEFAULT;
   private static TestInputDialog ourTestInputImplementation = TestInputDialog.DEFAULT;
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.ui.Messages");
+  private static final Logger LOG = Logger.getInstance(Messages.class);
 
   @TestOnly
   public static TestDialog setTestDialog(TestDialog newValue) {
diff --git a/platform/platform-api/src/com/intellij/openapi/ui/SelectFromListDialog.java b/platform/platform-api/src/com/intellij/openapi/ui/SelectFromListDialog.java
index a2ae7758940a..118d961f824b 100644
--- a/platform/platform-api/src/com/intellij/openapi/ui/SelectFromListDialog.java
+++ b/platform/platform-api/src/com/intellij/openapi/ui/SelectFromListDialog.java
@@ -30,7 +30,7 @@ import java.awt.*;
 
 
 public class SelectFromListDialog extends DialogWrapper {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.ui.SelectFromListDialog");
+  private static final Logger LOG = Logger.getInstance(SelectFromListDialog.class);
 
   private final ToStringAspect myToStringAspect;
   private final DefaultListModel<Object> myModel = new DefaultListModel<>();
diff --git a/platform/platform-api/src/com/intellij/openapi/ui/popup/util/PopupUtil.java b/platform/platform-api/src/com/intellij/openapi/ui/popup/util/PopupUtil.java
index 578be1d2b9f0..27c2c70a9d84 100644
--- a/platform/platform-api/src/com/intellij/openapi/ui/popup/util/PopupUtil.java
+++ b/platform/platform-api/src/com/intellij/openapi/ui/popup/util/PopupUtil.java
@@ -38,7 +38,7 @@ import java.awt.event.ComponentEvent;
 import java.lang.reflect.Method;
 
 public class PopupUtil {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.ui.popup.util.PopupUtil");
+  private static final Logger LOG = Logger.getInstance(PopupUtil.class);
 
   private PopupUtil() {
   }
diff --git a/platform/platform-api/src/com/intellij/openapi/util/process/InterruptibleProcess.java b/platform/platform-api/src/com/intellij/openapi/util/process/InterruptibleProcess.java
index b032842ece14..5439527cf90a 100644
--- a/platform/platform-api/src/com/intellij/openapi/util/process/InterruptibleProcess.java
+++ b/platform/platform-api/src/com/intellij/openapi/util/process/InterruptibleProcess.java
@@ -26,7 +26,7 @@ import java.io.InputStream;
 import java.util.concurrent.TimeUnit;
 
 public abstract class InterruptibleProcess extends InterruptibleActivity {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.util.process.InterruptibleProcess");
+  private static final Logger LOG = Logger.getInstance(InterruptibleProcess.class);
   private final Process myProcess;
   private final InputStream myInputStream;
   private final InputStream myErrorStream;
diff --git a/platform/platform-api/src/com/intellij/openapi/wm/ToolWindowContentUiType.java b/platform/platform-api/src/com/intellij/openapi/wm/ToolWindowContentUiType.java
index 26f52a9051eb..ae9cdd9bf071 100644
--- a/platform/platform-api/src/com/intellij/openapi/wm/ToolWindowContentUiType.java
+++ b/platform/platform-api/src/com/intellij/openapi/wm/ToolWindowContentUiType.java
@@ -8,7 +8,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 public class ToolWindowContentUiType {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.wm.ToolWindowContentUiType");
+  private static final Logger LOG = Logger.getInstance(ToolWindowContentUiType.class);
 
   public static final ToolWindowContentUiType TABBED = new ToolWindowContentUiType("tabs");
   public static final ToolWindowContentUiType COMBO = new ToolWindowContentUiType("combo");
diff --git a/platform/platform-api/src/com/intellij/openapi/wm/ToolWindowEP.java b/platform/platform-api/src/com/intellij/openapi/wm/ToolWindowEP.java
index e4043cae2935..b19d42f41e4f 100644
--- a/platform/platform-api/src/com/intellij/openapi/wm/ToolWindowEP.java
+++ b/platform/platform-api/src/com/intellij/openapi/wm/ToolWindowEP.java
@@ -30,7 +30,7 @@ import org.jetbrains.annotations.Nullable;
  * @author yole
  */
 public class ToolWindowEP extends AbstractExtensionPointBean {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.wm.ToolWindowEP");
+  private static final Logger LOG = Logger.getInstance(ToolWindowEP.class);
 
   public static final ExtensionPointName<ToolWindowEP> EP_NAME = ExtensionPointName.create("com.intellij.toolWindow");
 
diff --git a/platform/platform-api/src/com/intellij/ui/AbstractFieldPanel.java b/platform/platform-api/src/com/intellij/ui/AbstractFieldPanel.java
index 9b5fbd72edf4..1dac336034d3 100644
--- a/platform/platform-api/src/com/intellij/ui/AbstractFieldPanel.java
+++ b/platform/platform-api/src/com/intellij/ui/AbstractFieldPanel.java
@@ -27,7 +27,7 @@ import java.awt.event.KeyEvent;
 import java.util.ArrayList;
 
 public abstract class AbstractFieldPanel extends JPanel {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.ui.AbstractFieldPanel");
+  private static final Logger LOG = Logger.getInstance(AbstractFieldPanel.class);
   private final JComponent myComponent;
   private Runnable myChangeListener;
   protected ArrayList<JButton> myButtons = new ArrayList<>(1);
diff --git a/platform/platform-api/src/com/intellij/ui/GuiUtils.java b/platform/platform-api/src/com/intellij/ui/GuiUtils.java
index f50644084136..ab6c8416e651 100644
--- a/platform/platform-api/src/com/intellij/ui/GuiUtils.java
+++ b/platform/platform-api/src/com/intellij/ui/GuiUtils.java
@@ -36,7 +36,7 @@ import java.lang.reflect.InvocationTargetException;
 import java.net.MalformedURLException;
 
 public final class GuiUtils {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.ui.GuiUtils");
+  private static final Logger LOG = Logger.getInstance(GuiUtils.class);
 
   private static final Insets paddingInsideDialog = new Insets(5, 5, 5, 5);
 
diff --git a/platform/platform-api/src/com/intellij/ui/InsertPathAction.java b/platform/platform-api/src/com/intellij/ui/InsertPathAction.java
index fffa34ad86f9..20a9d369145a 100644
--- a/platform/platform-api/src/com/intellij/ui/InsertPathAction.java
+++ b/platform/platform-api/src/com/intellij/ui/InsertPathAction.java
@@ -36,7 +36,7 @@ import java.io.File;
 
 @SuppressWarnings("ComponentNotRegistered")
 public class InsertPathAction extends AnAction {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.ui.InsertPathAction");
+  private static final Logger LOG = Logger.getInstance(InsertPathAction.class);
   protected final JTextComponent myTextField;
   protected static final CustomShortcutSet CTRL_F = new CustomShortcutSet(KeyStroke.getKeyStroke(KeyEvent.VK_F, InputEvent.CTRL_DOWN_MASK));
   protected final FileChooserDescriptor myDescriptor;
diff --git a/platform/platform-api/src/com/intellij/ui/ScrollingUtil.java b/platform/platform-api/src/com/intellij/ui/ScrollingUtil.java
index 697aee253b69..702e50a83190 100644
--- a/platform/platform-api/src/com/intellij/ui/ScrollingUtil.java
+++ b/platform/platform-api/src/com/intellij/ui/ScrollingUtil.java
@@ -31,7 +31,7 @@ import java.awt.event.KeyEvent;
  * @author Konstantin Bulenkov
  */
 public class ScrollingUtil {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.ui.ScrollingUtil");
+  private static final Logger LOG = Logger.getInstance(ScrollingUtil.class);
   @NonNls
   protected static final String SCROLLUP_ACTION_ID = "scrollUp";
   @NonNls
diff --git a/platform/platform-api/src/com/intellij/ui/SimpleColoredComponent.java b/platform/platform-api/src/com/intellij/ui/SimpleColoredComponent.java
index e815066c42c8..4b7247de1564 100644
--- a/platform/platform-api/src/com/intellij/ui/SimpleColoredComponent.java
+++ b/platform/platform-api/src/com/intellij/ui/SimpleColoredComponent.java
@@ -43,7 +43,7 @@ import java.util.List;
  */
 @SuppressWarnings({"NonPrivateFieldAccessedInSynchronizedContext", "FieldAccessedSynchronizedAndUnsynchronized"})
 public class SimpleColoredComponent extends JComponent implements Accessible, ColoredTextContainer {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.ui.SimpleColoredComponent");
+  private static final Logger LOG = Logger.getInstance(SimpleColoredComponent.class);
 
   public static final int FRAGMENT_ICON = -2;
 
diff --git a/platform/platform-api/src/com/intellij/ui/TreeCopyProvider.java b/platform/platform-api/src/com/intellij/ui/TreeCopyProvider.java
index 2a9afc7e6b0d..42ee75001fef 100644
--- a/platform/platform-api/src/com/intellij/ui/TreeCopyProvider.java
+++ b/platform/platform-api/src/com/intellij/ui/TreeCopyProvider.java
@@ -28,7 +28,7 @@ import java.awt.datatransfer.Clipboard;
  * @author yole
  */
 public class TreeCopyProvider implements CopyProvider {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.ui.TreeCopyProvider");
+  private static final Logger LOG = Logger.getInstance(TreeCopyProvider.class);
   private final JTree myTree;
 
   public TreeCopyProvider(final JTree tree) {
diff --git a/platform/platform-api/src/com/intellij/ui/dualView/TreeTableView.java b/platform/platform-api/src/com/intellij/ui/dualView/TreeTableView.java
index a1a45301a963..e6902970ecad 100644
--- a/platform/platform-api/src/com/intellij/ui/dualView/TreeTableView.java
+++ b/platform/platform-api/src/com/intellij/ui/dualView/TreeTableView.java
@@ -38,7 +38,7 @@ import java.util.Collections;
 import java.util.List;
 
 public class TreeTableView extends TreeTable implements ItemsProvider, SelectionProvider {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.ui.dualView.TreeTableView");
+  private static final Logger LOG = Logger.getInstance(TreeTableView.class);
 
   public TreeTableView(ListTreeTableModelOnColumns treeTableModel) {
     super(treeTableModel);
diff --git a/platform/platform-api/src/com/intellij/ui/table/BaseTableView.java b/platform/platform-api/src/com/intellij/ui/table/BaseTableView.java
index 04fa6a83fd50..56b2889355bd 100644
--- a/platform/platform-api/src/com/intellij/ui/table/BaseTableView.java
+++ b/platform/platform-api/src/com/intellij/ui/table/BaseTableView.java
@@ -31,7 +31,7 @@ import java.util.Arrays;
  * Do NOT add code that assumes that table has same number of rows as model. It isn't true!
  */
 public class BaseTableView extends JBTable {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.ui.table.BaseTableView");
+  private static final Logger LOG = Logger.getInstance(BaseTableView.class);
 
   public BaseTableView(final TableModel model) {
     super(model);
diff --git a/platform/platform-api/src/com/intellij/util/Alarm.java b/platform/platform-api/src/com/intellij/util/Alarm.java
index a8467eaca2ff..848efba6331c 100644
--- a/platform/platform-api/src/com/intellij/util/Alarm.java
+++ b/platform/platform-api/src/com/intellij/util/Alarm.java
@@ -33,7 +33,7 @@ import java.util.concurrent.*;
  * {@link #cancelAllRequests()} and {@link #cancelRequest(Runnable)} allow to cancel already scheduled requests.
  */
 public class Alarm implements Disposable {
-  protected static final Logger LOG = Logger.getInstance("#com.intellij.util.Alarm");
+  protected static final Logger LOG = Logger.getInstance(Alarm.class);
 
   private volatile boolean myDisposed;
 
diff --git a/platform/platform-api/src/com/intellij/util/config/Storage.java b/platform/platform-api/src/com/intellij/util/config/Storage.java
index 101d2e7f86c6..416b09d2d911 100644
--- a/platform/platform-api/src/com/intellij/util/config/Storage.java
+++ b/platform/platform-api/src/com/intellij/util/config/Storage.java
@@ -34,7 +34,7 @@ public interface Storage {
   String get(String key);
 
   class PropertiesComponentStorage implements Storage {
-    private static final Logger LOG = Logger.getInstance("#com.intellij.util.config.Storage.PropertiesComponentStorage");
+    private static final Logger LOG = Logger.getInstance(PropertiesComponentStorage.class);
 
     private final PropertiesComponent myPropertiesComponent;
     private final String myPrefix;
diff --git a/platform/platform-api/src/com/intellij/util/net/HttpConfigurable.java b/platform/platform-api/src/com/intellij/util/net/HttpConfigurable.java
index 4d58eb48114d..57afa8f80588 100644
--- a/platform/platform-api/src/com/intellij/util/net/HttpConfigurable.java
+++ b/platform/platform-api/src/com/intellij/util/net/HttpConfigurable.java
@@ -55,7 +55,7 @@ import static com.intellij.openapi.util.Pair.pair;
 
 @State(name = "HttpConfigurable", storages = @Storage("proxy.settings.xml"))
 public class HttpConfigurable implements PersistentStateComponent<HttpConfigurable>, Disposable {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.util.net.HttpConfigurable");
+  private static final Logger LOG = Logger.getInstance(HttpConfigurable.class);
   private static final File PROXY_CREDENTIALS_FILE = new File(PathManager.getOptionsPath(), "proxy.settings.pwd");
 
   public boolean PROXY_TYPE_IS_SOCKS;
diff --git a/platform/platform-api/src/com/intellij/util/net/IdeaWideAuthenticator.java b/platform/platform-api/src/com/intellij/util/net/IdeaWideAuthenticator.java
index cd76cf16ab28..99d06bd284b3 100644
--- a/platform/platform-api/src/com/intellij/util/net/IdeaWideAuthenticator.java
+++ b/platform/platform-api/src/com/intellij/util/net/IdeaWideAuthenticator.java
@@ -12,7 +12,7 @@ import java.net.Authenticator;
 import java.net.PasswordAuthentication;
 
 public final class IdeaWideAuthenticator extends NonStaticAuthenticator {
-  private final static Logger LOG = Logger.getInstance("#com.intellij.util.net.IdeaWideAuthenticator");
+  private final static Logger LOG = Logger.getInstance(IdeaWideAuthenticator.class);
   private final HttpConfigurable myHttpConfigurable;
 
   public IdeaWideAuthenticator(@NotNull HttpConfigurable configurable) {
diff --git a/platform/platform-api/src/com/intellij/util/net/IdeaWideProxySelector.java b/platform/platform-api/src/com/intellij/util/net/IdeaWideProxySelector.java
index 59fce28ad717..58c7f261d381 100644
--- a/platform/platform-api/src/com/intellij/util/net/IdeaWideProxySelector.java
+++ b/platform/platform-api/src/com/intellij/util/net/IdeaWideProxySelector.java
@@ -19,7 +19,7 @@ import java.util.List;
 import java.util.concurrent.atomic.AtomicReference;
 
 public final class IdeaWideProxySelector extends ProxySelector {
-  private final static Logger LOG = Logger.getInstance("#com.intellij.util.net.IdeaWideProxySelector");
+  private final static Logger LOG = Logger.getInstance(IdeaWideProxySelector.class);
 
   private final HttpConfigurable myHttpConfigurable;
   private final AtomicReference<Pair<ProxySelector, String>> myPacProxySelector = new AtomicReference<>();
diff --git a/platform/platform-api/src/com/intellij/util/proxy/CommonProxy.java b/platform/platform-api/src/com/intellij/util/proxy/CommonProxy.java
index 65200f4c2b6f..4ef845ce18a6 100644
--- a/platform/platform-api/src/com/intellij/util/proxy/CommonProxy.java
+++ b/platform/platform-api/src/com/intellij/util/proxy/CommonProxy.java
@@ -22,7 +22,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
 
 public final class CommonProxy extends ProxySelector {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.util.proxy.CommonProxy");
+  private static final Logger LOG = Logger.getInstance(CommonProxy.class);
 
   private final static CommonProxy ourInstance = new CommonProxy();
   private final CommonAuthenticator myAuthenticator = new CommonAuthenticator();
diff --git a/platform/platform-api/src/com/intellij/util/ui/EditorAdapter.java b/platform/platform-api/src/com/intellij/util/ui/EditorAdapter.java
index af748ff8584d..af431d64202d 100644
--- a/platform/platform-api/src/com/intellij/util/ui/EditorAdapter.java
+++ b/platform/platform-api/src/com/intellij/util/ui/EditorAdapter.java
@@ -52,7 +52,7 @@ class Line {
 }
 
 public class EditorAdapter {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.util.ui.EditorAdapter");
+  private static final Logger LOG = Logger.getInstance(EditorAdapter.class);
 
   private final Editor myEditor;
 
diff --git a/platform/platform-api/src/com/intellij/util/ui/tree/TreeUtil.java b/platform/platform-api/src/com/intellij/util/ui/tree/TreeUtil.java
index 6822cac86043..d4f7948845ea 100644
--- a/platform/platform-api/src/com/intellij/util/ui/tree/TreeUtil.java
+++ b/platform/platform-api/src/com/intellij/util/ui/tree/TreeUtil.java
@@ -54,7 +54,7 @@ import static java.util.stream.Collectors.toList;
 
 public final class TreeUtil {
   public static final TreePath[] EMPTY_TREE_PATH = new TreePath[0];
-  private static final Logger LOG = Logger.getInstance("#com.intellij.util.ui.tree.TreeUtil");
+  private static final Logger LOG = Logger.getInstance(TreeUtil.class);
   private static final String TREE_UTIL_SCROLL_TIME_STAMP = "TreeUtil.scrollTimeStamp";
   private static final JBIterable<Integer> NUMBERS = JBIterable.generate(0, i -> i + 1);
 
diff --git a/platform/platform-impl/src/com/intellij/codeInsight/hint/EditorFragmentComponent.java b/platform/platform-impl/src/com/intellij/codeInsight/hint/EditorFragmentComponent.java
index 7dd2a4ec20c7..11c825070a60 100644
--- a/platform/platform-impl/src/com/intellij/codeInsight/hint/EditorFragmentComponent.java
+++ b/platform/platform-impl/src/com/intellij/codeInsight/hint/EditorFragmentComponent.java
@@ -35,7 +35,7 @@ import java.awt.image.BufferedImage;
 import java.lang.ref.WeakReference;
 
 public class EditorFragmentComponent extends JPanel {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.hint.EditorFragmentComponent");
+  private static final Logger LOG = Logger.getInstance(EditorFragmentComponent.class);
   private static final Key<WeakReference<LightweightHint>> CURRENT_HINT = Key.create("EditorFragmentComponent.currentHint");
   private static final int LINE_BORDER_THICKNESS = 1;
   private static final int EMPTY_BORDER_THICKNESS = 2;
diff --git a/platform/platform-impl/src/com/intellij/concurrency/JobLauncherImpl.java b/platform/platform-impl/src/com/intellij/concurrency/JobLauncherImpl.java
index 833c7facb1b9..057e166e59d5 100644
--- a/platform/platform-impl/src/com/intellij/concurrency/JobLauncherImpl.java
+++ b/platform/platform-impl/src/com/intellij/concurrency/JobLauncherImpl.java
@@ -25,7 +25,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
  * @author cdr
  */
 public class JobLauncherImpl extends JobLauncher {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.concurrency.JobLauncherImpl");
+  private static final Logger LOG = Logger.getInstance(JobLauncherImpl.class);
   static final int CORES_FORK_THRESHOLD = 1;
 
   @Override
diff --git a/platform/platform-impl/src/com/intellij/designer/propertyTable/PropertyTable.java b/platform/platform-impl/src/com/intellij/designer/propertyTable/PropertyTable.java
index bc9dc3043f09..cd9607a5de72 100644
--- a/platform/platform-impl/src/com/intellij/designer/propertyTable/PropertyTable.java
+++ b/platform/platform-impl/src/com/intellij/designer/propertyTable/PropertyTable.java
@@ -47,7 +47,7 @@ import java.util.*;
  * @author Alexander Lobas
  */
 public abstract class PropertyTable extends JBTable {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.designer.propertyTable.PropertyTable");
+  private static final Logger LOG = Logger.getInstance(PropertyTable.class);
   private static final Comparator<String> GROUP_COMPARATOR = (o1, o2) -> StringUtil.compare(o1, o2, true);
   private static final Comparator<Property> PROPERTY_COMPARATOR = (o1, o2) -> StringUtil.compare(o1.getName(), o2.getName(), true);
 
diff --git a/platform/platform-impl/src/com/intellij/diagnostic/VMOptions.java b/platform/platform-impl/src/com/intellij/diagnostic/VMOptions.java
index c1e58897a997..3867398d32c5 100644
--- a/platform/platform-impl/src/com/intellij/diagnostic/VMOptions.java
+++ b/platform/platform-impl/src/com/intellij/diagnostic/VMOptions.java
@@ -21,7 +21,7 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 public class VMOptions {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.diagnostic.VMOptions");
+  private static final Logger LOG = Logger.getInstance(VMOptions.class);
 
   public enum MemoryKind {
     HEAP("Xmx", ""), MIN_HEAP("Xms", ""), PERM_GEN("XX:MaxPermSize", "="), METASPACE("XX:MaxMetaspaceSize", "="), CODE_CACHE("XX:ReservedCodeCacheSize", "=");
diff --git a/platform/platform-impl/src/com/intellij/execution/process/RunnerMediator.java b/platform/platform-impl/src/com/intellij/execution/process/RunnerMediator.java
index 8476699492d3..2713eb072606 100644
--- a/platform/platform-impl/src/com/intellij/execution/process/RunnerMediator.java
+++ b/platform/platform-impl/src/com/intellij/execution/process/RunnerMediator.java
@@ -21,7 +21,7 @@ import java.io.PrintWriter;
  * @author traff
  */
 public class RunnerMediator {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.execution.process.RunnerMediator");
+  private static final Logger LOG = Logger.getInstance(RunnerMediator.class);
 
   private static final char IAC = (char)5;
   private static final char BRK = (char)3;
diff --git a/platform/platform-impl/src/com/intellij/featureStatistics/ProductivityFeaturesRegistryImpl.java b/platform/platform-impl/src/com/intellij/featureStatistics/ProductivityFeaturesRegistryImpl.java
index 9947008b2982..c4e56f833731 100644
--- a/platform/platform-impl/src/com/intellij/featureStatistics/ProductivityFeaturesRegistryImpl.java
+++ b/platform/platform-impl/src/com/intellij/featureStatistics/ProductivityFeaturesRegistryImpl.java
@@ -16,7 +16,7 @@ import java.io.IOException;
 import java.util.*;
 
 public class ProductivityFeaturesRegistryImpl extends ProductivityFeaturesRegistry {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.featureStatistics.ProductivityFeaturesRegistry");
+  private static final Logger LOG = Logger.getInstance(ProductivityFeaturesRegistry.class);
   private final Map<String, FeatureDescriptor> myFeatures = new HashMap<>();
   private final Map<String, GroupDescriptor> myGroups = new HashMap<>();
   private final List<Pair<String, ApplicabilityFilter>> myApplicabilityFilters = new ArrayList<>();
diff --git a/platform/platform-impl/src/com/intellij/featureStatistics/fusCollectors/LifecycleUsageTriggerCollector.java b/platform/platform-impl/src/com/intellij/featureStatistics/fusCollectors/LifecycleUsageTriggerCollector.java
index 33f86c784089..81773609e871 100644
--- a/platform/platform-impl/src/com/intellij/featureStatistics/fusCollectors/LifecycleUsageTriggerCollector.java
+++ b/platform/platform-impl/src/com/intellij/featureStatistics/fusCollectors/LifecycleUsageTriggerCollector.java
@@ -20,7 +20,7 @@ import static com.intellij.internal.statistic.utils.PluginInfoDetectorKt.getPlat
 import static com.intellij.internal.statistic.utils.PluginInfoDetectorKt.getPluginInfoById;
 
 public final class LifecycleUsageTriggerCollector {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.featureStatistics.fusCollectors.LifecycleUsageTriggerCollector");
+  private static final Logger LOG = Logger.getInstance(LifecycleUsageTriggerCollector.class);
   private static final String LIFECYCLE = "lifecycle";
 
   private static final EventsRateThrottle ourErrorsRateThrottle = new EventsRateThrottle(100, 5L * 60 * 1000); // 100 errors per 5 minutes
diff --git a/platform/platform-impl/src/com/intellij/ide/ApplicationActivationStateManager.java b/platform/platform-impl/src/com/intellij/ide/ApplicationActivationStateManager.java
index f6a727a2b77c..50fc5193cc3b 100644
--- a/platform/platform-impl/src/com/intellij/ide/ApplicationActivationStateManager.java
+++ b/platform/platform-impl/src/com/intellij/ide/ApplicationActivationStateManager.java
@@ -23,7 +23,7 @@ import java.util.concurrent.atomic.AtomicLong;
  */
 public class ApplicationActivationStateManager {
 
-  private static final Logger LOG = Logger.getInstance("#com.intellij.ide.ApplicationActivationStateManager");
+  private static final Logger LOG = Logger.getInstance(ApplicationActivationStateManager.class);
 
   private static final AtomicLong requestToDeactivateTime = new AtomicLong(System.currentTimeMillis());
 
diff --git a/platform/platform-impl/src/com/intellij/ide/CommandLineProcessor.java b/platform/platform-impl/src/com/intellij/ide/CommandLineProcessor.java
index 26b982ecfbda..a31b187f8132 100644
--- a/platform/platform-impl/src/com/intellij/ide/CommandLineProcessor.java
+++ b/platform/platform-impl/src/com/intellij/ide/CommandLineProcessor.java
@@ -38,7 +38,7 @@ import static com.intellij.openapi.util.Pair.pair;
  * @author yole
  */
 public final class CommandLineProcessor {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.ide.CommandLineProcessor");
+  private static final Logger LOG = Logger.getInstance(CommandLineProcessor.class);
   private static final String WAIT_KEY = "--wait";
 
   private CommandLineProcessor() { }
diff --git a/platform/platform-impl/src/com/intellij/ide/ProhibitAWTEvents.java b/platform/platform-impl/src/com/intellij/ide/ProhibitAWTEvents.java
index 3f5660917923..66636024f25d 100644
--- a/platform/platform-impl/src/com/intellij/ide/ProhibitAWTEvents.java
+++ b/platform/platform-impl/src/com/intellij/ide/ProhibitAWTEvents.java
@@ -28,7 +28,7 @@ import java.awt.*;
  * @author peter
  */
 public class ProhibitAWTEvents implements IdeEventQueue.EventDispatcher {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.ide.ProhibitAWTEvents");
+  private static final Logger LOG = Logger.getInstance(ProhibitAWTEvents.class);
 
   private final String myActivityName;
   private boolean myReported;
diff --git a/platform/platform-impl/src/com/intellij/ide/actions/CreateDesktopEntryAction.java b/platform/platform-impl/src/com/intellij/ide/actions/CreateDesktopEntryAction.java
index d2735d87f5e7..7d70e617d88a 100644
--- a/platform/platform-impl/src/com/intellij/ide/actions/CreateDesktopEntryAction.java
+++ b/platform/platform-impl/src/com/intellij/ide/actions/CreateDesktopEntryAction.java
@@ -40,7 +40,7 @@ import static com.intellij.openapi.util.Pair.pair;
 import static com.intellij.util.containers.ContainerUtil.newHashMap;
 
 public class CreateDesktopEntryAction extends DumbAwareAction {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.ide.actions.CreateDesktopEntryAction");
+  private static final Logger LOG = Logger.getInstance(CreateDesktopEntryAction.class);
 
   public static boolean isAvailable() {
     return SystemInfo.isXWindow && !ExternalUpdateManager.isRoaming() && SystemInfo.hasXdgOpen();
diff --git a/platform/platform-impl/src/com/intellij/ide/actions/DeleteAction.java b/platform/platform-impl/src/com/intellij/ide/actions/DeleteAction.java
index acf497c6401f..d7b7fa332aa4 100644
--- a/platform/platform-impl/src/com/intellij/ide/actions/DeleteAction.java
+++ b/platform/platform-impl/src/com/intellij/ide/actions/DeleteAction.java
@@ -18,7 +18,7 @@ import javax.swing.text.JTextComponent;
 import java.awt.event.KeyEvent;
 
 public class DeleteAction extends AnAction implements DumbAware {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.ide.actions.DeleteAction");
+  private static final Logger LOG = Logger.getInstance(DeleteAction.class);
 
   public DeleteAction() { }
 
diff --git a/platform/platform-impl/src/com/intellij/ide/actions/ShowSettingsUtilImpl.java b/platform/platform-impl/src/com/intellij/ide/actions/ShowSettingsUtilImpl.java
index 9d65c2e6af9e..ad0af231a330 100644
--- a/platform/platform-impl/src/com/intellij/ide/actions/ShowSettingsUtilImpl.java
+++ b/platform/platform-impl/src/com/intellij/ide/actions/ShowSettingsUtilImpl.java
@@ -32,7 +32,7 @@ import java.util.function.Predicate;
  * @author max
  */
 public class ShowSettingsUtilImpl extends ShowSettingsUtil {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.ide.actions.ShowSettingsUtilImpl");
+  private static final Logger LOG = Logger.getInstance(ShowSettingsUtilImpl.class);
 
   @NotNull
   private static Project getProject(@Nullable Project project) {
diff --git a/platform/platform-impl/src/com/intellij/ide/actions/TabNavigationActionBase.java b/platform/platform-impl/src/com/intellij/ide/actions/TabNavigationActionBase.java
index 119130bfa4b8..e7b1cdbc5c34 100644
--- a/platform/platform-impl/src/com/intellij/ide/actions/TabNavigationActionBase.java
+++ b/platform/platform-impl/src/com/intellij/ide/actions/TabNavigationActionBase.java
@@ -18,7 +18,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 abstract class TabNavigationActionBase extends AnAction implements DumbAware {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.ide.actions.TabNavigationActionBase");
+  private static final Logger LOG = Logger.getInstance(TabNavigationActionBase.class);
 
   enum NavigationType {NUM1, NUM2, NUM3, NUM4, NUM5, NUM6, NUM7, NUM8, NUM9, PREV, NEXT, LAST}
 
diff --git a/platform/platform-impl/src/com/intellij/ide/dnd/FileCopyPasteUtil.java b/platform/platform-impl/src/com/intellij/ide/dnd/FileCopyPasteUtil.java
index 038406c2663a..4545e983a50d 100644
--- a/platform/platform-impl/src/com/intellij/ide/dnd/FileCopyPasteUtil.java
+++ b/platform/platform-impl/src/com/intellij/ide/dnd/FileCopyPasteUtil.java
@@ -20,7 +20,7 @@ import java.util.Collections;
 import java.util.List;
 
 public class FileCopyPasteUtil {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.ide.dnd.FileCopyPasteUtil");
+  private static final Logger LOG = Logger.getInstance(FileCopyPasteUtil.class);
 
   private FileCopyPasteUtil() { }
 
diff --git a/platform/platform-impl/src/com/intellij/ide/errorTreeView/NewErrorTreeViewPanel.java b/platform/platform-impl/src/com/intellij/ide/errorTreeView/NewErrorTreeViewPanel.java
index c9c45d981818..e7199c52298b 100644
--- a/platform/platform-impl/src/com/intellij/ide/errorTreeView/NewErrorTreeViewPanel.java
+++ b/platform/platform-impl/src/com/intellij/ide/errorTreeView/NewErrorTreeViewPanel.java
@@ -53,7 +53,7 @@ import java.util.Collections;
 import java.util.List;
 
 public class NewErrorTreeViewPanel extends JPanel implements DataProvider, OccurenceNavigator, MutableErrorTreeView, CopyProvider, Disposable {
-  protected static final Logger LOG = Logger.getInstance("#com.intellij.ide.errorTreeView.NewErrorTreeViewPanel");
+  protected static final Logger LOG = Logger.getInstance(NewErrorTreeViewPanel.class);
   private volatile String myProgressText = "";
   private volatile float myFraction;
   private final boolean myCreateExitAction;
diff --git a/platform/platform-impl/src/com/intellij/ide/gdpr/ConsentOptions.java b/platform/platform-impl/src/com/intellij/ide/gdpr/ConsentOptions.java
index 5391d5c69776..db93103cc821 100644
--- a/platform/platform-impl/src/com/intellij/ide/gdpr/ConsentOptions.java
+++ b/platform/platform-impl/src/com/intellij/ide/gdpr/ConsentOptions.java
@@ -26,7 +26,7 @@ import java.util.stream.Stream;
  * Date: 05-Dec-17
  */
 public final class ConsentOptions {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.ide.gdpr.ConsentOptions");
+  private static final Logger LOG = Logger.getInstance(ConsentOptions.class);
   private static final String CONSENTS_CONFIRMATION_PROPERTY = "jb.consents.confirmation.enabled";
   private static final String STATISTICS_OPTION_ID = "rsch.send.usage.stat";
   private final boolean myIsEAP;
diff --git a/platform/platform-impl/src/com/intellij/ide/gdpr/Locations.java b/platform/platform-impl/src/com/intellij/ide/gdpr/Locations.java
index 149eb19c086e..d3a1f16aa464 100644
--- a/platform/platform-impl/src/com/intellij/ide/gdpr/Locations.java
+++ b/platform/platform-impl/src/com/intellij/ide/gdpr/Locations.java
@@ -15,7 +15,7 @@ import java.io.File;
  * Date: 06-Dec-17
  */
 public class Locations {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.ide.gdpr.Locations");
+  private static final Logger LOG = Logger.getInstance(Locations.class);
   private static final File ourDataDir;
 
   static {
diff --git a/platform/platform-impl/src/com/intellij/ide/impl/DataValidator.java b/platform/platform-impl/src/com/intellij/ide/impl/DataValidator.java
index 1ad9d8ac23c4..e5f1bbd3cc8e 100644
--- a/platform/platform-impl/src/com/intellij/ide/impl/DataValidator.java
+++ b/platform/platform-impl/src/com/intellij/ide/impl/DataValidator.java
@@ -22,7 +22,7 @@ public abstract class DataValidator<T> {
   public static final ExtensionPointName<KeyedLazyInstanceEP<DataValidator>> EP_NAME =
     ExtensionPointName.create("com.intellij.dataValidator");
 
-  private static final Logger LOG = Logger.getInstance("#com.intellij.ide.impl.DataValidator");
+  private static final Logger LOG = Logger.getInstance(DataValidator.class);
 
   private static final Map<String, DataValidator<?>> ourValidators = new HashMap<>();
   private static final DataValidator<VirtualFile> VIRTUAL_FILE_VALIDATOR = new DataValidator<VirtualFile>() {
diff --git a/platform/platform-impl/src/com/intellij/ide/plugins/newui/PluginLogo.java b/platform/platform-impl/src/com/intellij/ide/plugins/newui/PluginLogo.java
index 315e679102e7..3bf7e06030dc 100644
--- a/platform/platform-impl/src/com/intellij/ide/plugins/newui/PluginLogo.java
+++ b/platform/platform-impl/src/com/intellij/ide/plugins/newui/PluginLogo.java
@@ -42,7 +42,7 @@ import java.util.zip.ZipFile;
  * @author Alexander Lobas
  */
 public final class PluginLogo {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.ide.plugins.newui.PluginLogo");
+  private static final Logger LOG = Logger.getInstance(PluginLogo.class);
 
   private static final String CACHE_DIR = "imageCache";
   private static final String PLUGIN_ICON = "pluginIcon.svg";
diff --git a/platform/platform-impl/src/com/intellij/ide/startup/impl/StartupManagerImpl.java b/platform/platform-impl/src/com/intellij/ide/startup/impl/StartupManagerImpl.java
index 8be418ad98f7..dd6540f7121d 100644
--- a/platform/platform-impl/src/com/intellij/ide/startup/impl/StartupManagerImpl.java
+++ b/platform/platform-impl/src/com/intellij/ide/startup/impl/StartupManagerImpl.java
@@ -56,7 +56,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
 
 public class StartupManagerImpl extends StartupManagerEx implements Disposable {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.ide.startup.impl.StartupManagerImpl");
+  private static final Logger LOG = Logger.getInstance(StartupManagerImpl.class);
   private static final long EDT_WARN_THRESHOLD_IN_NANO = TimeUnit.MILLISECONDS.toNanos(100);
 
   private final Object myLock = new Object();
diff --git a/platform/platform-impl/src/com/intellij/ide/ui/customization/CustomizableActionsPanel.java b/platform/platform-impl/src/com/intellij/ide/ui/customization/CustomizableActionsPanel.java
index d85673550efc..e50c585f24a2 100644
--- a/platform/platform-impl/src/com/intellij/ide/ui/customization/CustomizableActionsPanel.java
+++ b/platform/platform-impl/src/com/intellij/ide/ui/customization/CustomizableActionsPanel.java
@@ -55,7 +55,7 @@ import java.util.List;
 import java.util.*;
 
 public class CustomizableActionsPanel {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.ide.ui.customization.CustomizableActionsPanel");
+  private static final Logger LOG = Logger.getInstance(CustomizableActionsPanel.class);
 
   private JPanel myPanel;
   private JTree myActionsTree;
diff --git a/platform/platform-impl/src/com/intellij/ide/ui/customization/CustomizationUtil.java b/platform/platform-impl/src/com/intellij/ide/ui/customization/CustomizationUtil.java
index f52cbbfaf82e..d12ec2d843ff 100644
--- a/platform/platform-impl/src/com/intellij/ide/ui/customization/CustomizationUtil.java
+++ b/platform/platform-impl/src/com/intellij/ide/ui/customization/CustomizationUtil.java
@@ -41,7 +41,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class CustomizationUtil {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.ide.ui.customization.CustomizationUtil");
+  private static final Logger LOG = Logger.getInstance(CustomizationUtil.class);
 
   private CustomizationUtil() {
   }
diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/LafManagerImpl.java b/platform/platform-impl/src/com/intellij/ide/ui/laf/LafManagerImpl.java
index 902e889f3558..d118057d8b38 100644
--- a/platform/platform-impl/src/com/intellij/ide/ui/laf/LafManagerImpl.java
+++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/LafManagerImpl.java
@@ -65,7 +65,7 @@ import java.util.*;
 
 @State(name = "LafManager", storages = @Storage(value = "laf.xml", roamingType = RoamingType.PER_OS))
 public final class LafManagerImpl extends LafManager implements PersistentStateComponent<Element>, Disposable {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.ide.ui.LafManager");
+  private static final Logger LOG = Logger.getInstance(LafManager.class);
 
   @NonNls private static final String ELEMENT_LAF = "laf";
   @NonNls private static final String ATTRIBUTE_CLASS_NAME = "class-name";
diff --git a/platform/platform-impl/src/com/intellij/ide/ui/search/SearchableOptionsRegistrarImpl.java b/platform/platform-impl/src/com/intellij/ide/ui/search/SearchableOptionsRegistrarImpl.java
index 3abe9d68cac6..aa227df1660e 100644
--- a/platform/platform-impl/src/com/intellij/ide/ui/search/SearchableOptionsRegistrarImpl.java
+++ b/platform/platform-impl/src/com/intellij/ide/ui/search/SearchableOptionsRegistrarImpl.java
@@ -68,7 +68,7 @@ public class SearchableOptionsRegistrarImpl extends SearchableOptionsRegistrar {
     }
   };
 
-  private static final Logger LOG = Logger.getInstance("#com.intellij.ide.ui.search.SearchableOptionsRegistrarImpl");
+  private static final Logger LOG = Logger.getInstance(SearchableOptionsRegistrarImpl.class);
   @NonNls
   private static final Pattern REG_EXP = Pattern.compile("[\\W&&[^-]]+");
 
diff --git a/platform/platform-impl/src/com/intellij/ide/util/ExportToFileUtil.java b/platform/platform-impl/src/com/intellij/ide/util/ExportToFileUtil.java
index 753258d5e7be..fba1e4c9bafe 100644
--- a/platform/platform-impl/src/com/intellij/ide/util/ExportToFileUtil.java
+++ b/platform/platform-impl/src/com/intellij/ide/util/ExportToFileUtil.java
@@ -43,7 +43,7 @@ import java.io.IOException;
 import java.util.TooManyListenersException;
 
 public class ExportToFileUtil {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.ide.util.ExportToFileUtil");
+  private static final Logger LOG = Logger.getInstance(ExportToFileUtil.class);
 
   public static void exportTextToFile(Project project, String fileName, String textToExport) {
     String prepend = "";
diff --git a/platform/platform-impl/src/com/intellij/idea/StartupUtil.java b/platform/platform-impl/src/com/intellij/idea/StartupUtil.java
index 91141dfd828d..50d6ab56a642 100644
--- a/platform/platform-impl/src/com/intellij/idea/StartupUtil.java
+++ b/platform/platform-impl/src/com/intellij/idea/StartupUtil.java
@@ -497,7 +497,7 @@ public final class StartupUtil {
   @NotNull
   private static Logger setupLogger() {
     Logger.setFactory(new LoggerFactory());
-    Logger log = Logger.getInstance("#com.intellij.idea.Main");
+    Logger log = Logger.getInstance(Main.class);
     log.info("------------------------------------------------------ IDE STARTED ------------------------------------------------------");
     ShutDownTracker.getInstance().registerShutdownTask(() -> {
       log.info("------------------------------------------------------ IDE SHUTDOWN ------------------------------------------------------");
diff --git a/platform/platform-impl/src/com/intellij/internal/IconsLoadTime.java b/platform/platform-impl/src/com/intellij/internal/IconsLoadTime.java
index 1213eab033b9..4dada389d7e6 100644
--- a/platform/platform-impl/src/com/intellij/internal/IconsLoadTime.java
+++ b/platform/platform-impl/src/com/intellij/internal/IconsLoadTime.java
@@ -18,7 +18,7 @@ import java.util.List;
  * @author tav
  */
 public final class IconsLoadTime extends DumbAwareAction {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.internal.IconsLoadTime");
+  private static final Logger LOG = Logger.getInstance(IconsLoadTime.class);
 
   private static final int STATS_LIMIT = 10000;
   private static final int FIXED_SCOPE = 100; // log stats for a first fixed number of icons
diff --git a/platform/platform-impl/src/com/intellij/internal/encodings/EncodingViewer.java b/platform/platform-impl/src/com/intellij/internal/encodings/EncodingViewer.java
index 792a9b833144..a614c1355cab 100644
--- a/platform/platform-impl/src/com/intellij/internal/encodings/EncodingViewer.java
+++ b/platform/platform-impl/src/com/intellij/internal/encodings/EncodingViewer.java
@@ -19,7 +19,7 @@ import java.nio.charset.Charset;
 import java.util.Arrays;
 
 public class EncodingViewer extends DialogWrapper {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.internal.encodings.EncodingViewer");
+  private static final Logger LOG = Logger.getInstance(EncodingViewer.class);
 
   private JPanel myPanel;
   private JTextArea myText;
diff --git a/platform/platform-impl/src/com/intellij/internal/focus/FocusDebuggerAction.java b/platform/platform-impl/src/com/intellij/internal/focus/FocusDebuggerAction.java
index 9f64bf4a6cb4..770226a94d60 100644
--- a/platform/platform-impl/src/com/intellij/internal/focus/FocusDebuggerAction.java
+++ b/platform/platform-impl/src/com/intellij/internal/focus/FocusDebuggerAction.java
@@ -23,7 +23,7 @@ import java.awt.event.FocusEvent;
  * @author spleaner
  */
 public class FocusDebuggerAction extends AnAction implements DumbAware {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.internal.focus.FocusDebuggerAction");
+  private static final Logger LOG = Logger.getInstance(FocusDebuggerAction.class);
   private FocusDrawer myFocusDrawer;
 
   public FocusDebuggerAction() {
diff --git a/platform/platform-impl/src/com/intellij/internal/statistic/collectors/fus/fileTypes/FileTypeUsageCounterCollector.java b/platform/platform-impl/src/com/intellij/internal/statistic/collectors/fus/fileTypes/FileTypeUsageCounterCollector.java
index 447ae0d80568..c98d82effb39 100644
--- a/platform/platform-impl/src/com/intellij/internal/statistic/collectors/fus/fileTypes/FileTypeUsageCounterCollector.java
+++ b/platform/platform-impl/src/com/intellij/internal/statistic/collectors/fus/fileTypes/FileTypeUsageCounterCollector.java
@@ -19,7 +19,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 public class FileTypeUsageCounterCollector {
-  private static final Logger LOG = Logger.getInstance("#" + FileTypeUsageCounterCollector.class.getPackage().getName());
+  private static final Logger LOG = Logger.getInstance(FileTypeUsageCounterCollector.class);
 
   private static final ExtensionPointName<FileTypeUsageSchemaDescriptorEP<FileTypeUsageSchemaDescriptor>> EP =
     ExtensionPointName.create("com.intellij.fileTypeUsageSchemaDescriptor");
diff --git a/platform/platform-impl/src/com/intellij/internal/statistic/eventLog/validator/persistence/EventLogTestWhitelistPersistence.java b/platform/platform-impl/src/com/intellij/internal/statistic/eventLog/validator/persistence/EventLogTestWhitelistPersistence.java
index 85b62ac95b0b..4a7f7b806f58 100644
--- a/platform/platform-impl/src/com/intellij/internal/statistic/eventLog/validator/persistence/EventLogTestWhitelistPersistence.java
+++ b/platform/platform-impl/src/com/intellij/internal/statistic/eventLog/validator/persistence/EventLogTestWhitelistPersistence.java
@@ -24,7 +24,7 @@ import java.util.Set;
 
 public class EventLogTestWhitelistPersistence extends BaseEventLogWhitelistPersistence {
   private static final Logger LOG =
-    Logger.getInstance("#com.intellij.internal.statistic.eventLog.validator.persistence.EventLogTestWhitelistPersistence");
+    Logger.getInstance(EventLogTestWhitelistPersistence.class);
 
   private static final String TEST_RULE = "{util#fus_test_mode}";
   private static final String TEST_WHITE_LIST_DATA_FILE = "test-white-list.json";
diff --git a/platform/platform-impl/src/com/intellij/internal/statistic/eventLog/validator/persistence/EventLogWhitelistPersistence.java b/platform/platform-impl/src/com/intellij/internal/statistic/eventLog/validator/persistence/EventLogWhitelistPersistence.java
index eb126bff4b4c..dfb73afdec92 100644
--- a/platform/platform-impl/src/com/intellij/internal/statistic/eventLog/validator/persistence/EventLogWhitelistPersistence.java
+++ b/platform/platform-impl/src/com/intellij/internal/statistic/eventLog/validator/persistence/EventLogWhitelistPersistence.java
@@ -18,7 +18,7 @@ import java.nio.file.StandardCopyOption;
 public class EventLogWhitelistPersistence extends BaseEventLogWhitelistPersistence {
   public static final String WHITE_LIST_DATA_FILE = "white-list.json";
   private static final Logger LOG =
-    Logger.getInstance("#com.intellij.internal.statistic.eventLog.validator.persistence.EventLogWhitelistPersistence");
+    Logger.getInstance(EventLogWhitelistPersistence.class);
   @NotNull
   private final String myRecorderId;
   @NotNull
diff --git a/platform/platform-impl/src/com/intellij/notification/impl/MacEventReader.java b/platform/platform-impl/src/com/intellij/notification/impl/MacEventReader.java
index 0bdd5ba0babc..8fdb30cbed2a 100644
--- a/platform/platform-impl/src/com/intellij/notification/impl/MacEventReader.java
+++ b/platform/platform-impl/src/com/intellij/notification/impl/MacEventReader.java
@@ -16,7 +16,7 @@ import java.util.concurrent.Executor;
 
 class MacEventReader {
   private static final int MAX_MESSAGE_LENGTH = 100;
-  private static final Logger LOG = Logger.getInstance("#com.intellij.notification.impl.MacEventReader");
+  private static final Logger LOG = Logger.getInstance(MacEventReader.class);
   private static final Notifications ourNotificationAdapter = new Notifications() {
     @Override
     public void notify(@NotNull Notification notification) {
diff --git a/platform/platform-impl/src/com/intellij/notification/impl/ui/NotificationsUtil.java b/platform/platform-impl/src/com/intellij/notification/impl/ui/NotificationsUtil.java
index d83d6f67f23c..ec8472de1374 100644
--- a/platform/platform-impl/src/com/intellij/notification/impl/ui/NotificationsUtil.java
+++ b/platform/platform-impl/src/com/intellij/notification/impl/ui/NotificationsUtil.java
@@ -37,7 +37,7 @@ import java.awt.*;
  * @author spleaner
  */
 public class NotificationsUtil {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.notification.impl.ui.NotificationsUtil");
+  private static final Logger LOG = Logger.getInstance(NotificationsUtil.class);
   private static final int TITLE_LIMIT = 1000;
   private static final int CONTENT_LIMIT = 10000;
 
diff --git a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionManagerImpl.java
index dfc8f6f6d51d..ccace289efb3 100644
--- a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionManagerImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionManagerImpl.java
@@ -111,7 +111,7 @@ public final class ActionManagerImpl extends ActionManagerEx implements Disposab
   private static final String PROJECT_TYPE = "project-type";
   private static final String UNREGISTER_ELEMENT_NAME = "unregister";
 
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.actionSystem.impl.ActionManagerImpl");
+  private static final Logger LOG = Logger.getInstance(ActionManagerImpl.class);
   private static final int DEACTIVATED_TIMER_DELAY = 5000;
   private static final int TIMER_DELAY = 500;
   private static final int UPDATE_DELAY_AFTER_TYPING = 500;
diff --git a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionToolbarImpl.java b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionToolbarImpl.java
index c13e25680e1a..1d123399d997 100644
--- a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionToolbarImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionToolbarImpl.java
@@ -51,7 +51,7 @@ import java.util.*;
 import java.util.concurrent.TimeUnit;
 
 public class ActionToolbarImpl extends JPanel implements ActionToolbar, QuickActionProvider {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.actionSystem.impl.ActionToolbarImpl");
+  private static final Logger LOG = Logger.getInstance(ActionToolbarImpl.class);
 
   private static final Set<ActionToolbarImpl> ourToolbars = new LinkedHashSet<>();
   private static final String RIGHT_ALIGN_KEY = "RIGHT_ALIGN";
diff --git a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionUpdater.java b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionUpdater.java
index f8f35187401a..851f91343265 100644
--- a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionUpdater.java
+++ b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionUpdater.java
@@ -43,7 +43,7 @@ import java.util.function.Predicate;
 import java.util.function.Supplier;
 
 class ActionUpdater {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.actionSystem.impl.ActionUpdater");
+  private static final Logger LOG = Logger.getInstance(ActionUpdater.class);
   private static final Executor ourExecutor = AppExecutorUtil.createBoundedApplicationPoolExecutor("Action Updater", 2);
 
   private final boolean myModalContext;
diff --git a/platform/platform-impl/src/com/intellij/openapi/application/ex/DecodeDefaultsUtil.java b/platform/platform-impl/src/com/intellij/openapi/application/ex/DecodeDefaultsUtil.java
index afc2761fbc52..073cbda028f4 100644
--- a/platform/platform-impl/src/com/intellij/openapi/application/ex/DecodeDefaultsUtil.java
+++ b/platform/platform-impl/src/com/intellij/openapi/application/ex/DecodeDefaultsUtil.java
@@ -16,7 +16,7 @@ import java.util.Collections;
 import java.util.Map;
 
 public class DecodeDefaultsUtil {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.application.ex.DecodeDefaultsUtil");
+  private static final Logger LOG = Logger.getInstance(DecodeDefaultsUtil.class);
   private static final Map<String, URL> RESOURCE_CACHE = Collections.synchronizedMap(new THashMap<>());
 
   public static URL getDefaults(Object requestor, @NotNull String componentResourcePath) {
diff --git a/platform/platform-impl/src/com/intellij/openapi/application/impl/NoSwingUnderWriteAction.java b/platform/platform-impl/src/com/intellij/openapi/application/impl/NoSwingUnderWriteAction.java
index c0617e396cdd..cd26a23fe127 100644
--- a/platform/platform-impl/src/com/intellij/openapi/application/impl/NoSwingUnderWriteAction.java
+++ b/platform/platform-impl/src/com/intellij/openapi/application/impl/NoSwingUnderWriteAction.java
@@ -13,7 +13,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
  * @author peter
  */
 final class NoSwingUnderWriteAction {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.application.impl.NoSwingUnderWriteAction");
+  private static final Logger LOG = Logger.getInstance(NoSwingUnderWriteAction.class);
 
   static void watchForEvents(Application application) {
     AtomicBoolean reported = new AtomicBoolean();
diff --git a/platform/platform-impl/src/com/intellij/openapi/application/impl/ReadMostlyRWLock.java b/platform/platform-impl/src/com/intellij/openapi/application/impl/ReadMostlyRWLock.java
index 6bd993de82ef..986778a629bc 100644
--- a/platform/platform-impl/src/com/intellij/openapi/application/impl/ReadMostlyRWLock.java
+++ b/platform/platform-impl/src/com/intellij/openapi/application/impl/ReadMostlyRWLock.java
@@ -47,7 +47,7 @@ import java.util.concurrent.locks.LockSupport;
  * Write lock: sets global {@link #writeRequested} bit and waits for all readers (in global {@link #readers} list) to release their locks by checking {@link Reader#readRequested} for all readers.
  */
 class ReadMostlyRWLock {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.application.impl.ReadMostlyRWLock");
+  private static final Logger LOG = Logger.getInstance(ReadMostlyRWLock.class);
   private final Thread writeThread;
   volatile boolean writeRequested;  // this writer is requesting or obtained the write access
   private volatile boolean writeAcquired;   // this writer obtained the write lock
diff --git a/platform/platform-impl/src/com/intellij/openapi/command/impl/UndoableGroup.java b/platform/platform-impl/src/com/intellij/openapi/command/impl/UndoableGroup.java
index 684ba5db6161..c0ecf23a9de4 100644
--- a/platform/platform-impl/src/com/intellij/openapi/command/impl/UndoableGroup.java
+++ b/platform/platform-impl/src/com/intellij/openapi/command/impl/UndoableGroup.java
@@ -24,7 +24,7 @@ import org.jetbrains.annotations.Nullable;
 import java.util.*;
 
 class UndoableGroup implements Dumpable {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.command.impl.UndoableGroup");
+  private static final Logger LOG = Logger.getInstance(UndoableGroup.class);
   private static final int BULK_MODE_ACTION_THRESHOLD = 50;
 
   private final String myCommandName;
diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/impl/mergeTool/MergeRequestImpl.java b/platform/platform-impl/src/com/intellij/openapi/diff/impl/mergeTool/MergeRequestImpl.java
index 751a66063511..b3571cdf2594 100644
--- a/platform/platform-impl/src/com/intellij/openapi/diff/impl/mergeTool/MergeRequestImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/diff/impl/mergeTool/MergeRequestImpl.java
@@ -34,7 +34,7 @@ import java.io.IOException;
 
 @Deprecated
 public class MergeRequestImpl extends MergeRequest {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.diff.impl.mergeTool.MergeRequestImpl");
+  private static final Logger LOG = Logger.getInstance(MergeRequestImpl.class);
 
   private final DiffContent[] myDiffContents = new DiffContent[3];
   private String myWindowTitle = null;
diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/impl/mergeTool/MergeVersion.java b/platform/platform-impl/src/com/intellij/openapi/diff/impl/mergeTool/MergeVersion.java
index 89c0447b8e3d..7e6530f7236d 100644
--- a/platform/platform-impl/src/com/intellij/openapi/diff/impl/mergeTool/MergeVersion.java
+++ b/platform/platform-impl/src/com/intellij/openapi/diff/impl/mergeTool/MergeVersion.java
@@ -37,7 +37,7 @@ public interface MergeVersion {
   void restoreOriginalContent(Project project);
 
   class MergeDocumentVersion implements MergeVersion {
-    private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.diff.impl.mergeTool.MergeVersion.MergeDocumentVersion");
+    private static final Logger LOG = Logger.getInstance(MergeDocumentVersion.class);
     protected final Document myDocument;
     private final String myOriginalText;
     private String myTextBeforeMerge;
diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/actions/PasteFromX11Action.java b/platform/platform-impl/src/com/intellij/openapi/editor/actions/PasteFromX11Action.java
index 077ac13212f3..2b5d0454aa5a 100644
--- a/platform/platform-impl/src/com/intellij/openapi/editor/actions/PasteFromX11Action.java
+++ b/platform/platform-impl/src/com/intellij/openapi/editor/actions/PasteFromX11Action.java
@@ -25,7 +25,7 @@ import java.awt.event.MouseEvent;
  * @author msk
  */
 public class PasteFromX11Action extends EditorAction {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.editor.actions.PasteFromX11Action");
+  private static final Logger LOG = Logger.getInstance(PasteFromX11Action.class);
 
   public PasteFromX11Action() {
     super(new Handler());
diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/actions/RemoveBomAction.java b/platform/platform-impl/src/com/intellij/openapi/editor/actions/RemoveBomAction.java
index 054af29afc03..900e40414433 100644
--- a/platform/platform-impl/src/com/intellij/openapi/editor/actions/RemoveBomAction.java
+++ b/platform/platform-impl/src/com/intellij/openapi/editor/actions/RemoveBomAction.java
@@ -30,7 +30,7 @@ import java.util.List;
  * Removes <a href="http://unicode.org/faq/utf_bom.html">file's BOM</a> (if any).
  */
 public class RemoveBomAction extends AnAction implements DumbAware {
-  private static final Logger LOG = Logger.getInstance("#" + RemoveBomAction.class);
+  private static final Logger LOG = Logger.getInstance(RemoveBomAction.class);
 
   public RemoveBomAction() {
     super("Remove BOM");
diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/ex/util/EmptyEditorHighlighter.java b/platform/platform-impl/src/com/intellij/openapi/editor/ex/util/EmptyEditorHighlighter.java
index c5466ba267c2..dcd69813b4e0 100644
--- a/platform/platform-impl/src/com/intellij/openapi/editor/ex/util/EmptyEditorHighlighter.java
+++ b/platform/platform-impl/src/com/intellij/openapi/editor/ex/util/EmptyEditorHighlighter.java
@@ -15,7 +15,7 @@ import com.intellij.psi.tree.IElementType;
 import org.jetbrains.annotations.NotNull;
 
 public class EmptyEditorHighlighter implements EditorHighlighter, PrioritizedDocumentListener {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.editor.ex.util.EmptyEditorHighlighter");
+  private static final Logger LOG = Logger.getInstance(EmptyEditorHighlighter.class);
 
   private TextAttributes myAttributes;
   private int myTextLength = 0;
diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/CaretImpl.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/CaretImpl.java
index 2f9f53085b79..a46034cab514 100644
--- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/CaretImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/CaretImpl.java
@@ -40,7 +40,7 @@ import org.jetbrains.annotations.TestOnly;
 import java.awt.*;
 
 public class CaretImpl extends UserDataHolderBase implements Caret, Dumpable {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.editor.impl.CaretImpl");
+  private static final Logger LOG = Logger.getInstance(CaretImpl.class);
   private static final Key<CaretVisualAttributes> VISUAL_ATTRIBUTES_KEY = new Key<>("CaretAttributes");
 
   private final EditorImpl myEditor;
diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/ScrollingModelImpl.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/ScrollingModelImpl.java
index f72e740bf407..4a0ccb48707a 100644
--- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/ScrollingModelImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/ScrollingModelImpl.java
@@ -33,7 +33,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class ScrollingModelImpl implements ScrollingModelEx {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.editor.impl.ScrollingModelImpl");
+  private static final Logger LOG = Logger.getInstance(ScrollingModelImpl.class);
 
   private final EditorImpl myEditor;
   private final List<VisibleAreaListener> myVisibleAreaListeners = ContainerUtil.createLockFreeCopyOnWriteList();
diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/SelectionModelImpl.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/SelectionModelImpl.java
index b969e2e9925b..6742729fbabb 100644
--- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/SelectionModelImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/SelectionModelImpl.java
@@ -21,7 +21,7 @@ import java.util.Collection;
 import java.util.List;
 
 public class SelectionModelImpl implements SelectionModel {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.editor.impl.SelectionModelImpl");
+  private static final Logger LOG = Logger.getInstance(SelectionModelImpl.class);
 
   private final List<SelectionListener> mySelectionListeners = ContainerUtil.createLockFreeCopyOnWriteList();
   private final EditorImpl myEditor;
diff --git a/platform/platform-impl/src/com/intellij/openapi/fileChooser/actions/VirtualFileDeleteProvider.java b/platform/platform-impl/src/com/intellij/openapi/fileChooser/actions/VirtualFileDeleteProvider.java
index 7d155a5f22c8..be44431c4884 100644
--- a/platform/platform-impl/src/com/intellij/openapi/fileChooser/actions/VirtualFileDeleteProvider.java
+++ b/platform/platform-impl/src/com/intellij/openapi/fileChooser/actions/VirtualFileDeleteProvider.java
@@ -25,7 +25,7 @@ import java.util.LinkedList;
 import java.util.List;
 
 public final class VirtualFileDeleteProvider implements DeleteProvider {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.fileChooser.actions.VirtualFileDeleteProvider");
+  private static final Logger LOG = Logger.getInstance(VirtualFileDeleteProvider.class);
 
   @Override
   public boolean canDeleteElement(@NotNull DataContext dataContext) {
diff --git a/platform/platform-impl/src/com/intellij/openapi/fileChooser/ex/FileTextFieldImpl.java b/platform/platform-impl/src/com/intellij/openapi/fileChooser/ex/FileTextFieldImpl.java
index e477dc71a12a..ce744068b54f 100644
--- a/platform/platform-impl/src/com/intellij/openapi/fileChooser/ex/FileTextFieldImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/fileChooser/ex/FileTextFieldImpl.java
@@ -47,7 +47,7 @@ import static com.intellij.openapi.actionSystem.IdeActions.ACTION_CODE_COMPLETIO
 
 public abstract class FileTextFieldImpl implements FileLookup, Disposable, FileTextField {
 
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.fileChooser.ex.FileTextFieldImpl");
+  private static final Logger LOG = Logger.getInstance(FileTextFieldImpl.class);
 
 
   private final JTextField myPathTextField;
diff --git a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorWindow.java b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorWindow.java
index a88a1cd58f24..eab83db18972 100644
--- a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorWindow.java
+++ b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorWindow.java
@@ -52,7 +52,7 @@ import static com.intellij.openapi.wm.IdeFocusManager.getGlobalInstance;
  * Author: msk
  */
 public class EditorWindow {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.fileEditor.impl.EditorWindow");
+  private static final Logger LOG = Logger.getInstance(EditorWindow.class);
 
   public static final DataKey<EditorWindow> DATA_KEY = DataKey.create("editorWindow");
 
diff --git a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorsSplitters.java b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorsSplitters.java
index 6602f5334777..9071eb897bc4 100644
--- a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorsSplitters.java
+++ b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorsSplitters.java
@@ -67,7 +67,7 @@ import java.util.concurrent.CopyOnWriteArraySet;
 import static com.intellij.openapi.wm.ToolWindowId.PROJECT_VIEW;
 
 public class EditorsSplitters extends IdePanePanel implements UISettingsListener, Disposable {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.fileEditor.impl.EditorsSplitters");
+  private static final Logger LOG = Logger.getInstance(EditorsSplitters.class);
   private static final String PINNED = "pinned";
   private static final String CURRENT_IN_TAB = "current-in-tab";
 
diff --git a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileDocumentManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileDocumentManagerImpl.java
index f5ad0c6942cd..1827f105bfcb 100644
--- a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileDocumentManagerImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileDocumentManagerImpl.java
@@ -72,7 +72,7 @@ import java.util.List;
 import java.util.*;
 
 public class FileDocumentManagerImpl extends FileDocumentManager implements SafeWriteRequestor {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.fileEditor.impl.FileDocumentManagerImpl");
+  private static final Logger LOG = Logger.getInstance(FileDocumentManagerImpl.class);
 
   public static final Key<Document> HARD_REF_TO_DOCUMENT_KEY = Key.create("HARD_REF_TO_DOCUMENT_KEY");
 
diff --git a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/MemoryDiskConflictResolver.java b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/MemoryDiskConflictResolver.java
index eb6079038269..b683017d2f0e 100644
--- a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/MemoryDiskConflictResolver.java
+++ b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/MemoryDiskConflictResolver.java
@@ -33,7 +33,7 @@ import java.util.Set;
  * @author peter
  */
 class MemoryDiskConflictResolver {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.fileEditor.impl.MemoryDiskConflictResolver");
+  private static final Logger LOG = Logger.getInstance(MemoryDiskConflictResolver.class);
 
   private final Set<VirtualFile> myConflicts = new LinkedHashSet<>();
   private Throwable myConflictAppeared;
diff --git a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/http/RemoteFilePanel.java b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/http/RemoteFilePanel.java
index d240c332fd34..b5a815525494 100644
--- a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/http/RemoteFilePanel.java
+++ b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/http/RemoteFilePanel.java
@@ -35,7 +35,7 @@ import java.beans.PropertyChangeListener;
  * @author nik
  */
 public class RemoteFilePanel {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.fileEditor.impl.http.RemoteFilePanel");
+  private static final Logger LOG = Logger.getInstance(RemoteFilePanel.class);
   @NonNls private static final String ERROR_CARD = "error";
   @NonNls private static final String DOWNLOADING_CARD = "downloading";
   @NonNls private static final String EDITOR_CARD = "editor";
diff --git a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/text/TextEditorComponent.java b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/text/TextEditorComponent.java
index 773c00719977..8157257d16f6 100644
--- a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/text/TextEditorComponent.java
+++ b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/text/TextEditorComponent.java
@@ -44,7 +44,7 @@ import java.awt.*;
  * @author Vladimir Kondratyev
  */
 class TextEditorComponent extends JBLoadingPanel implements DataProvider, Disposable, BackgroundableDataProvider {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.fileEditor.impl.text.TextEditorComponent");
+  private static final Logger LOG = Logger.getInstance(TextEditorComponent.class);
 
   private final Project myProject;
   @NotNull private final VirtualFile myFile;
diff --git a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/ActionsTreeUtil.java b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/ActionsTreeUtil.java
index 2114241cb8b5..f282966b09bc 100644
--- a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/ActionsTreeUtil.java
+++ b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/ActionsTreeUtil.java
@@ -35,7 +35,7 @@ import javax.swing.tree.DefaultMutableTreeNode;
 import java.util.*;
 
 public class ActionsTreeUtil {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.keymap.impl.ui.ActionsTreeUtil");
+  private static final Logger LOG = Logger.getInstance(ActionsTreeUtil.class);
 
   public static final String MAIN_MENU_TITLE = KeyMapBundle.message("main.menu.action.title");
   public static final String MAIN_TOOLBAR = KeyMapBundle.message("main.toolbar.title");
diff --git a/platform/platform-impl/src/com/intellij/openapi/options/binding/ControlBinder.java b/platform/platform-impl/src/com/intellij/openapi/options/binding/ControlBinder.java
index 0e53cd884ae1..0dfce01dab46 100644
--- a/platform/platform-impl/src/com/intellij/openapi/options/binding/ControlBinder.java
+++ b/platform/platform-impl/src/com/intellij/openapi/options/binding/ControlBinder.java
@@ -30,7 +30,7 @@ import java.util.List;
  */
 public class ControlBinder {
 
-  private final static Logger LOG = Logger.getInstance("#com.intellij.openapi.options.binding.ControlBinder");
+  private final static Logger LOG = Logger.getInstance(ControlBinder.class);
 
   private final Object myBean;
   private final List<Pair<ControlValueAccessor, BeanValueAccessor>> myBindings = new ArrayList<>();
diff --git a/platform/platform-impl/src/com/intellij/openapi/progress/util/ProgressWindow.java b/platform/platform-impl/src/com/intellij/openapi/progress/util/ProgressWindow.java
index abf8d33d170a..994e6b26e860 100644
--- a/platform/platform-impl/src/com/intellij/openapi/progress/util/ProgressWindow.java
+++ b/platform/platform-impl/src/com/intellij/openapi/progress/util/ProgressWindow.java
@@ -31,7 +31,7 @@ import java.awt.*;
 import java.awt.event.KeyEvent;
 
 public class ProgressWindow extends ProgressIndicatorBase implements BlockingProgressIndicator, Disposable {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.progress.util.ProgressWindow");
+  private static final Logger LOG = Logger.getInstance(ProgressWindow.class);
 
   /**
    * This constant defines default delay for showing progress dialog (in millis).
diff --git a/platform/platform-impl/src/com/intellij/openapi/project/CacheUpdateRunner.java b/platform/platform-impl/src/com/intellij/openapi/project/CacheUpdateRunner.java
index e16401f223e7..15ca31700594 100644
--- a/platform/platform-impl/src/com/intellij/openapi/project/CacheUpdateRunner.java
+++ b/platform/platform-impl/src/com/intellij/openapi/project/CacheUpdateRunner.java
@@ -31,7 +31,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 
 public class CacheUpdateRunner {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.project.CacheUpdateRunner");
+  private static final Logger LOG = Logger.getInstance(CacheUpdateRunner.class);
   private static final Key<Boolean> FAILED_TO_INDEX = Key.create("FAILED_TO_INDEX");
   private static final int PROC_COUNT = Runtime.getRuntime().availableProcessors();
   public static final int DEFAULT_MAX_INDEXER_THREADS = 4;
diff --git a/platform/platform-impl/src/com/intellij/openapi/project/DumbServiceImpl.java b/platform/platform-impl/src/com/intellij/openapi/project/DumbServiceImpl.java
index fd6c70b9bbb6..0dc5c5557aef 100644
--- a/platform/platform-impl/src/com/intellij/openapi/project/DumbServiceImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/project/DumbServiceImpl.java
@@ -55,7 +55,7 @@ import java.util.concurrent.atomic.AtomicReference;
 import java.util.concurrent.locks.LockSupport;
 
 public class DumbServiceImpl extends DumbService implements Disposable, ModificationTracker {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.project.DumbServiceImpl");
+  private static final Logger LOG = Logger.getInstance(DumbServiceImpl.class);
   private static final FrequentErrorLogger ourErrorLogger = FrequentErrorLogger.newInstance(LOG);
   private final AtomicReference<State> myState = new AtomicReference<>(State.SMART);
   private volatile Throwable myDumbEnterTrace;
diff --git a/platform/platform-impl/src/com/intellij/openapi/project/NoAccessDuringPsiEvents.java b/platform/platform-impl/src/com/intellij/openapi/project/NoAccessDuringPsiEvents.java
index f492fb74479f..68bd0a9ecf66 100644
--- a/platform/platform-impl/src/com/intellij/openapi/project/NoAccessDuringPsiEvents.java
+++ b/platform/platform-impl/src/com/intellij/openapi/project/NoAccessDuringPsiEvents.java
@@ -31,7 +31,7 @@ import java.util.Set;
  * @author peter
  */
 public class NoAccessDuringPsiEvents {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.project.NoAccessDuringPsiEvents");
+  private static final Logger LOG = Logger.getInstance(NoAccessDuringPsiEvents.class);
   private static final Set<String> ourReportedTraces = new HashSet<>();
 
   public static void checkCallContext() {
diff --git a/platform/platform-impl/src/com/intellij/openapi/ui/impl/DialogWrapperPeerImpl.java b/platform/platform-impl/src/com/intellij/openapi/ui/impl/DialogWrapperPeerImpl.java
index 31bcd685357f..50cde535c4cf 100644
--- a/platform/platform-impl/src/com/intellij/openapi/ui/impl/DialogWrapperPeerImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/ui/impl/DialogWrapperPeerImpl.java
@@ -56,7 +56,7 @@ import java.util.List;
 import java.util.Map;
 
 public class DialogWrapperPeerImpl extends DialogWrapperPeer {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.ui.DialogWrapper");
+  private static final Logger LOG = Logger.getInstance(DialogWrapper.class);
 
   public static boolean isHeadlessEnv() {
     Application app = ApplicationManager.getApplication();
diff --git a/platform/platform-impl/src/com/intellij/openapi/ui/impl/GlassPaneDialogWrapperPeer.java b/platform/platform-impl/src/com/intellij/openapi/ui/impl/GlassPaneDialogWrapperPeer.java
index b7a89276eb1b..a67f1d833acb 100644
--- a/platform/platform-impl/src/com/intellij/openapi/ui/impl/GlassPaneDialogWrapperPeer.java
+++ b/platform/platform-impl/src/com/intellij/openapi/ui/impl/GlassPaneDialogWrapperPeer.java
@@ -45,7 +45,7 @@ import java.lang.ref.WeakReference;
  * @author spleaner
  */
 public class GlassPaneDialogWrapperPeer extends DialogWrapperPeer {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.ui.impl.GlassPaneDialogWrapperPeer");
+  private static final Logger LOG = Logger.getInstance(GlassPaneDialogWrapperPeer.class);
 
   private final DialogWrapper myWrapper;
   private WindowManagerEx myWindowManager;
diff --git a/platform/platform-impl/src/com/intellij/openapi/vcs/readOnlyHandler/ReadonlyStatusHandlerImpl.java b/platform/platform-impl/src/com/intellij/openapi/vcs/readOnlyHandler/ReadonlyStatusHandlerImpl.java
index 17419939e74a..9b8c3535c438 100644
--- a/platform/platform-impl/src/com/intellij/openapi/vcs/readOnlyHandler/ReadonlyStatusHandlerImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/vcs/readOnlyHandler/ReadonlyStatusHandlerImpl.java
@@ -34,7 +34,7 @@ import static com.intellij.openapi.util.text.StringUtil.isEmpty;
 
 @State(name = "ReadonlyStatusHandler", storages = @Storage(StoragePathMacros.WORKSPACE_FILE))
 public class ReadonlyStatusHandlerImpl extends ReadonlyStatusHandler implements PersistentStateComponent<ReadonlyStatusHandlerImpl.State> {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.vcs.readOnlyHandler.ReadonlyStatusHandlerImpl");
+  private static final Logger LOG = Logger.getInstance(ReadonlyStatusHandlerImpl.class);
   private final Project myProject;
   protected boolean myClearReadOnlyInTests;
 
diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/ex/dummy/DummyFileIdGenerator.java b/platform/platform-impl/src/com/intellij/openapi/vfs/ex/dummy/DummyFileIdGenerator.java
index e0897f390613..7cee8466106e 100644
--- a/platform/platform-impl/src/com/intellij/openapi/vfs/ex/dummy/DummyFileIdGenerator.java
+++ b/platform/platform-impl/src/com/intellij/openapi/vfs/ex/dummy/DummyFileIdGenerator.java
@@ -29,7 +29,7 @@ import java.util.concurrent.atomic.AtomicInteger;
  */
 @Deprecated
 public class DummyFileIdGenerator {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.vfs.ex.dummy.DummyFileIdGenerator");
+  private static final Logger LOG = Logger.getInstance(DummyFileIdGenerator.class);
   private static final AtomicInteger ourId = new AtomicInteger(Integer.MAX_VALUE / 2);
 
   private DummyFileIdGenerator() {
diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/impl/VirtualFilePointerImpl.java b/platform/platform-impl/src/com/intellij/openapi/vfs/impl/VirtualFilePointerImpl.java
index e6bfde73d694..b4a5650db50a 100644
--- a/platform/platform-impl/src/com/intellij/openapi/vfs/impl/VirtualFilePointerImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/vfs/impl/VirtualFilePointerImpl.java
@@ -27,7 +27,7 @@ import com.intellij.util.PathUtil;
 import org.jetbrains.annotations.NotNull;
 
 class VirtualFilePointerImpl extends TraceableDisposable implements VirtualFilePointer {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.vfs.impl.VirtualFilePointerImpl");
+  private static final Logger LOG = Logger.getInstance(VirtualFilePointerImpl.class);
 
   private static final boolean TRACE_CREATION = LOG.isDebugEnabled() || ApplicationManager.getApplication().isUnitTestMode();
 
diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/impl/http/RemoteFileInfoImpl.java b/platform/platform-impl/src/com/intellij/openapi/vfs/impl/http/RemoteFileInfoImpl.java
index d6248865e726..4e2ea9a2ab34 100644
--- a/platform/platform-impl/src/com/intellij/openapi/vfs/impl/http/RemoteFileInfoImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/vfs/impl/http/RemoteFileInfoImpl.java
@@ -28,7 +28,7 @@ import static org.jetbrains.concurrency.Promises.rejectedPromise;
  * @author nik
  */
 public class RemoteFileInfoImpl implements RemoteContentProvider.DownloadingCallback, RemoteFileInfo {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.vfs.impl.http.RemoteFileInfoImpl");
+  private static final Logger LOG = Logger.getInstance(RemoteFileInfoImpl.class);
   private final Object myLock = new Object();
   private final Url myUrl;
   private final RemoteFileManagerImpl myManager;
diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/impl/jar/JarHandler.java b/platform/platform-impl/src/com/intellij/openapi/vfs/impl/jar/JarHandler.java
index 587b4663bb35..6f40227b19fb 100644
--- a/platform/platform-impl/src/com/intellij/openapi/vfs/impl/jar/JarHandler.java
+++ b/platform/platform-impl/src/com/intellij/openapi/vfs/impl/jar/JarHandler.java
@@ -42,7 +42,7 @@ import static com.intellij.util.containers.ContainerUtil.newTroveSet;
  * @author max
  */
 public class JarHandler extends ZipHandler {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.vfs.impl.jar.JarHandler");
+  private static final Logger LOG = Logger.getInstance(JarHandler.class);
 
   private static final String JARS_FOLDER = "jars";
   private static final int FS_TIME_RESOLUTION = 2000;
diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/RefreshQueueImpl.java b/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/RefreshQueueImpl.java
index e49ddda7f767..80b23f94c9d0 100644
--- a/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/RefreshQueueImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/RefreshQueueImpl.java
@@ -30,7 +30,7 @@ import java.util.concurrent.RejectedExecutionException;
  * @author max
  */
 public class RefreshQueueImpl extends RefreshQueue implements Disposable {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.vfs.newvfs.RefreshQueueImpl");
+  private static final Logger LOG = Logger.getInstance(RefreshQueueImpl.class);
 
   private final Executor myQueue = AppExecutorUtil.createBoundedApplicationPoolExecutor("RefreshQueue Pool", PooledThreadExecutor.INSTANCE, 1, this);
   private final Executor myEventProcessingQueue =
diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/VfsImplUtil.java b/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/VfsImplUtil.java
index 3bbdc804441b..42a0180af408 100644
--- a/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/VfsImplUtil.java
+++ b/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/VfsImplUtil.java
@@ -25,7 +25,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Consumer;
 
 public class VfsImplUtil {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.vfs.newvfs.VfsImplUtil");
+  private static final Logger LOG = Logger.getInstance(VfsImplUtil.class);
 
   private static final String FILE_SEPARATORS = "/" + (File.separatorChar == '/' ? "" : File.separator);
 
diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/FileLoadingTracker.java b/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/FileLoadingTracker.java
index 8a837f5e124d..33795ad4840f 100644
--- a/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/FileLoadingTracker.java
+++ b/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/FileLoadingTracker.java
@@ -32,7 +32,7 @@ import java.util.Set;
  * @author peter
  */
 class FileLoadingTracker {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.vfs.newvfs.impl.FileLoadingTracker");
+  private static final Logger LOG = Logger.getInstance(FileLoadingTracker.class);
   private static final Set<String> ourPaths = new THashSet<>(getPathsToTrack(), FilePathHashingStrategy.create());
   private static final TIntHashSet ourLeafNameIds = new TIntHashSet(ourPaths.stream().mapToInt(path -> FileNameCache.storeName(StringUtil.getShortName(path, '/'))).toArray());
 
diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VfsData.java b/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VfsData.java
index a014432b2d7f..cb277de6c692 100644
--- a/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VfsData.java
+++ b/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VfsData.java
@@ -64,7 +64,7 @@ import static com.intellij.util.ObjectUtils.assertNotNull;
  * @author peter
  */
 public class VfsData {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.vfs.newvfs.impl.VfsData");
+  private static final Logger LOG = Logger.getInstance(VfsData.class);
   private static final int SEGMENT_BITS = 9;
   private static final int SEGMENT_SIZE = 1 << SEGMENT_BITS;
   private static final int OFFSET_MASK = SEGMENT_SIZE - 1;
diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/persistent/VfsEventGenerationHelper.java b/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/persistent/VfsEventGenerationHelper.java
index b62df726ed9f..d895b7f3d48a 100644
--- a/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/persistent/VfsEventGenerationHelper.java
+++ b/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/persistent/VfsEventGenerationHelper.java
@@ -32,7 +32,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 class VfsEventGenerationHelper {
-  static final Logger LOG = Logger.getInstance("#com.intellij.openapi.vfs.newvfs.persistent.RefreshWorker");
+  static final Logger LOG = Logger.getInstance(RefreshWorker.class);
 
   private final List<VFileEvent> myEvents = new ArrayList<>();
   private int myMarkedStart = -1;
diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/CommandProcessor.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/CommandProcessor.java
index eda996908e54..a3e5ce12e442 100644
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/CommandProcessor.java
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/CommandProcessor.java
@@ -13,7 +13,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 public final class CommandProcessor implements Runnable {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.wm.impl.CommandProcessor");
+  private static final Logger LOG = Logger.getInstance(CommandProcessor.class);
   private final Object myLock = new Object();
 
   private final List<CommandGroup> myCommandGroupList = new ArrayList<>();
diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/FloatingDecorator.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/FloatingDecorator.java
index e755b86e77ee..5ac1a9738daf 100644
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/FloatingDecorator.java
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/FloatingDecorator.java
@@ -29,7 +29,7 @@ import java.awt.event.WindowEvent;
  * @author Vladimir Kondratyev
  */
 public final class FloatingDecorator extends JDialog {
-  private static final Logger LOG=Logger.getInstance("#com.intellij.openapi.wm.impl.FloatingDecorator");
+  private static final Logger LOG = Logger.getInstance(FloatingDecorator.class);
 
   static final int DIVIDER_WIDTH = 3;
 
diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/SideStack.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/SideStack.java
index d0c647f11891..c55e031f4b2f 100644
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/SideStack.java
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/SideStack.java
@@ -27,7 +27,7 @@ import java.util.Stack;
  * @author Vladimir Kondratyev
  */
 final class SideStack {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.wm.impl.SideStack");
+  private static final Logger LOG = Logger.getInstance(SideStack.class);
   private final Stack myStack;
 
   SideStack() {
diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowManagerImpl.java
index 1b4423f1af41..53da6f19996c 100644
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowManagerImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowManagerImpl.java
@@ -72,7 +72,7 @@ import java.util.function.Predicate;
   @Storage(value = StoragePathMacros.WORKSPACE_FILE, deprecated = true)
 })
 public class ToolWindowManagerImpl extends ToolWindowManagerEx implements PersistentStateComponent<Element>, Disposable {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.wm.impl.ToolWindowManagerImpl");
+  private static final Logger LOG = Logger.getInstance(ToolWindowManagerImpl.class);
 
   private final Project myProject;
   private final EventDispatcher<ToolWindowManagerListener> myDispatcher = EventDispatcher.create(ToolWindowManagerListener.class);
diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowsPane.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowsPane.java
index 899ac8487a78..e2cd50b63743 100644
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowsPane.java
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowsPane.java
@@ -47,7 +47,7 @@ import static com.intellij.util.ui.UIUtil.useSafely;
  * @author Vladimir Kondratyev
  */
 public final class ToolWindowsPane extends JBLayeredPane implements UISettingsListener, Disposable {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.wm.impl.ToolWindowsPane");
+  private static final Logger LOG = Logger.getInstance(ToolWindowsPane.class);
   public static final String TEMPORARY_ADDED = "TEMPORARY_ADDED";
 
   private final JFrame myFrame;
diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/WindowWatcher.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/WindowWatcher.java
index 1e64a58f4ecd..674937ce7dd1 100644
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/WindowWatcher.java
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/WindowWatcher.java
@@ -32,7 +32,7 @@ import java.util.Set;
  * @author Vladimir Kondratyev
  */
 public final class WindowWatcher implements PropertyChangeListener{
-  private static final Logger LOG=Logger.getInstance("#com.intellij.openapi.wm.impl.WindowWatcher");
+  private static final Logger LOG = Logger.getInstance(WindowWatcher.class);
   private final Object myLock = new Object();
   private final Map<Window, WindowInfo> myWindow2Info = ContainerUtil.createWeakMap();
   /**
diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/X11UiUtil.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/X11UiUtil.java
index 2f6a9dee6154..01c3f86ef19d 100644
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/X11UiUtil.java
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/X11UiUtil.java
@@ -26,7 +26,7 @@ import java.util.regex.Pattern;
 import static com.intellij.util.ArrayUtil.newLongArray;
 
 public class X11UiUtil {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.wm.impl.X11UiUtil");
+  private static final Logger LOG = Logger.getInstance(X11UiUtil.class);
 
   private static final int True = 1;
   private static final int False = 0;
diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/commands/RequestFocusInToolWindowCmd.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/commands/RequestFocusInToolWindowCmd.java
index 4593730df109..3307f7b2674e 100644
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/commands/RequestFocusInToolWindowCmd.java
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/commands/RequestFocusInToolWindowCmd.java
@@ -23,7 +23,7 @@ import java.awt.*;
  * @author Vladimir Kondratyev
  */
 public final class RequestFocusInToolWindowCmd extends FinalizableCommand {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.wm.impl.commands.RequestFocusInToolWindowCmd");
+  private static final Logger LOG = Logger.getInstance(RequestFocusInToolWindowCmd.class);
   private final ToolWindowImpl myToolWindow;
   private final FocusWatcher myFocusWatcher;
 
diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/EditorBasedWidget.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/EditorBasedWidget.java
index be531c9de8db..b24b3c830d60 100644
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/EditorBasedWidget.java
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/EditorBasedWidget.java
@@ -19,7 +19,7 @@ import org.jetbrains.annotations.Nullable;
 import java.awt.*;
 
 public abstract class EditorBasedWidget implements StatusBarWidget, FileEditorManagerListener {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.wm.impl.status.EditorBasedWidget");
+  private static final Logger LOG = Logger.getInstance(EditorBasedWidget.class);
   public static final String SWING_FOCUS_OWNER_PROPERTY = "focusOwner";
 
   @NotNull
diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/InfoAndProgressPanel.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/InfoAndProgressPanel.java
index 750ba365bed2..ca885d8b939a 100644
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/InfoAndProgressPanel.java
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/InfoAndProgressPanel.java
@@ -60,7 +60,7 @@ import java.util.*;
 import static com.intellij.icons.AllIcons.Process.*;
 
 public class InfoAndProgressPanel extends JPanel implements CustomStatusBarWidget {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.wm.impl.status.InfoAndProgressPanel");
+  private static final Logger LOG = Logger.getInstance(InfoAndProgressPanel.class);
   private final ProcessPopup myPopup;
 
   private final StatusPanel myInfoPanel = new StatusPanel();
diff --git a/platform/platform-impl/src/com/intellij/platform/PlatformProjectOpenProcessor.java b/platform/platform-impl/src/com/intellij/platform/PlatformProjectOpenProcessor.java
index cb03053f8992..bd2639744a75 100644
--- a/platform/platform-impl/src/com/intellij/platform/PlatformProjectOpenProcessor.java
+++ b/platform/platform-impl/src/com/intellij/platform/PlatformProjectOpenProcessor.java
@@ -53,7 +53,7 @@ import java.nio.file.Paths;
 import java.util.EnumSet;
 
 public final class PlatformProjectOpenProcessor extends ProjectOpenProcessor implements CommandLineProjectOpenProcessor {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.platform.PlatformProjectOpenProcessor");
+  private static final Logger LOG = Logger.getInstance(PlatformProjectOpenProcessor.class);
 
   public enum Option {
     FORCE_NEW_FRAME, TEMP_PROJECT
diff --git a/platform/platform-impl/src/com/intellij/ui/CustomProtocolHandler.java b/platform/platform-impl/src/com/intellij/ui/CustomProtocolHandler.java
index 63149e44ab35..d314677e6df6 100644
--- a/platform/platform-impl/src/com/intellij/ui/CustomProtocolHandler.java
+++ b/platform/platform-impl/src/com/intellij/ui/CustomProtocolHandler.java
@@ -18,7 +18,7 @@ import java.util.Map;
 public class CustomProtocolHandler {
   public static final String LINE_NUMBER_ARG_NAME = "--line";
 
-  private static final Logger LOG = Logger.getInstance("#com.intellij.ui.CustomProtocolHandler");
+  private static final Logger LOG = Logger.getInstance(CustomProtocolHandler.class);
 
   public boolean openLink(@NotNull URI uri) {
     LOG.info("CustomProtocolHandler.openLink");
diff --git a/platform/platform-impl/src/com/intellij/ui/LightweightHint.java b/platform/platform-impl/src/com/intellij/ui/LightweightHint.java
index e9e5d0fa93db..8ee9c78344f1 100644
--- a/platform/platform-impl/src/com/intellij/ui/LightweightHint.java
+++ b/platform/platform-impl/src/com/intellij/ui/LightweightHint.java
@@ -30,7 +30,7 @@ import java.util.EventObject;
 
 public class LightweightHint extends UserDataHolderBase implements Hint {
   public static final Key<Boolean> SHOWN_AT_DEBUG = Key.create("shown.at.debug");
-  private static final Logger LOG = Logger.getInstance("#com.intellij.ui.LightweightHint");
+  private static final Logger LOG = Logger.getInstance(LightweightHint.class);
 
   private final JComponent myComponent;
   private JComponent myFocusBackComponent;
diff --git a/platform/platform-impl/src/com/intellij/ui/SpeedSearchBase.java b/platform/platform-impl/src/com/intellij/ui/SpeedSearchBase.java
index 44a181872f16..6e98f8b844a1 100644
--- a/platform/platform-impl/src/com/intellij/ui/SpeedSearchBase.java
+++ b/platform/platform-impl/src/com/intellij/ui/SpeedSearchBase.java
@@ -39,7 +39,7 @@ import java.util.ListIterator;
 import java.util.NoSuchElementException;
 
 public abstract class SpeedSearchBase<Comp extends JComponent> extends SpeedSearchSupply {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.ui.SpeedSearchBase");
+  private static final Logger LOG = Logger.getInstance(SpeedSearchBase.class);
 
   private static final Border BORDER = new CustomLineBorder(JBColor.namedColor("SpeedSearch.borderColor", JBColor.GRAY), JBUI.insets(1));
   private static final Color FOREGROUND_COLOR = JBColor.namedColor("SpeedSearch.foreground", UIUtil.getToolTipForeground());
diff --git a/platform/platform-impl/src/com/intellij/ui/TabbedPaneImpl.java b/platform/platform-impl/src/com/intellij/ui/TabbedPaneImpl.java
index 3cc417acd354..2ef5fd6cdcad 100644
--- a/platform/platform-impl/src/com/intellij/ui/TabbedPaneImpl.java
+++ b/platform/platform-impl/src/com/intellij/ui/TabbedPaneImpl.java
@@ -42,7 +42,7 @@ public class TabbedPaneImpl extends JBTabbedPane implements TabbedPane {
   public static final PrevNextActionsDescriptor DEFAULT_PREV_NEXT_SHORTCUTS = new PrevNextActionsDescriptor(IdeActions.ACTION_NEXT_TAB,
                                                                                                             IdeActions.ACTION_PREVIOUS_TAB);
 
-  private static final Logger LOG = Logger.getInstance("#com.intellij.ui.TabbedPaneImpl");
+  private static final Logger LOG = Logger.getInstance(TabbedPaneImpl.class);
 
   private ScrollableTabSupport myScrollableTabSupport;
   private AnAction myNextTabAction;
diff --git a/platform/platform-impl/src/com/intellij/ui/mac/MacDockDelegate.java b/platform/platform-impl/src/com/intellij/ui/mac/MacDockDelegate.java
index 1b1639a1168e..33dcc150771c 100644
--- a/platform/platform-impl/src/com/intellij/ui/mac/MacDockDelegate.java
+++ b/platform/platform-impl/src/com/intellij/ui/mac/MacDockDelegate.java
@@ -35,7 +35,7 @@ import java.lang.reflect.Method;
  * @author Denis Fokin
  */
 public class MacDockDelegate implements SystemDock.Delegate {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.ui.mac.MacDockDelegate");
+  private static final Logger LOG = Logger.getInstance(MacDockDelegate.class);
 
   private static boolean initialized = false;
   private static final SystemDock.Delegate instance = new MacDockDelegate();
diff --git a/platform/platform-impl/src/com/intellij/ui/messages/MessagesServiceImpl.java b/platform/platform-impl/src/com/intellij/ui/messages/MessagesServiceImpl.java
index a799bc51e1b6..39f929ac3548 100644
--- a/platform/platform-impl/src/com/intellij/ui/messages/MessagesServiceImpl.java
+++ b/platform/platform-impl/src/com/intellij/ui/messages/MessagesServiceImpl.java
@@ -33,7 +33,7 @@ import static com.intellij.credentialStore.CredentialPromptDialog.getTrimmedChar
 import static com.intellij.openapi.ui.Messages.*;
 
 public class MessagesServiceImpl implements MessagesService {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.ui.messages.MessagesServiceImpl");
+  private static final Logger LOG = Logger.getInstance(MessagesServiceImpl.class);
 
   @Override
   public int showMessageDialog(@Nullable Project project,
diff --git a/platform/platform-impl/src/com/intellij/ui/popup/AbstractPopup.java b/platform/platform-impl/src/com/intellij/ui/popup/AbstractPopup.java
index 0a79c3970ab3..9411b4066fb1 100644
--- a/platform/platform-impl/src/com/intellij/ui/popup/AbstractPopup.java
+++ b/platform/platform-impl/src/com/intellij/ui/popup/AbstractPopup.java
@@ -65,7 +65,7 @@ public class AbstractPopup implements JBPopup, ScreenAreaConsumer {
   // Zero or negative values (with/height or both) would be ignored (actual values would be obtained from preferred size)
   public static final String FIRST_TIME_SIZE = "FirstTimeSize";
 
-  private static final Logger LOG = Logger.getInstance("#com.intellij.ui.popup.AbstractPopup");
+  private static final Logger LOG = Logger.getInstance(AbstractPopup.class);
 
   private PopupComponent myPopup;
   private MyContentPanel myContent;
diff --git a/platform/platform-impl/src/com/intellij/ui/popup/PopupComponent.java b/platform/platform-impl/src/com/intellij/ui/popup/PopupComponent.java
index b9381298d748..0a1acdf87d49 100644
--- a/platform/platform-impl/src/com/intellij/ui/popup/PopupComponent.java
+++ b/platform/platform-impl/src/com/intellij/ui/popup/PopupComponent.java
@@ -18,7 +18,7 @@ import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 
 public interface PopupComponent {
-  Logger LOG = Logger.getInstance("#com.intellij.ui.popup.PopupComponent");
+  Logger LOG = Logger.getInstance(PopupComponent.class);
 
   void hide(boolean dispose);
 
diff --git a/platform/platform-impl/src/com/intellij/ui/popup/PopupFactoryImpl.java b/platform/platform-impl/src/com/intellij/ui/popup/PopupFactoryImpl.java
index 015749d474cc..5b17f19b4d33 100644
--- a/platform/platform-impl/src/com/intellij/ui/popup/PopupFactoryImpl.java
+++ b/platform/platform-impl/src/com/intellij/ui/popup/PopupFactoryImpl.java
@@ -61,7 +61,7 @@ public class PopupFactoryImpl extends JBPopupFactory {
    */
   public static final Key<VisualPosition> ANCHOR_POPUP_POSITION = Key.create("popup.anchor.position");
 
-  private static final Logger LOG = Logger.getInstance("#com.intellij.ui.popup.PopupFactoryImpl");
+  private static final Logger LOG = Logger.getInstance(PopupFactoryImpl.class);
 
   private final Map<Disposable, List<Balloon>> myStorage = ContainerUtil.createWeakMap();
 
diff --git a/platform/platform-impl/src/com/intellij/ui/popup/WizardPopup.java b/platform/platform-impl/src/com/intellij/ui/popup/WizardPopup.java
index a2da92764004..0cac8393f149 100644
--- a/platform/platform-impl/src/com/intellij/ui/popup/WizardPopup.java
+++ b/platform/platform-impl/src/com/intellij/ui/popup/WizardPopup.java
@@ -30,7 +30,7 @@ import java.awt.event.*;
 import java.util.Collections;
 
 public abstract class WizardPopup extends AbstractPopup implements ActionListener, ElementFilter {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.ui.popup.WizardPopup");
+  private static final Logger LOG = Logger.getInstance(WizardPopup.class);
 
   private static final Dimension MAX_SIZE = new Dimension(Integer.MAX_VALUE, 600);
 
diff --git a/platform/platform-impl/src/com/intellij/ui/popup/list/ListPopupImpl.java b/platform/platform-impl/src/com/intellij/ui/popup/list/ListPopupImpl.java
index b10c2a13bc4f..2eb8c2376d03 100644
--- a/platform/platform-impl/src/com/intellij/ui/popup/list/ListPopupImpl.java
+++ b/platform/platform-impl/src/com/intellij/ui/popup/list/ListPopupImpl.java
@@ -42,7 +42,7 @@ import java.util.Arrays;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 public class ListPopupImpl extends WizardPopup implements ListPopup, NextStepHandler {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.ui.popup.list.ListPopupImpl");
+  private static final Logger LOG = Logger.getInstance(ListPopupImpl.class);
 
   private MyList myList;
 
diff --git a/platform/platform-impl/src/com/intellij/ui/popup/tree/TreePopupImpl.java b/platform/platform-impl/src/com/intellij/ui/popup/tree/TreePopupImpl.java
index 78e8405eb174..20afa2be44a2 100644
--- a/platform/platform-impl/src/com/intellij/ui/popup/tree/TreePopupImpl.java
+++ b/platform/platform-impl/src/com/intellij/ui/popup/tree/TreePopupImpl.java
@@ -34,7 +34,7 @@ import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 public class TreePopupImpl extends WizardPopup implements TreePopup, NextStepHandler {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.ui.popup.tree.TreePopupImpl");
+  private static final Logger LOG = Logger.getInstance(TreePopupImpl.class);
   private MyTree myWizardTree;
 
   private MouseMotionListener myMouseMotionListener;
diff --git a/platform/platform-impl/src/com/intellij/util/PendingEventDispatcher.java b/platform/platform-impl/src/com/intellij/util/PendingEventDispatcher.java
index c31e26899a9b..c6fd0a4e5319 100644
--- a/platform/platform-impl/src/com/intellij/util/PendingEventDispatcher.java
+++ b/platform/platform-impl/src/com/intellij/util/PendingEventDispatcher.java
@@ -16,7 +16,7 @@ import java.lang.reflect.Proxy;
 import java.util.*;
 
 public class PendingEventDispatcher <T extends EventListener> {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.util.PendingEventDispatcher");
+  private static final Logger LOG = Logger.getInstance(PendingEventDispatcher.class);
 
   private final T myMulticaster;
 
diff --git a/platform/platform-impl/src/com/intellij/util/io/socketConnection/impl/ResponseProcessor.java b/platform/platform-impl/src/com/intellij/util/io/socketConnection/impl/ResponseProcessor.java
index 32de1dfbcdd2..3978d6dd8bf1 100644
--- a/platform/platform-impl/src/com/intellij/util/io/socketConnection/impl/ResponseProcessor.java
+++ b/platform/platform-impl/src/com/intellij/util/io/socketConnection/impl/ResponseProcessor.java
@@ -21,7 +21,7 @@ import java.util.List;
  * @author nik
  */
 public class ResponseProcessor<R extends AbstractResponse> {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.util.io.socketConnection.impl.ResponseProcessor");
+  private static final Logger LOG = Logger.getInstance(ResponseProcessor.class);
   private final TIntObjectHashMap<AbstractResponseToRequestHandler<?>> myHandlers = new TIntObjectHashMap<>();
   private final MultiValuesMap<Class<? extends R>, AbstractResponseHandler<? extends R>> myClassHandlers = new MultiValuesMap<>();
   private final TIntObjectHashMap<TimeoutHandler> myTimeoutHandlers = new TIntObjectHashMap<>();
diff --git a/platform/platform-impl/src/com/intellij/util/io/socketConnection/impl/ServerSocketConnectionImpl.java b/platform/platform-impl/src/com/intellij/util/io/socketConnection/impl/ServerSocketConnectionImpl.java
index 85d40ae085d4..3f5a8dad66fb 100644
--- a/platform/platform-impl/src/com/intellij/util/io/socketConnection/impl/ServerSocketConnectionImpl.java
+++ b/platform/platform-impl/src/com/intellij/util/io/socketConnection/impl/ServerSocketConnectionImpl.java
@@ -19,7 +19,7 @@ import java.net.Socket;
  * @author nik
  */
 public class ServerSocketConnectionImpl<Request extends AbstractRequest, Response extends AbstractResponse> extends SocketConnectionBase<Request,Response> {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.util.io.socketConnection.impl.ServerSocketConnectionImpl");
+  private static final Logger LOG = Logger.getInstance(ServerSocketConnectionImpl.class);
   private ServerSocket myServerSocket;
   private final int myDefaultPort;
   private final int myPortChoiceAttempts;
diff --git a/platform/platform-impl/src/com/intellij/util/io/socketConnection/impl/SocketConnectionBase.java b/platform/platform-impl/src/com/intellij/util/io/socketConnection/impl/SocketConnectionBase.java
index 5d19d64843ea..8a7decd8d41f 100644
--- a/platform/platform-impl/src/com/intellij/util/io/socketConnection/impl/SocketConnectionBase.java
+++ b/platform/platform-impl/src/com/intellij/util/io/socketConnection/impl/SocketConnectionBase.java
@@ -37,7 +37,7 @@ import java.util.concurrent.atomic.AtomicReference;
  * @author nik
  */
 public abstract class SocketConnectionBase<Request extends AbstractRequest, Response extends AbstractResponse> implements SocketConnection<Request, Response> {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.util.io.socketConnection.impl.ServerSocketConnectionImpl");
+  private static final Logger LOG = Logger.getInstance(ServerSocketConnectionImpl.class);
   private final Object myLock = new Object();
   private int myPort = -1;
   private final AtomicReference<ConnectionState> myState = new AtomicReference<>(new ConnectionState(ConnectionStatus.NOT_CONNECTED));
diff --git a/platform/platform-impl/src/com/intellij/util/io/socketConnection/impl/SocketConnectionImpl.java b/platform/platform-impl/src/com/intellij/util/io/socketConnection/impl/SocketConnectionImpl.java
index 2848028a5bc8..584de39ee3b4 100644
--- a/platform/platform-impl/src/com/intellij/util/io/socketConnection/impl/SocketConnectionImpl.java
+++ b/platform/platform-impl/src/com/intellij/util/io/socketConnection/impl/SocketConnectionImpl.java
@@ -29,7 +29,7 @@ import java.net.UnknownHostException;
  * @author nik
  */
 public class SocketConnectionImpl<Request extends AbstractRequest, Response extends AbstractResponse> extends SocketConnectionBase<Request, Response> implements ClientSocketConnection<Request, Response> {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.util.io.socketConnection.impl.SocketConnectionImpl");
+  private static final Logger LOG = Logger.getInstance(SocketConnectionImpl.class);
   private static final int MAX_CONNECTION_ATTEMPTS = 60;
   private static final int CONNECTION_ATTEMPT_DELAY = 500;
   private final InetAddress myHost;
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/application/impl/LaterInvocatorTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/application/impl/LaterInvocatorTest.java
index 9400665b8670..9ca75b8f4941 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/application/impl/LaterInvocatorTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/application/impl/LaterInvocatorTest.java
@@ -32,7 +32,7 @@ import static org.junit.Assert.assertNotEquals;
 @SuppressWarnings({"SSBasedInspection", "SynchronizeOnThis"})
 @SkipInHeadlessEnvironment
 public class LaterInvocatorTest extends HeavyPlatformTestCase {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.application.impl.LaterInvokatorTest");
+  private static final Logger LOG = Logger.getInstance(LaterInvocatorTest.class);
   
   private final ArrayList<String> myOrder = new ArrayList<>();
 
diff --git a/platform/projectModel-impl/src/com/intellij/openapi/module/impl/ModuleManagerImpl.java b/platform/projectModel-impl/src/com/intellij/openapi/module/impl/ModuleManagerImpl.java
index f23cabd93c4c..ea86be0ae87d 100644
--- a/platform/projectModel-impl/src/com/intellij/openapi/module/impl/ModuleManagerImpl.java
+++ b/platform/projectModel-impl/src/com/intellij/openapi/module/impl/ModuleManagerImpl.java
@@ -71,7 +71,7 @@ public abstract class ModuleManagerImpl extends ModuleManager implements Disposa
   public static final String ATTRIBUTE_GROUP = "group";
   public static final String IML_EXTENSION = ".iml";
 
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.module.impl.ModuleManagerImpl");
+  private static final Logger LOG = Logger.getInstance(ModuleManagerImpl.class);
   private static final Key<String> DISPOSED_MODULE_NAME = Key.create("DisposedNeverAddedModuleName");
   public static final String MODULE_GROUP_SEPARATOR = "/";
 
diff --git a/platform/projectModel-impl/src/com/intellij/openapi/projectRoots/impl/ProjectJdkImpl.java b/platform/projectModel-impl/src/com/intellij/openapi/projectRoots/impl/ProjectJdkImpl.java
index 4e5e2b5801b1..fde34f3db8aa 100644
--- a/platform/projectModel-impl/src/com/intellij/openapi/projectRoots/impl/ProjectJdkImpl.java
+++ b/platform/projectModel-impl/src/com/intellij/openapi/projectRoots/impl/ProjectJdkImpl.java
@@ -26,7 +26,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 public class ProjectJdkImpl extends UserDataHolderBase implements Sdk, SdkModificator, Disposable {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.projectRoots.impl.ProjectJdkImpl");
+  private static final Logger LOG = Logger.getInstance(ProjectJdkImpl.class);
   private String myName;
   private String myVersionString;
   private boolean myVersionDefined;
diff --git a/platform/projectModel-impl/src/com/intellij/openapi/projectRoots/impl/ProjectRootUtil.java b/platform/projectModel-impl/src/com/intellij/openapi/projectRoots/impl/ProjectRootUtil.java
index 096660e8ce10..bda070826930 100644
--- a/platform/projectModel-impl/src/com/intellij/openapi/projectRoots/impl/ProjectRootUtil.java
+++ b/platform/projectModel-impl/src/com/intellij/openapi/projectRoots/impl/ProjectRootUtil.java
@@ -34,7 +34,7 @@ import java.util.List;
  * @author mike
  */
 public class ProjectRootUtil {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.projectRoots.impl.ProjectRootUtil");
+  private static final Logger LOG = Logger.getInstance(ProjectRootUtil.class);
 
   private ProjectRootUtil() {
   }
diff --git a/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/LibraryOrderEntryBaseImpl.java b/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/LibraryOrderEntryBaseImpl.java
index 242732e5ed9e..0e737b77cb1b 100644
--- a/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/LibraryOrderEntryBaseImpl.java
+++ b/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/LibraryOrderEntryBaseImpl.java
@@ -17,7 +17,7 @@ import org.jetbrains.annotations.Nullable;
  *  @author dsl
  */
 abstract class LibraryOrderEntryBaseImpl extends OrderEntryBaseImpl implements LibraryOrSdkOrderEntry {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.roots.impl.LibraryOrderEntryBaseImpl");
+  private static final Logger LOG = Logger.getInstance(LibraryOrderEntryBaseImpl.class);
   final ProjectRootManagerImpl myProjectRootManagerImpl;
   @NotNull protected DependencyScope myScope = DependencyScope.COMPILE;
   @Nullable private RootProvider myCurrentlySubscribedRootProvider;
diff --git a/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/LibraryOrderEntryImpl.java b/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/LibraryOrderEntryImpl.java
index ee81e5c60925..70345aca8d79 100644
--- a/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/LibraryOrderEntryImpl.java
+++ b/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/LibraryOrderEntryImpl.java
@@ -37,7 +37,7 @@ import org.jetbrains.jps.model.serialization.module.JpsModuleRootModelSerializer
  *  @author dsl
  */
 class LibraryOrderEntryImpl extends LibraryOrderEntryBaseImpl implements LibraryOrderEntry, ClonableOrderEntry, WritableOrderEntry {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.roots.impl.LibraryOrderEntryImpl");
+  private static final Logger LOG = Logger.getInstance(LibraryOrderEntryImpl.class);
   private Library myLibrary;
   @Nullable private String myLibraryName; // is non-null if myLibrary == null
   private String myLibraryLevel; // is non-null if myLibrary == null
diff --git a/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/ModuleLibraryOrderEntryImpl.java b/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/ModuleLibraryOrderEntryImpl.java
index 1b45c705fa7a..866e6d493225 100644
--- a/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/ModuleLibraryOrderEntryImpl.java
+++ b/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/ModuleLibraryOrderEntryImpl.java
@@ -43,7 +43,7 @@ import org.jetbrains.jps.model.serialization.module.JpsModuleRootModelSerializer
  */
 @ApiStatus.Internal
 public class ModuleLibraryOrderEntryImpl extends LibraryOrderEntryBaseImpl implements LibraryOrderEntry, ClonableOrderEntry, WritableOrderEntry {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.roots.impl.LibraryOrderEntryImpl");
+  private static final Logger LOG = Logger.getInstance(LibraryOrderEntryImpl.class);
   @NotNull
   private final Library myLibrary;
   @NonNls public static final String ENTRY_TYPE = JpsModuleRootModelSerializer.MODULE_LIBRARY_TYPE;
diff --git a/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/ModuleRootManagerImpl.java b/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/ModuleRootManagerImpl.java
index a4b606e3da97..fdeaa12369cc 100644
--- a/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/ModuleRootManagerImpl.java
+++ b/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/ModuleRootManagerImpl.java
@@ -33,7 +33,7 @@ import org.jetbrains.jps.model.module.JpsModuleSourceRootType;
 import java.util.*;
 
 public class ModuleRootManagerImpl extends ModuleRootManagerEx implements Disposable {
-  protected static final Logger LOG = Logger.getInstance("#com.intellij.openapi.roots.impl.ModuleRootManagerImpl");
+  protected static final Logger LOG = Logger.getInstance(ModuleRootManagerImpl.class);
 
   private final Module myModule;
   private final ProjectRootManagerImpl myProjectRootManager;
diff --git a/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/OrderEntryFactory.java b/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/OrderEntryFactory.java
index 263684e72af4..66fd7d4d1632 100644
--- a/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/OrderEntryFactory.java
+++ b/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/OrderEntryFactory.java
@@ -28,7 +28,7 @@ import org.jetbrains.jps.model.serialization.module.JpsModuleRootModelSerializer
  *  @author dsl
  */
 class OrderEntryFactory {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.roots.impl.OrderEntryFactory");
+  private static final Logger LOG = Logger.getInstance(OrderEntryFactory.class);
   @NonNls public static final String ORDER_ENTRY_ELEMENT_NAME = JpsModuleRootModelSerializer.ORDER_ENTRY_TAG;
   @NonNls public static final String ORDER_ENTRY_TYPE_ATTR = JpsModuleRootModelSerializer.TYPE_ATTRIBUTE;
 
diff --git a/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/OrderEnumeratorBase.java b/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/OrderEnumeratorBase.java
index 55cc0d97ea0d..c3da586f629c 100644
--- a/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/OrderEnumeratorBase.java
+++ b/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/OrderEnumeratorBase.java
@@ -36,7 +36,7 @@ import java.util.*;
  * @author nik
  */
 abstract class OrderEnumeratorBase extends OrderEnumerator implements OrderEnumeratorSettings {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.roots.impl.OrderEnumeratorBase");
+  private static final Logger LOG = Logger.getInstance(OrderEnumeratorBase.class);
   private boolean myProductionOnly;
   private boolean myCompileOnly;
   private boolean myRuntimeOnly;
diff --git a/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/OrderRootsEnumeratorImpl.java b/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/OrderRootsEnumeratorImpl.java
index 6a98ccf365b1..bd7400d37f6f 100644
--- a/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/OrderRootsEnumeratorImpl.java
+++ b/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/OrderRootsEnumeratorImpl.java
@@ -19,7 +19,7 @@ import java.util.*;
  * @author nik
  */
 class OrderRootsEnumeratorImpl implements OrderRootsEnumerator {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.roots.impl.OrderRootsEnumeratorImpl");
+  private static final Logger LOG = Logger.getInstance(OrderRootsEnumeratorImpl.class);
   private final OrderEnumeratorBase myOrderEnumerator;
   private final OrderRootType myRootType;
   private final NotNullFunction<? super OrderEntry, ? extends OrderRootType> myRootTypeProvider;
diff --git a/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/RootIndex.java b/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/RootIndex.java
index c50fe9e3b512..b9db15a51fcf 100644
--- a/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/RootIndex.java
+++ b/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/RootIndex.java
@@ -41,7 +41,7 @@ class RootIndex {
     return name1.compareTo(name2);
   };
 
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.roots.impl.RootIndex");
+  private static final Logger LOG = Logger.getInstance(RootIndex.class);
   private static final FileTypeRegistry ourFileTypes = FileTypeRegistry.getInstance();
 
   private final Map<VirtualFile, String> myPackagePrefixByRoot;
diff --git a/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/RootModelImpl.java b/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/RootModelImpl.java
index 82ba8540e326..55e4330508b0 100644
--- a/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/RootModelImpl.java
+++ b/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/RootModelImpl.java
@@ -37,7 +37,7 @@ import java.util.*;
  */
 @ApiStatus.Internal
 public class RootModelImpl extends RootModelBase implements ModifiableRootModel {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.roots.impl.RootModelImpl");
+  private static final Logger LOG = Logger.getInstance(RootModelImpl.class);
 
   private final Set<ContentEntry> myContent = new TreeSet<>(ContentComparator.INSTANCE);
 
diff --git a/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/libraries/LibraryTableBase.java b/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/libraries/LibraryTableBase.java
index e308a00ce340..8895f91e68cd 100644
--- a/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/libraries/LibraryTableBase.java
+++ b/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/libraries/LibraryTableBase.java
@@ -29,7 +29,7 @@ import java.util.*;
 
 @ApiStatus.Internal
 public abstract class LibraryTableBase implements PersistentStateComponent<Element>, LibraryTable, Disposable {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.roots.impl.libraries.LibraryTableBase");
+  private static final Logger LOG = Logger.getInstance(LibraryTableBase.class);
   private final EventDispatcher<Listener> myDispatcher = EventDispatcher.create(Listener.class);
   private LibraryModel myModel = new LibraryModel();
   private boolean myFirstLoad = true;
diff --git a/platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/GlobalMatchingVisitor.java b/platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/GlobalMatchingVisitor.java
index d096d6585f58..692cd2e77170 100644
--- a/platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/GlobalMatchingVisitor.java
+++ b/platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/GlobalMatchingVisitor.java
@@ -32,7 +32,7 @@ import static com.intellij.structuralsearch.impl.matcher.iterators.SingleNodeIte
  * Visitor class to manage pattern matching
  */
 public class GlobalMatchingVisitor extends AbstractMatchingVisitor {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.structuralsearch.impl.matcher.GlobalMatchingVisitor");
+  private static final Logger LOG = Logger.getInstance(GlobalMatchingVisitor.class);
   public static final Key<List<? extends PsiElement>> UNMATCHED_ELEMENTS_KEY = Key.create("UnmatchedElements");
 
   // the pattern element for visitor check
diff --git a/platform/structure-view-impl/src/com/intellij/ide/util/treeView/AbstractTreeStructureBase.java b/platform/structure-view-impl/src/com/intellij/ide/util/treeView/AbstractTreeStructureBase.java
index 528c566cae9e..6d39c32f77f2 100644
--- a/platform/structure-view-impl/src/com/intellij/ide/util/treeView/AbstractTreeStructureBase.java
+++ b/platform/structure-view-impl/src/com/intellij/ide/util/treeView/AbstractTreeStructureBase.java
@@ -22,7 +22,7 @@ import java.util.Objects;
 import static com.intellij.openapi.util.registry.Registry.is;
 
 public abstract class AbstractTreeStructureBase extends AbstractTreeStructure {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.ide.util.treeView.AbstractTreeStructureBase");
+  private static final Logger LOG = Logger.getInstance(AbstractTreeStructureBase.class);
   protected final Project myProject;
 
   protected AbstractTreeStructureBase(Project project) {
diff --git a/platform/structure-view-impl/src/com/intellij/ide/util/treeView/smartTree/CachingChildrenTreeNode.java b/platform/structure-view-impl/src/com/intellij/ide/util/treeView/smartTree/CachingChildrenTreeNode.java
index 4b0a3c261eac..ae5462b8e3c5 100644
--- a/platform/structure-view-impl/src/com/intellij/ide/util/treeView/smartTree/CachingChildrenTreeNode.java
+++ b/platform/structure-view-impl/src/com/intellij/ide/util/treeView/smartTree/CachingChildrenTreeNode.java
@@ -29,7 +29,7 @@ import org.jetbrains.annotations.NotNull;
 import java.util.*;
 
 public abstract class CachingChildrenTreeNode <Value> extends AbstractTreeNode<Value> {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.ide.util.treeView.smartTree.CachingChildrenTreeNode");
+  private static final Logger LOG = Logger.getInstance(CachingChildrenTreeNode.class);
   private List<CachingChildrenTreeNode> myChildren;
   private List<CachingChildrenTreeNode> myOldChildren;
   @NotNull
diff --git a/platform/structure-view-impl/src/com/intellij/ide/util/treeView/smartTree/GroupWrapper.java b/platform/structure-view-impl/src/com/intellij/ide/util/treeView/smartTree/GroupWrapper.java
index 3306840a511f..d4292c2b1220 100644
--- a/platform/structure-view-impl/src/com/intellij/ide/util/treeView/smartTree/GroupWrapper.java
+++ b/platform/structure-view-impl/src/com/intellij/ide/util/treeView/smartTree/GroupWrapper.java
@@ -24,7 +24,7 @@ import org.jetbrains.annotations.NotNull;
 import java.util.Collection;
 
 public class GroupWrapper extends CachingChildrenTreeNode<Group> {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.ide.util.treeView.smartTree.GroupWrapper");
+  private static final Logger LOG = Logger.getInstance(GroupWrapper.class);
   public GroupWrapper(Project project, @NotNull Group value, @NotNull TreeModel treeModel) {
     super(project, value, treeModel);
     clearChildren();
diff --git a/platform/structure-view-impl/src/com/intellij/ide/util/treeView/smartTree/TreeElementWrapper.java b/platform/structure-view-impl/src/com/intellij/ide/util/treeView/smartTree/TreeElementWrapper.java
index c7856f6ef726..94801050c6dc 100644
--- a/platform/structure-view-impl/src/com/intellij/ide/util/treeView/smartTree/TreeElementWrapper.java
+++ b/platform/structure-view-impl/src/com/intellij/ide/util/treeView/smartTree/TreeElementWrapper.java
@@ -27,7 +27,7 @@ import java.util.Arrays;
 import java.util.Collection;
 
 public class TreeElementWrapper extends CachingChildrenTreeNode<TreeElement> {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.ide.util.treeView.smartTree.TreeElementWrapper");
+  private static final Logger LOG = Logger.getInstance(TreeElementWrapper.class);
   public TreeElementWrapper(Project project, @NotNull TreeElement value, @NotNull TreeModel treeModel) {
     super(project, value, treeModel);
   }
diff --git a/platform/testFramework/core/src/com/intellij/testFramework/TeamCityLogger.java b/platform/testFramework/core/src/com/intellij/testFramework/TeamCityLogger.java
index 6a2147e60ebd..00f174007304 100644
--- a/platform/testFramework/core/src/com/intellij/testFramework/TeamCityLogger.java
+++ b/platform/testFramework/core/src/com/intellij/testFramework/TeamCityLogger.java
@@ -28,7 +28,7 @@ import java.io.File;
 import java.io.IOException;
 
 public class TeamCityLogger {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.testFramework.TeamCityLogger");
+  private static final Logger LOG = Logger.getInstance(TeamCityLogger.class);
 
   public static final boolean isUnderTC = System.getProperty("bootstrap.testcases") != null;
 
diff --git a/platform/testFramework/src/com/intellij/testFramework/propertyBased/InvokeCompletion.java b/platform/testFramework/src/com/intellij/testFramework/propertyBased/InvokeCompletion.java
index cc42b7c1fc19..474873b31e60 100644
--- a/platform/testFramework/src/com/intellij/testFramework/propertyBased/InvokeCompletion.java
+++ b/platform/testFramework/src/com/intellij/testFramework/propertyBased/InvokeCompletion.java
@@ -51,7 +51,7 @@ import java.util.*;
  * @author peter
  */
 public class InvokeCompletion extends ActionOnFile {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.testFramework.propertyBased.InvokeCompletion");
+  private static final Logger LOG = Logger.getInstance(InvokeCompletion.class);
   private final CompletionPolicy myPolicy;
 
   public InvokeCompletion(@NotNull PsiFile file, @NotNull CompletionPolicy policy) {
diff --git a/platform/testFramework/src/com/intellij/testFramework/propertyBased/InvokeIntention.java b/platform/testFramework/src/com/intellij/testFramework/propertyBased/InvokeIntention.java
index 927f66fe7af5..6694bab5ac22 100644
--- a/platform/testFramework/src/com/intellij/testFramework/propertyBased/InvokeIntention.java
+++ b/platform/testFramework/src/com/intellij/testFramework/propertyBased/InvokeIntention.java
@@ -53,7 +53,7 @@ import java.util.function.Function;
 import java.util.stream.Collectors;
 
 public class InvokeIntention extends ActionOnFile {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.testFramework.propertyBased.InvokeIntention");
+  private static final Logger LOG = Logger.getInstance(InvokeIntention.class);
   private final IntentionPolicy myPolicy;
 
   public InvokeIntention(@NotNull PsiFile file, @NotNull IntentionPolicy policy) {
diff --git a/platform/testFramework/src/com/intellij/testFramework/propertyBased/MadTestingUtil.java b/platform/testFramework/src/com/intellij/testFramework/propertyBased/MadTestingUtil.java
index 32e46e760343..494276bb6294 100644
--- a/platform/testFramework/src/com/intellij/testFramework/propertyBased/MadTestingUtil.java
+++ b/platform/testFramework/src/com/intellij/testFramework/propertyBased/MadTestingUtil.java
@@ -66,7 +66,7 @@ import java.util.stream.Stream;
  * @author peter
  */
 public class MadTestingUtil {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.testFramework.propertyBased.MadTestingUtil");
+  private static final Logger LOG = Logger.getInstance(MadTestingUtil.class);
   private static final boolean USE_ROULETTE_WHEEL = true;
 
   public static void restrictChangesToDocument(Document document, Runnable r) {
diff --git a/platform/testFramework/src/com/intellij/testFramework/propertyBased/RehighlightAllEditors.java b/platform/testFramework/src/com/intellij/testFramework/propertyBased/RehighlightAllEditors.java
index 83c13c83b89a..48775eec2cf0 100644
--- a/platform/testFramework/src/com/intellij/testFramework/propertyBased/RehighlightAllEditors.java
+++ b/platform/testFramework/src/com/intellij/testFramework/propertyBased/RehighlightAllEditors.java
@@ -36,7 +36,7 @@ import java.util.List;
  * @author peter
  */
 public class RehighlightAllEditors implements MadTestingAction {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.testFramework.propertyBased.RehighlightAllEditors");
+  private static final Logger LOG = Logger.getInstance(RehighlightAllEditors.class);
   private final Project myProject;
 
   public RehighlightAllEditors(Project project) {
diff --git a/platform/usageView/src/com/intellij/usages/ChunkExtractor.java b/platform/usageView/src/com/intellij/usages/ChunkExtractor.java
index 6739f3471f9b..e2ea4da0da18 100644
--- a/platform/usageView/src/com/intellij/usages/ChunkExtractor.java
+++ b/platform/usageView/src/com/intellij/usages/ChunkExtractor.java
@@ -58,7 +58,7 @@ import java.util.Map;
  * @author peter
  */
 public class ChunkExtractor {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.usages.ChunkExtractor");
+  private static final Logger LOG = Logger.getInstance(ChunkExtractor.class);
   static final int MAX_LINE_LENGTH_TO_SHOW = 200;
   static final int OFFSET_BEFORE_TO_SHOW_WHEN_LONG_LINE = 1;
   static final int OFFSET_AFTER_TO_SHOW_WHEN_LONG_LINE = 1;
diff --git a/platform/usageView/src/com/intellij/usages/impl/UsagePreviewPanel.java b/platform/usageView/src/com/intellij/usages/impl/UsagePreviewPanel.java
index 707d79f2a853..35f3aaa6ed2a 100644
--- a/platform/usageView/src/com/intellij/usages/impl/UsagePreviewPanel.java
+++ b/platform/usageView/src/com/intellij/usages/impl/UsagePreviewPanel.java
@@ -69,7 +69,7 @@ import java.util.regex.Pattern;
  * @author cdr
  */
 public class UsagePreviewPanel extends UsageContextPanelBase implements DataProvider {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.usages.impl.UsagePreviewPanel");
+  private static final Logger LOG = Logger.getInstance(UsagePreviewPanel.class);
   private Editor myEditor;
   private final boolean myIsEditor;
   private int myLineHeight;
diff --git a/platform/usageView/src/com/intellij/usages/impl/UsageViewTreeCellRenderer.java b/platform/usageView/src/com/intellij/usages/impl/UsageViewTreeCellRenderer.java
index 44b177564bd7..d4ecb4b8383b 100644
--- a/platform/usageView/src/com/intellij/usages/impl/UsageViewTreeCellRenderer.java
+++ b/platform/usageView/src/com/intellij/usages/impl/UsageViewTreeCellRenderer.java
@@ -32,7 +32,7 @@ import java.awt.*;
  * @author max
  */
 class UsageViewTreeCellRenderer extends ColoredTreeCellRenderer {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.usages.impl.UsageViewTreeCellRenderer");
+  private static final Logger LOG = Logger.getInstance(UsageViewTreeCellRenderer.class);
   private static final EditorColorsScheme ourColorsScheme = UsageTreeColorsScheme.getInstance().getScheme();
   private static final SimpleTextAttributes ourInvalidAttributes = SimpleTextAttributes.fromTextAttributes(ourColorsScheme.getAttributes(UsageTreeColors.INVALID_PREFIX));
   private static final SimpleTextAttributes ourReadOnlyAttributes = SimpleTextAttributes.fromTextAttributes(ourColorsScheme.getAttributes(UsageTreeColors.READONLY_PREFIX));
diff --git a/platform/util/src/com/intellij/AbstractBundle.java b/platform/util/src/com/intellij/AbstractBundle.java
index fc06d5589276..2b1c6078d2dc 100644
--- a/platform/util/src/com/intellij/AbstractBundle.java
+++ b/platform/util/src/com/intellij/AbstractBundle.java
@@ -31,7 +31,7 @@ import java.util.ResourceBundle;
  * @author Denis Zhdanov
  */
 public abstract class AbstractBundle {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.AbstractBundle");
+  private static final Logger LOG = Logger.getInstance(AbstractBundle.class);
   private Reference<ResourceBundle> myBundle;
   @NonNls private final String myPathToBundle;
 
diff --git a/platform/util/src/com/intellij/diagnostic/LoadingState.java b/platform/util/src/com/intellij/diagnostic/LoadingState.java
index fbdd64e1782b..32fe544a9d20 100644
--- a/platform/util/src/com/intellij/diagnostic/LoadingState.java
+++ b/platform/util/src/com/intellij/diagnostic/LoadingState.java
@@ -30,7 +30,7 @@ public enum LoadingState {
 
   @NotNull
   static Logger getLogger() {
-    return Logger.getInstance("#com.intellij.diagnostic.LoadingState");
+    return Logger.getInstance(LoadingState.class);
   }
 
   @ApiStatus.Internal
diff --git a/platform/util/src/com/intellij/execution/process/ProcessHandler.java b/platform/util/src/com/intellij/execution/process/ProcessHandler.java
index ba7962cbdb90..d4aa08acdd7d 100644
--- a/platform/util/src/com/intellij/execution/process/ProcessHandler.java
+++ b/platform/util/src/com/intellij/execution/process/ProcessHandler.java
@@ -24,7 +24,7 @@ import java.util.List;
 import java.util.concurrent.atomic.AtomicReference;
 
 public abstract class ProcessHandler extends UserDataHolderBase {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.execution.process.ProcessHandler");
+  private static final Logger LOG = Logger.getInstance(ProcessHandler.class);
   /**
    * todo: replace with an overridable method [nik]
    *
diff --git a/platform/util/src/com/intellij/execution/process/ProcessWaitFor.java b/platform/util/src/com/intellij/execution/process/ProcessWaitFor.java
index a7b64efa7ca3..2466f71ac931 100644
--- a/platform/util/src/com/intellij/execution/process/ProcessWaitFor.java
+++ b/platform/util/src/com/intellij/execution/process/ProcessWaitFor.java
@@ -13,7 +13,7 @@ import org.jetbrains.annotations.NotNull;
 import java.util.concurrent.*;
 
 public class ProcessWaitFor {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.execution.process.ProcessWaitFor");
+  private static final Logger LOG = Logger.getInstance(ProcessWaitFor.class);
 
   private final Future<?> myWaitForThreadFuture;
   private final BlockingQueue<Consumer<Integer>> myTerminationCallback = new ArrayBlockingQueue<>(1);
diff --git a/platform/util/src/com/intellij/openapi/diagnostic/FrequentEventDetector.java b/platform/util/src/com/intellij/openapi/diagnostic/FrequentEventDetector.java
index c3fa3c0f662f..e1f801e92579 100644
--- a/platform/util/src/com/intellij/openapi/diagnostic/FrequentEventDetector.java
+++ b/platform/util/src/com/intellij/openapi/diagnostic/FrequentEventDetector.java
@@ -30,7 +30,7 @@ import java.util.concurrent.atomic.AtomicInteger;
  * @author peter
  */
 public class FrequentEventDetector {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.diagnostic.FrequentEventDetector");
+  private static final Logger LOG = Logger.getInstance(FrequentEventDetector.class);
 
   public enum Level {INFO, WARN, ERROR}
 
diff --git a/platform/util/src/com/intellij/openapi/diff/impl/DiffFragmentBuilder.java b/platform/util/src/com/intellij/openapi/diff/impl/DiffFragmentBuilder.java
index c0a729a419b2..3b4782428380 100644
--- a/platform/util/src/com/intellij/openapi/diff/impl/DiffFragmentBuilder.java
+++ b/platform/util/src/com/intellij/openapi/diff/impl/DiffFragmentBuilder.java
@@ -57,7 +57,7 @@ import java.util.List;
  */
 public class DiffFragmentBuilder {
 
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.diff.impl.DiffFragmentBuilder");
+  private static final Logger LOG = Logger.getInstance(DiffFragmentBuilder.class);
 
   @NotNull private final DiffString[] mySource1;
   @NotNull private final DiffString[] mySource2;
diff --git a/platform/util/src/com/intellij/openapi/diff/impl/fragments/FragmentListImpl.java b/platform/util/src/com/intellij/openapi/diff/impl/fragments/FragmentListImpl.java
index 5db2f43df911..dbc8b18cc566 100644
--- a/platform/util/src/com/intellij/openapi/diff/impl/fragments/FragmentListImpl.java
+++ b/platform/util/src/com/intellij/openapi/diff/impl/fragments/FragmentListImpl.java
@@ -25,7 +25,7 @@ import java.util.Comparator;
 import java.util.Iterator;
 
 public class FragmentListImpl implements FragmentList {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.diff.impl.fragments.FragmentList");
+  private static final Logger LOG = Logger.getInstance(FragmentList.class);
   private final ArrayList<Fragment> myFragments;
 
   private <T extends Fragment> FragmentListImpl(ArrayList<T> sortedFragments) {
diff --git a/platform/util/src/com/intellij/openapi/diff/impl/fragments/InlineFragment.java b/platform/util/src/com/intellij/openapi/diff/impl/fragments/InlineFragment.java
index cc82eb02e4de..47760fc1c839 100644
--- a/platform/util/src/com/intellij/openapi/diff/impl/fragments/InlineFragment.java
+++ b/platform/util/src/com/intellij/openapi/diff/impl/fragments/InlineFragment.java
@@ -22,7 +22,7 @@ import com.intellij.openapi.util.Condition;
 import com.intellij.openapi.util.TextRange;
 
 public class InlineFragment implements Fragment {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.diff.impl.fragments.InlineFragment");
+  private static final Logger LOG = Logger.getInstance(InlineFragment.class);
   private final TextRange myRange1;
   private final TextRange myRange2;
   private final TextDiffTypeEnum myType;
diff --git a/platform/util/src/com/intellij/openapi/diff/impl/fragments/LineFragment.java b/platform/util/src/com/intellij/openapi/diff/impl/fragments/LineFragment.java
index 4d8851293dd2..b230271a9111 100644
--- a/platform/util/src/com/intellij/openapi/diff/impl/fragments/LineFragment.java
+++ b/platform/util/src/com/intellij/openapi/diff/impl/fragments/LineFragment.java
@@ -28,7 +28,7 @@ import java.util.ArrayList;
 import java.util.Iterator;
 
 public class LineFragment extends LineBlock implements Fragment {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.diff.impl.fragments.LineFragment");
+  private static final Logger LOG = Logger.getInstance(LineFragment.class);
   private final TextRange myRange1;
   private final TextRange myRange2;
   private FragmentList myChildren;
diff --git a/platform/util/src/com/intellij/openapi/diff/impl/highlighting/Util.java b/platform/util/src/com/intellij/openapi/diff/impl/highlighting/Util.java
index c16e1fbbe86d..e1fffdb9bf48 100644
--- a/platform/util/src/com/intellij/openapi/diff/impl/highlighting/Util.java
+++ b/platform/util/src/com/intellij/openapi/diff/impl/highlighting/Util.java
@@ -31,7 +31,7 @@ import java.util.List;
 import java.util.StringTokenizer;
 
 public class Util {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.diff.impl.highlighting.Util");
+  private static final Logger LOG = Logger.getInstance(Util.class);
   private static final String DELIMITERS = " \n\r\t(){}[],./?`~!@#$%^&*-=+|\\;:'\"<>";
   public static final TIntHashSet DELIMITERS_SET = new TIntHashSet();
 
diff --git a/platform/util/src/com/intellij/openapi/diff/impl/processing/ByWord.java b/platform/util/src/com/intellij/openapi/diff/impl/processing/ByWord.java
index d5dd8637afb7..abff1307610e 100644
--- a/platform/util/src/com/intellij/openapi/diff/impl/processing/ByWord.java
+++ b/platform/util/src/com/intellij/openapi/diff/impl/processing/ByWord.java
@@ -22,7 +22,7 @@ import java.util.ArrayList;
  */
 @Deprecated
 public class ByWord implements DiffPolicy {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.diff.impl.processing.ByWord");
+  private static final Logger LOG = Logger.getInstance(ByWord.class);
   private final ComparisonPolicy myComparisonPolicy;
 
   public ByWord(ComparisonPolicy comparisonPolicy) {
diff --git a/platform/util/src/com/intellij/openapi/diff/impl/processing/DiffCorrection.java b/platform/util/src/com/intellij/openapi/diff/impl/processing/DiffCorrection.java
index 7512c453a17d..a0c8665f21ad 100644
--- a/platform/util/src/com/intellij/openapi/diff/impl/processing/DiffCorrection.java
+++ b/platform/util/src/com/intellij/openapi/diff/impl/processing/DiffCorrection.java
@@ -31,7 +31,7 @@ public interface DiffCorrection {
   DiffFragment[] correct(DiffFragment[] fragments) throws FilesTooBigForDiffException;
 
   class TrueLineBlocks implements DiffCorrection, FragmentProcessor<FragmentsCollector> {
-    private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.diff.impl.processing.DiffCorrection.TrueLineBlocks");
+    private static final Logger LOG = Logger.getInstance(TrueLineBlocks.class);
     private final DiffPolicy myDiffPolicy;
     @NotNull private final ComparisonPolicy myComparisonPolicy;
 
diff --git a/platform/util/src/com/intellij/openapi/diff/impl/processing/PreferWholeLines.java b/platform/util/src/com/intellij/openapi/diff/impl/processing/PreferWholeLines.java
index 2026229b0c81..4812295862b3 100644
--- a/platform/util/src/com/intellij/openapi/diff/impl/processing/PreferWholeLines.java
+++ b/platform/util/src/com/intellij/openapi/diff/impl/processing/PreferWholeLines.java
@@ -8,7 +8,7 @@ import com.intellij.openapi.diff.impl.string.DiffString;
 import com.intellij.openapi.util.text.StringUtil;
 
 class PreferWholeLines implements DiffCorrection {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.diff.impl.processing.PreferWholeLines");
+  private static final Logger LOG = Logger.getInstance(PreferWholeLines.class);
   public static final DiffCorrection INSTANCE = new PreferWholeLines();
 
   @Override
diff --git a/platform/util/src/com/intellij/openapi/diff/impl/processing/UniteSameType.java b/platform/util/src/com/intellij/openapi/diff/impl/processing/UniteSameType.java
index 3dee295630f5..6d5d97dcae4e 100644
--- a/platform/util/src/com/intellij/openapi/diff/impl/processing/UniteSameType.java
+++ b/platform/util/src/com/intellij/openapi/diff/impl/processing/UniteSameType.java
@@ -24,7 +24,7 @@ import com.intellij.util.diff.FilesTooBigForDiffException;
 import org.jetbrains.annotations.NotNull;
 
 class UniteSameType implements DiffCorrection {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.diff.impl.processing.UniteSameType");
+  private static final Logger LOG = Logger.getInstance(UniteSameType.class);
   public static final DiffCorrection INSTANCE = new UniteSameType();
   @Override
   public DiffFragment[] correct(DiffFragment[] fragments) {
diff --git a/platform/util/src/com/intellij/openapi/diff/impl/processing/Word.java b/platform/util/src/com/intellij/openapi/diff/impl/processing/Word.java
index d9d67dc3e6f6..f8a0ad61a345 100644
--- a/platform/util/src/com/intellij/openapi/diff/impl/processing/Word.java
+++ b/platform/util/src/com/intellij/openapi/diff/impl/processing/Word.java
@@ -22,7 +22,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.TestOnly;
 
 public class Word {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.diff.impl.processing.Word");
+  private static final Logger LOG = Logger.getInstance(Word.class);
   @NotNull private final DiffString myBaseText;
   @NotNull private final TextRange myRange;
   @NotNull private final DiffString myText;
diff --git a/platform/util/src/com/intellij/openapi/util/DefaultJDOMExternalizer.java b/platform/util/src/com/intellij/openapi/util/DefaultJDOMExternalizer.java
index 158677dc782a..3585618bade5 100644
--- a/platform/util/src/com/intellij/openapi/util/DefaultJDOMExternalizer.java
+++ b/platform/util/src/com/intellij/openapi/util/DefaultJDOMExternalizer.java
@@ -27,7 +27,7 @@ import java.util.concurrent.ConcurrentMap;
 @Deprecated
 @SuppressWarnings("HardCodedStringLiteral")
 public class DefaultJDOMExternalizer {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.util.DefaultJDOMExternalizer");
+  private static final Logger LOG = Logger.getInstance(DefaultJDOMExternalizer.class);
 
   private DefaultJDOMExternalizer() {
   }
diff --git a/platform/util/src/com/intellij/openapi/util/JDOMExternalizableStringList.java b/platform/util/src/com/intellij/openapi/util/JDOMExternalizableStringList.java
index ed3a649a8247..b55c3e0778f2 100644
--- a/platform/util/src/com/intellij/openapi/util/JDOMExternalizableStringList.java
+++ b/platform/util/src/com/intellij/openapi/util/JDOMExternalizableStringList.java
@@ -16,7 +16,7 @@ import java.util.List;
 @SuppressWarnings({"HardCodedStringLiteral"})
 @Deprecated
 public class JDOMExternalizableStringList extends ArrayList<String> implements JDOMExternalizable {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.util.JDOMExternalizableStringList");
+  private static final Logger LOG = Logger.getInstance(JDOMExternalizableStringList.class);
 
   private static final String ATTR_LIST = "list";
   private static final String ATTR_LISTSIZE = "size";
diff --git a/platform/util/src/com/intellij/openapi/util/JDOMUtil.java b/platform/util/src/com/intellij/openapi/util/JDOMUtil.java
index 0fd6e31acabe..5844b742c9d5 100644
--- a/platform/util/src/com/intellij/openapi/util/JDOMUtil.java
+++ b/platform/util/src/com/intellij/openapi/util/JDOMUtil.java
@@ -109,7 +109,7 @@ public final class JDOMUtil {
   }
 
   private static class LoggerHolder {
-    private static final Logger ourLogger = Logger.getInstance("#com.intellij.openapi.util.JDOMUtil");
+    private static final Logger ourLogger = Logger.getInstance(JDOMUtil.class);
   }
 
   private static Logger getLogger() {
diff --git a/platform/util/src/com/intellij/openapi/util/LowMemoryWatcher.java b/platform/util/src/com/intellij/openapi/util/LowMemoryWatcher.java
index e8908f368b68..3fa64bcd0b2b 100644
--- a/platform/util/src/com/intellij/openapi/util/LowMemoryWatcher.java
+++ b/platform/util/src/com/intellij/openapi/util/LowMemoryWatcher.java
@@ -13,7 +13,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
  * @author Eugene Zhuravlev
  */
 public class LowMemoryWatcher {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.util.LowMemoryWatcher");
+  private static final Logger LOG = Logger.getInstance(LowMemoryWatcher.class);
 
   public enum LowMemoryWatcherType {
     ALWAYS,
diff --git a/platform/util/src/com/intellij/openapi/util/LowMemoryWatcherManager.java b/platform/util/src/com/intellij/openapi/util/LowMemoryWatcherManager.java
index 13a01d46e8ea..28035182a1e9 100644
--- a/platform/util/src/com/intellij/openapi/util/LowMemoryWatcherManager.java
+++ b/platform/util/src/com/intellij/openapi/util/LowMemoryWatcherManager.java
@@ -22,7 +22,7 @@ import java.util.concurrent.Future;
 public final class LowMemoryWatcherManager implements Disposable {
   @NotNull
   private static Logger getLogger() {
-    return Logger.getInstance("#com.intellij.openapi.util.LowMemoryWatcherManager");
+    return Logger.getInstance(LowMemoryWatcherManager.class);
   }
 
   private static final long MEM_THRESHOLD = 5 /*MB*/ * 1024 * 1024;
diff --git a/platform/util/src/com/intellij/openapi/util/RecursionManager.java b/platform/util/src/com/intellij/openapi/util/RecursionManager.java
index b4c6a294dbb0..7eac93a9beb7 100644
--- a/platform/util/src/com/intellij/openapi/util/RecursionManager.java
+++ b/platform/util/src/com/intellij/openapi/util/RecursionManager.java
@@ -57,7 +57,7 @@ import java.util.stream.Stream;
  */
 @SuppressWarnings("UtilityClassWithoutPrivateConstructor")
 public class RecursionManager {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.util.RecursionManager");
+  private static final Logger LOG = Logger.getInstance(RecursionManager.class);
   private static final ThreadLocal<CalculationStack> ourStack = ThreadLocal.withInitial(CalculationStack::new);
   private static boolean ourAssertOnPrevention;
 
diff --git a/platform/util/src/com/intellij/openapi/util/io/FileSystemUtil.java b/platform/util/src/com/intellij/openapi/util/io/FileSystemUtil.java
index e54bbba1f857..36cb2c067137 100644
--- a/platform/util/src/com/intellij/openapi/util/io/FileSystemUtil.java
+++ b/platform/util/src/com/intellij/openapi/util/io/FileSystemUtil.java
@@ -34,7 +34,7 @@ public class FileSystemUtil {
   static final String FORCE_USE_NIO2_KEY = "idea.io.use.nio2";
   private static final String COARSE_TIMESTAMP_KEY = "idea.io.coarse.ts";
 
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.util.io.FileSystemUtil");
+  private static final Logger LOG = Logger.getInstance(FileSystemUtil.class);
 
   private interface Mediator {
     @Nullable FileAttributes getAttributes(@NotNull String path) throws IOException;
diff --git a/platform/util/src/com/intellij/openapi/util/io/JarUtil.java b/platform/util/src/com/intellij/openapi/util/io/JarUtil.java
index 213ae5749380..e23e8d4ca8a3 100644
--- a/platform/util/src/com/intellij/openapi/util/io/JarUtil.java
+++ b/platform/util/src/com/intellij/openapi/util/io/JarUtil.java
@@ -29,7 +29,7 @@ import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 
 public class JarUtil {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.util.io.JarUtil");
+  private static final Logger LOG = Logger.getInstance(JarUtil.class);
 
   /**
    * Returns true if the given .jar file exists and contains the given class.
diff --git a/platform/util/src/com/intellij/openapi/util/io/win32/IdeaWin32.java b/platform/util/src/com/intellij/openapi/util/io/win32/IdeaWin32.java
index 800c1ab30ff8..afca0f55466f 100644
--- a/platform/util/src/com/intellij/openapi/util/io/win32/IdeaWin32.java
+++ b/platform/util/src/com/intellij/openapi/util/io/win32/IdeaWin32.java
@@ -34,7 +34,7 @@ import java.util.zip.CRC32;
  * @author Dmitry Avdeev
  */
 public class IdeaWin32 {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.util.io.win32.IdeaWin32");
+  private static final Logger LOG = Logger.getInstance(IdeaWin32.class);
   private static final boolean TRACE_ENABLED = LOG.isTraceEnabled();
 
   private static final IdeaWin32 ourInstance;
diff --git a/platform/util/src/com/intellij/util/EventDispatcher.java b/platform/util/src/com/intellij/util/EventDispatcher.java
index 6b1576c756ad..dc2fc63cb1ca 100644
--- a/platform/util/src/com/intellij/util/EventDispatcher.java
+++ b/platform/util/src/com/intellij/util/EventDispatcher.java
@@ -22,7 +22,7 @@ import java.util.*;
  * @author max
  */
 public class EventDispatcher<T extends EventListener> {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.util.EventDispatcher");
+  private static final Logger LOG = Logger.getInstance(EventDispatcher.class);
 
   private T myMulticaster;
 
diff --git a/platform/util/src/com/intellij/util/FieldAccessor.java b/platform/util/src/com/intellij/util/FieldAccessor.java
index 2a716360f07d..044683d6a853 100644
--- a/platform/util/src/com/intellij/util/FieldAccessor.java
+++ b/platform/util/src/com/intellij/util/FieldAccessor.java
@@ -29,7 +29,7 @@ import java.lang.reflect.Field;
  * @param <T> the type of the field
  */
 public class FieldAccessor<E, T> {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.util.FieldAccessor");
+  private static final Logger LOG = Logger.getInstance(FieldAccessor.class);
 
   private Ref<Field> myFieldRef;
   private final Class<E> myClass;
diff --git a/platform/util/src/com/intellij/util/MemoryDumpHelper.java b/platform/util/src/com/intellij/util/MemoryDumpHelper.java
index 4babc64d42c0..9d642c91ef0f 100644
--- a/platform/util/src/com/intellij/util/MemoryDumpHelper.java
+++ b/platform/util/src/com/intellij/util/MemoryDumpHelper.java
@@ -67,7 +67,7 @@ public class MemoryDumpHelper {
       dumpHeap = mxBean.getClass().getMethod("dumpHeap", String.class, boolean.class);
     }
     catch (Throwable t) {
-      Logger.getInstance("#com.intellij.util.MemoryDumpHelper").info(t.getMessage());
+      Logger.getInstance(MemoryDumpHelper.class).info(t.getMessage());
       mxBean = null;
       dumpHeap = null;
     }
diff --git a/platform/util/src/com/intellij/util/MethodInvocator.java b/platform/util/src/com/intellij/util/MethodInvocator.java
index f61fe18b974c..683c7dcd89bc 100644
--- a/platform/util/src/com/intellij/util/MethodInvocator.java
+++ b/platform/util/src/com/intellij/util/MethodInvocator.java
@@ -21,7 +21,7 @@ import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
 public class MethodInvocator {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.util.MethodInvocator");
+  private static final Logger LOG = Logger.getInstance(MethodInvocator.class);
 
   private Method myMethod;
 
diff --git a/platform/util/src/com/intellij/util/NewInstanceFactory.java b/platform/util/src/com/intellij/util/NewInstanceFactory.java
index 23516c53515f..4efd86355de5 100644
--- a/platform/util/src/com/intellij/util/NewInstanceFactory.java
+++ b/platform/util/src/com/intellij/util/NewInstanceFactory.java
@@ -8,7 +8,7 @@ import org.jetbrains.annotations.NotNull;
 import java.lang.reflect.Constructor;
 
 public class NewInstanceFactory<T> implements Factory<T> {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.util.NewInstanceFactory");
+  private static final Logger LOG = Logger.getInstance(NewInstanceFactory.class);
 
   private final Constructor<? extends T> myConstructor;
   private final Object[] myArgs;
diff --git a/platform/util/src/com/intellij/util/PatternUtil.java b/platform/util/src/com/intellij/util/PatternUtil.java
index 02348c17146b..1e03ad8792e4 100644
--- a/platform/util/src/com/intellij/util/PatternUtil.java
+++ b/platform/util/src/com/intellij/util/PatternUtil.java
@@ -15,7 +15,7 @@ import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
 
 public class PatternUtil {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.util.PatternUtil");
+  private static final Logger LOG = Logger.getInstance(PatternUtil.class);
 
   public static final Pattern NOTHING = Pattern.compile("(a\\A)");
 
diff --git a/platform/util/src/com/intellij/util/ReflectionUtil.java b/platform/util/src/com/intellij/util/ReflectionUtil.java
index 353a95dacb9c..8738ff5d09c0 100644
--- a/platform/util/src/com/intellij/util/ReflectionUtil.java
+++ b/platform/util/src/com/intellij/util/ReflectionUtil.java
@@ -16,7 +16,7 @@ import java.lang.reflect.*;
 import java.util.*;
 
 public final class ReflectionUtil {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.util.ReflectionUtil");
+  private static final Logger LOG = Logger.getInstance(ReflectionUtil.class);
 
   private ReflectionUtil() { }
 
diff --git a/platform/util/src/com/intellij/util/concurrency/AppDelayQueue.java b/platform/util/src/com/intellij/util/concurrency/AppDelayQueue.java
index 1e885c59954b..5b2b8fe234aa 100644
--- a/platform/util/src/com/intellij/util/concurrency/AppDelayQueue.java
+++ b/platform/util/src/com/intellij/util/concurrency/AppDelayQueue.java
@@ -28,7 +28,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
  * The {@link #shutdown()} must be called before disposal.
  */
 class AppDelayQueue extends DelayQueue<SchedulingWrapper.MyScheduledFutureTask> {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.util.concurrency.AppDelayQueue");
+  private static final Logger LOG = Logger.getInstance(AppDelayQueue.class);
   private final Thread scheduledToPooledTransferrer;
   private final AtomicBoolean shutdown = new AtomicBoolean();
 
diff --git a/platform/util/src/com/intellij/util/concurrency/AppScheduledExecutorService.java b/platform/util/src/com/intellij/util/concurrency/AppScheduledExecutorService.java
index 5be667163997..2a83243cda04 100644
--- a/platform/util/src/com/intellij/util/concurrency/AppScheduledExecutorService.java
+++ b/platform/util/src/com/intellij/util/concurrency/AppScheduledExecutorService.java
@@ -134,7 +134,7 @@ public final class AppScheduledExecutorService extends SchedulingWrapper {
     @Override
     protected void afterExecute(Runnable r, Throwable t) {
       if (t != null) {
-        Logger.getInstance("#com.intellij.util.concurrency.SchedulingWrapper").error("Worker exited due to exception", t);
+        Logger.getInstance(SchedulingWrapper.class).error("Worker exited due to exception", t);
       }
     }
 
diff --git a/platform/util/src/com/intellij/util/containers/Enumerator.java b/platform/util/src/com/intellij/util/containers/Enumerator.java
index 6f964e25b7c9..a152623d5284 100644
--- a/platform/util/src/com/intellij/util/containers/Enumerator.java
+++ b/platform/util/src/com/intellij/util/containers/Enumerator.java
@@ -26,7 +26,7 @@ import org.jetbrains.annotations.NotNull;
  * @author dyoma
  */
 public class Enumerator<T> {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.util.containers.Enumerator");
+  private static final Logger LOG = Logger.getInstance(Enumerator.class);
   private final TObjectIntHashMap<T> myNumbers;
   private int myNextNumber = 1;
 
diff --git a/platform/util/src/com/intellij/util/diff/Diff.java b/platform/util/src/com/intellij/util/diff/Diff.java
index e0ee9bd00609..dcbe881d7ecd 100644
--- a/platform/util/src/com/intellij/util/diff/Diff.java
+++ b/platform/util/src/com/intellij/util/diff/Diff.java
@@ -33,7 +33,7 @@ import java.util.BitSet;
  * @author dyoma
  */
 public class Diff {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.util.diff.Diff");
+  private static final Logger LOG = Logger.getInstance(Diff.class);
 
   @Nullable
   public static Change buildChanges(@NotNull CharSequence before, @NotNull CharSequence after) throws FilesTooBigForDiffException {
diff --git a/platform/util/src/com/intellij/util/indexing/impl/MapReduceIndex.java b/platform/util/src/com/intellij/util/indexing/impl/MapReduceIndex.java
index 68aee72e04bf..7ba599eb4ce4 100644
--- a/platform/util/src/com/intellij/util/indexing/impl/MapReduceIndex.java
+++ b/platform/util/src/com/intellij/util/indexing/impl/MapReduceIndex.java
@@ -42,7 +42,7 @@ import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
 public abstract class MapReduceIndex<Key,Value, Input> implements InvertedIndex<Key, Value, Input> {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.util.indexing.impl.MapReduceIndex");
+  private static final Logger LOG = Logger.getInstance(MapReduceIndex.class);
   @NotNull protected final IndexId<Key, Value> myIndexId;
   @NotNull protected final IndexStorage<Key, Value> myStorage;
 
diff --git a/platform/util/src/com/intellij/util/indexing/impl/ValueContainerImpl.java b/platform/util/src/com/intellij/util/indexing/impl/ValueContainerImpl.java
index fed6db51505c..9725c2f5ff47 100644
--- a/platform/util/src/com/intellij/util/indexing/impl/ValueContainerImpl.java
+++ b/platform/util/src/com/intellij/util/indexing/impl/ValueContainerImpl.java
@@ -40,7 +40,7 @@ import java.util.NoSuchElementException;
  * @author Eugene Zhuravlev
  */
 class ValueContainerImpl<Value> extends UpdatableValueContainer<Value> implements Cloneable{
-  private static final Logger LOG = Logger.getInstance("#com.intellij.util.indexing.impl.ValueContainerImpl");
+  private static final Logger LOG = Logger.getInstance(ValueContainerImpl.class);
   private static final Object myNullValue = new Object();
 
   // there is no volatile as we modify under write lock and read under read lock
diff --git a/platform/util/src/com/intellij/util/io/PagedFileStorage.java b/platform/util/src/com/intellij/util/io/PagedFileStorage.java
index acb0abb0a821..29ee77d97a7e 100644
--- a/platform/util/src/com/intellij/util/io/PagedFileStorage.java
+++ b/platform/util/src/com/intellij/util/io/PagedFileStorage.java
@@ -26,7 +26,7 @@ import java.util.concurrent.locks.ReentrantLock;
  * @author max
  */
 public class PagedFileStorage implements Forceable {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.util.io.PagedFileStorage");
+  private static final Logger LOG = Logger.getInstance(PagedFileStorage.class);
 
   public static final int MB = 1024 * 1024;
   public static final int BUFFER_SIZE;
diff --git a/platform/util/src/com/intellij/util/io/PersistentEnumeratorBase.java b/platform/util/src/com/intellij/util/io/PersistentEnumeratorBase.java
index 3fcfc0a69881..929bf541dff3 100644
--- a/platform/util/src/com/intellij/util/io/PersistentEnumeratorBase.java
+++ b/platform/util/src/com/intellij/util/io/PersistentEnumeratorBase.java
@@ -40,7 +40,7 @@ import java.util.List;
  * @author jeka
  */
 public abstract class PersistentEnumeratorBase<Data> implements DataEnumeratorEx<Data>, Forceable, Closeable {
-  protected static final Logger LOG = Logger.getInstance("#com.intellij.util.io.PersistentEnumerator");
+  protected static final Logger LOG = Logger.getInstance(PersistentEnumerator.class);
   protected static final int NULL_ID = 0;
 
   private static final int META_DATA_OFFSET = 4;
diff --git a/platform/util/src/com/intellij/util/io/PersistentHashMap.java b/platform/util/src/com/intellij/util/io/PersistentHashMap.java
index 22467b5c1639..8f98c204b834 100644
--- a/platform/util/src/com/intellij/util/io/PersistentHashMap.java
+++ b/platform/util/src/com/intellij/util/io/PersistentHashMap.java
@@ -40,7 +40,7 @@ public class PersistentHashMap<Key, Value> extends PersistentEnumeratorDelegate<
   // key enumeration is <enumerated_id>? [.values file offset 4 or 8 bytes], however for unique integral keys enumerate_id isn't produced.
   // Also for certain Value types it is possible to avoid random reads at all: e.g. in case Value is non-negative integer the value can be stored
   // directly in storage used for offset and in case of btree enumerator directly in btree leaf.
-  private static final Logger LOG = Logger.getInstance("#com.intellij.util.io.PersistentHashMap");
+  private static final Logger LOG = Logger.getInstance(PersistentHashMap.class);
   private static final boolean myDoTrace = SystemProperties.getBooleanProperty("idea.trace.persistent.map", false);
   private static final int DEAD_KEY_NUMBER_MASK = 0xFFFFFFFF;
 
diff --git a/platform/util/src/com/intellij/util/io/RandomAccessDataFile.java b/platform/util/src/com/intellij/util/io/RandomAccessDataFile.java
index 01d1782b20d8..a0f3347a5fc8 100644
--- a/platform/util/src/com/intellij/util/io/RandomAccessDataFile.java
+++ b/platform/util/src/com/intellij/util/io/RandomAccessDataFile.java
@@ -14,7 +14,7 @@ import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
 
 public class RandomAccessDataFile implements Forceable, Closeable {
-  protected static final Logger LOG = Logger.getInstance("#com.intellij.util.io.RandomAccessDataFile");
+  protected static final Logger LOG = Logger.getInstance(RandomAccessDataFile.class);
 
   private static final OpenChannelsCache ourCache = new OpenChannelsCache(150, "rw");
   private static int ourFilesCount;
diff --git a/platform/util/src/com/intellij/util/io/ResizeableMappedFile.java b/platform/util/src/com/intellij/util/io/ResizeableMappedFile.java
index d59b82dbbb8b..cb4f5081a00d 100644
--- a/platform/util/src/com/intellij/util/io/ResizeableMappedFile.java
+++ b/platform/util/src/com/intellij/util/io/ResizeableMappedFile.java
@@ -29,7 +29,7 @@ import org.jetbrains.annotations.Nullable;
 import java.io.*;
 
 public class ResizeableMappedFile implements Forceable {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.util.io.ResizeableMappedFile");
+  private static final Logger LOG = Logger.getInstance(ResizeableMappedFile.class);
 
   private static final boolean truncateOnClose = SystemProperties.getBooleanProperty("idea.resizeable.file.truncate.on.close", false);
   private long myLogicalSize;
diff --git a/platform/util/src/com/intellij/util/io/ZipUtil.java b/platform/util/src/com/intellij/util/io/ZipUtil.java
index ac5237bdc518..2a2312f64844 100644
--- a/platform/util/src/com/intellij/util/io/ZipUtil.java
+++ b/platform/util/src/com/intellij/util/io/ZipUtil.java
@@ -18,7 +18,7 @@ import java.util.zip.ZipFile;
 import java.util.zip.ZipOutputStream;
 
 public class ZipUtil {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.util.io.ZipUtil");
+  private static final Logger LOG = Logger.getInstance(ZipUtil.class);
 
   private ZipUtil() { }
 
diff --git a/platform/util/src/com/intellij/util/io/storage/AbstractStorage.java b/platform/util/src/com/intellij/util/io/storage/AbstractStorage.java
index 76e41e742aa6..2a2d2735465c 100644
--- a/platform/util/src/com/intellij/util/io/storage/AbstractStorage.java
+++ b/platform/util/src/com/intellij/util/io/storage/AbstractStorage.java
@@ -26,7 +26,7 @@ import java.io.IOException;
 
 @SuppressWarnings({"HardCodedStringLiteral"})
 public abstract class AbstractStorage implements Disposable, Forceable {
-  protected static final Logger LOG = Logger.getInstance("#com.intellij.util.io.storage.Storage");
+  protected static final Logger LOG = Logger.getInstance(Storage.class);
 
   @NonNls public static final String INDEX_EXTENSION = ".storageRecordIndex";
   @NonNls public static final String DATA_EXTENSION = ".storageData";
diff --git a/platform/util/src/com/intellij/util/io/storage/HeavyProcessLatch.java b/platform/util/src/com/intellij/util/io/storage/HeavyProcessLatch.java
index 8e30b57b9160..7d8192eb1bed 100644
--- a/platform/util/src/com/intellij/util/io/storage/HeavyProcessLatch.java
+++ b/platform/util/src/com/intellij/util/io/storage/HeavyProcessLatch.java
@@ -15,7 +15,7 @@ import java.util.Set;
 import java.util.concurrent.ConcurrentLinkedDeque;
 
 public final class HeavyProcessLatch {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.util.io.storage.HeavyProcessLatch");
+  private static final Logger LOG = Logger.getInstance(HeavyProcessLatch.class);
   public static final HeavyProcessLatch INSTANCE = new HeavyProcessLatch();
 
   private final Set<String> myHeavyProcesses = ContainerUtil.newConcurrentSet();
diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/StartedActivated.java b/platform/vcs-api/src/com/intellij/openapi/vcs/StartedActivated.java
index 679f0100b50e..0d863754d822 100644
--- a/platform/vcs-api/src/com/intellij/openapi/vcs/StartedActivated.java
+++ b/platform/vcs-api/src/com/intellij/openapi/vcs/StartedActivated.java
@@ -32,7 +32,7 @@ import java.util.List;
  * - and "actual" methods should not be called under lock
  */
 public abstract class StartedActivated {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.vcs.StartedActivated");
+  private static final Logger LOG = Logger.getInstance(StartedActivated.class);
 
   private final MySection myStart;
   private final MySection myActivate;
diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/contentAnnotation/VcsContentAnnotationImpl.java b/platform/vcs-api/src/com/intellij/openapi/vcs/contentAnnotation/VcsContentAnnotationImpl.java
index e3190fd1c2c1..dfa69f0466c3 100644
--- a/platform/vcs-api/src/com/intellij/openapi/vcs/contentAnnotation/VcsContentAnnotationImpl.java
+++ b/platform/vcs-api/src/com/intellij/openapi/vcs/contentAnnotation/VcsContentAnnotationImpl.java
@@ -22,7 +22,7 @@ public final class VcsContentAnnotationImpl implements VcsContentAnnotation {
   private final Project myProject;
   private final VcsContentAnnotationSettings mySettings;
   private final ContentAnnotationCache myContentAnnotationCache;
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.vcs.contentAnnotation.VcsContentAnnotationImpl");
+  private static final Logger LOG = Logger.getInstance(VcsContentAnnotationImpl.class);
 
   public static VcsContentAnnotation getInstance(final Project project) {
     return ServiceManager.getService(project, VcsContentAnnotation.class);
diff --git a/platform/vcs-api/src/com/intellij/vcsUtil/VcsUtil.java b/platform/vcs-api/src/com/intellij/vcsUtil/VcsUtil.java
index b721561e0caf..4548d5984d64 100644
--- a/platform/vcs-api/src/com/intellij/vcsUtil/VcsUtil.java
+++ b/platform/vcs-api/src/com/intellij/vcsUtil/VcsUtil.java
@@ -54,7 +54,7 @@ import java.util.stream.Collectors;
 @SuppressWarnings("UtilityClassWithoutPrivateConstructor")
 public class VcsUtil {
   protected static final char[] ourCharsToBeChopped = {'/', '\\'};
-  private static final Logger LOG = Logger.getInstance("#com.intellij.vcsUtil.VcsUtil");
+  private static final Logger LOG = Logger.getInstance(VcsUtil.class);
 
   public static final String MAX_VCS_LOADED_SIZE_KB = "idea.max.vcs.loaded.size.kb";
   private static final int ourMaxLoadedFileSize = computeLoadedFileSize();
diff --git a/platform/vcs-api/vcs-api-core/src/com/intellij/lifecycle/PeriodicalTasksCloser.java b/platform/vcs-api/vcs-api-core/src/com/intellij/lifecycle/PeriodicalTasksCloser.java
index 569e8da80070..35b6a5dd1b9a 100644
--- a/platform/vcs-api/vcs-api-core/src/com/intellij/lifecycle/PeriodicalTasksCloser.java
+++ b/platform/vcs-api/vcs-api-core/src/com/intellij/lifecycle/PeriodicalTasksCloser.java
@@ -19,7 +19,7 @@ import org.jetbrains.annotations.NotNull;
  */
 @Deprecated
 public class PeriodicalTasksCloser {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.lifecycle.PeriodicalTasksCloser");
+  private static final Logger LOG = Logger.getInstance(PeriodicalTasksCloser.class);
   private final Object myLock = new Object();
 
   public static PeriodicalTasksCloser getInstance() {
diff --git a/platform/vcs-impl/src/com/intellij/openapi/diff/impl/patch/BaseRevisionTextPatchEP.java b/platform/vcs-impl/src/com/intellij/openapi/diff/impl/patch/BaseRevisionTextPatchEP.java
index 3da155f3fada..89ccd1a8c3e8 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/diff/impl/patch/BaseRevisionTextPatchEP.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/diff/impl/patch/BaseRevisionTextPatchEP.java
@@ -20,7 +20,7 @@ public class BaseRevisionTextPatchEP implements PatchEP {
   public static final Key<Map<FilePath, ContentRevision>>
     ourBaseRevisions = Key.create("com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP.ourBaseRevisionPaths");
   public static final Key<Map<String, String>> ourStoredTexts = Key.create("com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP.ourStoredTexts");
-  private final static Logger LOG = Logger.getInstance("#com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP");
+  private final static Logger LOG = Logger.getInstance(BaseRevisionTextPatchEP.class);
 
   private final String myBaseDir;
 
diff --git a/platform/vcs-impl/src/com/intellij/openapi/diff/impl/patch/apply/ApplyFilePatchBase.java b/platform/vcs-impl/src/com/intellij/openapi/diff/impl/patch/apply/ApplyFilePatchBase.java
index 4dc33c586464..7d596745fce9 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/diff/impl/patch/apply/ApplyFilePatchBase.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/diff/impl/patch/apply/ApplyFilePatchBase.java
@@ -16,7 +16,7 @@ import org.jetbrains.annotations.Nullable;
 import java.io.IOException;
 
 public abstract class ApplyFilePatchBase<T extends FilePatch> implements ApplyFilePatch {
-  protected final static Logger LOG = Logger.getInstance("#com.intellij.openapi.diff.impl.patch.apply.ApplyFilePatchBase");
+  protected final static Logger LOG = Logger.getInstance(ApplyFilePatchBase.class);
   protected final T myPatch;
 
   public ApplyFilePatchBase(T patch) {
diff --git a/platform/vcs-impl/src/com/intellij/openapi/diff/impl/patch/apply/GenericPatchApplier.java b/platform/vcs-impl/src/com/intellij/openapi/diff/impl/patch/apply/GenericPatchApplier.java
index 4cb462773599..44bf9d39f6d3 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/diff/impl/patch/apply/GenericPatchApplier.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/diff/impl/patch/apply/GenericPatchApplier.java
@@ -38,7 +38,7 @@ import static com.intellij.openapi.diff.impl.patch.ApplyPatchStatus.ALREADY_APPL
 import static com.intellij.openapi.diff.impl.patch.ApplyPatchStatus.SUCCESS;
 
 public class GenericPatchApplier {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.diff.impl.patch.apply.GenericPatchApplier");
+  private static final Logger LOG = Logger.getInstance(GenericPatchApplier.class);
   private final static int ourMaxWalk = 1000;
   
   private final TreeMap<TextRange, MyAppliedData> myTransformations;
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListManagerImpl.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListManagerImpl.java
index 506f1dd12edc..4662b3fa4cc0 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListManagerImpl.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListManagerImpl.java
@@ -71,7 +71,7 @@ import static java.util.stream.Collectors.toSet;
 
 @State(name = "ChangeListManager", storages = @Storage(StoragePathMacros.WORKSPACE_FILE))
 public class ChangeListManagerImpl extends ChangeListManagerEx implements ProjectComponent, ChangeListOwner, PersistentStateComponent<Element> {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.vcs.changes.ChangeListManagerImpl");
+  private static final Logger LOG = Logger.getInstance(ChangeListManagerImpl.class);
 
   public static final Topic<LocalChangeListsLoadedListener> LISTS_LOADED =
     new Topic<>("LOCAL_CHANGE_LISTS_LOADED", LocalChangeListsLoadedListener.class);
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListWorker.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListWorker.java
index 4ec343bd9d71..5014e411f126 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListWorker.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListWorker.java
@@ -34,7 +34,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
  * just logic here: do modifications to group of change lists
  */
 public class ChangeListWorker {
-  private final static Logger LOG = Logger.getInstance("#com.intellij.openapi.vcs.changes.ChangeListWorker");
+  private final static Logger LOG = Logger.getInstance(ChangeListWorker.class);
   @NotNull private final Project myProject;
   @NotNull private final DelayedNotificator myDelayedNotificator;
   private final boolean myMainWorker;
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListsIndexes.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListsIndexes.java
index e2ae54836fe0..0b57c8d0d367 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListsIndexes.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListsIndexes.java
@@ -32,7 +32,7 @@ import org.jetbrains.annotations.Nullable;
 import java.util.*;
 
 public class ChangeListsIndexes {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.vcs.changes.ChangeListsIndexes");
+  private static final Logger LOG = Logger.getInstance(ChangeListsIndexes.class);
   private final Map<FilePath, Data> myMap;
   private final TreeSet<FilePath> myAffectedPaths;
   private final Set<Change> myChanges;
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangesPreprocess.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangesPreprocess.java
index a9b6b9d98b38..1b8c0b225467 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangesPreprocess.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangesPreprocess.java
@@ -24,7 +24,7 @@ import java.util.List;
 import java.util.Map;
 
 public class ChangesPreprocess {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.vcs.changes.ChangesPreprocess");
+  private static final Logger LOG = Logger.getInstance(ChangesPreprocess.class);
 
   public static List<Change> preprocessChangesRemoveDeletedForDuplicateMoved(List<? extends Change> list) {
     final List<Change> result = new ArrayList<>();
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangesViewManager.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangesViewManager.java
index 3cd2dc746af1..7e000c1317d2 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangesViewManager.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangesViewManager.java
@@ -78,7 +78,7 @@ public class ChangesViewManager implements ChangesViewEx,
                                            PersistentStateComponent<ChangesViewManager.State>,
                                            Disposable {
 
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.vcs.changes.ChangesViewManager");
+  private static final Logger LOG = Logger.getInstance(ChangesViewManager.class);
   private static final String CHANGES_VIEW_PREVIEW_SPLITTER_PROPORTION = "ChangesViewManager.DETAILS_SPLITTER_PROPORTION";
 
   @NotNull private final Project myProject;
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ControlledCycle.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ControlledCycle.java
index 9b04c056ce76..c32dfda60c00 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ControlledCycle.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ControlledCycle.java
@@ -13,7 +13,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
 
 @SomeQueue
 public class ControlledCycle {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.vcs.changes.ControlledCycle");
+  private static final Logger LOG = Logger.getInstance(ControlledCycle.class);
 
   private final Alarm mySimpleAlarm;
   private final int myRefreshInterval;
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/DelayedNotificator.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/DelayedNotificator.java
index e70fbc436803..dd06aec55dbe 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/DelayedNotificator.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/DelayedNotificator.java
@@ -13,7 +13,7 @@ import java.util.List;
 import java.util.Set;
 
 public class DelayedNotificator implements ChangeListListener {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.vcs.changes.DelayedNotificator");
+  private static final Logger LOG = Logger.getInstance(DelayedNotificator.class);
 
   @NotNull private final ChangeListManagerImpl myManager;
   @NotNull private final EventDispatcher<? extends ChangeListListener> myDispatcher;
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/LastUnchangedContentTracker.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/LastUnchangedContentTracker.java
index 983c814b0d4e..ccf8f6f4335b 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/LastUnchangedContentTracker.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/LastUnchangedContentTracker.java
@@ -32,7 +32,7 @@ import java.io.IOException;
  * @author peter
  */
 public class LastUnchangedContentTracker {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.vcs.changes.LastUnchangedContentTracker");
+  private static final Logger LOG = Logger.getInstance(LastUnchangedContentTracker.class);
   private static final Key<Long> LAST_TS_KEY = Key.create("LAST_TS_KEY");
   private static final FileAttribute LAST_TS_ATTR = new FileAttribute("LAST_TS_ATTR", 0, true);
   private static final FileAttribute ACQUIRED_CONTENT_ATTR = new FileAttribute("ACQUIRED_CONTENT_ATTR", 1, true);
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/LazyRefreshingSelfQueue.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/LazyRefreshingSelfQueue.java
index f1d8f396700a..7c0bce24adde 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/LazyRefreshingSelfQueue.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/LazyRefreshingSelfQueue.java
@@ -34,7 +34,7 @@ import java.util.*;
 @SomeQueue
 // TODO: Used only in RemoteRevisionsNumberCache
 public class LazyRefreshingSelfQueue<T> {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.vcs.changes.LazyRefreshingSelfQueue");
+  private static final Logger LOG = Logger.getInstance(LazyRefreshingSelfQueue.class);
 
   // provides update interval in milliseconds.
   private final Getter<Long> myUpdateInterval;
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/LocalChangeListImpl.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/LocalChangeListImpl.java
index 27279947e345..3d137d8773e2 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/LocalChangeListImpl.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/LocalChangeListImpl.java
@@ -14,7 +14,7 @@ import java.util.*;
  * @author yole
  */
 public class LocalChangeListImpl extends LocalChangeList {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.vcs.changes.ChangeList");
+  private static final Logger LOG = Logger.getInstance(ChangeList.class);
 
   @NotNull private final Project myProject;
   @NotNull private final String myId;
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/RemoteRevisionsCache.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/RemoteRevisionsCache.java
index 434f1216ae89..39bc1300c0dc 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/RemoteRevisionsCache.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/RemoteRevisionsCache.java
@@ -23,7 +23,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 public class RemoteRevisionsCache implements VcsListener {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.vcs.changes.RemoteRevisionsCache");
+  private static final Logger LOG = Logger.getInstance(RemoteRevisionsCache.class);
 
   public static final Topic<Runnable> REMOTE_VERSION_CHANGED  = new Topic<>("REMOTE_VERSION_CHANGED", Runnable.class);
   public static final int DEFAULT_REFRESH_INTERVAL = 3 * 60 * 1000;
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/RemoteRevisionsNumbersCache.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/RemoteRevisionsNumbersCache.java
index 961d0617812e..7033424cc2b6 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/RemoteRevisionsNumbersCache.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/RemoteRevisionsNumbersCache.java
@@ -27,7 +27,7 @@ import java.util.*;
  * for vcses where it is reasonable to ask revision of each item separately
  */
 public class RemoteRevisionsNumbersCache implements ChangesOnServerTracker {
-  public static final Logger LOG = Logger.getInstance("#com.intellij.openapi.vcs.changes.RemoteRevisionsNumbersCache");
+  public static final Logger LOG = Logger.getInstance(RemoteRevisionsNumbersCache.class);
 
   // every hour (time unit to check for server commits)
   // default, actual in settings
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/UpdateRequestsQueue.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/UpdateRequestsQueue.java
index 1ad06a9bda1d..cd74cc7db09c 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/UpdateRequestsQueue.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/UpdateRequestsQueue.java
@@ -28,7 +28,7 @@ import static com.intellij.util.ObjectUtils.notNull;
  */
 @SomeQueue
 public class UpdateRequestsQueue {
-  private final Logger LOG = Logger.getInstance("#com.intellij.openapi.vcs.changes.UpdateRequestsQueue");
+  private final Logger LOG = Logger.getInstance(UpdateRequestsQueue.class);
 
   private final Project myProject;
   private final ChangeListManagerImpl.Scheduler myScheduler;
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/UpdatingChangeListBuilder.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/UpdatingChangeListBuilder.java
index c11d54870d5c..7cc175774022 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/UpdatingChangeListBuilder.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/UpdatingChangeListBuilder.java
@@ -19,7 +19,7 @@ import org.jetbrains.annotations.Nullable;
 import javax.swing.*;
 
 class UpdatingChangeListBuilder implements ChangelistBuilder {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.vcs.changes.UpdatingChangeListBuilder");
+  private static final Logger LOG = Logger.getInstance(UpdatingChangeListBuilder.class);
   private final ChangeListUpdater myChangeListUpdater;
   private final FileHolderComposite myComposite;
   private final Getter<Boolean> myDisposedGetter;
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/CommittedChangesCache.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/CommittedChangesCache.java
index f47971d97196..e5be880423cc 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/CommittedChangesCache.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/CommittedChangesCache.java
@@ -54,7 +54,7 @@ import java.util.concurrent.TimeUnit;
   storages = {@Storage(StoragePathMacros.WORKSPACE_FILE)}
 )
 public class CommittedChangesCache implements PersistentStateComponent<CommittedChangesCache.State> {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.vcs.changes.committed.CommittedChangesCache");
+  private static final Logger LOG = Logger.getInstance(CommittedChangesCache.class);
 
   private final Project myProject;
   private final MessageBus myBus;
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/CommittedChangesPanel.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/CommittedChangesPanel.java
index f7c4f37f95b4..2bd75861d1cd 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/CommittedChangesPanel.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/CommittedChangesPanel.java
@@ -44,7 +44,7 @@ import static com.intellij.openapi.util.text.StringUtil.isEmpty;
 import static com.intellij.util.WaitForProgressToShow.runOrInvokeLaterAboveProgress;
 
 public class CommittedChangesPanel extends JPanel implements TypeSafeDataProvider, Disposable {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.vcs.changes.committed.CommittedChangesPanel");
+  private static final Logger LOG = Logger.getInstance(CommittedChangesPanel.class);
 
   private final CommittedChangesTreeBrowser myBrowser;
   private final Project myProject;
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/IncomingChangesIndicator.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/IncomingChangesIndicator.java
index 81c0d8f408a9..5cc973ec0bad 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/IncomingChangesIndicator.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/IncomingChangesIndicator.java
@@ -32,7 +32,7 @@ import static com.intellij.util.ObjectUtils.notNull;
  * @author yole
  */
 public class IncomingChangesIndicator {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.vcs.changes.committed.IncomingChangesIndicator");
+  private static final Logger LOG = Logger.getInstance(IncomingChangesIndicator.class);
 
   private final Project myProject;
   private final CommittedChangesCache myCache;
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/ApplyPatchAction.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/ApplyPatchAction.java
index 3855e6f1b7ed..788336e89029 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/ApplyPatchAction.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/ApplyPatchAction.java
@@ -50,7 +50,7 @@ import java.util.List;
 import static com.intellij.openapi.vcs.changes.patch.PatchFileType.isPatchFile;
 
 public class ApplyPatchAction extends DumbAwareAction {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.vcs.changes.patch.ApplyPatchAction");
+  private static final Logger LOG = Logger.getInstance(ApplyPatchAction.class);
 
   @Override
   public void update(@NotNull AnActionEvent e) {
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/DefaultPatchBaseVersionProvider.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/DefaultPatchBaseVersionProvider.java
index 20d85ec519d2..642fb80339ce 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/DefaultPatchBaseVersionProvider.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/DefaultPatchBaseVersionProvider.java
@@ -41,7 +41,7 @@ import java.util.regex.Pattern;
 import static com.intellij.openapi.vcs.VcsBundle.message;
 
 public class DefaultPatchBaseVersionProvider {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.vcs.changes.patch.DefaultPatchBaseVersionProvider");
+  private static final Logger LOG = Logger.getInstance(DefaultPatchBaseVersionProvider.class);
   private final static Pattern ourTsPattern = Pattern.compile("\\(date ([0-9]+)\\)");
 
   private final Project myProject;
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelveChangesCommitExecutor.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelveChangesCommitExecutor.java
index 6e48b87de1fb..422ae0a4a807 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelveChangesCommitExecutor.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelveChangesCommitExecutor.java
@@ -17,7 +17,7 @@ import org.jetbrains.annotations.Nullable;
 import java.util.Collection;
 
 public class ShelveChangesCommitExecutor extends LocalCommitExecutor {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.vcs.changes.shelf.ShelveChangesCommitExecutor");
+  private static final Logger LOG = Logger.getInstance(ShelveChangesCommitExecutor.class);
 
   private final Project myProject;
 
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelveChangesManager.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelveChangesManager.java
index 3b44a4687d61..fac29480e0d1 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelveChangesManager.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelveChangesManager.java
@@ -81,7 +81,7 @@ import static java.util.Objects.requireNonNull;
 
 @State(name = "ShelveChangesManager", storages = {@Storage(StoragePathMacros.WORKSPACE_FILE)})
 public class ShelveChangesManager implements PersistentStateComponent<Element>, ProjectComponent {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.vcs.changes.shelf.ShelveChangesManager");
+  private static final Logger LOG = Logger.getInstance(ShelveChangesManager.class);
   @NonNls private static final String ELEMENT_CHANGELIST = "changelist";
   @NonNls private static final String ELEMENT_RECYCLED_CHANGELIST = "recycled_changelist";
   @NonNls private static final String DEFAULT_PATCH_NAME = "shelved";
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelvedChange.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelvedChange.java
index 3c2e3a07c044..8b314e1f805f 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelvedChange.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelvedChange.java
@@ -44,7 +44,7 @@ import java.util.List;
 import java.util.Objects;
 
 public class ShelvedChange {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.vcs.changes.shelf.ShelvedChange");
+  private static final Logger LOG = Logger.getInstance(ShelvedChange.class);
 
   private final String myPatchPath;
   private final String myBeforePath;
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelvedChangeList.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelvedChangeList.java
index baba3bbc7b34..bf6c582c7033 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelvedChangeList.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelvedChangeList.java
@@ -38,7 +38,7 @@ import java.util.Date;
 import java.util.List;
 
 public class ShelvedChangeList implements JDOMExternalizable, ExternalizableScheme {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.vcs.changes.shelf.ShelvedChangeList");
+  private static final Logger LOG = Logger.getInstance(ShelvedChangeList.class);
 
   @NonNls private static final String NAME_ATTRIBUTE = "name";
   @NonNls private static final String ATTRIBUTE_DATE = "date";
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesViewContentEP.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesViewContentEP.java
index bd1d9b18cfbb..9286575d1306 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesViewContentEP.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesViewContentEP.java
@@ -17,7 +17,7 @@ import org.jetbrains.annotations.Nullable;
  * @author yole
  */
 public class ChangesViewContentEP implements PluginAware {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.vcs.changes.ui.ChangesViewContentEP");
+  private static final Logger LOG = Logger.getInstance(ChangesViewContentEP.class);
 
   public static final ProjectExtensionPointName<ChangesViewContentEP> EP_NAME = new ProjectExtensionPointName<>("com.intellij.changesViewContent");
 
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/checkin/TodoCheckinHandlerWorker.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/checkin/TodoCheckinHandlerWorker.java
index 5d1477e12446..008da1333b71 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/checkin/TodoCheckinHandlerWorker.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/checkin/TodoCheckinHandlerWorker.java
@@ -48,7 +48,7 @@ import static com.intellij.util.ObjectUtils.notNull;
  * @author irengrig
  */
 public class TodoCheckinHandlerWorker {
-  private final static Logger LOG = Logger.getInstance("#com.intellij.openapi.vcs.checkin.TodoCheckinHandler");
+  private final static Logger LOG = Logger.getInstance(TodoCheckinHandler.class);
 
   private final Project myProject;
   private final Collection<? extends Change> myChanges;
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/history/VcsAnnotationCachedProxy.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/history/VcsAnnotationCachedProxy.java
index 83be159cbeb9..64a2207d0605 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/history/VcsAnnotationCachedProxy.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/history/VcsAnnotationCachedProxy.java
@@ -28,7 +28,7 @@ import org.jetbrains.annotations.Nullable;
 public class VcsAnnotationCachedProxy implements AnnotationProvider, CacheableAnnotationProvider {
   private final VcsHistoryCache myCache;
   private final AbstractVcs myVcs;
-  private final static Logger LOG = Logger.getInstance("#com.intellij.openapi.vcs.history.VcsAnnotationCachedProxy");
+  private final static Logger LOG = Logger.getInstance(VcsAnnotationCachedProxy.class);
   private final AnnotationProvider myAnnotationProvider;
 
   public VcsAnnotationCachedProxy(@NotNull AbstractVcs vcs, @NotNull AnnotationProvider provider) {
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/AbstractVcsHelperImpl.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/AbstractVcsHelperImpl.java
index 5616cf911e11..366e4af6a9be 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/AbstractVcsHelperImpl.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/AbstractVcsHelperImpl.java
@@ -80,7 +80,7 @@ import static com.intellij.vcs.commit.AbstractCommitWorkflow.getCommitExecutors;
 import static java.text.MessageFormat.format;
 
 public class AbstractVcsHelperImpl extends AbstractVcsHelper {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.vcs.impl.AbstractVcsHelperImpl");
+  private static final Logger LOG = Logger.getInstance(AbstractVcsHelperImpl.class);
   private static final String CHANGES_DETAILS_WINDOW_KEY = "CommittedChangesDetailsLock";
 
   private Consumer<VcsException> myCustomHandler = null;
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/CodeSmellDetectorImpl.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/CodeSmellDetectorImpl.java
index df596947f661..1f52b7ae6d70 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/CodeSmellDetectorImpl.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/CodeSmellDetectorImpl.java
@@ -43,7 +43,7 @@ import java.util.*;
  */
 public class CodeSmellDetectorImpl extends CodeSmellDetector {
   private final Project myProject;
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.vcs.impl.CodeSmellDetectorImpl");
+  private static final Logger LOG = Logger.getInstance(CodeSmellDetectorImpl.class);
 
   public CodeSmellDetectorImpl(final Project project) {
     myProject = project;
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/ProjectLevelVcsManagerImpl.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/ProjectLevelVcsManagerImpl.java
index 430ee84015c9..48d112e1962f 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/ProjectLevelVcsManagerImpl.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/ProjectLevelVcsManagerImpl.java
@@ -68,7 +68,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 
 @State(name = "ProjectLevelVcsManager", storages = @Storage(StoragePathMacros.WORKSPACE_FILE))
 public final class ProjectLevelVcsManagerImpl extends ProjectLevelVcsManagerEx implements PersistentStateComponent<Element>, Disposable {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.vcs.impl.ProjectLevelVcsManagerImpl");
+  private static final Logger LOG = Logger.getInstance(ProjectLevelVcsManagerImpl.class);
   @NonNls private static final String SETTINGS_EDITED_MANUALLY = "settingsEditedManually";
 
   private final ProjectLevelVcsManagerSerialization mySerialization;
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/VcsEP.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/VcsEP.java
index 9ccdc9d29b07..49f5d8ea8576 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/VcsEP.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/VcsEP.java
@@ -32,7 +32,7 @@ import org.jetbrains.annotations.Nullable;
  * @author yole
  */
 public class VcsEP extends AbstractExtensionPointBean {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.vcs.impl.VcsEP");
+  private static final Logger LOG = Logger.getInstance(VcsEP.class);
 
   public static final ExtensionPointName<VcsEP> EP_NAME = ExtensionPointName.create("com.intellij.vcs");
 
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/VcsFileStatusProvider.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/VcsFileStatusProvider.java
index b0347bf98a10..b6c47fa6e51b 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/VcsFileStatusProvider.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/VcsFileStatusProvider.java
@@ -29,7 +29,7 @@ public final class VcsFileStatusProvider implements FileStatusProvider, VcsBaseC
   private final Project myProject;
   private final ExtensionPointImpl<VcsBaseContentProvider> myAdditionalProviderPoint;
 
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.vcs.impl.VcsFileStatusProvider");
+  private static final Logger LOG = Logger.getInstance(VcsFileStatusProvider.class);
 
   public static VcsFileStatusProvider getInstance(@NotNull Project project) {
     return project.getService(VcsFileStatusProvider.class);
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/VcsInitialization.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/VcsInitialization.java
index 0ded9cb62f96..2fe7e63ba367 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/VcsInitialization.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/VcsInitialization.java
@@ -27,7 +27,7 @@ import java.util.concurrent.Future;
 import java.util.function.Predicate;
 
 public final class VcsInitialization implements Disposable {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.vcs.impl.VcsInitialization");
+  private static final Logger LOG = Logger.getInstance(VcsInitialization.class);
 
   private final List<Pair<VcsInitObject, Runnable>> myList = new ArrayList<>();
   private final Object myLock = new Object();
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/projectlevelman/AllVcses.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/projectlevelman/AllVcses.java
index 66ae47cc5d7d..75e1e1be6ce9 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/projectlevelman/AllVcses.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/projectlevelman/AllVcses.java
@@ -34,7 +34,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
 import static com.intellij.openapi.vcs.VcsNotifier.IMPORTANT_ERROR_NOTIFICATION;
 
 public final class AllVcses implements AllVcsesI, Disposable {
-  private final Logger LOG = Logger.getInstance("#com.intellij.openapi.vcs.impl.projectlevelman.AllVcses");
+  private final Logger LOG = Logger.getInstance(AllVcses.class);
   private final Map<String, AbstractVcs> myVcses;
 
   private final Object myLock;
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/update/AbstractCommonUpdateAction.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/update/AbstractCommonUpdateAction.java
index 1dd41b92b6e3..b6908209293f 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/update/AbstractCommonUpdateAction.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/update/AbstractCommonUpdateAction.java
@@ -52,7 +52,7 @@ import static com.intellij.util.ObjectUtils.notNull;
 
 public abstract class AbstractCommonUpdateAction extends AbstractVcsAction implements UpdateInBackground {
   private final boolean myAlwaysVisible;
-  private final static Logger LOG = Logger.getInstance("#com.intellij.openapi.vcs.update.AbstractCommonUpdateAction");
+  private final static Logger LOG = Logger.getInstance(AbstractCommonUpdateAction.class);
 
   private final ActionInfo myActionInfo;
   private final ScopeInfo myScopeInfo;
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/vfs/VcsVirtualFile.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/vfs/VcsVirtualFile.java
index 50d4ad118d4d..05ef9b418f95 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/vfs/VcsVirtualFile.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/vfs/VcsVirtualFile.java
@@ -19,7 +19,7 @@ import java.nio.charset.Charset;
  * author: lesya
  */
 public class VcsVirtualFile extends AbstractVcsVirtualFile {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.vcs.vfs.VcsVirtualFile");
+  private static final Logger LOG = Logger.getInstance(VcsVirtualFile.class);
 
   private final VcsFileRevision myFileRevision;
 
diff --git a/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/impl/facade/bek/BekChecker.java b/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/impl/facade/bek/BekChecker.java
index e211e0ebbb7b..be68870dbcd9 100644
--- a/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/impl/facade/bek/BekChecker.java
+++ b/platform/vcs-log/graph/src/com/intellij/vcs/log/graph/impl/facade/bek/BekChecker.java
@@ -25,7 +25,7 @@ import static com.intellij.vcs.log.graph.utils.LinearGraphUtils.getDownNodes;
 import static com.intellij.vcs.log.graph.utils.LinearGraphUtils.getUpNodes;
 
 public class BekChecker {
-  private final static Logger LOG = Logger.getInstance("#com.intellij.vcs.log.graph.impl.facade.bek.BekChecker");
+  private final static Logger LOG = Logger.getInstance(BekChecker.class);
 
   public static void checkLinearGraph(@NotNull LinearGraph linearGraph) {
     Pair<Integer, Integer> reversedEdge = findReversedEdge(linearGraph);
diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/XDebugSessionImpl.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/XDebugSessionImpl.java
index 955ef146516c..24436676433c 100644
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/XDebugSessionImpl.java
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/XDebugSessionImpl.java
@@ -68,7 +68,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
  * @author nik
  */
 public class XDebugSessionImpl implements XDebugSession {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.xdebugger.impl.XDebugSessionImpl");
+  private static final Logger LOG = Logger.getInstance(XDebugSessionImpl.class);
   private static final Logger PERFORMANCE_LOG = Logger.getInstance("#com.intellij.xdebugger.impl.XDebugSessionImpl.performance");
 
   /** @deprecated Use {@link XDebuggerManagerImpl#NOTIFICATION_GROUP} */
diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/quick/XQuickEvaluateHandler.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/quick/XQuickEvaluateHandler.java
index eb5cf1dab2ae..dfb3d22fa863 100644
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/quick/XQuickEvaluateHandler.java
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/quick/XQuickEvaluateHandler.java
@@ -27,7 +27,7 @@ import java.awt.*;
  * @author nik
  */
 public class XQuickEvaluateHandler extends QuickEvaluateHandler {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.xdebugger.impl.evaluate.quick.XQuickEvaluateHandler");
+  private static final Logger LOG = Logger.getInstance(XQuickEvaluateHandler.class);
 
   @Override
   public boolean isEnabled(@NotNull final Project project) {
diff --git a/plugins/IntelliLang/intellilang-jps-plugin/src/org/jetbrains/jps/intellilang/model/impl/JpsIntelliLangConfigurationSerializer.java b/plugins/IntelliLang/intellilang-jps-plugin/src/org/jetbrains/jps/intellilang/model/impl/JpsIntelliLangConfigurationSerializer.java
index 7d57baedf49d..2d2aa7eea933 100644
--- a/plugins/IntelliLang/intellilang-jps-plugin/src/org/jetbrains/jps/intellilang/model/impl/JpsIntelliLangConfigurationSerializer.java
+++ b/plugins/IntelliLang/intellilang-jps-plugin/src/org/jetbrains/jps/intellilang/model/impl/JpsIntelliLangConfigurationSerializer.java
@@ -14,7 +14,7 @@ import org.jetbrains.jps.model.serialization.JpsGlobalExtensionSerializer;
  * @author Eugene Zhuravlev
  */
 public class JpsIntelliLangConfigurationSerializer extends JpsGlobalExtensionSerializer {
-  private static final Logger LOG = Logger.getInstance("#org.jetbrains.jps.intellilang.model.impl.JpsIntelliLangConfigurationSerializer");
+  private static final Logger LOG = Logger.getInstance(JpsIntelliLangConfigurationSerializer.class);
   private static final String INSTRUMENTATION_TYPE_NAME = "INSTRUMENTATION";
   private static final String PATTERN_ANNOTATION_NAME = "PATTERN_ANNOTATION";
 
diff --git a/plugins/ant/src/com/intellij/lang/ant/AntIntrospector.java b/plugins/ant/src/com/intellij/lang/ant/AntIntrospector.java
index 656a185474d7..75647505b8ca 100644
--- a/plugins/ant/src/com/intellij/lang/ant/AntIntrospector.java
+++ b/plugins/ant/src/com/intellij/lang/ant/AntIntrospector.java
@@ -35,7 +35,7 @@ import java.util.stream.Collectors;
  * @author Eugene Zhuravlev
  */
 public final class AntIntrospector {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.lang.ant.AntIntrospector");
+  private static final Logger LOG = Logger.getInstance(AntIntrospector.class);
   private final Object myHelper;
   //private static final ObjectCache<String, SoftReference<Object>> ourCache = new ObjectCache<String, SoftReference<Object>>(300);
   private static final HashMap<Class, Object> ourCache = new HashMap<>();
diff --git a/plugins/ant/src/com/intellij/lang/ant/ForcedAntFileAttribute.java b/plugins/ant/src/com/intellij/lang/ant/ForcedAntFileAttribute.java
index 0b6e0bcb734e..99e38555420b 100644
--- a/plugins/ant/src/com/intellij/lang/ant/ForcedAntFileAttribute.java
+++ b/plugins/ant/src/com/intellij/lang/ant/ForcedAntFileAttribute.java
@@ -30,7 +30,7 @@ import java.io.IOException;
  * @author Eugene Zhuravlev
  */
 public class ForcedAntFileAttribute extends FileAttribute {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.lang.ant.ForcedAntFileAttribute");
+  private static final Logger LOG = Logger.getInstance(ForcedAntFileAttribute.class);
 
   private static final String ANT_ID = "ant";
 
diff --git a/plugins/ant/src/com/intellij/lang/ant/ReflectedProject.java b/plugins/ant/src/com/intellij/lang/ant/ReflectedProject.java
index a6b6276eaf1b..5921c937f4aa 100644
--- a/plugins/ant/src/com/intellij/lang/ant/ReflectedProject.java
+++ b/plugins/ant/src/com/intellij/lang/ant/ReflectedProject.java
@@ -34,7 +34,7 @@ import java.util.concurrent.locks.ReentrantLock;
 * @author Eugene Zhuravlev
 */
 public final class ReflectedProject {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.lang.ant.ReflectedProject");
+  private static final Logger LOG = Logger.getInstance(ReflectedProject.class);
 
 
   private static final List<SoftReference<Pair<ReflectedProject, ClassLoader>>> ourProjects =
diff --git a/plugins/ant/src/com/intellij/lang/ant/config/explorer/AntExplorerTreeStructure.java b/plugins/ant/src/com/intellij/lang/ant/config/explorer/AntExplorerTreeStructure.java
index 64f6762dcc81..8162b1b67d43 100644
--- a/plugins/ant/src/com/intellij/lang/ant/config/explorer/AntExplorerTreeStructure.java
+++ b/plugins/ant/src/com/intellij/lang/ant/config/explorer/AntExplorerTreeStructure.java
@@ -18,7 +18,7 @@ import org.jetbrains.annotations.Nullable;
 import java.util.*;
 
 final class AntExplorerTreeStructure extends AbstractTreeStructure {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.lang.ant.config.explorer.AntExplorerTreeStructure");
+  private static final Logger LOG = Logger.getInstance(AntExplorerTreeStructure.class);
   private final Project myProject;
   private final Object myRoot = new Object();
   private boolean myFilteredTargets = false;
diff --git a/plugins/ant/src/com/intellij/lang/ant/config/impl/AntBuildFileClassLoaderHolder.java b/plugins/ant/src/com/intellij/lang/ant/config/impl/AntBuildFileClassLoaderHolder.java
index 74b47b9cd3d3..bbc23010b8ef 100644
--- a/plugins/ant/src/com/intellij/lang/ant/config/impl/AntBuildFileClassLoaderHolder.java
+++ b/plugins/ant/src/com/intellij/lang/ant/config/impl/AntBuildFileClassLoaderHolder.java
@@ -25,7 +25,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class AntBuildFileClassLoaderHolder extends ClassLoaderHolder {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.lang.ant.config.impl.AntBuildFileClassLoaderHolder");
+  private static final Logger LOG = Logger.getInstance(AntBuildFileClassLoaderHolder.class);
 
   public AntBuildFileClassLoaderHolder(AbstractProperty.AbstractPropertyContainer options) {
     super(options);
diff --git a/plugins/ant/src/com/intellij/lang/ant/config/impl/AntConfigurationImpl.java b/plugins/ant/src/com/intellij/lang/ant/config/impl/AntConfigurationImpl.java
index 52959a338c8f..b16bc545776d 100644
--- a/plugins/ant/src/com/intellij/lang/ant/config/impl/AntConfigurationImpl.java
+++ b/plugins/ant/src/com/intellij/lang/ant/config/impl/AntConfigurationImpl.java
@@ -82,7 +82,7 @@ public class AntConfigurationImpl extends AntConfigurationBase implements Persis
     }
   };
 
-  private static final Logger LOG = Logger.getInstance("#com.intellij.lang.ant.config.impl.AntConfigurationImpl");
+  private static final Logger LOG = Logger.getInstance(AntConfigurationImpl.class);
   @NonNls private static final String BUILD_FILE = "buildFile";
   @NonNls private static final String CONTEXT_MAPPING = "contextMapping";
   @NonNls private static final String CONTEXT = "context";
diff --git a/plugins/ant/src/com/intellij/lang/ant/config/impl/AntInstallationClassLoaderHolder.java b/plugins/ant/src/com/intellij/lang/ant/config/impl/AntInstallationClassLoaderHolder.java
index 897ed4889ffc..2f8c95e48877 100644
--- a/plugins/ant/src/com/intellij/lang/ant/config/impl/AntInstallationClassLoaderHolder.java
+++ b/plugins/ant/src/com/intellij/lang/ant/config/impl/AntInstallationClassLoaderHolder.java
@@ -25,7 +25,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class AntInstallationClassLoaderHolder extends ClassLoaderHolder {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.lang.ant.config.impl.AntInstallationClassLoaderHolder");
+  private static final Logger LOG = Logger.getInstance(AntInstallationClassLoaderHolder.class);
 
   public AntInstallationClassLoaderHolder(AbstractProperty.AbstractPropertyContainer options) {
     super(options);
diff --git a/plugins/ant/src/com/intellij/lang/ant/config/impl/AntReference.java b/plugins/ant/src/com/intellij/lang/ant/config/impl/AntReference.java
index 16f0f8db10a2..55be75a39f50 100644
--- a/plugins/ant/src/com/intellij/lang/ant/config/impl/AntReference.java
+++ b/plugins/ant/src/com/intellij/lang/ant/config/impl/AntReference.java
@@ -28,7 +28,7 @@ import org.jetbrains.annotations.Nullable;
 import java.util.Comparator;
 
 public abstract class AntReference {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.lang.ant.config.impl.AntReference");
+  private static final Logger LOG = Logger.getInstance(AntReference.class);
   @NonNls private static final String PROJECT_DEFAULT_ATTR = "projectDefault";
   @NonNls private static final String NAME_ATTR = "name";
   @NonNls private static final String BUNDLED_ANT_ATTR = "bundledAnt";
diff --git a/plugins/ant/src/com/intellij/lang/ant/config/impl/AntWorkspaceConfiguration.java b/plugins/ant/src/com/intellij/lang/ant/config/impl/AntWorkspaceConfiguration.java
index 0a07d647a037..325da88e904e 100644
--- a/plugins/ant/src/com/intellij/lang/ant/config/impl/AntWorkspaceConfiguration.java
+++ b/plugins/ant/src/com/intellij/lang/ant/config/impl/AntWorkspaceConfiguration.java
@@ -23,7 +23,7 @@ import java.util.concurrent.atomic.AtomicReference;
   @Storage(value = StoragePathMacros.WORKSPACE_FILE, deprecated = true)
 })
 public final class AntWorkspaceConfiguration implements PersistentStateComponent<Element> {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.lang.ant.config.impl.AntWorkspaceConfiguration");
+  private static final Logger LOG = Logger.getInstance(AntWorkspaceConfiguration.class);
 
   private final Project myProject;
   @NonNls private static final String BUILD_FILE = "buildFile";
diff --git a/plugins/ant/src/com/intellij/lang/ant/config/impl/CompositePropertyContainer.java b/plugins/ant/src/com/intellij/lang/ant/config/impl/CompositePropertyContainer.java
index 4a7fd34c665d..12dbd0408464 100644
--- a/plugins/ant/src/com/intellij/lang/ant/config/impl/CompositePropertyContainer.java
+++ b/plugins/ant/src/com/intellij/lang/ant/config/impl/CompositePropertyContainer.java
@@ -23,7 +23,7 @@ import com.intellij.util.config.ExternalizablePropertyContainer;
 import java.util.Arrays;
 
 public class CompositePropertyContainer extends AbstractProperty.AbstractPropertyContainer {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.lang.ant.config.impl.CompositePropertyContainer");
+  private static final Logger LOG = Logger.getInstance(CompositePropertyContainer.class);
   private final AbstractProperty.AbstractPropertyContainer[] myContainers;
 
   public CompositePropertyContainer(AbstractProperty.AbstractPropertyContainer[] containers) {
diff --git a/plugins/ant/src/com/intellij/lang/ant/doc/AntDomDocumentationProvider.java b/plugins/ant/src/com/intellij/lang/ant/doc/AntDomDocumentationProvider.java
index 8fd57e29c152..1047a8ab6b78 100644
--- a/plugins/ant/src/com/intellij/lang/ant/doc/AntDomDocumentationProvider.java
+++ b/plugins/ant/src/com/intellij/lang/ant/doc/AntDomDocumentationProvider.java
@@ -33,7 +33,7 @@ import java.util.List;
 
 public class AntDomDocumentationProvider implements DocumentationProvider {
 
-  private static final Logger LOG = Logger.getInstance("#com.intellij.lang.ant.doc.AntDomDocumentationProvider");
+  private static final Logger LOG = Logger.getInstance(AntDomDocumentationProvider.class);
 
   @Override
   public String generateDoc(PsiElement element, PsiElement originalElement) {
diff --git a/plugins/ant/src/com/intellij/lang/ant/dom/AntDomExtender.java b/plugins/ant/src/com/intellij/lang/ant/dom/AntDomExtender.java
index 23a1f7663879..5f51455fb569 100644
--- a/plugins/ant/src/com/intellij/lang/ant/dom/AntDomExtender.java
+++ b/plugins/ant/src/com/intellij/lang/ant/dom/AntDomExtender.java
@@ -43,7 +43,7 @@ import java.util.*;
  * @author Eugene Zhuravlev
  */
 public class AntDomExtender extends DomExtender<AntDomElement>{
-  private static final Logger LOG = Logger.getInstance("#com.intellij.lang.ant.dom.AntDomExtender");
+  private static final Logger LOG = Logger.getInstance(AntDomExtender.class);
 
   private static final Key<Class> ELEMENT_IMPL_CLASS_KEY = Key.create("_element_impl_class_");
   private static final Key<Boolean> IS_TASK_CONTAINER = Key.create("_task_container_");
diff --git a/plugins/ant/src/com/intellij/lang/ant/dom/AntDomLoadFileTask.java b/plugins/ant/src/com/intellij/lang/ant/dom/AntDomLoadFileTask.java
index e47112e300f1..b6857c2fbf7c 100644
--- a/plugins/ant/src/com/intellij/lang/ant/dom/AntDomLoadFileTask.java
+++ b/plugins/ant/src/com/intellij/lang/ant/dom/AntDomLoadFileTask.java
@@ -31,7 +31,7 @@ import java.io.IOException;
  */
 public abstract class AntDomLoadFileTask extends AntDomPropertyDefiningTask {
 
-  private static final Logger LOG = Logger.getInstance("#com.intellij.lang.ant.dom.AntDomLoadFileTask");
+  private static final Logger LOG = Logger.getInstance(AntDomLoadFileTask.class);
 
   private String myCachedText;
 
diff --git a/plugins/ant/src/com/intellij/lang/ant/dom/AntDomProject.java b/plugins/ant/src/com/intellij/lang/ant/dom/AntDomProject.java
index 232654793a39..0a1406a795d6 100644
--- a/plugins/ant/src/com/intellij/lang/ant/dom/AntDomProject.java
+++ b/plugins/ant/src/com/intellij/lang/ant/dom/AntDomProject.java
@@ -49,7 +49,7 @@ import java.util.*;
  */
 @DefinesXml
 public abstract class AntDomProject extends AntDomNamedElement implements PropertiesProvider {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.lang.ant.dom.AntDomProject");
+  private static final Logger LOG = Logger.getInstance(AntDomProject.class);
 
   @NonNls public static final String DEFAULT_ENVIRONMENT_PREFIX = "env.";
 
diff --git a/plugins/ant/src/com/intellij/lang/ant/dom/CustomAntElementsRegistry.java b/plugins/ant/src/com/intellij/lang/ant/dom/CustomAntElementsRegistry.java
index df471c49d7da..7b7b31bd363a 100644
--- a/plugins/ant/src/com/intellij/lang/ant/dom/CustomAntElementsRegistry.java
+++ b/plugins/ant/src/com/intellij/lang/ant/dom/CustomAntElementsRegistry.java
@@ -58,7 +58,7 @@ import java.util.*;
 public class CustomAntElementsRegistry {
 
   public static final ThreadLocal<Boolean> ourIsBuildingClasspathForCustomTagLoading = ThreadLocal.withInitial(() -> Boolean.FALSE);
-  private static final Logger LOG = Logger.getInstance("#com.intellij.lang.ant.dom.CustomAntElementsRegistry");
+  private static final Logger LOG = Logger.getInstance(CustomAntElementsRegistry.class);
   private static final Key<CustomAntElementsRegistry> REGISTRY_KEY = Key.create("_custom_element_registry_");
 
   private final Map<XmlName, ClassProvider> myCustomElements = new THashMap<>();
diff --git a/plugins/coverage-common/src/com/intellij/coverage/SrcFileAnnotator.java b/plugins/coverage-common/src/com/intellij/coverage/SrcFileAnnotator.java
index a3230fbedc87..940f9551b56b 100644
--- a/plugins/coverage-common/src/com/intellij/coverage/SrcFileAnnotator.java
+++ b/plugins/coverage-common/src/com/intellij/coverage/SrcFileAnnotator.java
@@ -61,7 +61,7 @@ import java.util.*;
  * @author ven
  */
 public class SrcFileAnnotator implements Disposable {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.coverage.SrcFileAnnotator");
+  private static final Logger LOG = Logger.getInstance(SrcFileAnnotator.class);
   public static final Key<List<RangeHighlighter>> COVERAGE_HIGHLIGHTERS = Key.create("COVERAGE_HIGHLIGHTERS");
   private static final Key<DocumentListener> COVERAGE_DOCUMENT_LISTENER = Key.create("COVERAGE_DOCUMENT_LISTENER");
   public static final Key<Map<FileEditor, EditorNotificationPanel>> NOTIFICATION_PANELS = Key.create("NOTIFICATION_PANELS");
diff --git a/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/config/ExtConfiguration.java b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/config/ExtConfiguration.java
index 177f476f4f15..5b37969a0078 100644
--- a/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/config/ExtConfiguration.java
+++ b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/config/ExtConfiguration.java
@@ -31,7 +31,7 @@ public class ExtConfiguration implements JDOMExternalizable, Cloneable{
   public String PRIVATE_KEY_FILE = "";
   public String ADDITIONAL_PARAMETERS = "";
 
-  private static final Logger LOG = Logger.getInstance("#com.intellij.cvsSupport2.config.ExtConfiguration");
+  private static final Logger LOG = Logger.getInstance(ExtConfiguration.class);
   public boolean USE_INTERNAL_SSH_IMPLEMENTATION = false;
 
   @Override
diff --git a/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/config/LocalSettings.java b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/config/LocalSettings.java
index 6aac1fee5c89..aca9495faf3c 100644
--- a/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/config/LocalSettings.java
+++ b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/config/LocalSettings.java
@@ -28,7 +28,7 @@ import org.jetbrains.annotations.NonNls;
  */
 public class LocalSettings implements JDOMExternalizable, Cloneable {
 
-  private static final Logger LOG = Logger.getInstance("#com.intellij.cvsSupport2.config.LocalSettings");
+  private static final Logger LOG = Logger.getInstance(LocalSettings.class);
 
   @NonNls
   public String PATH_TO_CVS_CLIENT = "cvs";
diff --git a/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ConnectionOnProcess.java b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ConnectionOnProcess.java
index 95d19d4cf412..528631f4a21e 100644
--- a/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ConnectionOnProcess.java
+++ b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ConnectionOnProcess.java
@@ -24,7 +24,7 @@ import java.util.concurrent.Future;
 @SuppressWarnings({"NonPrivateFieldAccessedInSynchronizedContext", "FieldAccessedSynchronizedAndUnsynchronized"})
 public abstract class ConnectionOnProcess implements IConnection {
 
-  private static final Logger LOG = Logger.getInstance("#com.intellij.cvsSupport2.connections.ConnectionOnProcess");
+  private static final Logger LOG = Logger.getInstance(ConnectionOnProcess.class);
 
   protected InputStream myInputStream;
   protected OutputStream myOutputStream;
diff --git a/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ssh/SshLogger.java b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ssh/SshLogger.java
index 4949ec170cd5..6840a22a0843 100644
--- a/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ssh/SshLogger.java
+++ b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ssh/SshLogger.java
@@ -18,7 +18,7 @@ package com.intellij.cvsSupport2.connections.ssh;
 import com.intellij.openapi.diagnostic.Logger;
 
 public class SshLogger {
-  private final static Logger LOG = Logger.getInstance("#com.intellij.cvsSupport2.connections.ssh.SshLogger");
+  private final static Logger LOG = Logger.getInstance(SshLogger.class);
 
   public static void debug(final String s) {
     LOG.debug(s);
diff --git a/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/javacvsImpl/io/ReadThread.java b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/javacvsImpl/io/ReadThread.java
index 7fa117bf6559..3c1e5006a109 100644
--- a/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/javacvsImpl/io/ReadThread.java
+++ b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/javacvsImpl/io/ReadThread.java
@@ -19,7 +19,7 @@ public class ReadThread implements Runnable {
 
   public final static Collection<ReadThread> READ_THREADS = Collections.synchronizedCollection(new ArrayList<>());
 
-  private static final Logger LOG = Logger.getInstance("#com.intellij.cvsSupport2.javacvsImpl.io.ReadThread");
+  private static final Logger LOG = Logger.getInstance(ReadThread.class);
 
   private static final int INITIAL_BUFFER_SIZE = 128 * 1024;
   private static final int TIMEOUT = 3000;
diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/CvsUtil.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/CvsUtil.java
index 640748ddeaa1..775fd162e903 100644
--- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/CvsUtil.java
+++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/CvsUtil.java
@@ -49,7 +49,7 @@ public class CvsUtil {
 
   @NonNls public static final String CVS_IGNORE_FILE = ".cvsignore";
   @NonNls public static final String CVS_ROOT_FILE = "Root";
-  private static final Logger LOG = Logger.getInstance("#com.intellij.cvsSupport2.CvsUtil");
+  private static final Logger LOG = Logger.getInstance(CvsUtil.class);
   @NonNls private static final String REPOSITORY = "Repository";
   @NonNls private static final String TAG = "Tag";
   @NonNls public static final String CVS = "CVS";
diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/AbstractAction.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/AbstractAction.java
index 462c9d4bfb03..20d6f8f7a6cf 100644
--- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/AbstractAction.java
+++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/AbstractAction.java
@@ -31,7 +31,7 @@ import java.awt.event.InputEvent;
 
 
 public abstract class AbstractAction extends AnAction implements DumbAware {
-  protected static final Logger LOG = Logger.getInstance("#com.intellij.cvsSupport2.actions.AbstractAction");
+  protected static final Logger LOG = Logger.getInstance(AbstractAction.class);
   private final boolean myStartLvcsAction;
   private boolean myAutoSave = true;
   private LocalHistoryAction myLocalHistoryAction = LocalHistoryAction.NULL;
diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/IgnoreFileAction.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/IgnoreFileAction.java
index 37a3d8c89668..56c22426763b 100644
--- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/IgnoreFileAction.java
+++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/IgnoreFileAction.java
@@ -52,7 +52,7 @@ import java.util.Collection;
  */
 public class IgnoreFileAction extends AnAction implements DumbAware {
 
-  private static final Logger LOG = Logger.getInstance("#com.intellij.cvsSupport2.actions.IgnoreFileAction");
+  private static final Logger LOG = Logger.getInstance(IgnoreFileAction.class);
 
   private final CvsActionVisibility myVisibility = new CvsActionVisibility();
 
diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/MigrateCvsRootAction.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/MigrateCvsRootAction.java
index 4a5d540d9961..6eef52175b17 100644
--- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/MigrateCvsRootAction.java
+++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/MigrateCvsRootAction.java
@@ -38,7 +38,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class MigrateCvsRootAction extends AnAction implements DumbAware {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.cvsSupport2.actions.MigrateCvsRootAction");
+  private static final Logger LOG = Logger.getInstance(MigrateCvsRootAction.class);
   private final CvsActionVisibility myVisibility = new CvsActionVisibility();
 
   public MigrateCvsRootAction() {
diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/merge/MergeAction.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/merge/MergeAction.java
index 523c94450575..3f0de2fb8635 100644
--- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/merge/MergeAction.java
+++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/merge/MergeAction.java
@@ -20,7 +20,7 @@ import java.util.Arrays;
 
 
 public class MergeAction extends AnAction {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.cvsSupport2.actions.merge.MergeAction");
+  private static final Logger LOG = Logger.getInstance(MergeAction.class);
   private final CvsActionVisibility myVisibility = new CvsActionVisibility();
 
   public MergeAction() {
diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/application/CvsEntriesManager.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/application/CvsEntriesManager.java
index 6d32bd6d021c..d4ccb3ba385c 100644
--- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/application/CvsEntriesManager.java
+++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/application/CvsEntriesManager.java
@@ -38,7 +38,7 @@ import java.util.Map;
  */
 
 public class CvsEntriesManager implements VirtualFileListener {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.cvsSupport2.application.CvsEntriesManager");
+  private static final Logger LOG = Logger.getInstance(CvsEntriesManager.class);
 
   private final Map<VirtualFile, CvsInfo> myInfoByParentDirectoryPath = new THashMap<>();
 
diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/changeBrowser/CvsCommittedChangesProvider.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/changeBrowser/CvsCommittedChangesProvider.java
index e024de95fe53..020b209297bb 100644
--- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/changeBrowser/CvsCommittedChangesProvider.java
+++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/changeBrowser/CvsCommittedChangesProvider.java
@@ -40,7 +40,7 @@ import java.util.*;
  * @author yole
  */
 public class CvsCommittedChangesProvider implements CachingCommittedChangesProvider<CvsChangeList, ChangeBrowserSettings> {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.cvsSupport2.changeBrowser.CvsCommittedChangesProvider");
+  private static final Logger LOG = Logger.getInstance(CvsCommittedChangesProvider.class);
 
   private final Project myProject;
 
diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/checkinProject/CvsRollbackEnvironment.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/checkinProject/CvsRollbackEnvironment.java
index ee3eded6dfa7..c7f37bb08234 100644
--- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/checkinProject/CvsRollbackEnvironment.java
+++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/checkinProject/CvsRollbackEnvironment.java
@@ -44,7 +44,7 @@ import java.util.List;
  */
 public class CvsRollbackEnvironment extends DefaultRollbackEnvironment {
 
-  private static final Logger LOG = Logger.getInstance("#com.intellij.cvsSupport2.checkinProject.CvsRollbackEnvironment");
+  private static final Logger LOG = Logger.getInstance(CvsRollbackEnvironment.class);
   private final Project myProject;
 
   public CvsRollbackEnvironment(final Project project) {
diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/CvsApplicationLevelConfiguration.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/CvsApplicationLevelConfiguration.java
index 00bc34d9f10a..f111ebf3ae22 100644
--- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/CvsApplicationLevelConfiguration.java
+++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/CvsApplicationLevelConfiguration.java
@@ -22,7 +22,7 @@ import java.util.List;
 
 @State(name = "CvsApplicationLevelConfiguration", storages = @Storage(value = "other.xml", roamingType = RoamingType.DISABLED))
 public class CvsApplicationLevelConfiguration implements PersistentStateComponent<Element> {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.cvsSupport2.config.CvsApplicationLevelConfiguration");
+  private static final Logger LOG = Logger.getInstance(CvsApplicationLevelConfiguration.class);
 
   public List<CvsRootConfiguration> CONFIGURATIONS = new ArrayList<>();
 
diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/ui/CvsConfigurationPanel.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/ui/CvsConfigurationPanel.java
index 86d335a6fa96..dd233d631b75 100644
--- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/ui/CvsConfigurationPanel.java
+++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/ui/CvsConfigurationPanel.java
@@ -37,7 +37,7 @@ import java.util.HashSet;
  */
 public class CvsConfigurationPanel {
 
-  private static final Logger LOG = Logger.getInstance("#com.intellij.cvsSupport2.config.ui.CvsConfigurationPanel");
+  private static final Logger LOG = Logger.getInstance(CvsConfigurationPanel.class);
 
   private JPanel myPanel;
 
diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/ext/ExtConnectionCvsSettings.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/ext/ExtConnectionCvsSettings.java
index bb638fc2c134..611fa8c74331 100644
--- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/ext/ExtConnectionCvsSettings.java
+++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/ext/ExtConnectionCvsSettings.java
@@ -43,7 +43,7 @@ import java.io.IOException;
  * author: lesya
  */
 public class ExtConnectionCvsSettings extends CvsConnectionSettings {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.cvsSupport2.connections.ext.ExtConnectionCvsSettings");
+  private static final Logger LOG = Logger.getInstance(ExtConnectionCvsSettings.class);
   @NonNls private static final String UNHANDLED_RESPONSE_PREFIX = "Unhandled response: ";
   private final SshSettings mySshSettings;
 
diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/pserver/PServerLoginProviderImpl.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/pserver/PServerLoginProviderImpl.java
index 4b0283d61bb8..48c461974859 100644
--- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/pserver/PServerLoginProviderImpl.java
+++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/pserver/PServerLoginProviderImpl.java
@@ -40,7 +40,7 @@ import java.util.List;
  * author: lesya
  */
 public class PServerLoginProviderImpl extends PServerLoginProvider {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.cvsSupport2.connections.pserver.PServerLoginProviderImpl");
+  private static final Logger LOG = Logger.getInstance(PServerLoginProviderImpl.class);
 
   @Override
   @Nullable
diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/ssh/SshConnectionSettings.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/ssh/SshConnectionSettings.java
index 5b702a486dce..6ec9741a8553 100644
--- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/ssh/SshConnectionSettings.java
+++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/ssh/SshConnectionSettings.java
@@ -39,7 +39,7 @@ import java.io.IOException;
  */
 public class SshConnectionSettings extends CvsConnectionSettings {
 
-  private static final Logger LOG = Logger.getInstance("#com.intellij.cvsSupport2.connections.ssh.SshConnectionSettings");
+  private static final Logger LOG = Logger.getInstance(SshConnectionSettings.class);
 
   public SshConnectionSettings(CvsRootConfiguration cvsRootConfiguration) {
     super(cvsRootConfiguration);
diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsIgnore/IgnoredFilesInfoImpl.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsIgnore/IgnoredFilesInfoImpl.java
index 44aeee197b6c..8a90d2cfb5ab 100644
--- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsIgnore/IgnoredFilesInfoImpl.java
+++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsIgnore/IgnoredFilesInfoImpl.java
@@ -17,7 +17,7 @@ import java.util.StringTokenizer;
  */
 public class IgnoredFilesInfoImpl implements IgnoredFilesInfo {
 
-  private static final Logger LOG = Logger.getInstance("#com.intellij.cvsSupport2.cvsIgnore.IgnoredFilesInfoImpl");
+  private static final Logger LOG = Logger.getInstance(IgnoredFilesInfoImpl.class);
 
   private static final SimpleStringPattern[] PREDEFINED_PATTERNS = new SimpleStringPattern[]{
       new SimpleStringPattern("RCS"),
diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvshandlers/AnyProcessedFiles.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvshandlers/AnyProcessedFiles.java
index f9c9079994bf..36b39586cfa4 100644
--- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvshandlers/AnyProcessedFiles.java
+++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvshandlers/AnyProcessedFiles.java
@@ -25,7 +25,7 @@ import java.util.Collection;
  * author: lesya
  */
 public abstract class AnyProcessedFiles extends FileSetToBeUpdated {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.cvsSupport2.cvshandlers.AnyProcessedFiles");
+  private static final Logger LOG = Logger.getInstance(AnyProcessedFiles.class);
 
   public abstract Collection<VirtualFile> getFiles();
 
diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvshandlers/CommandCvsHandler.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvshandlers/CommandCvsHandler.java
index 23dae272dc97..86757b917394 100644
--- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvshandlers/CommandCvsHandler.java
+++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvshandlers/CommandCvsHandler.java
@@ -71,7 +71,7 @@ import java.util.*;
  */
 public class CommandCvsHandler extends CvsHandler {
 
-  private static final Logger LOG = Logger.getInstance("#com.intellij.cvsSupport2.cvshandlers.CommandCvsHandler");
+  private static final Logger LOG = Logger.getInstance(CommandCvsHandler.class);
 
   protected final CvsOperation myCvsOperation;
 
diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvshandlers/FileSetToBeUpdated.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvshandlers/FileSetToBeUpdated.java
index a3501c22975f..7bc655f39b00 100644
--- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvshandlers/FileSetToBeUpdated.java
+++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvshandlers/FileSetToBeUpdated.java
@@ -27,7 +27,7 @@ import com.intellij.openapi.vfs.VirtualFile;
  */
 public abstract class FileSetToBeUpdated {
 
-  private static final Logger LOG = Logger.getInstance("#com.intellij.cvsSupport2.cvshandlers.FileSetToBeUpdated");
+  private static final Logger LOG = Logger.getInstance(FileSetToBeUpdated.class);
 
   public static FileSetToBeUpdated allFiles() {
     return new AllFilesInProject();
diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/common/CreateFileObjects.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/common/CreateFileObjects.java
index e4d04537b1a4..ea0a1eef951d 100644
--- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/common/CreateFileObjects.java
+++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/common/CreateFileObjects.java
@@ -28,7 +28,7 @@ import java.util.*;
  */
 public class CreateFileObjects {
 
-  private static final Logger LOG = Logger.getInstance("#com.intellij.cvsSupport2.cvsoperations.common.CreateFileObjects");
+  private static final Logger LOG = Logger.getInstance(CreateFileObjects.class);
 
   private final File[] myFiles;
   private final String myRootPath;
diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/common/CvsCommandOperation.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/common/CvsCommandOperation.java
index 34788d73b7dd..9973a3d0cded 100644
--- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/common/CvsCommandOperation.java
+++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/common/CvsCommandOperation.java
@@ -78,7 +78,7 @@ public abstract class CvsCommandOperation extends CvsOperation implements IFileI
   protected final IAdminReader myAdminReader;
   protected final IAdminWriter myAdminWriter;
 
-  protected static final Logger LOG = Logger.getInstance("#com.intellij.cvsSupport2.cvsoperations.common.CvsCommandOperation");
+  protected static final Logger LOG = Logger.getInstance(CvsCommandOperation.class);
   private String myLastProcessedCvsRoot;
   private final UpdatedFilesManager myUpdatedFilesManager = new UpdatedFilesManager();
 
diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/common/LocalPathIndifferentOperationHelper.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/common/LocalPathIndifferentOperationHelper.java
index 35112fb7e6af..61a140ccbb77 100644
--- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/common/LocalPathIndifferentOperationHelper.java
+++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/common/LocalPathIndifferentOperationHelper.java
@@ -32,7 +32,7 @@ import java.util.*;
  * @author lesya
  */
 public class LocalPathIndifferentOperationHelper {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.cvsSupport2.cvsoperations.common.LocalPathIndifferentOperationHelper");
+  private static final Logger LOG = Logger.getInstance(LocalPathIndifferentOperationHelper.class);
   private final Map<File, Entry> myFileToEntryMap = new HashMap<>();
   private final IAdminReader myAdminReader = new AdminReaderForLightFiles(myFileToEntryMap);
   private final String myRevision;
diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsAdd/ui/AbstractAddOptionsDialog.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsAdd/ui/AbstractAddOptionsDialog.java
index 451541a70f74..250d1bc00d41 100644
--- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsAdd/ui/AbstractAddOptionsDialog.java
+++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsAdd/ui/AbstractAddOptionsDialog.java
@@ -31,7 +31,7 @@ import java.util.Collection;
 public abstract class AbstractAddOptionsDialog extends OptionsDialog {
   protected final Options myOptions;
 
-  private static final Logger LOG = Logger.getInstance("#com.intellij.cvsSupport2.cvsoperations.cvsAdd.ui.AbstractAddOptionsDialog");
+  private static final Logger LOG = Logger.getInstance(AbstractAddOptionsDialog.class);
 
   public static AbstractAddOptionsDialog createDialog(Project project,
                                                       Collection<AddedFileInfo> files,
diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsAnnotate/AnnotateOperation.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsAnnotate/AnnotateOperation.java
index 5353342832d6..1513abc4431b 100644
--- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsAnnotate/AnnotateOperation.java
+++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsAnnotate/AnnotateOperation.java
@@ -36,7 +36,7 @@ import java.util.List;
  */
 public class AnnotateOperation extends LocalPathIndifferentOperation {
 
-  private static final Logger LOG = Logger.getInstance("#com.intellij.cvsSupport2.cvsoperations.cvsAnnotate.AnnotateOperation");
+  private static final Logger LOG = Logger.getInstance(AnnotateOperation.class);
 
   private final String myRevision;
   private final List<Annotation> myAnnotations = new ArrayList<>();
diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsEdit/EditorInfo.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsEdit/EditorInfo.java
index c2c80db9185d..cb74bbbeee15 100644
--- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsEdit/EditorInfo.java
+++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsEdit/EditorInfo.java
@@ -15,7 +15,7 @@ import java.util.TimeZone;
  */
 public class EditorInfo {
 
-  private static final Logger LOG = Logger.getInstance("#com.intellij.cvsSupport2.cvsoperations.cvsEdit.EditorInfo");
+  private static final Logger LOG = Logger.getInstance(EditorInfo.class);
 
   public final static SyncDateFormat DATE_FORMAT;
   public final static SyncDateFormat DATE_FORMAT1;
diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsTagOrBranch/TagsHelper.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsTagOrBranch/TagsHelper.java
index 7d8e9362bd4c..4798aa9022d3 100644
--- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsTagOrBranch/TagsHelper.java
+++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsTagOrBranch/TagsHelper.java
@@ -35,7 +35,7 @@ import java.util.*;
  * author: lesya
  */
 public class TagsHelper {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.cvsSupport2.cvsoperations.cvsTagOrBranch.TagsHelper");
+  private static final Logger LOG = Logger.getInstance(TagsHelper.class);
 
   private TagsHelper() {
   }
diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsTagOrBranch/ui/TagsPanel.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsTagOrBranch/ui/TagsPanel.java
index ae1b62f11629..59419459d6de 100644
--- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsTagOrBranch/ui/TagsPanel.java
+++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsTagOrBranch/ui/TagsPanel.java
@@ -20,7 +20,7 @@ import java.util.Collection;
 
 public class TagsPanel extends JPanel implements TableCellRenderer{
 
-  private static final Logger LOG = Logger.getInstance("#com.intellij.cvsSupport2.cvsoperations.cvsTagOrBranch.ui.TagsPanel");
+  private static final Logger LOG = Logger.getInstance(TagsPanel.class);
 
   private final JLabel myTextLabel = new JLabel();
 
diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsUpdate/ui/CorruptedProjectFilesDialog.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsUpdate/ui/CorruptedProjectFilesDialog.java
index fbe9b7ad18cd..e35de466e00d 100644
--- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsUpdate/ui/CorruptedProjectFilesDialog.java
+++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsUpdate/ui/CorruptedProjectFilesDialog.java
@@ -38,7 +38,7 @@ import java.util.Collection;
 
 public class CorruptedProjectFilesDialog extends DialogWrapper {
 
-  private static final Logger LOG = Logger.getInstance("#com.intellij.cvsSupport2.cvsoperations.cvsUpdate.ui.CorruptedProjectFilesDialog");
+  private static final Logger LOG = Logger.getInstance(CorruptedProjectFilesDialog.class);
 
   private JLabel myMessageLabel;
   private JLabel myIconLabel;
diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/javacvsSpecificImpls/AdminReaderOnCache.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/javacvsSpecificImpls/AdminReaderOnCache.java
index 7f921167d995..fd7c8d48b6d3 100644
--- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/javacvsSpecificImpls/AdminReaderOnCache.java
+++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/javacvsSpecificImpls/AdminReaderOnCache.java
@@ -40,7 +40,7 @@ import java.util.Date;
  */
 public class AdminReaderOnCache implements IAdminReader {
 
-  private static final Logger LOG = Logger.getInstance("#com.intellij.cvsSupport2.cvsoperations.javacvsSpecificImpls.AdminReaderOnCache");
+  private static final Logger LOG = Logger.getInstance(AdminReaderOnCache.class);
 
   private final IAdminReader ourStandardAdminReader = new AdminReader(CvsApplicationLevelConfiguration.getCharset());
   private final CvsEntriesManager myCvsEntriesManager = CvsEntriesManager.getInstance();
diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/javacvsSpecificImpls/AdminWriterOnCache.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/javacvsSpecificImpls/AdminWriterOnCache.java
index d3144f23141a..413be4d3df50 100644
--- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/javacvsSpecificImpls/AdminWriterOnCache.java
+++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/javacvsSpecificImpls/AdminWriterOnCache.java
@@ -42,7 +42,7 @@ import java.io.InputStream;
  */
 public class AdminWriterOnCache implements IAdminWriter {
 
-  private static final Logger LOG = Logger.getInstance("#com.intellij.cvsSupport2.cvsoperations.javacvsSpecificImpls.AdminWriterOnCache");
+  private static final Logger LOG = Logger.getInstance(AdminWriterOnCache.class);
 
   private final IAdminWriter myAdminWriter;
   private final CvsEntriesManager myCvsEntriesManager = CvsEntriesManager.getInstance();
diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsstatuses/CvsChangeProvider.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsstatuses/CvsChangeProvider.java
index 148b67a08d54..e1c3124da85b 100644
--- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsstatuses/CvsChangeProvider.java
+++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsstatuses/CvsChangeProvider.java
@@ -56,7 +56,7 @@ import static com.intellij.util.containers.ContainerUtil.map;
  * @author max
  */
 public class CvsChangeProvider implements ChangeProvider {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.cvsSupport2.cvsstatuses.CvsChangeProvider");
+  private static final Logger LOG = Logger.getInstance(CvsChangeProvider.class);
 
   private final CvsVcs2 myVcs;
   private final CvsEntriesManager myEntriesManager;
diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsstatuses/CvsStatusProvider.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsstatuses/CvsStatusProvider.java
index b03453f6a9e6..62e48b3c012e 100644
--- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsstatuses/CvsStatusProvider.java
+++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsstatuses/CvsStatusProvider.java
@@ -31,7 +31,7 @@ import java.util.Date;
  * author: lesya
  */
 public class CvsStatusProvider {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.cvsSupport2.cvsstatuses.CvsStatusProvider");
+  private static final Logger LOG = Logger.getInstance(CvsStatusProvider.class);
 
   private static long TIME_STAMP_EPSILON = 3000;
 
diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/history/ComparableVcsRevisionOnOperation.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/history/ComparableVcsRevisionOnOperation.java
index 1028e6bc4710..3aef429c32c9 100644
--- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/history/ComparableVcsRevisionOnOperation.java
+++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/history/ComparableVcsRevisionOnOperation.java
@@ -35,7 +35,7 @@ import java.io.IOException;
 import java.util.Date;
 
 public class ComparableVcsRevisionOnOperation implements VcsFileRevision {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.cvsSupport2.history.ComparableVcsRevisionOnOperation");
+  private static final Logger LOG = Logger.getInstance(ComparableVcsRevisionOnOperation.class);
 
   private final GetFileContentOperation myOperation;
   private final Project myProject;
diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/history/CvsFileContent.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/history/CvsFileContent.java
index 7448360575d5..cd1bc4012982 100644
--- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/history/CvsFileContent.java
+++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/history/CvsFileContent.java
@@ -26,7 +26,7 @@ import org.jetbrains.annotations.Nullable;
 import java.io.IOException;
 
 public abstract class CvsFileContent implements VcsFileContent{
-  private static final Logger LOG = Logger.getInstance("#com.intellij.cvsSupport2.history.CvsFileContent");
+  private static final Logger LOG = Logger.getInstance(CvsFileContent.class);
   protected final ComparableVcsRevisionOnOperation myComparableCvsRevisionOnOperation;
 
   protected CvsFileContent(final ComparableVcsRevisionOnOperation comparableCvsRevisionOnOperation) {
diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/impl/CvsServicesImpl.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/impl/CvsServicesImpl.java
index a88cf47d180f..9bd2f2be52ef 100644
--- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/impl/CvsServicesImpl.java
+++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/impl/CvsServicesImpl.java
@@ -52,7 +52,7 @@ import java.util.List;
  */
 public class CvsServicesImpl extends CvsServices {
 
-  private static final Logger LOG = Logger.getInstance("#com.intellij.cvsSupport2.impl.CvsServicesImpl");
+  private static final Logger LOG = Logger.getInstance(CvsServicesImpl.class);
 
   @Override
   public CvsModule[] chooseModules(Project project,
diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/javacvsImpl/io/LocalFileReaderBasedOnVFS.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/javacvsImpl/io/LocalFileReaderBasedOnVFS.java
index bd9e72dd1a6e..6ff2a0baedd0 100644
--- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/javacvsImpl/io/LocalFileReaderBasedOnVFS.java
+++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/javacvsImpl/io/LocalFileReaderBasedOnVFS.java
@@ -31,7 +31,7 @@ import java.util.Collection;
  */
 public class LocalFileReaderBasedOnVFS implements ILocalFileReader {
 
-  private static final Logger LOG = Logger.getInstance("#com.intellij.cvsSupport2.javacvsImpl.io.LocalFileReaderBasedOnVFS");
+  private static final Logger LOG = Logger.getInstance(LocalFileReaderBasedOnVFS.class);
 
   private final ILocalFileReader myLocalFileReader;
   private final ProjectContentInfoProvider myProjectContentInfoProvider;
diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/updateinfo/UpdatedFilesProcessor.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/updateinfo/UpdatedFilesProcessor.java
index 6be87accc2a0..17aa61b0525d 100644
--- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/updateinfo/UpdatedFilesProcessor.java
+++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/updateinfo/UpdatedFilesProcessor.java
@@ -33,7 +33,7 @@ import org.netbeans.lib.cvsclient.admin.Entry;
 import java.io.File;
 
 public class UpdatedFilesProcessor  extends CvsMessagesAdapter {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.cvsSupport2.updateinfo.UpdatedFilesProcessor");
+  private static final Logger LOG = Logger.getInstance(UpdatedFilesProcessor.class);
 
   private final UpdatedFiles myUpdatedFiles;
 
diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/util/CvsVfsUtil.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/util/CvsVfsUtil.java
index b521e17e8e62..7841b9bdd1c8 100644
--- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/util/CvsVfsUtil.java
+++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/util/CvsVfsUtil.java
@@ -27,7 +27,7 @@ import java.io.File;
  */
 public class CvsVfsUtil {
 
-  private static final Logger LOG = Logger.getInstance("#com.intellij.cvsSupport2.util.CvsVfsUtil");
+  private static final Logger LOG = Logger.getInstance(CvsVfsUtil.class);
 
   public static VirtualFile findFileByPath(final String path) {
     return LocalFileSystem.getInstance().findFileByPath(path);
diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/openapi/cvsIntegration/CvsRepository.java b/plugins/cvs/cvs-plugin/src/com/intellij/openapi/cvsIntegration/CvsRepository.java
index c250bd6dc1cd..fc0a0b05e9df 100644
--- a/plugins/cvs/cvs-plugin/src/com/intellij/openapi/cvsIntegration/CvsRepository.java
+++ b/plugins/cvs/cvs-plugin/src/com/intellij/openapi/cvsIntegration/CvsRepository.java
@@ -30,7 +30,7 @@ public class CvsRepository {
   private final DateOrRevision myBranch;
   private final String myStringRepresentation;
 
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.cvsIntegration.CvsRepository");
+  private static final Logger LOG = Logger.getInstance(CvsRepository.class);
 
   public CvsRepository(@NotNull String stringRepresentation,
                        @NotNull String method,
diff --git a/plugins/devkit/devkit-core/src/actions/ShowSerializedXmlAction.java b/plugins/devkit/devkit-core/src/actions/ShowSerializedXmlAction.java
index 6ef9f44e45d9..94a9ef770b1c 100644
--- a/plugins/devkit/devkit-core/src/actions/ShowSerializedXmlAction.java
+++ b/plugins/devkit/devkit-core/src/actions/ShowSerializedXmlAction.java
@@ -48,7 +48,7 @@ import java.util.*;
  * @author nik
  */
 public class ShowSerializedXmlAction extends DumbAwareAction {
-  private static final Logger LOG = Logger.getInstance("#org.jetbrains.idea.devkit.actions.ShowSerializedXmlAction");
+  private static final Logger LOG = Logger.getInstance(ShowSerializedXmlAction.class);
 
   @Override
   public void update(@NotNull AnActionEvent e) {
diff --git a/plugins/devkit/devkit-core/src/inspections/quickfix/BaseFix.java b/plugins/devkit/devkit-core/src/inspections/quickfix/BaseFix.java
index f56cd4c99ddf..528f2c96c1e2 100644
--- a/plugins/devkit/devkit-core/src/inspections/quickfix/BaseFix.java
+++ b/plugins/devkit/devkit-core/src/inspections/quickfix/BaseFix.java
@@ -55,7 +55,7 @@ abstract class BaseFix implements LocalQuickFix {
       doFix(project, descriptor, external);
     }
     catch (IncorrectOperationException e) {
-      Logger.getInstance("#" + getClass().getName()).error(e);
+      Logger.getInstance(getClass()).error(e);
     }
   }
 
diff --git a/plugins/devkit/devkit-core/src/internal/DumpCleanHighlightingTestdataAction.java b/plugins/devkit/devkit-core/src/internal/DumpCleanHighlightingTestdataAction.java
index 5674107df29a..970cb3566ffd 100644
--- a/plugins/devkit/devkit-core/src/internal/DumpCleanHighlightingTestdataAction.java
+++ b/plugins/devkit/devkit-core/src/internal/DumpCleanHighlightingTestdataAction.java
@@ -38,7 +38,7 @@ import java.io.File;
 import java.io.IOException;
 
 public class DumpCleanHighlightingTestdataAction extends AnAction implements DumbAware {
-  private static final Logger LOG = Logger.getInstance("#" + DumpCleanHighlightingTestdataAction.class);
+  private static final Logger LOG = Logger.getInstance(DumpCleanHighlightingTestdataAction.class);
 
   @Override
   public void actionPerformed(@NotNull final AnActionEvent e) {
diff --git a/plugins/devkit/devkit-core/src/projectRoots/IdeaJdk.java b/plugins/devkit/devkit-core/src/projectRoots/IdeaJdk.java
index 557b57124ed1..f3d0b47e14cc 100644
--- a/plugins/devkit/devkit-core/src/projectRoots/IdeaJdk.java
+++ b/plugins/devkit/devkit-core/src/projectRoots/IdeaJdk.java
@@ -62,7 +62,7 @@ import java.util.zip.ZipFile;
  */
 public class IdeaJdk extends JavaDependentSdkType implements JavaSdkType {
 
-  private static final Logger LOG = Logger.getInstance("#org.jetbrains.idea.devkit.projectRoots.IdeaJdk");
+  private static final Logger LOG = Logger.getInstance(IdeaJdk.class);
   @NonNls private static final String LIB_DIR_NAME = "lib";
   @NonNls private static final String SRC_DIR_NAME = "src";
   @NonNls private static final String PLUGINS_DIR = "plugins";
diff --git a/plugins/devkit/devkit-core/src/projectRoots/Sandbox.java b/plugins/devkit/devkit-core/src/projectRoots/Sandbox.java
index f2bc1dc45cf7..5c4ca1d7272b 100644
--- a/plugins/devkit/devkit-core/src/projectRoots/Sandbox.java
+++ b/plugins/devkit/devkit-core/src/projectRoots/Sandbox.java
@@ -32,7 +32,7 @@ import org.jetbrains.annotations.Nullable;
 import org.jetbrains.idea.devkit.DevKitBundle;
 
 public class Sandbox implements ValidatableSdkAdditionalData {
-  private static final Logger LOG = Logger.getInstance("#org.jetbrains.idea.devkit.projectRoots.Sandbox");
+  private static final Logger LOG = Logger.getInstance(Sandbox.class);
 
   @SuppressWarnings("WeakerAccess")
   public String mySandboxHome;
diff --git a/plugins/devkit/devkit-core/src/run/IdeaLicenseHelper.java b/plugins/devkit/devkit-core/src/run/IdeaLicenseHelper.java
index e821850f376a..3bc91f1c6e47 100644
--- a/plugins/devkit/devkit-core/src/run/IdeaLicenseHelper.java
+++ b/plugins/devkit/devkit-core/src/run/IdeaLicenseHelper.java
@@ -24,7 +24,7 @@ import java.io.File;
 import java.io.IOException;
 
 public class IdeaLicenseHelper {
-  private static final Logger LOG = Logger.getInstance("#org.jetbrains.idea.devkit.run.IdeaLicenseHelper");
+  private static final Logger LOG = Logger.getInstance(IdeaLicenseHelper.class);
 
   public static void copyIDEALicense(final String sandboxHome) {
     File sandboxSystemPath = new File(sandboxHome, "system");
diff --git a/plugins/devkit/jps-plugin/src/org/jetbrains/jps/devkit/builder/JpsPluginSyntheticArtifactProvider.java b/plugins/devkit/jps-plugin/src/org/jetbrains/jps/devkit/builder/JpsPluginSyntheticArtifactProvider.java
index 01bd8532f3a6..aa11c97c595b 100644
--- a/plugins/devkit/jps-plugin/src/org/jetbrains/jps/devkit/builder/JpsPluginSyntheticArtifactProvider.java
+++ b/plugins/devkit/jps-plugin/src/org/jetbrains/jps/devkit/builder/JpsPluginSyntheticArtifactProvider.java
@@ -54,7 +54,7 @@ import java.util.List;
  * @author nik
  */
 public class JpsPluginSyntheticArtifactProvider extends JpsSyntheticArtifactProvider {
-  private static final Logger LOG = Logger.getInstance("#org.jetbrains.jps.devkit.builder.JpsPluginSyntheticArtifactProvider");
+  private static final Logger LOG = Logger.getInstance(JpsPluginSyntheticArtifactProvider.class);
 
   @NotNull
   @Override
diff --git a/plugins/git4idea/src/git4idea/GitBranchesSearcher.java b/plugins/git4idea/src/git4idea/GitBranchesSearcher.java
index a87012a77f02..49ad479c8e5b 100644
--- a/plugins/git4idea/src/git4idea/GitBranchesSearcher.java
+++ b/plugins/git4idea/src/git4idea/GitBranchesSearcher.java
@@ -26,7 +26,7 @@ import java.util.HashSet;
 import java.util.Set;
 
 public class GitBranchesSearcher {
-  private final static Logger LOG = Logger.getInstance("#git4idea.GitBranchesSearcher");
+  private final static Logger LOG = Logger.getInstance(GitBranchesSearcher.class);
   private final GitBranch myLocal;
   private GitBranch myRemote;
 
diff --git a/plugins/git4idea/src/git4idea/changes/GitOutgoingChangesProvider.java b/plugins/git4idea/src/git4idea/changes/GitOutgoingChangesProvider.java
index a3bc3d761e82..208347a1e21c 100644
--- a/plugins/git4idea/src/git4idea/changes/GitOutgoingChangesProvider.java
+++ b/plugins/git4idea/src/git4idea/changes/GitOutgoingChangesProvider.java
@@ -26,7 +26,7 @@ import static com.intellij.util.Functions.identity;
 import static com.intellij.util.containers.ContainerUtil.map;
 
 public class GitOutgoingChangesProvider implements VcsOutgoingChangesProvider<CommittedChangeList> {
-  private final static Logger LOG = Logger.getInstance("#git4idea.changes.GitOutgoingChangesProvider");
+  private final static Logger LOG = Logger.getInstance(GitOutgoingChangesProvider.class);
   private final Project myProject;
 
   public GitOutgoingChangesProvider(Project project) {
diff --git a/plugins/git4idea/src/git4idea/history/GitFileHistory.java b/plugins/git4idea/src/git4idea/history/GitFileHistory.java
index 8a98444b40c9..216e7cb02538 100644
--- a/plugins/git4idea/src/git4idea/history/GitFileHistory.java
+++ b/plugins/git4idea/src/git4idea/history/GitFileHistory.java
@@ -73,7 +73,7 @@ import static git4idea.history.GitLogParser.GitLogOption.*;
  * TODO: handle multiple repositories configuration: a file can be moved from one repo to another
  */
 public class GitFileHistory {
-  private static final Logger LOG = Logger.getInstance("#git4idea.history.GitFileHistory");
+  private static final Logger LOG = Logger.getInstance(GitFileHistory.class);
 
   @NotNull private final Project myProject;
   @NotNull private final VirtualFile myRoot;
diff --git a/plugins/git4idea/src/git4idea/repo/GitRepositoryFiles.java b/plugins/git4idea/src/git4idea/repo/GitRepositoryFiles.java
index 25fc774ca954..c7e953bad960 100644
--- a/plugins/git4idea/src/git4idea/repo/GitRepositoryFiles.java
+++ b/plugins/git4idea/src/git4idea/repo/GitRepositoryFiles.java
@@ -36,7 +36,7 @@ import static com.intellij.openapi.vfs.VfsUtilCore.virtualToIoFile;
  * matches once of them.
  */
 public class GitRepositoryFiles {
-  private static final Logger LOG = Logger.getInstance("#git4idea.repo.GitRepositoryFiles");
+  private static final Logger LOG = Logger.getInstance(GitRepositoryFiles.class);
 
   public static final String GITIGNORE = ".gitignore";
 
diff --git a/plugins/google-app-engine/source/com/intellij/appengine/actions/AppEngineUploader.java b/plugins/google-app-engine/source/com/intellij/appengine/actions/AppEngineUploader.java
index 7f8902485512..a69407ed320a 100644
--- a/plugins/google-app-engine/source/com/intellij/appengine/actions/AppEngineUploader.java
+++ b/plugins/google-app-engine/source/com/intellij/appengine/actions/AppEngineUploader.java
@@ -57,7 +57,7 @@ import java.util.Collections;
  * @author nik
  */
 public class AppEngineUploader {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.appengine.actions.AppEngineUploader");
+  private static final Logger LOG = Logger.getInstance(AppEngineUploader.class);
   private final Project myProject;
   private final Artifact myArtifact;
   private final AppEngineFacet myAppEngineFacet;
diff --git a/plugins/google-app-engine/source/com/intellij/appengine/facet/AppEngineSupportProvider.java b/plugins/google-app-engine/source/com/intellij/appengine/facet/AppEngineSupportProvider.java
index b058e53ec920..fc013d8eb2a0 100644
--- a/plugins/google-app-engine/source/com/intellij/appengine/facet/AppEngineSupportProvider.java
+++ b/plugins/google-app-engine/source/com/intellij/appengine/facet/AppEngineSupportProvider.java
@@ -61,7 +61,7 @@ import java.util.List;
  * @author nik
  */
 public class AppEngineSupportProvider extends FrameworkSupportInModuleProvider {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.appengine.facet.AppEngineSupportProvider");
+  private static final Logger LOG = Logger.getInstance(AppEngineSupportProvider.class);
   public static final String JPA_FRAMEWORK_ID = "facet:jpa";
 
   @NotNull
diff --git a/plugins/google-app-engine/source/com/intellij/appengine/sdk/impl/AppEngineSdkImpl.java b/plugins/google-app-engine/source/com/intellij/appengine/sdk/impl/AppEngineSdkImpl.java
index a736773de52c..53f260f7858d 100644
--- a/plugins/google-app-engine/source/com/intellij/appengine/sdk/impl/AppEngineSdkImpl.java
+++ b/plugins/google-app-engine/source/com/intellij/appengine/sdk/impl/AppEngineSdkImpl.java
@@ -29,7 +29,7 @@ import java.util.jar.Attributes;
  * @author nik
  */
 public class AppEngineSdkImpl implements AppEngineSdk {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.appengine.sdk.impl.AppEngineSdkImpl");
+  private static final Logger LOG = Logger.getInstance(AppEngineSdkImpl.class);
   private Map<String, Set<String>> myClassesWhiteList;
   private Map<String, Set<String>> myMethodsBlackList;
   private final String myHomePath;
diff --git a/plugins/google-app-engine/source/com/intellij/appengine/sdk/impl/AppEngineSdkUtil.java b/plugins/google-app-engine/source/com/intellij/appengine/sdk/impl/AppEngineSdkUtil.java
index e8d8036651e7..18dd856da7de 100644
--- a/plugins/google-app-engine/source/com/intellij/appengine/sdk/impl/AppEngineSdkUtil.java
+++ b/plugins/google-app-engine/source/com/intellij/appengine/sdk/impl/AppEngineSdkUtil.java
@@ -23,7 +23,7 @@ import java.util.Set;
  * @author nik
  */
 public class AppEngineSdkUtil {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.appengine.sdk.impl.AppEngineSdkUtil");
+  private static final Logger LOG = Logger.getInstance(AppEngineSdkUtil.class);
   @NonNls public static final String APP_ENGINE_DOWNLOAD_URL = "https://code.google.com/appengine/downloads.html#Google_App_Engine_SDK_for_Java";
   private static final FacetConfigurationQuickFix DOWNLOAD_SDK_QUICK_FIX = new FacetConfigurationQuickFix("Download...") {
     @Override
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/action/ToggleOfflineAction.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/action/ToggleOfflineAction.java
index 7243852d27cf..3788e534c269 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/action/ToggleOfflineAction.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/action/ToggleOfflineAction.java
@@ -29,7 +29,7 @@ import org.jetbrains.plugins.gradle.util.GradleConstants;
  * @author Vladislav.Soroka
  */
 public class ToggleOfflineAction extends ExternalSystemToggleAction {
-  private static final Logger LOG = Logger.getInstance("#" + ToggleOfflineAction.class.getPackage().getName());
+  private static final Logger LOG = Logger.getInstance(ToggleOfflineAction.class);
 
   @Override
   public void update(@NotNull AnActionEvent e) {
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/settings/IdeaGradleProjectSettingsControlBuilder.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/settings/IdeaGradleProjectSettingsControlBuilder.java
index 38724801b09c..9ca83c38c3b6 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/settings/IdeaGradleProjectSettingsControlBuilder.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/settings/IdeaGradleProjectSettingsControlBuilder.java
@@ -77,7 +77,7 @@ import static com.intellij.openapi.externalSystem.util.ExternalSystemUiUtil.INSE
  */
 @SuppressWarnings("FieldCanBeLocal") // Used implicitly by reflection at disposeUIResources() and showUi()
 public class IdeaGradleProjectSettingsControlBuilder implements GradleProjectSettingsControlBuilder {
-  private static final Logger LOG = Logger.getInstance("#" + IdeaGradleProjectSettingsControlBuilder.class.getPackage().getName());
+  private static final Logger LOG = Logger.getInstance(IdeaGradleProjectSettingsControlBuilder.class);
 
   private static final long BALLOON_DELAY_MILLIS = TimeUnit.SECONDS.toMillis(1);
   private static final String HIDDEN_KEY = "hidden";
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/settings/GradleSystemRunningSettings.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/settings/GradleSystemRunningSettings.java
index 66bf196541f9..cfa1318e11b2 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/settings/GradleSystemRunningSettings.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/settings/GradleSystemRunningSettings.java
@@ -12,7 +12,7 @@ import org.jetbrains.annotations.NotNull;
 @Deprecated
 @ApiStatus.ScheduledForRemoval(inVersion = "2020.1")
 public class GradleSystemRunningSettings {
-  private static final Logger LOG = Logger.getInstance("#" + GradleSystemRunningSettings.class.getPackage().getName());
+  private static final Logger LOG = Logger.getInstance(GradleSystemRunningSettings.class);
   private static boolean alreadyLogged = false;
 
   @NotNull
diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/unusedDef/UnusedDefInspection.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/unusedDef/UnusedDefInspection.java
index 674748cca88a..7912216af9c2 100644
--- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/unusedDef/UnusedDefInspection.java
+++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/unusedDef/UnusedDefInspection.java
@@ -43,7 +43,7 @@ import static org.jetbrains.plugins.groovy.lang.psi.dataFlow.UtilKt.getVarIndexe
  & @author ven
  */
 public class UnusedDefInspection extends GroovyLocalInspectionBase {
-  private static final Logger LOG = Logger.getInstance("#org.jetbrains.plugins.groovy.codeInspection.unusedDef.UnusedDefInspection");
+  private static final Logger LOG = Logger.getInstance(UnusedDefInspection.class);
 
   @NotNull
   @Override
diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/dsl/CustomMembersGenerator.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/dsl/CustomMembersGenerator.java
index 3d70212a2538..2faf25b7bb22 100644
--- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/dsl/CustomMembersGenerator.java
+++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/dsl/CustomMembersGenerator.java
@@ -39,7 +39,7 @@ import java.util.function.Consumer;
  * @author peter
  */
 public class CustomMembersGenerator extends GroovyObjectSupport implements GdslMembersHolderConsumer {
-  private static final Logger LOG = Logger.getInstance("#org.jetbrains.plugins.groovy.dsl.CustomMembersGenerator");
+  private static final Logger LOG = Logger.getInstance(CustomMembersGenerator.class);
   private static final GdslMembersProvider[] PROVIDERS = GdslMembersProvider.EP_NAME.getExtensions();
   public static final String THROWS = "throws";
   private FList<Map> myDeclarations = FList.emptyList();
diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/dsl/GroovyDslScript.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/dsl/GroovyDslScript.java
index 6ce907222b02..084da624cc2e 100644
--- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/dsl/GroovyDslScript.java
+++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/dsl/GroovyDslScript.java
@@ -27,7 +27,7 @@ import java.util.List;
  * @author peter
  */
 public class GroovyDslScript {
-  private static final Logger LOG = Logger.getInstance("#org.jetbrains.plugins.groovy.dsl.GroovyDslScript");
+  private static final Logger LOG = Logger.getInstance(GroovyDslScript.class);
   private final Project project;
   @Nullable private final VirtualFile file;
   private final GroovyDslExecutor executor;
diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/groovydoc/psi/impl/GrDocMethodParamsImpl.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/groovydoc/psi/impl/GrDocMethodParamsImpl.java
index d6054b9b75ac..63df5fe12255 100644
--- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/groovydoc/psi/impl/GrDocMethodParamsImpl.java
+++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/groovydoc/psi/impl/GrDocMethodParamsImpl.java
@@ -28,7 +28,7 @@ import java.util.List;
  */
 public class GrDocMethodParamsImpl extends GroovyDocPsiElementImpl implements GrDocMethodParams {
 
-  private static final Logger LOG = Logger.getInstance("#org.jetbrains.plugins.groovy.lang.groovydoc.psi.impl.GrDocMethodParamsImpl");
+  private static final Logger LOG = Logger.getInstance(GrDocMethodParamsImpl.class);
 
   public GrDocMethodParamsImpl(@NotNull ASTNode node) {
     super(node);
diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/params/GrParameterListImpl.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/params/GrParameterListImpl.java
index f78128d96ce5..84f77b0e716f 100644
--- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/params/GrParameterListImpl.java
+++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/params/GrParameterListImpl.java
@@ -32,7 +32,7 @@ import static org.jetbrains.plugins.groovy.lang.psi.GroovyElementTypes.T_RPAREN;
 public class GrParameterListImpl extends GrStubElementBase<EmptyStub>
   implements GrParameterList, StubBasedPsiElement<EmptyStub>, PsiListLikeElement {
 
-  private static final Logger LOG = Logger.getInstance("#org.jetbrains.plugins.groovy.lang.psi.impl.statements.params.GrParameterListImpl");
+  private static final Logger LOG = Logger.getInstance(GrParameterListImpl.class);
 
   public GrParameterListImpl(@NotNull ASTNode node) {
     super(node);
diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/types/GrCodeReferenceElementImpl.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/types/GrCodeReferenceElementImpl.java
index 6e11598aa909..c1daec656f35 100644
--- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/types/GrCodeReferenceElementImpl.java
+++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/types/GrCodeReferenceElementImpl.java
@@ -34,7 +34,7 @@ import static org.jetbrains.plugins.groovy.lang.psi.util.PropertyUtilKt.getAcces
  * @date: 26.03.2007
  */
 public class GrCodeReferenceElementImpl extends GrReferenceElementImpl<GrCodeReferenceElement> implements GrCodeReferenceElement {
-  private static final Logger LOG = Logger.getInstance("#org.jetbrains.plugins.groovy.lang.psi.impl.types.GrCodeReferenceElementImpl");
+  private static final Logger LOG = Logger.getInstance(GrCodeReferenceElementImpl.class);
 
   public GrCodeReferenceElementImpl(@NotNull ASTNode node) {
     super(node);
diff --git a/plugins/groovy/jps-plugin/src/org/jetbrains/jps/incremental/groovy/GreclipseBuilder.java b/plugins/groovy/jps-plugin/src/org/jetbrains/jps/incremental/groovy/GreclipseBuilder.java
index 5725d2129de7..f78f47b25190 100644
--- a/plugins/groovy/jps-plugin/src/org/jetbrains/jps/incremental/groovy/GreclipseBuilder.java
+++ b/plugins/groovy/jps-plugin/src/org/jetbrains/jps/incremental/groovy/GreclipseBuilder.java
@@ -44,7 +44,7 @@ import java.util.*;
  * @author peter
  */
 public class GreclipseBuilder extends ModuleLevelBuilder {
-  private static final Logger LOG = Logger.getInstance("#org.jetbrains.jps.incremental.groovy.GreclipseBuilder");
+  private static final Logger LOG = Logger.getInstance(GreclipseBuilder.class);
   private static final Key<Boolean> COMPILER_VERSION_INFO = Key.create("_greclipse_compiler_info_");
   public static final String ID = "Groovy-Eclipse";
   private static final Object ourGlobalEnvironmentLock = new String("GreclipseBuilder lock");
diff --git a/plugins/groovy/jps-plugin/src/org/jetbrains/jps/incremental/groovy/GroovyBuilder.java b/plugins/groovy/jps-plugin/src/org/jetbrains/jps/incremental/groovy/GroovyBuilder.java
index b2c5bd559f5a..b411dfa8c164 100644
--- a/plugins/groovy/jps-plugin/src/org/jetbrains/jps/incremental/groovy/GroovyBuilder.java
+++ b/plugins/groovy/jps-plugin/src/org/jetbrains/jps/incremental/groovy/GroovyBuilder.java
@@ -42,7 +42,7 @@ import java.io.IOException;
 import java.util.*;
 
 public class GroovyBuilder extends ModuleLevelBuilder {
-  private static final Logger LOG = Logger.getInstance("#org.jetbrains.jps.incremental.groovy.GroovyBuilder");
+  private static final Logger LOG = Logger.getInstance(GroovyBuilder.class);
   static final Key<Map<String, String>> STUB_TO_SRC = Key.create("STUB_TO_SRC");
   private static final Key<Boolean> FILES_MARKED_DIRTY_FOR_NEXT_ROUND = Key.create("SRC_MARKED_DIRTY");
   private static final String GROOVY_EXTENSION = "groovy";
diff --git a/plugins/groovy/jps-plugin/src/org/jetbrains/jps/incremental/groovy/InProcessGroovyc.java b/plugins/groovy/jps-plugin/src/org/jetbrains/jps/incremental/groovy/InProcessGroovyc.java
index 8d83ca10ef1f..7d9ffd6eb3fc 100644
--- a/plugins/groovy/jps-plugin/src/org/jetbrains/jps/incremental/groovy/InProcessGroovyc.java
+++ b/plugins/groovy/jps-plugin/src/org/jetbrains/jps/incremental/groovy/InProcessGroovyc.java
@@ -38,7 +38,7 @@ import java.util.regex.Pattern;
  * @author peter
  */
 class InProcessGroovyc implements GroovycFlavor {
-  private static final Logger LOG = Logger.getInstance("#org.jetbrains.jps.incremental.groovy.InProcessGroovyc");
+  private static final Logger LOG = Logger.getInstance(InProcessGroovyc.class);
   private static final Pattern GROOVY_ALL_JAR_PATTERN = Pattern.compile("groovy-all(-(.*))?\\.jar");
   private static final Pattern GROOVY_JAR_PATTERN = Pattern.compile("groovy(-(.*))?\\.jar");
   private static final Pattern GROOVY_ECLIPSE_BATCH_PATTERN = Pattern.compile("groovy-eclipse-batch-(.*)\\.jar");
diff --git a/plugins/groovy/jps-plugin/src/org/jetbrains/jps/incremental/groovy/JpsGroovycRunner.java b/plugins/groovy/jps-plugin/src/org/jetbrains/jps/incremental/groovy/JpsGroovycRunner.java
index 5a53e9aa40ab..a601955b9752 100644
--- a/plugins/groovy/jps-plugin/src/org/jetbrains/jps/incremental/groovy/JpsGroovycRunner.java
+++ b/plugins/groovy/jps-plugin/src/org/jetbrains/jps/incremental/groovy/JpsGroovycRunner.java
@@ -47,7 +47,7 @@ import java.util.*;
  */
 public abstract class JpsGroovycRunner<R extends BuildRootDescriptor, T extends BuildTarget<R>> {
   private static final int ourOptimizeThreshold = Integer.parseInt(System.getProperty("groovyc.optimized.class.loading.threshold", "10"));
-  private static final Logger LOG = Logger.getInstance("#org.jetbrains.jps.incremental.groovy.JpsGroovycRunner");
+  private static final Logger LOG = Logger.getInstance(JpsGroovycRunner.class);
   private static final Key<Boolean> CHUNK_REBUILD_ORDERED = Key.create("CHUNK_REBUILD_ORDERED");
   private static final Key<Map<ModuleChunk, GroovycContinuation>> CONTINUATIONS = Key.create("CONTINUATIONS");
   public static final String GROOVYC_IN_PROCESS = "groovyc.in.process";
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/CreateClassActionBase.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/CreateClassActionBase.java
index b84e51c470f1..daed51252900 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/CreateClassActionBase.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/CreateClassActionBase.java
@@ -45,7 +45,7 @@ public abstract class CreateClassActionBase extends Intention {
   private final GrCreateClassKind myType;
 
   protected final GrReferenceElement myRefElement;
-  private static final Logger LOG = Logger.getInstance("#org.jetbrains.plugins.groovy.annotator.intentions.CreateClassActionBase");
+  private static final Logger LOG = Logger.getInstance(CreateClassActionBase.class);
 
   public CreateClassActionBase(GrCreateClassKind type, GrReferenceElement refElement) {
     myType = type;
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/GroovyStaticImportMethodFix.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/GroovyStaticImportMethodFix.java
index 9d4afe1ec636..fba6b17b8036 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/GroovyStaticImportMethodFix.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/GroovyStaticImportMethodFix.java
@@ -50,7 +50,7 @@ import java.util.List;
  * @author Maxim.Medvedev
  */
 public class GroovyStaticImportMethodFix extends Intention {
-  private static final Logger LOG = Logger.getInstance("#org.jetbrains.plugins.groovy.annotator.intentions.GroovyStaticImportMethodFix");
+  private static final Logger LOG = Logger.getInstance(GroovyStaticImportMethodFix.class);
   private final SmartPsiElementPointer<GrMethodCall> myMethodCall;
   private List<PsiMethod> myCandidates = null;
 
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/GroovyOptimizeImportsFix.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/GroovyOptimizeImportsFix.java
index bbecf57c8b38..472b6c521901 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/GroovyOptimizeImportsFix.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/GroovyOptimizeImportsFix.java
@@ -39,12 +39,13 @@ import com.intellij.psi.PsiFile;
 import com.intellij.util.DocumentUtil;
 import com.intellij.util.IncorrectOperationException;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.plugins.groovy.codeInspection.local.GroovyPostHighlightingPass;
 import org.jetbrains.plugins.groovy.editor.GroovyImportOptimizer;
 import org.jetbrains.plugins.groovy.lang.psi.GroovyFile;
 import org.jetbrains.plugins.groovy.lang.psi.api.toplevel.imports.GrImportStatement;
 
 public class GroovyOptimizeImportsFix implements IntentionAction {
-  private static final Logger LOG = Logger.getInstance("#org.jetbrains.plugins.groovy.codeInspection.local.GroovyPostHighlightingPass");
+  private static final Logger LOG = Logger.getInstance(GroovyPostHighlightingPass.class);
   private final boolean onTheFly;
 
   public GroovyOptimizeImportsFix(boolean onTheFly) {
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/debugger/GroovyHotSwapper.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/debugger/GroovyHotSwapper.java
index 9d95117fa7c5..f792e02bf7fa 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/debugger/GroovyHotSwapper.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/debugger/GroovyHotSwapper.java
@@ -49,7 +49,7 @@ import java.util.regex.Pattern;
  * @author peter
  */
 public class GroovyHotSwapper extends JavaProgramPatcher {
-  private static final Logger LOG = Logger.getInstance("#org.jetbrains.plugins.groovy.debugger.GroovyHotSwapper");
+  private static final Logger LOG = Logger.getInstance(GroovyHotSwapper.class);
   private static final String GROOVY_HOTSWAP_AGENT_PATH = "groovy.hotswap.agent.path";
   private static final Pattern SPRING_LOADED_PATTERN = Pattern.compile("-javaagent:.+springloaded-[^/\\\\]+\\.jar");
   
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/debugger/GroovyPositionManager.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/debugger/GroovyPositionManager.java
index a8d9d629c6d8..4882219acfba 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/debugger/GroovyPositionManager.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/debugger/GroovyPositionManager.java
@@ -8,6 +8,7 @@ import com.intellij.debugger.SourcePosition;
 import com.intellij.debugger.engine.CompoundPositionManager;
 import com.intellij.debugger.engine.DebugProcess;
 import com.intellij.debugger.engine.DebugProcessImpl;
+import com.intellij.debugger.engine.PositionManagerImpl;
 import com.intellij.debugger.engine.jdi.VirtualMachineProxy;
 import com.intellij.debugger.impl.DebuggerUtilsEx;
 import com.intellij.debugger.requests.ClassPrepareRequestor;
@@ -48,7 +49,7 @@ import java.util.List;
 import java.util.Set;
 
 public class GroovyPositionManager implements PositionManager {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.engine.PositionManagerImpl");
+  private static final Logger LOG = Logger.getInstance(PositionManagerImpl.class);
 
   private final DebugProcess myDebugProcess;
   private static final Set<FileType> ourFileTypes = Collections.singleton(GroovyFileType.GROOVY_FILE_TYPE);
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/dsl/DslErrorReporterImpl.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/dsl/DslErrorReporterImpl.java
index 9a04b167c295..539879ac9de4 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/dsl/DslErrorReporterImpl.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/dsl/DslErrorReporterImpl.java
@@ -14,7 +14,7 @@ import org.jetbrains.annotations.NotNull;
 import javax.swing.event.HyperlinkEvent;
 
 public class DslErrorReporterImpl extends DslErrorReporter {
-  private static final Logger LOG = Logger.getInstance("#org.jetbrains.plugins.groovy.dsl.GroovyDslFileIndex");
+  private static final Logger LOG = Logger.getInstance(GroovyDslFileIndex.class);
   private final NotificationGroup NOTIFICATION_GROUP = new NotificationGroup("Groovy DSL errors", NotificationDisplayType.BALLOON, true);
 
   public DslErrorReporterImpl() {
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/gant/AntTasksProvider.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/gant/AntTasksProvider.java
index acf8d2996833..788e8e7e3c10 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/gant/AntTasksProvider.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/gant/AntTasksProvider.java
@@ -50,7 +50,7 @@ import java.util.concurrent.TimeoutException;
  * @author ilyas, peter
  */
 public class AntTasksProvider {
-  private static final Logger LOG = Logger.getInstance("#org.jetbrains.plugins.groovy.gant.AntTasksProvider");
+  private static final Logger LOG = Logger.getInstance(AntTasksProvider.class);
   private static final Key<CachedValue<Set<LightMethodBuilder>>> GANT_METHODS = Key.create("gantMethods");
   private static final Object ourLock = new Object();
   public static final ParameterizedCachedValueProvider<Map<List<URL>,AntClassLoader>,Project> PROVIDER =
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/grape/GrabDependencies.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/grape/GrabDependencies.java
index 5867396ea3cd..9675626a3ecf 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/grape/GrabDependencies.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/grape/GrabDependencies.java
@@ -78,7 +78,7 @@ import java.util.*;
  * @author peter
  */
 public class GrabDependencies implements IntentionAction {
-  private static final Logger LOG = Logger.getInstance("#org.jetbrains.plugins.groovy.grape.GrabDependencies");
+  private static final Logger LOG = Logger.getInstance(GrabDependencies.class);
 
   private static final NotificationGroup NOTIFICATION_GROUP = new NotificationGroup("Grape", NotificationDisplayType.BALLOON, true);
   public static final String GRAPE_RUNNER = "org.jetbrains.plugins.groovy.grape.GrapeRunner";
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/ConvertClosureToMethodIntention.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/ConvertClosureToMethodIntention.java
index f7f72ce355fc..a1c38508bf3e 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/ConvertClosureToMethodIntention.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/ConvertClosureToMethodIntention.java
@@ -44,7 +44,7 @@ import java.util.List;
  */
 public class ConvertClosureToMethodIntention extends Intention {
   private static final Logger LOG =
-    Logger.getInstance("#org.jetbrains.plugins.groovy.intentions.conversions.ConvertClosureToMethodIntention");
+    Logger.getInstance(ConvertClosureToMethodIntention.class);
 
   @NotNull
   @Override
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/ConvertMapToClassIntention.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/ConvertMapToClassIntention.java
index c13e14f01108..ddca3ad63603 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/ConvertMapToClassIntention.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/conversions/ConvertMapToClassIntention.java
@@ -72,7 +72,7 @@ import java.util.Map;
  * @author Maxim.Medvedev
  */
 public class ConvertMapToClassIntention extends Intention {
-  private static final Logger LOG = Logger.getInstance("#org.jetbrains.plugins.groovy.intentions.conversions.ConvertMapToClassIntention");
+  private static final Logger LOG = Logger.getInstance(ConvertMapToClassIntention.class);
 
   @Override
   public boolean startInWriteAction() {
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyNoVariantsDelegator.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyNoVariantsDelegator.java
index 3341fd57bd14..fa095a612ee8 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyNoVariantsDelegator.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyNoVariantsDelegator.java
@@ -25,7 +25,7 @@ import java.util.Set;
  * @author peter
  */
 public class GroovyNoVariantsDelegator extends CompletionContributor {
-  private static final Logger LOG = Logger.getInstance("#org.jetbrains.plugins.groovy.lang.completion.GroovyNoVariantsDelegator");
+  private static final Logger LOG = Logger.getInstance(GroovyNoVariantsDelegator.class);
 
   private static boolean suggestAnnotations(CompletionParameters parameters) {
     return PsiJavaPatterns.psiElement().withParents(GrCodeReferenceElement.class, GrAnnotation.class).accepts(parameters.getPosition());
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcConsole.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcConsole.java
index 32df89f49fd1..b1f9ccf1f1d5 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcConsole.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcConsole.java
@@ -51,7 +51,7 @@ import java.util.Queue;
 
 public final class MvcConsole implements Disposable {
   private static final Key<Boolean> UPDATING_BY_CONSOLE_PROCESS = Key.create("UPDATING_BY_CONSOLE_PROCESS");
-  private static final Logger LOG = Logger.getInstance("#org.jetbrains.plugins.groovy.mvc.MvcConsole");
+  private static final Logger LOG = Logger.getInstance(MvcConsole.class);
   @NonNls private static final String CONSOLE_ID = "Groovy MVC Console";
 
   @NonNls public static final String TOOL_WINDOW_ID = "Console";
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcFramework.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcFramework.java
index 9fafc7cb090f..d6a703920cdb 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcFramework.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcFramework.java
@@ -61,7 +61,7 @@ import java.util.regex.Pattern;
 public abstract class MvcFramework {
   protected static final ExtensionPointName<MvcFramework> EP_NAME = ExtensionPointName.create("org.intellij.groovy.mvc.framework");
 
-  private static final Logger LOG = Logger.getInstance("#org.jetbrains.plugins.groovy.mvc.MvcFramework");
+  private static final Logger LOG = Logger.getInstance(MvcFramework.class);
   public static final Key<Boolean> CREATE_APP_STRUCTURE = Key.create("CREATE_MVC_APP_STRUCTURE");
   public static final Key<Boolean> UPGRADE = Key.create("UPGRADE");
   @NonNls public static final String GROOVY_STARTER_CONF = "/conf/groovy-starter.conf";
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcModuleStructureUtil.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcModuleStructureUtil.java
index c3ab6b39a34c..729665829a9f 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcModuleStructureUtil.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcModuleStructureUtil.java
@@ -50,7 +50,7 @@ import java.util.*;
  * @author peter
  */
 public class MvcModuleStructureUtil {
-  private static final Logger LOG = Logger.getInstance("#org.jetbrains.plugins.groovy.mvc.MvcModuleStructureUtil");
+  private static final Logger LOG = Logger.getInstance(MvcModuleStructureUtil.class);
   @NonNls public static final String PLUGINS_DIRECTORY = "plugins";
   @NonNls public static final String APPLICATION_PROPERTIES = "application.properties";
   public static final Key<String> LAST_MVC_VERSION = Key.create("LAST_MVC_VERSION");
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/changeSignature/GrChangeSignatureProcessor.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/changeSignature/GrChangeSignatureProcessor.java
index 03b90e96d534..cbe844b17a84 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/changeSignature/GrChangeSignatureProcessor.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/changeSignature/GrChangeSignatureProcessor.java
@@ -38,7 +38,7 @@ import java.util.Set;
  */
 public class GrChangeSignatureProcessor extends ChangeSignatureProcessorBase {
   public static final Logger LOG =
-    Logger.getInstance("#org.jetbrains.plugins.groovy.refactoring.changeSignature.GrChangeSignatureProcessor");
+    Logger.getInstance(GrChangeSignatureProcessor.class);
 
   public GrChangeSignatureProcessor(Project project, GrChangeInfoImpl changeInfo) {
     super(project, changeInfo);
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/changeSignature/GrChangeSignatureUsageProcessor.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/changeSignature/GrChangeSignatureUsageProcessor.java
index 675801ca1aec..6c20c9e14c37 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/changeSignature/GrChangeSignatureUsageProcessor.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/changeSignature/GrChangeSignatureUsageProcessor.java
@@ -73,7 +73,7 @@ import static org.jetbrains.plugins.groovy.lang.psi.util.PsiTreeUtilKt.treeWalkU
  */
 public class GrChangeSignatureUsageProcessor implements ChangeSignatureUsageProcessor {
   private static final Logger LOG =
-    Logger.getInstance("#org.jetbrains.plugins.groovy.refactoring.changeSignature.GrChangeSignatureUsageProcessor");
+    Logger.getInstance(GrChangeSignatureUsageProcessor.class);
 
   @Override
   public UsageInfo[] findUsages(ChangeInfo info) {
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/ArgumentListGenerator.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/ArgumentListGenerator.java
index 54463edaaaa6..ae3a88de152f 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/ArgumentListGenerator.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/ArgumentListGenerator.java
@@ -24,7 +24,7 @@ import java.util.Arrays;
  * @author Maxim.Medvedev
  */
 class ArgumentListGenerator {
-  private static final Logger LOG = Logger.getInstance("#org.jetbrains.plugins.groovy.refactoring.convertToJava.ArgumentListGenerator");
+  private static final Logger LOG = Logger.getInstance(ArgumentListGenerator.class);
 
   private final StringBuilder myBuilder;
   private final ExpressionGenerator myExpressionGenerator;
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/ClassItemGeneratorImpl.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/ClassItemGeneratorImpl.java
index acc9ed647e94..468674fb8ef6 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/ClassItemGeneratorImpl.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/ClassItemGeneratorImpl.java
@@ -43,7 +43,7 @@ import static org.jetbrains.plugins.groovy.lang.psi.util.GroovyCommonClassNames.
  * @author Maxim.Medvedev
  */
 public class ClassItemGeneratorImpl implements ClassItemGenerator {
-  private static final Logger LOG = Logger.getInstance("#org.jetbrains.plugins.groovy.refactoring.convertToJava.ClassItemGeneratorImpl");
+  private static final Logger LOG = Logger.getInstance(ClassItemGeneratorImpl.class);
 
   private final ClassNameProvider classNameProvider;
   private final ExpressionContext context;
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/CodeBlockGenerator.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/CodeBlockGenerator.java
index d1607d5dca88..c61a79cf434e 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/CodeBlockGenerator.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/CodeBlockGenerator.java
@@ -51,7 +51,7 @@ import java.util.Set;
  * @author Maxim.Medvedev
  */
 public class CodeBlockGenerator extends Generator {
-  private static final Logger LOG = Logger.getInstance("#org.jetbrains.plugins.groovy.refactoring.convertToJava.CodeBlockGenerator");
+  private static final Logger LOG = Logger.getInstance(CodeBlockGenerator.class);
 
   private static final boolean IN_TEST = ApplicationManager.getApplication().isUnitTestMode();
 
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/ExpressionGenerator.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/ExpressionGenerator.java
index dbde51064375..cf3ae7dd3056 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/ExpressionGenerator.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/ExpressionGenerator.java
@@ -70,7 +70,7 @@ import static org.jetbrains.plugins.groovy.lang.psi.util.GroovyIndexPropertyUtil
  * @author Maxim.Medvedev
  */
 public class ExpressionGenerator extends Generator {
-  private static final Logger LOG = Logger.getInstance("#org.jetbrains.plugins.groovy.refactoring.convertToJava.ExpressionGenerator");
+  private static final Logger LOG = Logger.getInstance(ExpressionGenerator.class);
 
   private final StringBuilder builder;
   private final GroovyPsiElementFactory factory;
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/GenerationUtil.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/GenerationUtil.java
index b52101b747b9..82e022c619c3 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/GenerationUtil.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/GenerationUtil.java
@@ -51,7 +51,7 @@ import static org.jetbrains.plugins.groovy.lang.psi.util.GroovyIndexPropertyUtil
  * @author Maxim.Medvedev
  */
 public class GenerationUtil {
-  private static final Logger LOG = Logger.getInstance("#org.jetbrains.plugins.groovy.refactoring.convertToJava.GenerationUtil");
+  private static final Logger LOG = Logger.getInstance(GenerationUtil.class);
 
   private GenerationUtil() {
   }
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/StubGenerator.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/StubGenerator.java
index b9293872735a..ff7d140c6030 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/StubGenerator.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/StubGenerator.java
@@ -59,7 +59,7 @@ public class StubGenerator implements ClassItemGenerator {
   };
 
   private final ClassNameProvider classNameProvider;
-  private static final Logger LOG = Logger.getInstance("#org.jetbrains.plugins.groovy.refactoring.convertToJava.StubGenerator");
+  private static final Logger LOG = Logger.getInstance(StubGenerator.class);
 
   public StubGenerator(ClassNameProvider classNameProvider) {
     this.classNameProvider = classNameProvider;
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/inline/GroovyMethodInliner.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/inline/GroovyMethodInliner.java
index c64e9a637ec5..ef0b55f8b332 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/inline/GroovyMethodInliner.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/inline/GroovyMethodInliner.java
@@ -58,7 +58,7 @@ import java.util.Collection;
 public class GroovyMethodInliner implements InlineHandler.Inliner {
 
   private final GrMethod myMethod;
-  private static final Logger LOG = Logger.getInstance("#org.jetbrains.plugins.groovy.refactoring.inline.GroovyMethodInliner");
+  private static final Logger LOG = Logger.getInstance(GroovyMethodInliner.class);
 
   public GroovyMethodInliner(GrMethod method) {
     myMethod = method;
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/constant/GrIntroduceConstantDialog.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/constant/GrIntroduceConstantDialog.java
index f76339e59108..601e18a71f1a 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/constant/GrIntroduceConstantDialog.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/constant/GrIntroduceConstantDialog.java
@@ -64,7 +64,7 @@ import java.util.*;
 public class GrIntroduceConstantDialog extends DialogWrapper
   implements GrIntroduceConstantSettings, GrIntroduceDialog<GrIntroduceConstantSettings> {
 
-  private static final Logger LOG  = Logger.getInstance("#org.jetbrains.plugins.groovy.refactoring.introduce.constant.GrIntroduceConstantDialog");
+  private static final Logger LOG = Logger.getInstance(GrIntroduceConstantDialog.class);
 
   private final GrIntroduceContext myContext;
   private JLabel myNameLabel;
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/parameter/FieldConflictsResolver.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/parameter/FieldConflictsResolver.java
index 8417a6ae5ce8..c1f5ca35b530 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/parameter/FieldConflictsResolver.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/parameter/FieldConflictsResolver.java
@@ -41,7 +41,7 @@ import java.util.List;
  */
 public class FieldConflictsResolver {
   private static final Logger LOG =
-    Logger.getInstance("#org.jetbrains.plugins.groovy.refactoring.introduce.parameter.FieldConflictsResolver");
+    Logger.getInstance(FieldConflictsResolver.class);
   private final GrCodeBlock myScope;
   private PsiField myField = null;
   private List<GrReferenceExpression> myReferenceExpressions = null;
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/parameter/GrIntroduceParameterProcessor.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/parameter/GrIntroduceParameterProcessor.java
index 1e976afcfed5..c1dd26d2903b 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/parameter/GrIntroduceParameterProcessor.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/parameter/GrIntroduceParameterProcessor.java
@@ -57,7 +57,7 @@ import java.util.Collection;
  * @author Maxim.Medvedev
  */
 public class GrIntroduceParameterProcessor extends BaseRefactoringProcessor implements IntroduceParameterData {
-  private static final Logger LOG = Logger.getInstance("#org.jetbrains.plugins.groovy.refactoring.introduce.parameter.GrIntroduceParameterProcessor");
+  private static final Logger LOG = Logger.getInstance(GrIntroduceParameterProcessor.class);
 
   private final GrIntroduceParameterSettings mySettings;
   private final IntroduceParameterData.ExpressionWrapper myParameterInitializer;
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/rename/RenameGroovyPropertyProcessor.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/rename/RenameGroovyPropertyProcessor.java
index b8a454cf646e..153b97ecd7a7 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/rename/RenameGroovyPropertyProcessor.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/rename/RenameGroovyPropertyProcessor.java
@@ -21,7 +21,7 @@ import java.util.Map;
  * @author Maxim.Medvedev
  */
 public class RenameGroovyPropertyProcessor extends RenamePsiElementProcessor {
-  Logger LOG = Logger.getInstance("#org.jetbrains.plugins.groovy.refactoring.rename.RenameGroovyPropertyProcessor");
+  Logger LOG = Logger.getInstance(RenameGroovyPropertyProcessor.class);
 
   @Override
   public void prepareRenaming(@NotNull PsiElement element, @NotNull String newName, @NotNull Map<PsiElement, String> allRenames) {
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/rename/inplace/GroovyResolveSnapshot.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/rename/inplace/GroovyResolveSnapshot.java
index d12b7416a201..d2f558146871 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/rename/inplace/GroovyResolveSnapshot.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/rename/inplace/GroovyResolveSnapshot.java
@@ -37,7 +37,7 @@ import java.util.Map;
  * @author Maxim.Medvedev
  */
 public class GroovyResolveSnapshot extends ResolveSnapshotProvider.ResolveSnapshot {
-  private static final Logger LOG = Logger.getInstance("#org.jetbrains.plugins.groovy.refactoring.rename.inplace.GroovyResolveSnapshot");
+  private static final Logger LOG = Logger.getInstance(GroovyResolveSnapshot.class);
 
   private final Map<SmartPsiElementPointer, SmartPsiElementPointer> myReferencesMap =
     new HashMap<>();
diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/execution/HgDeleteModifyPromptHandler.java b/plugins/hg4idea/src/org/zmlx/hg4idea/execution/HgDeleteModifyPromptHandler.java
index d908d5ad180c..4965ae5ecfb8 100644
--- a/plugins/hg4idea/src/org/zmlx/hg4idea/execution/HgDeleteModifyPromptHandler.java
+++ b/plugins/hg4idea/src/org/zmlx/hg4idea/execution/HgDeleteModifyPromptHandler.java
@@ -16,7 +16,7 @@ import java.util.regex.Pattern;
  */
 public class HgDeleteModifyPromptHandler implements HgPromptHandler {
 
-  private static final Logger LOG = Logger.getInstance("#org.zmlx.hg4idea.execution.HgDeleteModifyPromptHandler");
+  private static final Logger LOG = Logger.getInstance(HgDeleteModifyPromptHandler.class);
 
   private static final Pattern LOCAL_DELETE_REMOTE_MODIFIED_CONFLICT_MESSAGE_PATTERN = Pattern.compile(
     "remote\\schanged(.+)which\\slocal\\sdeleted\\s.+");
diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/sceneBuilder/SceneBuilderEditor.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/sceneBuilder/SceneBuilderEditor.java
index 5187509a9a77..e4d6e7a6cfde 100644
--- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/sceneBuilder/SceneBuilderEditor.java
+++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/sceneBuilder/SceneBuilderEditor.java
@@ -40,7 +40,7 @@ import java.util.List;
  * @author Alexander Lobas
  */
 public class SceneBuilderEditor extends UserDataHolderBase implements FileEditor, EditorCallback {
-  private static final Logger LOG = Logger.getInstance("#org.jetbrains.plugins.javaFX.sceneBuilder.SceneBuilderEditor");
+  private static final Logger LOG = Logger.getInstance(SceneBuilderEditor.class);
 
   private final static String SCENE_CARD = "scene_builder";
   private final static String ERROR_CARD = "error";
diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/sceneBuilder/SceneBuilderUtil.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/sceneBuilder/SceneBuilderUtil.java
index 05ff3f7ceecd..b1d3655b9140 100644
--- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/sceneBuilder/SceneBuilderUtil.java
+++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/sceneBuilder/SceneBuilderUtil.java
@@ -17,7 +17,7 @@ import java.nio.file.Path;
 import java.nio.file.Paths;
 
 class SceneBuilderUtil {
-  private static final Logger LOG = Logger.getInstance("#org.jetbrains.plugins.javaFX.sceneBuilder.SceneBuilderUtil");
+  private static final Logger LOG = Logger.getInstance(SceneBuilderUtil.class);
   private static final URLClassLoader ourLoader = createClassLoader();
 
   private static boolean isJava8() {
diff --git a/plugins/maven/jps-plugin/src/org/jetbrains/jps/maven/model/impl/JpsMavenExtensionServiceImpl.java b/plugins/maven/jps-plugin/src/org/jetbrains/jps/maven/model/impl/JpsMavenExtensionServiceImpl.java
index 7ed85ff7eded..6a9452cb291a 100644
--- a/plugins/maven/jps-plugin/src/org/jetbrains/jps/maven/model/impl/JpsMavenExtensionServiceImpl.java
+++ b/plugins/maven/jps-plugin/src/org/jetbrains/jps/maven/model/impl/JpsMavenExtensionServiceImpl.java
@@ -42,7 +42,7 @@ import java.util.Map;
  * @author nik
  */
 public class JpsMavenExtensionServiceImpl extends JpsMavenExtensionService {
-  private static final Logger LOG = Logger.getInstance("#org.jetbrains.jps.maven.model.impl.JpsMavenExtensionServiceImpl");
+  private static final Logger LOG = Logger.getInstance(JpsMavenExtensionServiceImpl.class);
   private static final JpsElementChildRole<JpsSimpleElement<Boolean>> PRODUCTION_ON_TEST_ROLE = JpsElementChildRoleBase.create("maven production on test");
   private final Map<File, MavenProjectConfiguration> myLoadedConfigs =
     new THashMap<>(FileUtil.FILE_HASHING_STRATEGY);
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenCompilerAnnotationProcessorPathsImporter.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenCompilerAnnotationProcessorPathsImporter.java
index 5603325cc1bf..a136a18a0672 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenCompilerAnnotationProcessorPathsImporter.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenCompilerAnnotationProcessorPathsImporter.java
@@ -25,7 +25,7 @@ import java.util.Map;
 
 public class MavenCompilerAnnotationProcessorPathsImporter extends MavenImporter {
 
-  private final Logger LOG = Logger.getInstance("#org.jetbrains.idea.maven.importing.MavenCompilerAnnotationProcessorPathsImporter");
+  private final Logger LOG = Logger.getInstance(MavenCompilerAnnotationProcessorPathsImporter.class);
 
   public MavenCompilerAnnotationProcessorPathsImporter() {
     super("org.apache.maven.plugins", "maven-compiler-plugin");
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenCompilerImporter.kt b/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenCompilerImporter.kt
index 3b322c7fa193..a69535b1f77a 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenCompilerImporter.kt
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenCompilerImporter.kt
@@ -23,7 +23,7 @@ import org.jetbrains.jps.model.java.compiler.JpsJavaCompilerOptions
  * @author Vladislav.Soroka
  */
 class MavenCompilerImporter : MavenImporter("org.apache.maven.plugins", "maven-compiler-plugin") {
-  private val LOG = Logger.getInstance("#org.jetbrains.idea.maven.importing.MavenCompilerImporter")
+  private val LOG = Logger.getInstance(MavenCompilerImporter::class.java)
 
   override fun isApplicable(mavenProject: MavenProject?): Boolean {
     return super.isApplicable(mavenProject) && Registry.`is`("maven.import.compiler.arguments", true)
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/actions/ToggleOfflineAction.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/actions/ToggleOfflineAction.java
index 9a96b4d54e00..219279b0f59c 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/actions/ToggleOfflineAction.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/actions/ToggleOfflineAction.java
@@ -25,7 +25,7 @@ import org.jetbrains.idea.maven.utils.actions.MavenActionUtil;
 import org.jetbrains.idea.maven.utils.actions.MavenToggleAction;
 
 public class ToggleOfflineAction extends MavenToggleAction {
-  private static final Logger LOG = Logger.getInstance("#" + ToggleOfflineAction.class.getPackage().getName());
+  private static final Logger LOG = Logger.getInstance(ToggleOfflineAction.class);
 
   @Override
   public void update(@NotNull AnActionEvent e) {
diff --git a/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/RemovePropertyLocalFix.java b/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/RemovePropertyLocalFix.java
index 17038388b2e0..edc7baac61fc 100644
--- a/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/RemovePropertyLocalFix.java
+++ b/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/RemovePropertyLocalFix.java
@@ -29,7 +29,7 @@ import org.jetbrains.annotations.NotNull;
  * @author cdr
 */
 public class RemovePropertyLocalFix implements LocalQuickFix {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.lang.properties.RemovePropertyLocalFix");
+  private static final Logger LOG = Logger.getInstance(RemovePropertyLocalFix.class);
   public static final RemovePropertyLocalFix INSTANCE = new RemovePropertyLocalFix();
 
   @Override
diff --git a/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/parsing/Parsing.java b/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/parsing/Parsing.java
index 27e79991373f..8cdcecbc3a07 100644
--- a/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/parsing/Parsing.java
+++ b/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/parsing/Parsing.java
@@ -24,7 +24,7 @@ import com.intellij.openapi.diagnostic.Logger;
  * @author Alexey
  */
 public class Parsing {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.lang.properties.parsing.Parsing");
+  private static final Logger LOG = Logger.getInstance(Parsing.class);
 
   public static void parseProperty(PsiBuilder builder) {
     if (builder.getTokenType() == PropertiesTokenTypes.KEY_CHARACTERS) {
diff --git a/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/psi/impl/PropertyImpl.java b/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/psi/impl/PropertyImpl.java
index 70e17d8f0d6f..504bb96c16b0 100644
--- a/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/psi/impl/PropertyImpl.java
+++ b/plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/psi/impl/PropertyImpl.java
@@ -29,7 +29,7 @@ import java.util.List;
  * @author max
  */
 public class PropertyImpl extends PropertiesStubElementImpl<PropertyStub> implements Property, PsiLanguageInjectionHost {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.lang.properties.psi.impl.PropertyImpl");
+  private static final Logger LOG = Logger.getInstance(PropertyImpl.class);
 
   public PropertyImpl(@NotNull ASTNode node) {
     super(node);
diff --git a/plugins/properties/src/com/intellij/lang/properties/editor/ResourceBundleEditor.java b/plugins/properties/src/com/intellij/lang/properties/editor/ResourceBundleEditor.java
index 833a8fb57d33..0fed9e59f3e8 100644
--- a/plugins/properties/src/com/intellij/lang/properties/editor/ResourceBundleEditor.java
+++ b/plugins/properties/src/com/intellij/lang/properties/editor/ResourceBundleEditor.java
@@ -84,8 +84,8 @@ import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 
 public class ResourceBundleEditor extends UserDataHolderBase implements DocumentsEditor {
-  private static final         Logger LOG                  =
-    Logger.getInstance("#com.intellij.lang.properties.editor.ResourceBundleEditor");
+  private static final Logger LOG =
+    Logger.getInstance(ResourceBundleEditor.class);
   @NonNls private static final String VALUES               = "values";
   @NonNls private static final String NO_PROPERTY_SELECTED = "noPropertySelected";
   public static final Key<ResourceBundleEditor> RESOURCE_BUNDLE_EDITOR_KEY = Key.create("resourceBundleEditor");
diff --git a/plugins/stats-collector/src/com/intellij/completion/settings/CompletionMLRankingSettings.java b/plugins/stats-collector/src/com/intellij/completion/settings/CompletionMLRankingSettings.java
index e7f4a75bad3e..25dda62ffae6 100644
--- a/plugins/stats-collector/src/com/intellij/completion/settings/CompletionMLRankingSettings.java
+++ b/plugins/stats-collector/src/com/intellij/completion/settings/CompletionMLRankingSettings.java
@@ -16,7 +16,7 @@ import java.util.*;
 
 @State(name = "CompletionMLRankingSettings", storages = @Storage("completionMLRanking.xml"))
 public class CompletionMLRankingSettings implements PersistentStateComponent<CompletionMLRankingSettings.State> {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.completion.settings.CompletionMLRankingSettings");
+  private static final Logger LOG = Logger.getInstance(CompletionMLRankingSettings.class);
 
   private static final Collection<String> ENABLE_RANKING_BY_DEFAULT = Collections.emptyList();
   private final State myState = new State();
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnChangeProvider.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnChangeProvider.java
index 2fad731cd661..2645c9c5eabf 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnChangeProvider.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnChangeProvider.java
@@ -41,7 +41,7 @@ import static org.jetbrains.idea.svn.SvnUtil.isAncestor;
  * @author yole
  */
 public class SvnChangeProvider implements ChangeProvider {
-  private static final Logger LOG = Logger.getInstance("#org.jetbrains.idea.svn.SvnChangeProvider");
+  private static final Logger LOG = Logger.getInstance(SvnChangeProvider.class);
   public static final String PROPERTY_LAYER = "Property";
 
   @NotNull private final SvnVcs myVcs;
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnChangelistListener.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnChangelistListener.java
index fb302ecf24c8..0f810afb2fa3 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnChangelistListener.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnChangelistListener.java
@@ -23,7 +23,7 @@ import java.util.Collection;
 import java.util.List;
 
 public class SvnChangelistListener implements ChangeListListener {
-  private final static Logger LOG = Logger.getInstance("#org.jetbrains.idea.svn.SvnChangelistListener");
+  private final static Logger LOG = Logger.getInstance(SvnChangelistListener.class);
 
   @NotNull private final SvnVcs myVcs;
   @NotNull private final Condition<FilePath> myUnderSvnCondition;
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnDiffProvider.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnDiffProvider.java
index 2918911f0c83..283de1ef8cf2 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnDiffProvider.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnDiffProvider.java
@@ -36,7 +36,7 @@ import static com.intellij.openapi.vfs.VfsUtilCore.virtualToIoFile;
 
 public class SvnDiffProvider extends DiffProviderEx implements DiffProvider, DiffMixin {
 
-  private static final Logger LOG = Logger.getInstance("#org.jetbrains.idea.svn.SvnDiffProvider");
+  private static final Logger LOG = Logger.getInstance(SvnDiffProvider.class);
 
   public static final String COMMIT_MESSAGE = "svn:log";
   private static final int BATCH_INFO_SIZE = 20;
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnEntriesFileListener.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnEntriesFileListener.java
index ee8c4185d537..aed0071bc3d1 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnEntriesFileListener.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnEntriesFileListener.java
@@ -31,7 +31,7 @@ import java.util.List;
 
 public class SvnEntriesFileListener implements VirtualFileListener {
   private final Project myProject;
-  private static final Logger LOG = Logger.getInstance("#org.jetbrains.idea.svn.SvnEntriesFileListener");
+  private static final Logger LOG = Logger.getInstance(SvnEntriesFileListener.class);
   private final VcsDirtyScopeManager myDirtyScopeManager;
 
   public SvnEntriesFileListener(final Project project) {
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnRecursiveStatusWalker.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnRecursiveStatusWalker.java
index bcbdffcf62c9..03dc7c8ec33b 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnRecursiveStatusWalker.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnRecursiveStatusWalker.java
@@ -36,7 +36,7 @@ import static com.intellij.openapi.vfs.VirtualFileVisitor.SKIP_ROOT;
 import static com.intellij.util.containers.ContainerUtil.ar;
 
 public class SvnRecursiveStatusWalker {
-  private static final Logger LOG = Logger.getInstance("#org.jetbrains.idea.svn.SvnRecursiveStatusWalker");
+  private static final Logger LOG = Logger.getInstance(SvnRecursiveStatusWalker.class);
 
   @NotNull private final SvnVcs myVcs;
   @NotNull private final Project myProject;
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnUtil.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnUtil.java
index 5bd35f7029b7..e81f04ca2820 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnUtil.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnUtil.java
@@ -82,7 +82,7 @@ public class SvnUtil {
           ? Paths.get(notNull(EnvironmentUtil.getValue("ALLUSERSPROFILE")), "Application Data", "Subversion")
           : Paths.get("/etc/subversion"));
 
-  private static final Logger LOG = Logger.getInstance("#org.jetbrains.idea.svn.SvnUtil");
+  private static final Logger LOG = Logger.getInstance(SvnUtil.class);
 
   public static final Pattern ERROR_PATTERN = Pattern.compile("^svn: (E(\\d+)): (.*)$", Pattern.MULTILINE);
   public static final Pattern WARNING_PATTERN = Pattern.compile("^svn: warning: (W(\\d+)): (.*)$", Pattern.MULTILINE);
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/SvnMergeProvider.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/SvnMergeProvider.java
index a1b6e529bda0..a0de86b831b3 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/SvnMergeProvider.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/SvnMergeProvider.java
@@ -31,7 +31,7 @@ import static com.intellij.openapi.vfs.VfsUtilCore.virtualToIoFile;
 public class SvnMergeProvider implements MergeProvider {
 
   private final Project myProject;
-  private static final Logger LOG = Logger.getInstance("#org.jetbrains.idea.svn.actions.SvnMergeProvider");
+  private static final Logger LOG = Logger.getInstance(SvnMergeProvider.class);
 
   public SvnMergeProvider(final Project project) {
     myProject = project;
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/history/LoadedRevisionsCache.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/history/LoadedRevisionsCache.java
index 65e024d48d1c..48c00f04924b 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/history/LoadedRevisionsCache.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/history/LoadedRevisionsCache.java
@@ -19,7 +19,7 @@ import org.jetbrains.annotations.Nullable;
 import java.util.*;
 
 public class LoadedRevisionsCache implements Disposable {
-  private static final Logger LOG = Logger.getInstance("#org.jetbrains.idea.svn.history.LoadedRevisionsCache");
+  private static final Logger LOG = Logger.getInstance(LoadedRevisionsCache.class);
 
   private final Project myProject;
   private final Map<String, Bunch> myMap;
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/history/RootsAndBranches.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/history/RootsAndBranches.java
index d06c69953c85..8b301164799f 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/history/RootsAndBranches.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/history/RootsAndBranches.java
@@ -47,7 +47,7 @@ import java.util.Map;
 import static org.jetbrains.idea.svn.SvnBundle.message;
 
 public class RootsAndBranches implements CommittedChangeListDecorator {
-  private static final Logger LOG = Logger.getInstance("#org.jetbrains.idea.svn.history.RootsAndBranches");
+  private static final Logger LOG = Logger.getInstance(RootsAndBranches.class);
 
   @NotNull private final SvnVcs myVcs;
   @NotNull private final Project myProject;
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/history/SvnRevisionsNavigationMediator.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/history/SvnRevisionsNavigationMediator.java
index b70fe1952edc..609ae75f1915 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/history/SvnRevisionsNavigationMediator.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/history/SvnRevisionsNavigationMediator.java
@@ -21,7 +21,7 @@ import org.jetbrains.idea.svn.info.Info;
 import java.util.*;
 
 public class SvnRevisionsNavigationMediator implements CommittedChangesNavigation {
-  private static final Logger LOG = Logger.getInstance("#org.jetbrains.idea.svn.history.SvnRevisionsNavigationMediator");
+  private static final Logger LOG = Logger.getInstance(SvnRevisionsNavigationMediator.class);
 
   public final static int CHUNK_SIZE = 50;
 
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/update/AbstractUpdateIntegrateCrawler.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/update/AbstractUpdateIntegrateCrawler.java
index 1738204dc838..ab3465be8bd4 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/update/AbstractUpdateIntegrateCrawler.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/update/AbstractUpdateIntegrateCrawler.java
@@ -19,7 +19,7 @@ public abstract class AbstractUpdateIntegrateCrawler implements SvnWCRootCrawler
   protected final Collection<VcsException> myExceptions;
   protected final UpdatedFiles myPostUpdateFiles;
   protected final boolean myIsTotalUpdate;
-  private final static Logger LOG = Logger.getInstance("#org.jetbrains.idea.svn.update.AbstractUpdateIntegrateCrawler");
+  private final static Logger LOG = Logger.getInstance(AbstractUpdateIntegrateCrawler.class);
 
   protected AbstractUpdateIntegrateCrawler(
     final boolean isTotalUpdate,
diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/fogbugz/FogBugzRepository.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/fogbugz/FogBugzRepository.java
index 12e2023ced6e..e3171d1acd4b 100644
--- a/plugins/tasks/tasks-core/src/com/intellij/tasks/fogbugz/FogBugzRepository.java
+++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/fogbugz/FogBugzRepository.java
@@ -45,7 +45,7 @@ import java.util.List;
  */
 @Tag("FogBugz")
 public class FogBugzRepository extends BaseRepositoryImpl {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.tasks.fogbugz.FogBugzRepository");
+  private static final Logger LOG = Logger.getInstance(FogBugzRepository.class);
 
   private String myToken;
 
diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/generic/RegExResponseHandler.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/generic/RegExResponseHandler.java
index 4b8c3ac33d7b..acf36f8c36f3 100644
--- a/plugins/tasks/tasks-core/src/com/intellij/tasks/generic/RegExResponseHandler.java
+++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/generic/RegExResponseHandler.java
@@ -31,7 +31,7 @@ import java.util.regex.Pattern;
  */
 @Tag("RegExResponseHandler")
 public final class RegExResponseHandler extends ResponseHandler {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.tasks.generic.RegExResponseHandler");
+  private static final Logger LOG = Logger.getInstance(RegExResponseHandler.class);
   private static final String ID_PLACEHOLDER = "{id}";
   private static final String SUMMARY_PLACEHOLDER = "{summary}";
 
diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/lighthouse/LighthouseRepository.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/lighthouse/LighthouseRepository.java
index 1638d520f7c5..4ccebd1be5e4 100644
--- a/plugins/tasks/tasks-core/src/com/intellij/tasks/lighthouse/LighthouseRepository.java
+++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/lighthouse/LighthouseRepository.java
@@ -51,7 +51,7 @@ import java.util.regex.Pattern;
  */
 @Tag("Lighthouse")
 public class LighthouseRepository extends BaseRepositoryImpl {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.tasks.lighthouse.LighthouseRepository");
+  private static final Logger LOG = Logger.getInstance(LighthouseRepository.class);
   private static final Pattern DATE_PATTERN = Pattern.compile("(\\d\\d\\d\\d\\-\\d\\d\\-\\d\\d).*(\\d\\d:\\d\\d:\\d\\d).*");
   private static final DateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/youtrack/YouTrackRepository.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/youtrack/YouTrackRepository.java
index 818741c96167..bae195cb5573 100644
--- a/plugins/tasks/tasks-core/src/com/intellij/tasks/youtrack/YouTrackRepository.java
+++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/youtrack/YouTrackRepository.java
@@ -328,7 +328,7 @@ public class YouTrackRepository extends BaseRepositoryImpl {
     return Comparing.equal(repository.getDefaultSearch(), getDefaultSearch());
   }
 
-  private static final Logger LOG = Logger.getInstance("#com.intellij.tasks.youtrack.YouTrackRepository");
+  private static final Logger LOG = Logger.getInstance(YouTrackRepository.class);
 
   @Override
   public void updateTimeSpent(@NotNull LocalTask task, @NotNull String timeSpent, @NotNull String comment) throws Exception {
diff --git a/plugins/ui-designer-core/src/com/intellij/designer/clipboard/SimpleTransferable.java b/plugins/ui-designer-core/src/com/intellij/designer/clipboard/SimpleTransferable.java
index 378e338da6c6..eaae4eb704b6 100644
--- a/plugins/ui-designer-core/src/com/intellij/designer/clipboard/SimpleTransferable.java
+++ b/plugins/ui-designer-core/src/com/intellij/designer/clipboard/SimpleTransferable.java
@@ -27,7 +27,7 @@ import java.io.IOException;
  * @author yole
  */
 public class SimpleTransferable implements Transferable {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.designer.clipboard.SimpleTransferable");
+  private static final Logger LOG = Logger.getInstance(SimpleTransferable.class);
 
   private final Object myData;
   private final DataFlavor myFlavor;
diff --git a/plugins/ui-designer-core/src/com/intellij/designer/designSurface/DesignerEditorPanel.java b/plugins/ui-designer-core/src/com/intellij/designer/designSurface/DesignerEditorPanel.java
index caf258de0380..a7b79a6ff234 100644
--- a/plugins/ui-designer-core/src/com/intellij/designer/designSurface/DesignerEditorPanel.java
+++ b/plugins/ui-designer-core/src/com/intellij/designer/designSurface/DesignerEditorPanel.java
@@ -68,7 +68,7 @@ import java.util.Map;
  */
 public abstract class DesignerEditorPanel extends JPanel
   implements DesignerEditorPanelFacade, DataProvider, ModuleProvider, RadPropertyContext {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.designer.designSurface.DesignerEditorPanel");
+  private static final Logger LOG = Logger.getInstance(DesignerEditorPanel.class);
 
   protected static final Integer LAYER_COMPONENT = JLayeredPane.DEFAULT_LAYER;
   protected static final Integer LAYER_DECORATION = JLayeredPane.POPUP_LAYER;
diff --git a/plugins/ui-designer-core/src/com/intellij/designer/designSurface/InplaceEditingLayer.java b/plugins/ui-designer-core/src/com/intellij/designer/designSurface/InplaceEditingLayer.java
index 2a20ecf889cc..d80fd96b4f45 100644
--- a/plugins/ui-designer-core/src/com/intellij/designer/designSurface/InplaceEditingLayer.java
+++ b/plugins/ui-designer-core/src/com/intellij/designer/designSurface/InplaceEditingLayer.java
@@ -35,7 +35,7 @@ import java.util.List;
  * @author Vladimir Kondratyev
  */
 public class InplaceEditingLayer extends JComponent {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.designer.designSurface.InplaceEditingLayer");
+  private static final Logger LOG = Logger.getInstance(InplaceEditingLayer.class);
 
   private final FocusWatcher myFocusWatcher = new FocusWatcher() {
     @Override
diff --git a/plugins/ui-designer-core/src/com/intellij/designer/model/ModelLoader.java b/plugins/ui-designer-core/src/com/intellij/designer/model/ModelLoader.java
index 355fe62007a7..0bb8d29b73f2 100644
--- a/plugins/ui-designer-core/src/com/intellij/designer/model/ModelLoader.java
+++ b/plugins/ui-designer-core/src/com/intellij/designer/model/ModelLoader.java
@@ -27,7 +27,7 @@ import java.io.InputStream;
  * @author Alexander Lobas
  */
 public abstract class ModelLoader {
-  protected static final Logger LOG = Logger.getInstance("#com.intellij.designer.model.ModelLoader");
+  protected static final Logger LOG = Logger.getInstance(ModelLoader.class);
 
   protected final Project myProject;
 
diff --git a/plugins/ui-designer/jps-plugin/src/org/jetbrains/jps/uiDesigner/compiler/FormsBuilder.java b/plugins/ui-designer/jps-plugin/src/org/jetbrains/jps/uiDesigner/compiler/FormsBuilder.java
index 442a05930a08..6ec3a2cfb8a2 100644
--- a/plugins/ui-designer/jps-plugin/src/org/jetbrains/jps/uiDesigner/compiler/FormsBuilder.java
+++ b/plugins/ui-designer/jps-plugin/src/org/jetbrains/jps/uiDesigner/compiler/FormsBuilder.java
@@ -32,7 +32,7 @@ import java.util.Map;
  * @author Eugene Zhuravlev
  */
 public abstract class FormsBuilder extends ModuleLevelBuilder {
-  protected static final Logger LOG = Logger.getInstance("#org.jetbrains.jps.uiDesigner.compiler.FormsInstrumenter");
+  protected static final Logger LOG = Logger.getInstance(FormsInstrumenter.class);
   protected static final Key<Map<File, Collection<File>>> FORMS_TO_COMPILE = Key.create("_forms-to_compile_");
   protected static final String FORM_EXTENSION = "form";
   protected static final FileFilter JAVA_SOURCES_FILTER = FileFilters.withExtension("java");
diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/CutCopyPasteSupport.java b/plugins/ui-designer/src/com/intellij/uiDesigner/CutCopyPasteSupport.java
index d6c8f43b03cb..6b3394d2784f 100644
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/CutCopyPasteSupport.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/CutCopyPasteSupport.java
@@ -34,7 +34,7 @@ import java.util.List;
  * @author Vladimir Kondratyev
  */
 public final class CutCopyPasteSupport implements CopyProvider, CutProvider, PasteProvider{
-  private static final Logger LOG = Logger.getInstance("#com.intellij.uiDesigner.CutCopyPasteSupport");
+  private static final Logger LOG = Logger.getInstance(CutCopyPasteSupport.class);
   private static final SAXBuilder SAX_BUILDER = new SAXBuilder();
 
   private final GuiEditor myEditor;
diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/ErrorAnalyzer.java b/plugins/ui-designer/src/com/intellij/uiDesigner/ErrorAnalyzer.java
index 43c968e4ba98..b36e646a7837 100644
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/ErrorAnalyzer.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/ErrorAnalyzer.java
@@ -34,7 +34,7 @@ import java.util.*;
  * @author Vladimir Kondratyev
  */
 public final class ErrorAnalyzer {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.uiDesigner.ErrorAnalyzer");
+  private static final Logger LOG = Logger.getInstance(ErrorAnalyzer.class);
 
   /**
    * Value {@link ErrorInfo}
diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/GridBuildUtil.java b/plugins/ui-designer/src/com/intellij/uiDesigner/GridBuildUtil.java
index 061b745e0bf2..7b767e542d36 100644
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/GridBuildUtil.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/GridBuildUtil.java
@@ -35,7 +35,7 @@ import java.util.Arrays;
  * @author yole
  */
 public class GridBuildUtil {
-  private static final Logger LOG=Logger.getInstance("#com.intellij.uiDesigner.GridBuildUtil");
+  private static final Logger LOG = Logger.getInstance(GridBuildUtil.class);
 
   private final static int HORIZONTAL_GRID = 1;
   private final static int VERTICAL_GRID = 2;
diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/GuiDesignerConfigurable.java b/plugins/ui-designer/src/com/intellij/uiDesigner/GuiDesignerConfigurable.java
index 3b930cd4e23b..06b00d5ec906 100644
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/GuiDesignerConfigurable.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/GuiDesignerConfigurable.java
@@ -32,7 +32,7 @@ import javax.swing.*;
  * @author Vladimir Kondratyev
  */
 public final class GuiDesignerConfigurable implements SearchableConfigurable, Configurable.NoScroll {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.uiDesigner.GuiDesignerConfigurable");
+  private static final Logger LOG = Logger.getInstance(GuiDesignerConfigurable.class);
   private final Project myProject;
   private MyGeneralUI myGeneralUI;
 
diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/SimpleTransferable.java b/plugins/ui-designer/src/com/intellij/uiDesigner/SimpleTransferable.java
index 773bf32e6a3b..3e5dde8e6d38 100644
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/SimpleTransferable.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/SimpleTransferable.java
@@ -14,7 +14,7 @@ import java.util.Map;
  * @author yole
  */
 public final class SimpleTransferable<T> implements Transferable {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.uiDesigner.SimpleTransferable");
+  private static final Logger LOG = Logger.getInstance(SimpleTransferable.class);
   private static final Map<String, DataFlavor> ourDataFlavorMap = new HashMap<>();
 
   private final T myDataProxy;
diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/XmlReader.java b/plugins/ui-designer/src/com/intellij/uiDesigner/XmlReader.java
index e19fd4dcd47c..da7abe9bd457 100644
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/XmlReader.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/XmlReader.java
@@ -40,7 +40,7 @@ import java.util.Map;
  * @author Vladimir Kondratyev
  */
 public final class XmlReader {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.uiDesigner.XmlReader");
+  private static final Logger LOG = Logger.getInstance(XmlReader.class);
 
   private XmlReader() {
   }
diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/actions/AbstractMoveSelectionAction.java b/plugins/ui-designer/src/com/intellij/uiDesigner/actions/AbstractMoveSelectionAction.java
index 21019242fda1..f8d999358d01 100644
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/actions/AbstractMoveSelectionAction.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/actions/AbstractMoveSelectionAction.java
@@ -22,7 +22,7 @@ import java.util.ArrayList;
  * @author Vladimir Kondratyev
  */
 abstract class AbstractMoveSelectionAction extends AnAction implements DumbAware {
-  private static final Logger LOG=Logger.getInstance("#com.intellij.uiDesigner.actions.MoveSelectionToRightAction");
+  private static final Logger LOG = Logger.getInstance(MoveSelectionToRightAction.class);
 
   private final GuiEditor myEditor;
   private final boolean myExtend;
diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/actions/CreateFormAction.java b/plugins/ui-designer/src/com/intellij/uiDesigner/actions/CreateFormAction.java
index b9d3a424150a..0cf61708d0a1 100644
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/actions/CreateFormAction.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/actions/CreateFormAction.java
@@ -26,7 +26,7 @@ import javax.swing.event.DocumentEvent;
  * @author yole
  */
 public class CreateFormAction extends AbstractCreateFormAction {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.uiDesigner.actions.CreateFormAction");
+  private static final Logger LOG = Logger.getInstance(CreateFormAction.class);
 
   private String myLastClassName = null;
   private String myLastLayoutManager = null;
diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/actions/CreateListenerAction.java b/plugins/ui-designer/src/com/intellij/uiDesigner/actions/CreateListenerAction.java
index 1c55b245746d..df5ac0c37a36 100644
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/actions/CreateListenerAction.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/actions/CreateListenerAction.java
@@ -55,7 +55,7 @@ import java.util.List;
  * @author yole
  */
 public class CreateListenerAction extends AbstractGuiEditorAction {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.uiDesigner.actions.CreateListenerAction");
+  private static final Logger LOG = Logger.getInstance(CreateListenerAction.class);
 
   @Override
   protected void actionPerformed(final GuiEditor editor, final List<? extends RadComponent> selection, final AnActionEvent e) {
diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/actions/DataBindingWizardAction.java b/plugins/ui-designer/src/com/intellij/uiDesigner/actions/DataBindingWizardAction.java
index edc17f1a3562..ddee4c88073f 100644
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/actions/DataBindingWizardAction.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/actions/DataBindingWizardAction.java
@@ -27,7 +27,7 @@ import org.jetbrains.annotations.NotNull;
  * @author Vladimir Kondratyev
  */
 public final class DataBindingWizardAction extends AnAction{
-  private static final Logger LOG = Logger.getInstance("#com.intellij.uiDesigner.actions.DataBindingWizardAction");
+  private static final Logger LOG = Logger.getInstance(DataBindingWizardAction.class);
 
   @Override
   public void actionPerformed(@NotNull final AnActionEvent e) {
diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/actions/DuplicateComponentsAction.java b/plugins/ui-designer/src/com/intellij/uiDesigner/actions/DuplicateComponentsAction.java
index 707fab4f6e2e..4cd027bd63f3 100644
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/actions/DuplicateComponentsAction.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/actions/DuplicateComponentsAction.java
@@ -24,7 +24,7 @@ import java.util.*;
  * @author yole
  */
 public class DuplicateComponentsAction extends AbstractGuiEditorAction {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.uiDesigner.actions.DuplicateComponentsAction");
+  private static final Logger LOG = Logger.getInstance(DuplicateComponentsAction.class);
 
   public DuplicateComponentsAction() {
     super(true);
diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/actions/GenerateMainAction.java b/plugins/ui-designer/src/com/intellij/uiDesigner/actions/GenerateMainAction.java
index 47511514d869..53bb8e2d3bb1 100644
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/actions/GenerateMainAction.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/actions/GenerateMainAction.java
@@ -38,7 +38,7 @@ import java.util.List;
  * @author yole
  */
 public class GenerateMainAction extends AnAction {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.uiDesigner.actions.GenerateMainAction");
+  private static final Logger LOG = Logger.getInstance(GenerateMainAction.class);
 
   @Override
   public void actionPerformed(@NotNull AnActionEvent e) {
diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/actions/MorphAction.java b/plugins/ui-designer/src/com/intellij/uiDesigner/actions/MorphAction.java
index 18f402beb0f7..a43edbec0cab 100644
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/actions/MorphAction.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/actions/MorphAction.java
@@ -39,7 +39,7 @@ import java.util.List;
  * @author yole
  */
 public class MorphAction extends AbstractGuiEditorAction {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.uiDesigner.actions.MorphAction");
+  private static final Logger LOG = Logger.getInstance(MorphAction.class);
 
   private final ComponentItem myLastMorphComponent = null;
 
diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/actions/PreviewFormAction.java b/plugins/ui-designer/src/com/intellij/uiDesigner/actions/PreviewFormAction.java
index d69797129002..8c9f71c52807 100644
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/actions/PreviewFormAction.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/actions/PreviewFormAction.java
@@ -69,7 +69,7 @@ import java.util.*;
  * @author Vladimir Kondratyev
  */
 public final class PreviewFormAction extends AnAction{
-  private static final Logger LOG = Logger.getInstance("#com.intellij.uiDesigner.actions.PreviewFormAction");
+  private static final Logger LOG = Logger.getInstance(PreviewFormAction.class);
 
   /**
    * The problem is that this class is in a default package so it's not
diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/actions/ResetValueAction.java b/plugins/ui-designer/src/com/intellij/uiDesigner/actions/ResetValueAction.java
index cd20ea4b46aa..387db513d4ef 100644
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/actions/ResetValueAction.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/actions/ResetValueAction.java
@@ -17,7 +17,7 @@ import java.util.List;
  * @author yole
  */
 public class ResetValueAction extends AbstractGuiEditorAction {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.uiDesigner.actions.ResetValueAction");
+  private static final Logger LOG = Logger.getInstance(ResetValueAction.class);
 
   @Override
   protected void actionPerformed(final GuiEditor editor, final List<? extends RadComponent> selection, final AnActionEvent e) {
diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/actions/ShowJavadocAction.java b/plugins/ui-designer/src/com/intellij/uiDesigner/actions/ShowJavadocAction.java
index a1f9a83d4f8b..c05617481074 100644
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/actions/ShowJavadocAction.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/actions/ShowJavadocAction.java
@@ -27,7 +27,7 @@ import java.awt.*;
  * @author Vladimir Kondratyev
  */
 public final class ShowJavadocAction extends AnAction {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.uiDesigner.actions.ShowJavadocAction");
+  private static final Logger LOG = Logger.getInstance(ShowJavadocAction.class);
 
   @Override
   public void actionPerformed(@NotNull final AnActionEvent e) {
diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/actions/SurroundAction.java b/plugins/ui-designer/src/com/intellij/uiDesigner/actions/SurroundAction.java
index 07f14176cfd9..483764c7de94 100644
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/actions/SurroundAction.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/actions/SurroundAction.java
@@ -26,7 +26,7 @@ import java.util.List;
  * @author yole
  */
 public class SurroundAction extends AbstractGuiEditorAction {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.uiDesigner.actions.SurroundAction");
+  private static final Logger LOG = Logger.getInstance(SurroundAction.class);
 
   private final String myComponentClass;
 
diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/binding/FormClassAnnotator.java b/plugins/ui-designer/src/com/intellij/uiDesigner/binding/FormClassAnnotator.java
index e03bd1b5d649..a6328c8fbb14 100644
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/binding/FormClassAnnotator.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/binding/FormClassAnnotator.java
@@ -34,7 +34,7 @@ import java.util.List;
  * @author yole
  */
 public class FormClassAnnotator implements Annotator {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.uiDesigner.binding.FormClassAnnotator");
+  private static final Logger LOG = Logger.getInstance(FormClassAnnotator.class);
 
   @Override
   public void annotate(@NotNull PsiElement psiElement, @NotNull AnnotationHolder holder) {
diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/binding/FormReferenceProvider.java b/plugins/ui-designer/src/com/intellij/uiDesigner/binding/FormReferenceProvider.java
index ee55186a227f..4edd65e16dd3 100644
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/binding/FormReferenceProvider.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/binding/FormReferenceProvider.java
@@ -37,7 +37,7 @@ import java.util.Map;
  * @author yole
  */
 public class FormReferenceProvider extends PsiReferenceProvider {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.uiDesigner.binding.FormReferenceProvider");
+  private static final Logger LOG = Logger.getInstance(FormReferenceProvider.class);
   private static class CachedFormData {
     PsiReference[] myReferences;
     Map<String, Pair<PsiType, TextRange>> myFieldNameToTypeMap;
diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/binding/FormWordsScanner.java b/plugins/ui-designer/src/com/intellij/uiDesigner/binding/FormWordsScanner.java
index 3c2e25c242e3..c1c7a027bffe 100644
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/binding/FormWordsScanner.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/binding/FormWordsScanner.java
@@ -19,7 +19,7 @@ import org.jetbrains.annotations.NotNull;
  * @author yole
  */
 public class FormWordsScanner extends SimpleWordsScanner {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.uiDesigner.binding.FormWordsScanner");
+  private static final Logger LOG = Logger.getInstance(FormWordsScanner.class);
 
   @Override
   public void processWords(@NotNull CharSequence fileText, @NotNull final Processor<WordOccurrence> processor) {
diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/componentTree/ComponentTree.java b/plugins/ui-designer/src/com/intellij/uiDesigner/componentTree/ComponentTree.java
index eb9e7d485a88..fa8242edacf3 100644
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/componentTree/ComponentTree.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/componentTree/ComponentTree.java
@@ -61,7 +61,7 @@ import java.util.*;
  * @author Vladimir Kondratyev
  */
 public final class ComponentTree extends Tree implements DataProvider {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.uiDesigner.componentTree.ComponentTree");
+  private static final Logger LOG = Logger.getInstance(ComponentTree.class);
 
   public static final DataKey<LwInspectionSuppression[]> LW_INSPECTION_SUPPRESSION_ARRAY_DATA_KEY =
     DataKey.create(LwInspectionSuppression.class.getName());
diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/componentTree/ComponentTreeStructure.java b/plugins/ui-designer/src/com/intellij/uiDesigner/componentTree/ComponentTreeStructure.java
index b6e858019b8e..6cf1c75ac76e 100644
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/componentTree/ComponentTreeStructure.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/componentTree/ComponentTreeStructure.java
@@ -22,7 +22,7 @@ import java.util.ArrayList;
  * @author Vladimir Kondratyev
  */
 final class ComponentTreeStructure extends AbstractTreeStructure{
-  private static final Logger LOG=Logger.getInstance("#com.intellij.uiDesigner.componentTree.ComponentPtr");
+  private static final Logger LOG = Logger.getInstance(ComponentPtr.class);
   private static final Object[] ourEmptyObjectArray=new Object[]{};
 
   private final Object myRootElement;
diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/componentTree/QuickFixManagerImpl.java b/plugins/ui-designer/src/com/intellij/uiDesigner/componentTree/QuickFixManagerImpl.java
index fa9d1a308dc3..3fadc7516629 100644
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/componentTree/QuickFixManagerImpl.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/componentTree/QuickFixManagerImpl.java
@@ -21,7 +21,7 @@ import java.awt.*;
  * @author Vladimir Kondratyev
  */
 public final class QuickFixManagerImpl extends QuickFixManager<ComponentTree>{
-  private static final Logger LOG = Logger.getInstance("#com.intellij.uiDesigner.componentTree.QuickFixManagerImpl");
+  private static final Logger LOG = Logger.getInstance(QuickFixManagerImpl.class);
 
   public QuickFixManagerImpl(final GuiEditor editor, @NotNull final ComponentTree componentTree, final JViewport viewPort) {
     super(editor, componentTree, viewPort);
diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/ActiveDecorationLayer.java b/plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/ActiveDecorationLayer.java
index d1fd4b9801c1..857a46964fb4 100644
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/ActiveDecorationLayer.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/ActiveDecorationLayer.java
@@ -23,7 +23,7 @@ import java.util.Map;
  * @author Vladimir Kondratyev
  */
 final class ActiveDecorationLayer extends JComponent implements FeedbackLayer {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.uiDesigner.designSurface.ActiveDecorationLayer");
+  private static final Logger LOG = Logger.getInstance(ActiveDecorationLayer.class);
 
   private final GuiEditor myEditor;
   private final JToolTip myToolTip;
diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/DesignDropTargetListener.java b/plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/DesignDropTargetListener.java
index 0b405960ab25..8591466d802c 100644
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/DesignDropTargetListener.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/DesignDropTargetListener.java
@@ -27,7 +27,7 @@ import java.util.List;
  * @author yole
  */
 class DesignDropTargetListener implements DropTargetListener {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.uiDesigner.designSurface.DesignDropTargetListener");
+  private static final Logger LOG = Logger.getInstance(DesignDropTargetListener.class);
 
   private DraggedComponentList myDraggedComponentList;
   private ComponentDragObject myComponentDragObject;
diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/DragSelectionProcessor.java b/plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/DragSelectionProcessor.java
index 8670ef39f034..588a504d2665 100644
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/DragSelectionProcessor.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/DragSelectionProcessor.java
@@ -19,7 +19,7 @@ import java.util.ArrayList;
  * @author Vladimir Kondratyev
  */
 public final class DragSelectionProcessor extends EventProcessor {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.uiDesigner.designSurface.DragSelectionProcessor");
+  private static final Logger LOG = Logger.getInstance(DragSelectionProcessor.class);
 
   /**
    * We have not start drag/cancel drop if mouse pointer trembles in small area
diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/GlassLayer.java b/plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/GlassLayer.java
index 6da018f5194a..f75dd4e4e060 100644
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/GlassLayer.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/GlassLayer.java
@@ -25,7 +25,7 @@ import java.util.ArrayList;
  */
 public final class GlassLayer extends JComponent implements DataProvider, PopupOwner {
   private final GuiEditor myEditor;
-  private static final Logger LOG = Logger.getInstance("#com.intellij.uiDesigner.designSurface.GlassLayer");
+  private static final Logger LOG = Logger.getInstance(GlassLayer.class);
   private Point myLastMousePosition;
 
   public GlassLayer(final GuiEditor editor){
diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/GridCaptionPanel.java b/plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/GridCaptionPanel.java
index 415e37af719e..575751a71d07 100644
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/GridCaptionPanel.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/GridCaptionPanel.java
@@ -41,7 +41,7 @@ import java.util.ArrayList;
  * @author yole
  */
 public class GridCaptionPanel extends JPanel implements ComponentSelectionListener, DataProvider {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.uiDesigner.designSurface.GridCaptionPanel");
+  private static final Logger LOG = Logger.getInstance(GridCaptionPanel.class);
 
   private final GuiEditor myEditor;
   private final boolean myIsRow;
diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/GridDropLocation.java b/plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/GridDropLocation.java
index ff82ad22be1c..232c20aff133 100644
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/GridDropLocation.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/GridDropLocation.java
@@ -17,7 +17,7 @@ import java.awt.*;
  * @author yole
  */
 public class GridDropLocation implements ComponentDropLocation {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.uiDesigner.designSurface.GridDropLocation");
+  private static final Logger LOG = Logger.getInstance(GridDropLocation.class);
 
   protected final RadContainer myContainer;
   protected int myRow;
diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/GridInsertLocation.java b/plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/GridInsertLocation.java
index c9a7dcedebff..f3a930737490 100644
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/GridInsertLocation.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/GridInsertLocation.java
@@ -34,7 +34,7 @@ import java.awt.*;
  * @author yole
  */
 public class GridInsertLocation extends GridDropLocation {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.uiDesigner.designSurface.GridInsertLocation");
+  private static final Logger LOG = Logger.getInstance(GridInsertLocation.class);
 
   public static final int INSERT_ARROW_SIZE = 3;
   public static final int INSERT_RECT_MIN_SIZE = 15;  // should be larger than the insets increase on Shift
diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/GridInsertProcessor.java b/plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/GridInsertProcessor.java
index 9c442e5d5ba2..52e34de0d6e8 100644
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/GridInsertProcessor.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/GridInsertProcessor.java
@@ -29,7 +29,7 @@ import java.awt.*;
  * @author yole
  */
 public class GridInsertProcessor {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.uiDesigner.designSurface.GridInsertProcessor");
+  private static final Logger LOG = Logger.getInstance(GridInsertProcessor.class);
 
   private final GuiEditor myEditor;
 
diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/InsertComponentProcessor.java b/plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/InsertComponentProcessor.java
index e0cdfee26eca..9b4d3e283ee0 100644
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/InsertComponentProcessor.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/InsertComponentProcessor.java
@@ -48,7 +48,7 @@ import java.util.Map;
  * @author Vladimir Kondratyev
  */
 public final class InsertComponentProcessor extends EventProcessor {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.uiDesigner.designSurface.InsertComponentProcessor");
+  private static final Logger LOG = Logger.getInstance(InsertComponentProcessor.class);
 
   private final GuiEditor myEditor;
   private boolean mySticky;
diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/ListenerNavigateButton.java b/plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/ListenerNavigateButton.java
index 9e91c14c12e0..9eb72aa9771b 100644
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/ListenerNavigateButton.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/ListenerNavigateButton.java
@@ -39,7 +39,7 @@ import java.beans.Introspector;
  * @author yole
  */
 public class ListenerNavigateButton extends JButton implements ActionListener {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.uiDesigner.designSurface.ListenerNavigateButton");
+  private static final Logger LOG = Logger.getInstance(ListenerNavigateButton.class);
 
   private final RadComponent myComponent;
 
diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/editor/UIFormEditorProvider.java b/plugins/ui-designer/src/com/intellij/uiDesigner/editor/UIFormEditorProvider.java
index 06051ae1b016..427efe8cb2e1 100644
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/editor/UIFormEditorProvider.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/editor/UIFormEditorProvider.java
@@ -18,7 +18,7 @@ import org.jdom.Element;
 import org.jetbrains.annotations.NotNull;
 
 public final class UIFormEditorProvider implements FileEditorProvider, DumbAware {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.uiDesigner.editor.UIFormEditorProvider");
+  private static final Logger LOG = Logger.getInstance(UIFormEditorProvider.class);
 
   @Override
   public boolean accept(@NotNull final Project project, @NotNull final VirtualFile file){
diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/i18n/I18nizeFormQuickFix.java b/plugins/ui-designer/src/com/intellij/uiDesigner/i18n/I18nizeFormQuickFix.java
index 78a0189a7924..9715b8af731f 100644
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/i18n/I18nizeFormQuickFix.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/i18n/I18nizeFormQuickFix.java
@@ -42,7 +42,7 @@ import java.util.Collection;
  * @author yole
  */
 public abstract class I18nizeFormQuickFix extends QuickFix {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.uiDesigner.i18n.I18nizeFormQuickFix");
+  private static final Logger LOG = Logger.getInstance(I18nizeFormQuickFix.class);
 
   I18nizeFormQuickFix(final GuiEditor editor, final String name, final RadComponent component) {
     super(editor, name, component);
diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/inspections/NoButtonGroupInspection.java b/plugins/ui-designer/src/com/intellij/uiDesigner/inspections/NoButtonGroupInspection.java
index 5d6da583741e..0aa9e91a756a 100644
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/inspections/NoButtonGroupInspection.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/inspections/NoButtonGroupInspection.java
@@ -40,7 +40,7 @@ import java.util.Collections;
  * @author yole
  */
 public class NoButtonGroupInspection extends BaseFormInspection {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.uiDesigner.inspections.NoButtonGroupInspection");
+  private static final Logger LOG = Logger.getInstance(NoButtonGroupInspection.class);
 
   public NoButtonGroupInspection() {
     super("NoButtonGroup");
diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/make/BindingsCache.java b/plugins/ui-designer/src/com/intellij/uiDesigner/make/BindingsCache.java
index 11752d56e6d6..cee42b7a8f20 100644
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/make/BindingsCache.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/make/BindingsCache.java
@@ -20,7 +20,7 @@ import org.jetbrains.annotations.NonNls;
 import java.io.*;
 
 final class BindingsCache {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.uiDesigner.make.BindingsCache");
+  private static final Logger LOG = Logger.getInstance(BindingsCache.class);
   @NonNls
   private static final String BINDINGS_FILE_NAME = "formbinding.dat";
   private StateCache<MyState> myCache;
diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/palette/ComponentItem.java b/plugins/ui-designer/src/com/intellij/uiDesigner/palette/ComponentItem.java
index 290e4d3c7851..0290879f28df 100644
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/palette/ComponentItem.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/palette/ComponentItem.java
@@ -41,7 +41,7 @@ import java.util.List;
  * @author Vladimir Kondratyev
  */
 public final class ComponentItem implements Cloneable, PaletteItem {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.uiDesigner.palette.ComponentItem");
+  private static final Logger LOG = Logger.getInstance(ComponentItem.class);
 
   public static final DataKey<ComponentItem> DATA_KEY = DataKey.create(ComponentItem.class.getName());
 
diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/palette/EditComponentAction.java b/plugins/ui-designer/src/com/intellij/uiDesigner/palette/EditComponentAction.java
index 37de864810fc..7f0c0c503bca 100644
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/palette/EditComponentAction.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/palette/EditComponentAction.java
@@ -17,7 +17,7 @@ import java.awt.*;
  * @author yole
  */
 public class EditComponentAction extends AnAction {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.uiDesigner.palette.EditComponentAction");
+  private static final Logger LOG = Logger.getInstance(EditComponentAction.class);
 
   @Override
   public void actionPerformed(@NotNull AnActionEvent e) {
diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/palette/GroupItem.java b/plugins/ui-designer/src/com/intellij/uiDesigner/palette/GroupItem.java
index 79f190fc5a9f..427ccd07c59f 100644
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/palette/GroupItem.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/palette/GroupItem.java
@@ -18,7 +18,7 @@ import java.util.ArrayList;
  * @author Vladimir Kondratyev
  */
 public final class GroupItem implements Cloneable, PaletteGroup {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.uiDesigner.palette.GroupItem");
+  private static final Logger LOG = Logger.getInstance(GroupItem.class);
 
   public static final DataKey<GroupItem> DATA_KEY = DataKey.create(GroupItem.class.getName());
 
diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/projectView/FormMoveProvider.java b/plugins/ui-designer/src/com/intellij/uiDesigner/projectView/FormMoveProvider.java
index d770d741cd5d..ea4d8542296a 100644
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/projectView/FormMoveProvider.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/projectView/FormMoveProvider.java
@@ -22,7 +22,7 @@ import java.util.Set;
  * @author yole
  */
 public class FormMoveProvider extends MoveHandlerDelegate {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.uiDesigner.projectView.FormMoveProvider");
+  private static final Logger LOG = Logger.getInstance(FormMoveProvider.class);
 
   @Override
   public boolean canMove(DataContext dataContext) {
diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/Property.java b/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/Property.java
index 19f2ab20cebd..8370e72747dd 100644
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/Property.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/Property.java
@@ -18,7 +18,7 @@ import java.util.List;
 public abstract class Property<T extends RadComponent, V> implements IProperty {
   public static final Property[] EMPTY_ARRAY=new Property[]{};
 
-  private static final Logger LOG = Logger.getInstance("#com.intellij.uiDesigner.propertyInspector.Property");
+  private static final Logger LOG = Logger.getInstance(Property.class);
 
   /**
    * Parent property
diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/PropertyInspectorTable.java b/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/PropertyInspectorTable.java
index 26fd8334f019..dec6cf7d1ac9 100644
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/PropertyInspectorTable.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/PropertyInspectorTable.java
@@ -65,7 +65,7 @@ import java.util.*;
  * @author Vladimir Kondratyev
  */
 public final class PropertyInspectorTable extends Table implements DataProvider{
-  private static final Logger LOG = Logger.getInstance("#com.intellij.uiDesigner.propertyInspector.PropertyInspectorTable");
+  private static final Logger LOG = Logger.getInstance(PropertyInspectorTable.class);
 
   public static final DataKey<PropertyInspectorTable> DATA_KEY = DataKey.create(PropertyInspectorTable.class.getName());
 
diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/editors/string/StringEditor.java b/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/editors/string/StringEditor.java
index f9ffa8767ac9..6f427575dd6d 100644
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/editors/string/StringEditor.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/editors/string/StringEditor.java
@@ -32,7 +32,7 @@ import java.awt.event.ActionListener;
  * @author Vladimir Kondratyev
  */
 public final class StringEditor extends PropertyEditor<StringDescriptor> {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.uiDesigner.propertyInspector.editors.string.StringEditor");
+  private static final Logger LOG = Logger.getInstance(StringEditor.class);
 
   @Nullable private final IntroStringProperty myProperty;
   private final TextFieldWithBrowseButton myTfWithButton;
diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/editors/string/StringEditorDialog.java b/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/editors/string/StringEditorDialog.java
index 19de513315fe..9d3c135af229 100644
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/editors/string/StringEditorDialog.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/editors/string/StringEditorDialog.java
@@ -55,7 +55,7 @@ import java.util.*;
  * @author Vladimir Kondratyev
  */
 public final class StringEditorDialog extends DialogWrapper{
-  private static final Logger LOG = Logger.getInstance("#com.intellij.uiDesigner.propertyInspector.editors.string.StringEditorDialog");
+  private static final Logger LOG = Logger.getInstance(StringEditorDialog.class);
 
   @NonNls private static final String CARD_STRING = "string";
   @NonNls private static final String CARD_BUNDLE = "bundle";
diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/properties/BindingProperty.java b/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/properties/BindingProperty.java
index c0064aa66b2c..43939245a843 100644
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/properties/BindingProperty.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/properties/BindingProperty.java
@@ -49,7 +49,7 @@ import java.util.regex.Pattern;
  * @author Vladimir Kondratyev
  */
 public final class BindingProperty extends Property<RadComponent, String> {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.uiDesigner.propertyInspector.properties.BindingProperty");
+  private static final Logger LOG = Logger.getInstance(BindingProperty.class);
 
   private final PropertyRenderer<String> myRenderer = new LabelPropertyRenderer<String>() {
     @Override
diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/properties/CustomCreateProperty.java b/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/properties/CustomCreateProperty.java
index cb29f8f6a671..1845da0f608b 100644
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/properties/CustomCreateProperty.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/properties/CustomCreateProperty.java
@@ -37,7 +37,7 @@ import java.util.List;
  * @author yole
  */
 public class CustomCreateProperty extends Property<RadComponent, Boolean> {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.uiDesigner.propertyInspector.properties.CustomCreateProperty");
+  private static final Logger LOG = Logger.getInstance(CustomCreateProperty.class);
 
   public static CustomCreateProperty getInstance(Project project) {
     return ServiceManager.getService(project, CustomCreateProperty.class);
diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/quickFixes/CreateClassToBindFix.java b/plugins/ui-designer/src/com/intellij/uiDesigner/quickFixes/CreateClassToBindFix.java
index b074b13cd7e9..93d6b628364e 100644
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/quickFixes/CreateClassToBindFix.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/quickFixes/CreateClassToBindFix.java
@@ -28,7 +28,7 @@ import org.jetbrains.annotations.NotNull;
  * @author Vladimir Kondratyev
  */
 public final class CreateClassToBindFix extends QuickFix{
-  private static final Logger LOG = Logger.getInstance("#com.intellij.uiDesigner.quickFixes.CreateClassToBindFix");
+  private static final Logger LOG = Logger.getInstance(CreateClassToBindFix.class);
 
   private final String myClassName;
 
diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/quickFixes/CreateFieldFix.java b/plugins/ui-designer/src/com/intellij/uiDesigner/quickFixes/CreateFieldFix.java
index 29c656db0b21..33fce491d770 100644
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/quickFixes/CreateFieldFix.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/quickFixes/CreateFieldFix.java
@@ -25,7 +25,7 @@ import org.jetbrains.annotations.Nullable;
  * @author Vladimir Kondratyev
  */
 public final class CreateFieldFix extends QuickFix{
-  private static final Logger LOG = Logger.getInstance("#com.intellij.uiDesigner.quickFixes.CreateFieldFix");
+  private static final Logger LOG = Logger.getInstance(CreateFieldFix.class);
 
   private final PsiClass myClass;
   private final String myFieldClassName;
diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/quickFixes/QuickFixManager.java b/plugins/ui-designer/src/com/intellij/uiDesigner/quickFixes/QuickFixManager.java
index 0d9ff6a5c897..f48a6adc7d8c 100644
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/quickFixes/QuickFixManager.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/quickFixes/QuickFixManager.java
@@ -32,7 +32,7 @@ import java.util.ArrayList;
  * @author Vladimir Kondratyev
  */
 public abstract class QuickFixManager <T extends JComponent>{
-  private static final Logger LOG = Logger.getInstance("#com.intellij.uiDesigner.quickFixes.QuickFixManager");
+  private static final Logger LOG = Logger.getInstance(QuickFixManager.class);
 
   private GuiEditor myEditor;
   /** Component on which hint will be shown */
diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/radComponents/RadComponent.java b/plugins/ui-designer/src/com/intellij/uiDesigner/radComponents/RadComponent.java
index 01cea2ebc798..93eb2e192b9b 100644
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/radComponents/RadComponent.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/radComponents/RadComponent.java
@@ -40,7 +40,7 @@ import java.util.HashSet;
  * @author Vladimir Kondratyev
  */
 public abstract class RadComponent implements IComponent {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.uiDesigner.radComponents.RadComponent");
+  private static final Logger LOG = Logger.getInstance(RadComponent.class);
 
   /**
    * Shared instance of empty array of RadComponenets
diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/radComponents/RadContainer.java b/plugins/ui-designer/src/com/intellij/uiDesigner/radComponents/RadContainer.java
index 7f36f5353f2f..f673acbb6ce7 100644
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/radComponents/RadContainer.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/radComponents/RadContainer.java
@@ -29,7 +29,7 @@ import java.util.ArrayList;
  * @author Vladimir Kondratyev
  */
 public class RadContainer extends RadComponent implements IContainer {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.uiDesigner.radComponents.RadContainer");
+  private static final Logger LOG = Logger.getInstance(RadContainer.class);
 
   public static class Factory extends RadComponentFactory {
     @Override
diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/radComponents/RadNestedForm.java b/plugins/ui-designer/src/com/intellij/uiDesigner/radComponents/RadNestedForm.java
index 9977bbe40ef0..97c29d47499b 100644
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/radComponents/RadNestedForm.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/radComponents/RadNestedForm.java
@@ -22,7 +22,7 @@ import java.awt.*;
  * @author yole
  */
 public class RadNestedForm extends RadComponent {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.uiDesigner.radComponents.RadNestedForm");
+  private static final Logger LOG = Logger.getInstance(RadNestedForm.class);
 
   private final String myFormFileName;
   private final RadRootContainer myRootContainer;
diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/radComponents/RadScrollPane.java b/plugins/ui-designer/src/com/intellij/uiDesigner/radComponents/RadScrollPane.java
index 88bc60e8e786..9f1caa31da0a 100644
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/radComponents/RadScrollPane.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/radComponents/RadScrollPane.java
@@ -24,7 +24,7 @@ import java.awt.*;
  */
 public final class RadScrollPane extends RadContainer {
   public static final Class COMPONENT_CLASS = JScrollPane.class;
-  private static final Logger LOG = Logger.getInstance("#com.intellij.uiDesigner.radComponents.RadScrollPane");
+  private static final Logger LOG = Logger.getInstance(RadScrollPane.class);
 
   public static class Factory extends RadComponentFactory {
     @Override
diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/radComponents/RadTabbedPane.java b/plugins/ui-designer/src/com/intellij/uiDesigner/radComponents/RadTabbedPane.java
index 8208ca01177d..62f1d0aea62b 100644
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/radComponents/RadTabbedPane.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/radComponents/RadTabbedPane.java
@@ -49,7 +49,7 @@ public final class RadTabbedPane extends RadContainer implements ITabbedPane {
     }
   }
 
-  private static final Logger LOG = Logger.getInstance("#com.intellij.uiDesigner.radComponents.RadTabbedPane");
+  private static final Logger LOG = Logger.getInstance(RadTabbedPane.class);
   /**
    * value: HashMap<String, LwTabbedPane.Constraints>
    */
diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/snapShooter/SnapShotClient.java b/plugins/ui-designer/src/com/intellij/uiDesigner/snapShooter/SnapShotClient.java
index a179f717d53e..a1d2cf7b50c4 100644
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/snapShooter/SnapShotClient.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/snapShooter/SnapShotClient.java
@@ -19,7 +19,7 @@ import java.util.List;
  * @author yole
  */
 public class SnapShotClient {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.uiDesigner.snapShooter.SnapShotClient");
+  private static final Logger LOG = Logger.getInstance(SnapShotClient.class);
 
   private Socket mySocket;
   @NonNls private BufferedReader myReader;
diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/wizard/BindToExistingBeanStep.java b/plugins/ui-designer/src/com/intellij/uiDesigner/wizard/BindToExistingBeanStep.java
index f1406ecba3c7..e52b9d01ff17 100644
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/wizard/BindToExistingBeanStep.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/wizard/BindToExistingBeanStep.java
@@ -25,7 +25,7 @@ import java.util.Collections;
  * @author Vladimir Kondratyev
  */
 final class BindToExistingBeanStep extends StepAdapter{
-  private static final Logger LOG = Logger.getInstance("#com.intellij.uiDesigner.wizard.BindToExistingBeanStep");
+  private static final Logger LOG = Logger.getInstance(BindToExistingBeanStep.class);
 
   private JScrollPane myScrollPane;
   private JTable myTable;
diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/wizard/BindToNewBeanStep.java b/plugins/ui-designer/src/com/intellij/uiDesigner/wizard/BindToNewBeanStep.java
index 740540f8ce0f..10857f969543 100644
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/wizard/BindToNewBeanStep.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/wizard/BindToNewBeanStep.java
@@ -18,7 +18,7 @@ import javax.swing.table.TableColumn;
  * @author Vladimir Kondratyev
  */
 final class BindToNewBeanStep extends StepAdapter{
-  private static final Logger LOG = Logger.getInstance("#com.intellij.uiDesigner.wizard.BindToNewBeanStep");
+  private static final Logger LOG = Logger.getInstance(BindToNewBeanStep.class);
 
   private JScrollPane myScrollPane;
   private JTable myTable;
diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/wizard/FormPropertyTableCellRenderer.java b/plugins/ui-designer/src/com/intellij/uiDesigner/wizard/FormPropertyTableCellRenderer.java
index 1a5f23cdd2e3..59daf0ce1dd0 100644
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/wizard/FormPropertyTableCellRenderer.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/wizard/FormPropertyTableCellRenderer.java
@@ -19,7 +19,7 @@ import java.awt.*;
  * @author Vladimir Kondratyev
  */
 final class FormPropertyTableCellRenderer extends ColoredTableCellRenderer{
-  private static final Logger LOG = Logger.getInstance("#com.intellij.uiDesigner.wizard.FormPropertyTableCellRenderer");
+  private static final Logger LOG = Logger.getInstance(FormPropertyTableCellRenderer.class);
 
   private final Palette myPalette;
   private final SimpleTextAttributes myAttrs1;
diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/wizard/Generator.java b/plugins/ui-designer/src/com/intellij/uiDesigner/wizard/Generator.java
index 3bb6dbb0ebe9..d75c15a9e399 100644
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/wizard/Generator.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/wizard/Generator.java
@@ -41,7 +41,7 @@ import java.util.HashMap;
  * @author Vladimir Kondratyev
  */
 public final class Generator {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.uiDesigner.wizard.Generator");
+  private static final Logger LOG = Logger.getInstance(Generator.class);
 
   private Generator() {
   }
diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/wizard/WizardData.java b/plugins/ui-designer/src/com/intellij/uiDesigner/wizard/WizardData.java
index 572715116b4a..55f8263fc4e7 100644
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/wizard/WizardData.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/wizard/WizardData.java
@@ -27,7 +27,7 @@ import org.jetbrains.annotations.NotNull;
  * @author Vladimir Kondratyev
  */
 public final class WizardData {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.uiDesigner.wizard.WizardData");
+  private static final Logger LOG = Logger.getInstance(WizardData.class);
 
   @NotNull public final Project myProject;
   /**
diff --git a/python/pluginJava/com/jetbrains/python/module/PyProjectStructureDetector.java b/python/pluginJava/com/jetbrains/python/module/PyProjectStructureDetector.java
index 76b0538b8753..ee504d3585a3 100644
--- a/python/pluginJava/com/jetbrains/python/module/PyProjectStructureDetector.java
+++ b/python/pluginJava/com/jetbrains/python/module/PyProjectStructureDetector.java
@@ -38,7 +38,7 @@ import java.util.List;
  * @author yole
  */
 public class PyProjectStructureDetector extends ProjectStructureDetector {
-  private static final Logger LOG = Logger.getInstance("#com.jetbrains.python.module.PyProjectStructureDetector"); 
+  private static final Logger LOG = Logger.getInstance(PyProjectStructureDetector.class);
   
   
   @NotNull
diff --git a/python/src/com/jetbrains/python/actions/CreatePackageAction.java b/python/src/com/jetbrains/python/actions/CreatePackageAction.java
index a39cf1bfe2a2..e1ffbbb6037d 100644
--- a/python/src/com/jetbrains/python/actions/CreatePackageAction.java
+++ b/python/src/com/jetbrains/python/actions/CreatePackageAction.java
@@ -30,7 +30,7 @@ import javax.swing.*;
 import java.util.function.Consumer;
 
 public final class CreatePackageAction extends DumbAwareAction {
-  private static final Logger LOG = Logger.getInstance("#com.jetbrains.python.actions.CreatePackageAction");
+  private static final Logger LOG = Logger.getInstance(CreatePackageAction.class);
 
   @Override
   public void actionPerformed(@NotNull AnActionEvent e) {
diff --git a/python/src/com/jetbrains/python/buildout/BuildoutFacet.java b/python/src/com/jetbrains/python/buildout/BuildoutFacet.java
index 8a616c001db4..be951f86efce 100644
--- a/python/src/com/jetbrains/python/buildout/BuildoutFacet.java
+++ b/python/src/com/jetbrains/python/buildout/BuildoutFacet.java
@@ -50,7 +50,7 @@ import java.util.regex.Pattern;
 @Deprecated
 public class BuildoutFacet extends LibraryContributingFacet<BuildoutFacetConfiguration> implements PythonPathContributingFacet {
 
-  private static final Logger LOG = Logger.getInstance("#com.jetbrains.python.buildout.BuildoutFacet");
+  private static final Logger LOG = Logger.getInstance(BuildoutFacet.class);
   @NonNls public static final String BUILDOUT_CFG = "buildout.cfg";
   @NonNls public static final String SCRIPT_SUFFIX = "-script";
   private static final String BUILDOUT_LIB_NAME = "Buildout Eggs";
diff --git a/python/src/com/jetbrains/python/buildout/BuildoutFrameworkDetector.java b/python/src/com/jetbrains/python/buildout/BuildoutFrameworkDetector.java
index bd2857d9e23f..38c49f708262 100644
--- a/python/src/com/jetbrains/python/buildout/BuildoutFrameworkDetector.java
+++ b/python/src/com/jetbrains/python/buildout/BuildoutFrameworkDetector.java
@@ -36,7 +36,7 @@ import java.util.Collection;
  * @author nik
  */
 public class BuildoutFrameworkDetector extends FacetBasedFrameworkDetector<BuildoutFacet, BuildoutFacetConfiguration> {
-  private static final Logger LOG = Logger.getInstance("#com.jetbrains.python.buildout.BuildoutFrameworkDetector");
+  private static final Logger LOG = Logger.getInstance(BuildoutFrameworkDetector.class);
 
   public BuildoutFrameworkDetector() {
     super("buildout-python");
diff --git a/python/src/com/jetbrains/python/codeInsight/editorActions/smartEnter/PySmartEnterProcessor.java b/python/src/com/jetbrains/python/codeInsight/editorActions/smartEnter/PySmartEnterProcessor.java
index d663baca3649..52517cde7892 100644
--- a/python/src/com/jetbrains/python/codeInsight/editorActions/smartEnter/PySmartEnterProcessor.java
+++ b/python/src/com/jetbrains/python/codeInsight/editorActions/smartEnter/PySmartEnterProcessor.java
@@ -33,7 +33,7 @@ import java.util.List;
  * Author: Alexey.Ivanov
  */
 public class PySmartEnterProcessor extends SmartEnterProcessor {
-  private static final Logger LOG = Logger.getInstance("#com.jetbrains.python.codeInsight.editorActions.smartEnter.PySmartEnterProcessor");
+  private static final Logger LOG = Logger.getInstance(PySmartEnterProcessor.class);
   private static final List<PyFixer> ourFixers = ImmutableList.<PyFixer>builder()
     .add(new PyStringLiteralFixer())
     .add(new GoogleDocStringSectionFixer())
diff --git a/python/src/com/jetbrains/python/codeInsight/testIntegration/PyTestCreator.java b/python/src/com/jetbrains/python/codeInsight/testIntegration/PyTestCreator.java
index 939a1c0c3ca3..f748badd2f14 100644
--- a/python/src/com/jetbrains/python/codeInsight/testIntegration/PyTestCreator.java
+++ b/python/src/com/jetbrains/python/codeInsight/testIntegration/PyTestCreator.java
@@ -24,7 +24,7 @@ import org.jetbrains.annotations.NotNull;
 import java.util.List;
 
 public class PyTestCreator implements TestCreator {
-  private static final Logger LOG = Logger.getInstance("#com.jetbrains.python.codeInsight.testIntegration.PyTestCreator");
+  private static final Logger LOG = Logger.getInstance(PyTestCreator.class);
 
   @Override
   public boolean isAvailable(Project project, Editor editor, PsiFile file) {
diff --git a/python/src/com/jetbrains/python/debugger/PyDebugProcess.java b/python/src/com/jetbrains/python/debugger/PyDebugProcess.java
index 4c9d4c67aab9..6edc9fc36cd8 100644
--- a/python/src/com/jetbrains/python/debugger/PyDebugProcess.java
+++ b/python/src/com/jetbrains/python/debugger/PyDebugProcess.java
@@ -79,7 +79,7 @@ import java.util.concurrent.ConcurrentHashMap;
 // todo: pydevd supports module reloading - look for a way to use the feature
 public class PyDebugProcess extends XDebugProcess implements IPyDebugProcess, ProcessListener {
 
-  private static final Logger LOG = Logger.getInstance("#com.jetbrains.python.debugger.PyDebugProcess");
+  private static final Logger LOG = Logger.getInstance(PyDebugProcess.class);
   private static final int CONNECTION_TIMEOUT = 60000;
 
   public static final NotificationGroup NOTIFICATION_GROUP =
diff --git a/python/src/com/jetbrains/python/debugger/array/ArrayTableCellEditor.java b/python/src/com/jetbrains/python/debugger/array/ArrayTableCellEditor.java
index cdcd9c0ce03e..f5f687f3b46d 100644
--- a/python/src/com/jetbrains/python/debugger/array/ArrayTableCellEditor.java
+++ b/python/src/com/jetbrains/python/debugger/array/ArrayTableCellEditor.java
@@ -33,7 +33,7 @@ public class ArrayTableCellEditor extends AbstractCellEditor implements TableCel
   private final Project myProject;
   private Object myLastValue;
 
-  private static final Logger LOG = Logger.getInstance("#com.jetbrains.python.debugger.array.ArrayTableCellEditor");
+  private static final Logger LOG = Logger.getInstance(ArrayTableCellEditor.class);
 
   public ArrayTableCellEditor(Project project) {
     myProject = project;
diff --git a/python/src/com/jetbrains/python/hierarchy/call/PyCallHierarchyBrowser.java b/python/src/com/jetbrains/python/hierarchy/call/PyCallHierarchyBrowser.java
index ae94e82fb4b7..e28bd7bbe84f 100644
--- a/python/src/com/jetbrains/python/hierarchy/call/PyCallHierarchyBrowser.java
+++ b/python/src/com/jetbrains/python/hierarchy/call/PyCallHierarchyBrowser.java
@@ -42,7 +42,7 @@ import java.util.Map;
  * @author novokrest
  */
 public class PyCallHierarchyBrowser extends CallHierarchyBrowserBase {
-  private static final Logger LOG = Logger.getInstance("#com.jetbrains.python.hierarchy.call.PyCallHierarchyBrowser");
+  private static final Logger LOG = Logger.getInstance(PyCallHierarchyBrowser.class);
 
   public PyCallHierarchyBrowser(PsiElement function) {
     super(function.getProject(), function);
diff --git a/python/src/com/jetbrains/python/packaging/setupPy/SetupTaskIntrospector.java b/python/src/com/jetbrains/python/packaging/setupPy/SetupTaskIntrospector.java
index 738fab8b676c..5db7211cc614 100644
--- a/python/src/com/jetbrains/python/packaging/setupPy/SetupTaskIntrospector.java
+++ b/python/src/com/jetbrains/python/packaging/setupPy/SetupTaskIntrospector.java
@@ -26,7 +26,7 @@ import java.util.*;
  * @author yole
  */
 public class SetupTaskIntrospector {
-  private static final Logger LOG = Logger.getInstance("#com.jetbrains.python.packaging.setupPy.SetupTaskIntrospector");
+  private static final Logger LOG = Logger.getInstance(SetupTaskIntrospector.class);
 
   private static final Map<String, List<SetupTask>> ourDistutilsTaskCache = new HashMap<>();
   private static final Map<String, List<SetupTask>> ourSetuptoolsTaskCache = new HashMap<>();
diff --git a/python/src/com/jetbrains/python/refactoring/surround/surrounders/expressions/PyExpressionSurrounder.java b/python/src/com/jetbrains/python/refactoring/surround/surrounders/expressions/PyExpressionSurrounder.java
index 26d03a0b4c0e..18a09bb3e4d6 100644
--- a/python/src/com/jetbrains/python/refactoring/surround/surrounders/expressions/PyExpressionSurrounder.java
+++ b/python/src/com/jetbrains/python/refactoring/surround/surrounders/expressions/PyExpressionSurrounder.java
@@ -12,7 +12,7 @@ import com.jetbrains.python.psi.PyExpression;
 import org.jetbrains.annotations.NotNull;
 
 public abstract class PyExpressionSurrounder implements Surrounder {
-  private static final Logger LOG = Logger.getInstance("#com.jetbrains.python.refactoring.surround.surrounders.expressions.PyExpressionSurrounder");
+  private static final Logger LOG = Logger.getInstance(PyExpressionSurrounder.class);
 
   @Override
   public boolean isApplicable(@NotNull PsiElement[] elements) {
diff --git a/python/src/com/jetbrains/python/refactoring/surround/surrounders/statements/PyStatementSurrounder.java b/python/src/com/jetbrains/python/refactoring/surround/surrounders/statements/PyStatementSurrounder.java
index 82e37653f21e..7cc36266588a 100644
--- a/python/src/com/jetbrains/python/refactoring/surround/surrounders/statements/PyStatementSurrounder.java
+++ b/python/src/com/jetbrains/python/refactoring/surround/surrounders/statements/PyStatementSurrounder.java
@@ -12,7 +12,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 public abstract class PyStatementSurrounder implements Surrounder {
-  private static final Logger LOG = Logger.getInstance("#com.jetbrains.python.refactoring.surround.surrounders.statements.PyStatementSurrounder");
+  private static final Logger LOG = Logger.getInstance(PyStatementSurrounder.class);
 
   @Override
   public boolean isApplicable(@NotNull PsiElement[] elements) {
diff --git a/python/src/com/jetbrains/python/run/PythonCommandLineState.java b/python/src/com/jetbrains/python/run/PythonCommandLineState.java
index caa9defac868..e56bc3570ece 100644
--- a/python/src/com/jetbrains/python/run/PythonCommandLineState.java
+++ b/python/src/com/jetbrains/python/run/PythonCommandLineState.java
@@ -63,7 +63,7 @@ import java.util.*;
  * @author traff, Leonid Shalupov
  */
 public abstract class PythonCommandLineState extends CommandLineState {
-  private static final Logger LOG = Logger.getInstance("#com.jetbrains.python.run.PythonCommandLineState");
+  private static final Logger LOG = Logger.getInstance(PythonCommandLineState.class);
 
   // command line has a number of fixed groups of parameters; patchers should only operate on them and not the raw list.
 
diff --git a/python/src/com/jetbrains/python/sdk/PythonSdkUpdater.java b/python/src/com/jetbrains/python/sdk/PythonSdkUpdater.java
index 71ce6bd2edbc..e3a3ffcc8550 100644
--- a/python/src/com/jetbrains/python/sdk/PythonSdkUpdater.java
+++ b/python/src/com/jetbrains/python/sdk/PythonSdkUpdater.java
@@ -64,7 +64,7 @@ import java.util.concurrent.Future;
  * @author yole
  */
 public class PythonSdkUpdater implements StartupActivity.Background {
-  private static final Logger LOG = Logger.getInstance("#com.jetbrains.python.sdk.PythonSdkUpdater");
+  private static final Logger LOG = Logger.getInstance(PythonSdkUpdater.class);
 
   private static final Object ourLock = new Object();
   private static final Set<String> ourScheduledToRefresh = Sets.newHashSet();
diff --git a/spellchecker/src/com/intellij/spellchecker/FileLoader.java b/spellchecker/src/com/intellij/spellchecker/FileLoader.java
index f65403900a9a..52596dad9202 100644
--- a/spellchecker/src/com/intellij/spellchecker/FileLoader.java
+++ b/spellchecker/src/com/intellij/spellchecker/FileLoader.java
@@ -28,7 +28,7 @@ import java.nio.charset.Charset;
 import static com.intellij.openapi.vfs.VfsUtil.findFileByIoFile;
 
 public class FileLoader implements Loader {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.spellchecker.FileLoader");
+  private static final Logger LOG = Logger.getInstance(FileLoader.class);
 
   private final String url;
   private final String name;
diff --git a/spellchecker/src/com/intellij/spellchecker/SpellCheckerManager.java b/spellchecker/src/com/intellij/spellchecker/SpellCheckerManager.java
index 2f312e18b259..6c63c6852d3d 100644
--- a/spellchecker/src/com/intellij/spellchecker/SpellCheckerManager.java
+++ b/spellchecker/src/com/intellij/spellchecker/SpellCheckerManager.java
@@ -46,7 +46,7 @@ import static com.intellij.openapi.vfs.VfsUtilCore.visitChildrenRecursively;
 import static com.intellij.project.ProjectKt.getProjectStoreDirectory;
 
 public class SpellCheckerManager implements Disposable {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.spellchecker.SpellCheckerManager");
+  private static final Logger LOG = Logger.getInstance(SpellCheckerManager.class);
 
   private static final int MAX_METRICS = 1;
   public static final String PROJECT = "project";
diff --git a/spellchecker/src/com/intellij/spellchecker/SpellcheckerCorrectionsFilter.java b/spellchecker/src/com/intellij/spellchecker/SpellcheckerCorrectionsFilter.java
index 71d055ee81db..654a79658310 100644
--- a/spellchecker/src/com/intellij/spellchecker/SpellcheckerCorrectionsFilter.java
+++ b/spellchecker/src/com/intellij/spellchecker/SpellcheckerCorrectionsFilter.java
@@ -12,7 +12,7 @@ import java.io.IOException;
 import java.io.InputStream;
 
 public class SpellcheckerCorrectionsFilter {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.spellchecker.SpellcheckerCorrectionsFilter");
+  private static final Logger LOG = Logger.getInstance(SpellcheckerCorrectionsFilter.class);
   private static final String DICT = "excluded.dic";
   private Dictionary excludedCorrections;
 
diff --git a/spellchecker/src/com/intellij/spellchecker/compress/Encoder.java b/spellchecker/src/com/intellij/spellchecker/compress/Encoder.java
index 7a77e749642b..4c26e9165071 100644
--- a/spellchecker/src/com/intellij/spellchecker/compress/Encoder.java
+++ b/spellchecker/src/com/intellij/spellchecker/compress/Encoder.java
@@ -15,7 +15,6 @@
  */
 package com.intellij.spellchecker.compress;
 
-import com.intellij.openapi.diagnostic.Logger;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -23,7 +22,6 @@ public final class Encoder {
   private final Alphabet alphabet;
   private static final int offset = 0;
   static final UnitBitSet WORD_OF_ENTIRELY_UNKNOWN_LETTERS = new UnitBitSet(new byte[1],new Alphabet());
-  private static final Logger LOG = Logger.getInstance("#com.intellij.spellchecker.compress");
 
   public Encoder() {
     this(new Alphabet());
diff --git a/spellchecker/src/com/intellij/spellchecker/engine/BaseSpellChecker.java b/spellchecker/src/com/intellij/spellchecker/engine/BaseSpellChecker.java
index c23ffc744a19..76460d8427cf 100644
--- a/spellchecker/src/com/intellij/spellchecker/engine/BaseSpellChecker.java
+++ b/spellchecker/src/com/intellij/spellchecker/engine/BaseSpellChecker.java
@@ -31,7 +31,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.stream.Collectors;
 
 public class BaseSpellChecker implements SpellCheckerEngine {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.spellchecker.engine.BaseSpellChecker");
+  private static final Logger LOG = Logger.getInstance(BaseSpellChecker.class);
 
   private static final SpellcheckerCorrectionsFilter CORRECTIONS_FILTER = SpellcheckerCorrectionsFilter.getInstance();
   private final Transformation transform = new Transformation();
diff --git a/spellchecker/src/com/intellij/spellchecker/generator/SpellCheckerDictionaryGenerator.java b/spellchecker/src/com/intellij/spellchecker/generator/SpellCheckerDictionaryGenerator.java
index 3759681640f2..00c73300a92d 100644
--- a/spellchecker/src/com/intellij/spellchecker/generator/SpellCheckerDictionaryGenerator.java
+++ b/spellchecker/src/com/intellij/spellchecker/generator/SpellCheckerDictionaryGenerator.java
@@ -33,7 +33,7 @@ import java.io.IOException;
 import java.util.*;
 
 public abstract class SpellCheckerDictionaryGenerator {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.spellchecker.generator.SpellCheckerDictionaryGenerator");
+  private static final Logger LOG = Logger.getInstance(SpellCheckerDictionaryGenerator.class);
   private final Set<String> globalSeenNames = new HashSet<>();
   protected final Project myProject;
   private final String myDefaultDictName;
diff --git a/xml/dom-impl/src/com/intellij/util/xml/highlighting/DomElementAnnotationHolderImpl.java b/xml/dom-impl/src/com/intellij/util/xml/highlighting/DomElementAnnotationHolderImpl.java
index ff215c464697..72f89d92fb18 100644
--- a/xml/dom-impl/src/com/intellij/util/xml/highlighting/DomElementAnnotationHolderImpl.java
+++ b/xml/dom-impl/src/com/intellij/util/xml/highlighting/DomElementAnnotationHolderImpl.java
@@ -36,7 +36,7 @@ import org.jetbrains.annotations.Nullable;
 import java.util.List;
 
 public class DomElementAnnotationHolderImpl extends SmartList<DomElementProblemDescriptor> implements DomElementAnnotationHolder {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.util.xml.highlighting.DomElementAnnotationHolderImpl");
+  private static final Logger LOG = Logger.getInstance(DomElementAnnotationHolderImpl.class);
   private final SmartList<Annotation> myAnnotations = new SmartList<>();
   private final boolean myOnTheFly;
   private final DomFileElement myFileElement;
diff --git a/xml/dom-impl/src/com/intellij/util/xml/highlighting/DomElementProblemDescriptorImpl.java b/xml/dom-impl/src/com/intellij/util/xml/highlighting/DomElementProblemDescriptorImpl.java
index 245befffd27c..60d8be809962 100644
--- a/xml/dom-impl/src/com/intellij/util/xml/highlighting/DomElementProblemDescriptorImpl.java
+++ b/xml/dom-impl/src/com/intellij/util/xml/highlighting/DomElementProblemDescriptorImpl.java
@@ -41,7 +41,7 @@ import org.jetbrains.annotations.Nullable;
 import java.util.List;
 
 public class DomElementProblemDescriptorImpl implements DomElementProblemDescriptor {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.util.xml.highlighting.DomElementProblemDescriptorImpl");
+  private static final Logger LOG = Logger.getInstance(DomElementProblemDescriptorImpl.class);
   private final DomElement myDomElement;
   private final HighlightSeverity mySeverity;
   private final String myMessage;
diff --git a/xml/dom-impl/src/com/intellij/util/xml/impl/AttributeChildInvocationHandler.java b/xml/dom-impl/src/com/intellij/util/xml/impl/AttributeChildInvocationHandler.java
index 034fdb98f171..58c3fada7ba3 100644
--- a/xml/dom-impl/src/com/intellij/util/xml/impl/AttributeChildInvocationHandler.java
+++ b/xml/dom-impl/src/com/intellij/util/xml/impl/AttributeChildInvocationHandler.java
@@ -37,7 +37,7 @@ import org.jetbrains.annotations.Nullable;
  * @author peter
  */
 public class AttributeChildInvocationHandler extends DomInvocationHandler {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.util.xml.impl.AttributeChildInvocationHandler");
+  private static final Logger LOG = Logger.getInstance(AttributeChildInvocationHandler.class);
 
   protected AttributeChildInvocationHandler(final EvaluatedXmlName attributeName,
                                             final AttributeChildDescriptionImpl description,
diff --git a/xml/dom-impl/src/com/intellij/util/xml/impl/DomAnchorImpl.java b/xml/dom-impl/src/com/intellij/util/xml/impl/DomAnchorImpl.java
index 91b87dfaa6d8..4068cf38c682 100644
--- a/xml/dom-impl/src/com/intellij/util/xml/impl/DomAnchorImpl.java
+++ b/xml/dom-impl/src/com/intellij/util/xml/impl/DomAnchorImpl.java
@@ -34,7 +34,7 @@ import java.util.List;
  * @author peter
  */
 public abstract class DomAnchorImpl<T extends DomElement> implements DomAnchor<T> {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.util.xml.impl.DomAnchorImpl");
+  private static final Logger LOG = Logger.getInstance(DomAnchorImpl.class);
 
   public static <T extends DomElement> DomAnchor<T> createAnchor(@NotNull T t) {
     return createAnchor(t, true);
diff --git a/xml/dom-impl/src/com/intellij/util/xml/impl/DomImplUtil.java b/xml/dom-impl/src/com/intellij/util/xml/impl/DomImplUtil.java
index fea3fafeeab4..9e028412d482 100644
--- a/xml/dom-impl/src/com/intellij/util/xml/impl/DomImplUtil.java
+++ b/xml/dom-impl/src/com/intellij/util/xml/impl/DomImplUtil.java
@@ -28,7 +28,7 @@ import java.util.Set;
  * @author peter
  */
 public final class DomImplUtil {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.util.xml.impl.DomImplUtil");
+  private static final Logger LOG = Logger.getInstance(DomImplUtil.class);
 
   private DomImplUtil() {
   }
diff --git a/xml/dom-impl/src/com/intellij/util/xml/impl/DomInvocationHandler.java b/xml/dom-impl/src/com/intellij/util/xml/impl/DomInvocationHandler.java
index ff1721eaa119..e5f967fb73c0 100644
--- a/xml/dom-impl/src/com/intellij/util/xml/impl/DomInvocationHandler.java
+++ b/xml/dom-impl/src/com/intellij/util/xml/impl/DomInvocationHandler.java
@@ -47,7 +47,7 @@ import java.util.List;
  * @author peter
  */
 public abstract class DomInvocationHandler extends UserDataHolderBase implements InvocationHandler, DomElement {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.util.xml.impl.DomInvocationHandler");
+  private static final Logger LOG = Logger.getInstance(DomInvocationHandler.class);
   public static final Method ACCEPT_METHOD = ReflectionUtil.getMethod(DomElement.class, "accept", DomElementVisitor.class);
   public static final Method ACCEPT_CHILDREN_METHOD = ReflectionUtil.getMethod(DomElement.class, "acceptChildren", DomElementVisitor.class);
   private static final JavaMethod ourGetValue = JavaMethod.getMethod(GenericValue.class, new JavaMethodSignature("getValue"));
diff --git a/xml/dom-impl/src/com/intellij/util/xml/impl/DomRootInvocationHandler.java b/xml/dom-impl/src/com/intellij/util/xml/impl/DomRootInvocationHandler.java
index aa4f1d8d7415..1cff5639f067 100644
--- a/xml/dom-impl/src/com/intellij/util/xml/impl/DomRootInvocationHandler.java
+++ b/xml/dom-impl/src/com/intellij/util/xml/impl/DomRootInvocationHandler.java
@@ -38,7 +38,7 @@ import java.util.List;
  * @author peter
  */
 public class DomRootInvocationHandler extends DomInvocationHandler {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.util.xml.impl.DomRootInvocationHandler");
+  private static final Logger LOG = Logger.getInstance(DomRootInvocationHandler.class);
   private final DomFileElementImpl<?> myParent;
 
   public DomRootInvocationHandler(final Class aClass,
diff --git a/xml/dom-impl/src/com/intellij/util/xml/impl/GenericValueReferenceProvider.java b/xml/dom-impl/src/com/intellij/util/xml/impl/GenericValueReferenceProvider.java
index 54f10e85036b..2084a97058e9 100644
--- a/xml/dom-impl/src/com/intellij/util/xml/impl/GenericValueReferenceProvider.java
+++ b/xml/dom-impl/src/com/intellij/util/xml/impl/GenericValueReferenceProvider.java
@@ -33,7 +33,7 @@ import java.util.List;
  * @author peter
  */
 public class GenericValueReferenceProvider extends PsiReferenceProvider {
-  private final static Logger LOG = Logger.getInstance("#com.intellij.util.xml.impl.GenericValueReferenceProvider");
+  private final static Logger LOG = Logger.getInstance(GenericValueReferenceProvider.class);
 
   @Override
   @NotNull
diff --git a/xml/dom-impl/src/com/intellij/util/xml/impl/IndexedElementInvocationHandler.java b/xml/dom-impl/src/com/intellij/util/xml/impl/IndexedElementInvocationHandler.java
index c7ba916281cf..1bf552afadb7 100644
--- a/xml/dom-impl/src/com/intellij/util/xml/impl/IndexedElementInvocationHandler.java
+++ b/xml/dom-impl/src/com/intellij/util/xml/impl/IndexedElementInvocationHandler.java
@@ -35,7 +35,7 @@ import java.util.List;
  * @author peter
  */
 public class IndexedElementInvocationHandler extends DomInvocationHandler {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.util.xml.impl.IndexedElementInvocationHandler");
+  private static final Logger LOG = Logger.getInstance(IndexedElementInvocationHandler.class);
   private final int myIndex;
 
   public IndexedElementInvocationHandler(final EvaluatedXmlName tagName,
diff --git a/xml/dom-impl/src/com/intellij/util/xml/impl/PhysicalDomParentStrategy.java b/xml/dom-impl/src/com/intellij/util/xml/impl/PhysicalDomParentStrategy.java
index 50c2a2635490..68e418b81a91 100644
--- a/xml/dom-impl/src/com/intellij/util/xml/impl/PhysicalDomParentStrategy.java
+++ b/xml/dom-impl/src/com/intellij/util/xml/impl/PhysicalDomParentStrategy.java
@@ -15,7 +15,7 @@ import org.jetbrains.annotations.Nullable;
  * @author peter
  */
 public class PhysicalDomParentStrategy implements DomParentStrategy {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.util.xml.impl.PhysicalDomParentStrategy");
+  private static final Logger LOG = Logger.getInstance(PhysicalDomParentStrategy.class);
   private XmlElement myElement;
   private final DomManagerImpl myDomManager;
 
diff --git a/xml/dom-impl/src/com/intellij/util/xml/reflect/DomExtenderEP.java b/xml/dom-impl/src/com/intellij/util/xml/reflect/DomExtenderEP.java
index 264e16a00ab6..3e7c62fb39b6 100644
--- a/xml/dom-impl/src/com/intellij/util/xml/reflect/DomExtenderEP.java
+++ b/xml/dom-impl/src/com/intellij/util/xml/reflect/DomExtenderEP.java
@@ -33,7 +33,7 @@ public class DomExtenderEP extends AbstractExtensionPointBean {
 
   public static final ExtensionPointName<DomExtenderEP> EP_NAME = ExtensionPointName.create("com.intellij.dom.extender");
 
-  private static final Logger LOG = Logger.getInstance("#com.intellij.util.xml.reflect.DomExtenderEP");
+  private static final Logger LOG = Logger.getInstance(DomExtenderEP.class);
 
   @Attribute("domClass")
   public String domClassName;
diff --git a/xml/dom-openapi/src/com/intellij/util/xml/DomUtil.java b/xml/dom-openapi/src/com/intellij/util/xml/DomUtil.java
index 98eec7ae9bab..df3406ef4592 100644
--- a/xml/dom-openapi/src/com/intellij/util/xml/DomUtil.java
+++ b/xml/dom-openapi/src/com/intellij/util/xml/DomUtil.java
@@ -34,7 +34,7 @@ import java.util.concurrent.ConcurrentMap;
  * @author peter
  */
 public class DomUtil {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.util.xml.DomUtil");
+  private static final Logger LOG = Logger.getInstance(DomUtil.class);
   public static final TypeVariable<Class<GenericValue>> GENERIC_VALUE_TYPE_VARIABLE = GenericValue.class.getTypeParameters()[0];
   private static final Class<Void> DUMMY = void.class;
   private static final Key<DomFileElement> FILE_ELEMENT_KEY = Key.create("dom file element");
diff --git a/xml/dom-openapi/src/com/intellij/util/xml/highlighting/DomElementsInspection.java b/xml/dom-openapi/src/com/intellij/util/xml/highlighting/DomElementsInspection.java
index 3cfea6958214..046798b99bac 100644
--- a/xml/dom-openapi/src/com/intellij/util/xml/highlighting/DomElementsInspection.java
+++ b/xml/dom-openapi/src/com/intellij/util/xml/highlighting/DomElementsInspection.java
@@ -41,7 +41,7 @@ import java.util.Set;
  * @see com.intellij.util.xml.highlighting.BasicDomElementsInspection
  */
 public abstract class DomElementsInspection<T extends DomElement> extends XmlSuppressableInspectionTool {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.util.xml.highlighting.DomElementsInspection");
+  private static final Logger LOG = Logger.getInstance(DomElementsInspection.class);
 
   private final Set<Class<? extends T>> myDomClasses;
 
diff --git a/xml/impl/src/com/intellij/codeInsight/actions/GenerateDTDAction.java b/xml/impl/src/com/intellij/codeInsight/actions/GenerateDTDAction.java
index 73a13381872e..4d35b0b67395 100644
--- a/xml/impl/src/com/intellij/codeInsight/actions/GenerateDTDAction.java
+++ b/xml/impl/src/com/intellij/codeInsight/actions/GenerateDTDAction.java
@@ -39,7 +39,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 public class GenerateDTDAction extends BaseCodeInsightAction{
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.actions.GenerateDTDAction");
+  private static final Logger LOG = Logger.getInstance(GenerateDTDAction.class);
   @Override
   @NotNull
   protected CodeInsightActionHandler getHandler(){
diff --git a/xml/impl/src/com/intellij/codeInsight/completion/ExtendedTagInsertHandler.java b/xml/impl/src/com/intellij/codeInsight/completion/ExtendedTagInsertHandler.java
index 785cfa4b0d0e..a94c010955f2 100644
--- a/xml/impl/src/com/intellij/codeInsight/completion/ExtendedTagInsertHandler.java
+++ b/xml/impl/src/com/intellij/codeInsight/completion/ExtendedTagInsertHandler.java
@@ -32,7 +32,7 @@ import java.util.Set;
 */
 public class ExtendedTagInsertHandler extends XmlTagInsertHandler {
 
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.completion.ExtendedTagInsertHandler");
+  private static final Logger LOG = Logger.getInstance(ExtendedTagInsertHandler.class);
 
   protected final String myElementName;
   @Nullable protected final String myNamespace;
diff --git a/xml/impl/src/com/intellij/codeInsight/completion/XmlAttributeInsertHandler.java b/xml/impl/src/com/intellij/codeInsight/completion/XmlAttributeInsertHandler.java
index 1ee00c267f7c..ad33b44d5870 100644
--- a/xml/impl/src/com/intellij/codeInsight/completion/XmlAttributeInsertHandler.java
+++ b/xml/impl/src/com/intellij/codeInsight/completion/XmlAttributeInsertHandler.java
@@ -31,7 +31,7 @@ import java.util.Collections;
 * @author peter
 */
 public class XmlAttributeInsertHandler implements InsertHandler<LookupElement> {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.completion.XmlAttributeInsertHandler");
+  private static final Logger LOG = Logger.getInstance(XmlAttributeInsertHandler.class);
 
   public static final XmlAttributeInsertHandler INSTANCE = new XmlAttributeInsertHandler();
 
diff --git a/xml/impl/src/com/intellij/codeInsight/completion/XmlSmartEnterProcessor.java b/xml/impl/src/com/intellij/codeInsight/completion/XmlSmartEnterProcessor.java
index c26b36311743..0359a5737990 100644
--- a/xml/impl/src/com/intellij/codeInsight/completion/XmlSmartEnterProcessor.java
+++ b/xml/impl/src/com/intellij/codeInsight/completion/XmlSmartEnterProcessor.java
@@ -36,7 +36,7 @@ import org.jetbrains.annotations.Nullable;
  * @author spleaner
  */
 public class XmlSmartEnterProcessor extends SmartEnterProcessor {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.completion.XmlSmartEnterProcessor");
+  private static final Logger LOG = Logger.getInstance(XmlSmartEnterProcessor.class);
 
   @Override
   public boolean process(@NotNull final Project project, @NotNull final Editor editor, @NotNull final PsiFile psiFile) {
diff --git a/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/CreateNSDeclarationIntentionFix.java b/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/CreateNSDeclarationIntentionFix.java
index db968d7124a1..baad40106add 100644
--- a/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/CreateNSDeclarationIntentionFix.java
+++ b/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/CreateNSDeclarationIntentionFix.java
@@ -57,7 +57,7 @@ import java.util.Set;
  */
 public class CreateNSDeclarationIntentionFix implements HintAction, LocalQuickFix {
 
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.daemon.impl.analysis.CreateNSDeclarationIntentionFix");
+  private static final Logger LOG = Logger.getInstance(CreateNSDeclarationIntentionFix.class);
 
   private final String myNamespacePrefix;
   private final PsiAnchor myElement;
diff --git a/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/encoding/XmlEncodingReferenceProvider.java b/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/encoding/XmlEncodingReferenceProvider.java
index b13d04c904eb..3b6c7017d233 100644
--- a/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/encoding/XmlEncodingReferenceProvider.java
+++ b/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/encoding/XmlEncodingReferenceProvider.java
@@ -31,7 +31,7 @@ import org.jetbrains.annotations.NotNull;
  * @author cdr
  */
 public class XmlEncodingReferenceProvider extends PsiReferenceProvider {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.daemon.impl.analysis.encoding.XmlEncodingReferenceProvider");
+  private static final Logger LOG = Logger.getInstance(XmlEncodingReferenceProvider.class);
   @NonNls private static final String CHARSET_PREFIX = "charset=";
 
   @Override
diff --git a/xml/impl/src/com/intellij/codeInsight/editorActions/XmlGtTypedHandler.java b/xml/impl/src/com/intellij/codeInsight/editorActions/XmlGtTypedHandler.java
index 5774f6b35472..4d2fe5fa08e9 100644
--- a/xml/impl/src/com/intellij/codeInsight/editorActions/XmlGtTypedHandler.java
+++ b/xml/impl/src/com/intellij/codeInsight/editorActions/XmlGtTypedHandler.java
@@ -37,7 +37,7 @@ import java.util.Collection;
 import java.util.List;
 
 public class XmlGtTypedHandler extends TypedHandlerDelegate {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.editorActions.TypedHandler");
+  private static final Logger LOG = Logger.getInstance(TypedHandler.class);
 
   @NotNull
   @Override
diff --git a/xml/impl/src/com/intellij/codeInsight/folding/impl/XmlElementSignatureProvider.java b/xml/impl/src/com/intellij/codeInsight/folding/impl/XmlElementSignatureProvider.java
index b9d60b2d152f..d2526187610c 100644
--- a/xml/impl/src/com/intellij/codeInsight/folding/impl/XmlElementSignatureProvider.java
+++ b/xml/impl/src/com/intellij/codeInsight/folding/impl/XmlElementSignatureProvider.java
@@ -18,7 +18,7 @@ import java.util.StringTokenizer;
  * @author yole
  */
 public class XmlElementSignatureProvider extends AbstractElementSignatureProvider {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.folding.impl.XmlElementSignatureProvider");
+  private static final Logger LOG = Logger.getInstance(XmlElementSignatureProvider.class);
 
   @Override
   public String getSignature(@NotNull PsiElement element) {
diff --git a/xml/impl/src/com/intellij/lang/xml/XmlFormattingModel.java b/xml/impl/src/com/intellij/lang/xml/XmlFormattingModel.java
index 292db80b92d7..6bcb023036c9 100644
--- a/xml/impl/src/com/intellij/lang/xml/XmlFormattingModel.java
+++ b/xml/impl/src/com/intellij/lang/xml/XmlFormattingModel.java
@@ -37,7 +37,7 @@ import org.jetbrains.annotations.Nullable;
 
 public class XmlFormattingModel extends PsiBasedFormattingModel {
   private static final Logger LOG =
-      Logger.getInstance("#com.intellij.psi.impl.source.codeStyle.PsiBasedFormatterModelWithShiftIndentInside");
+      Logger.getInstance(XmlFormattingModel.class);
 
   public XmlFormattingModel(final PsiFile file,
                                                      final Block rootBlock,
diff --git a/xml/impl/src/com/intellij/psi/formatter/xml/AbstractSyntheticBlock.java b/xml/impl/src/com/intellij/psi/formatter/xml/AbstractSyntheticBlock.java
index bafde7e4256f..9581915d077c 100644
--- a/xml/impl/src/com/intellij/psi/formatter/xml/AbstractSyntheticBlock.java
+++ b/xml/impl/src/com/intellij/psi/formatter/xml/AbstractSyntheticBlock.java
@@ -54,7 +54,7 @@ public abstract class AbstractSyntheticBlock implements Block {
 
   }
 
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.formatter.xml.AbstractSyntheticBlock");
+  private static final Logger LOG = Logger.getInstance(AbstractSyntheticBlock.class);
 
   public boolean shouldKeepWhiteSpacesInside() {
     return myTag != null && myXmlFormattingPolicy.keepWhiteSpacesInsideTag(myTag);
diff --git a/xml/impl/src/com/intellij/psi/formatter/xml/AbstractXmlBlock.java b/xml/impl/src/com/intellij/psi/formatter/xml/AbstractXmlBlock.java
index 29496f88a143..1c277dcb399a 100644
--- a/xml/impl/src/com/intellij/psi/formatter/xml/AbstractXmlBlock.java
+++ b/xml/impl/src/com/intellij/psi/formatter/xml/AbstractXmlBlock.java
@@ -378,7 +378,7 @@ public abstract class AbstractXmlBlock extends AbstractBlock {
 
   public abstract boolean isTextElement();
 
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.formatter.xml.AbstractXmlBlock");
+  private static final Logger LOG = Logger.getInstance(AbstractXmlBlock.class);
 
   protected void createJspTextNode(final List<? super Block> localResult, final ASTNode child, final Indent indent) {
   }
diff --git a/xml/impl/src/com/intellij/psi/formatter/xml/XmlBlock.java b/xml/impl/src/com/intellij/psi/formatter/xml/XmlBlock.java
index 8ace1373f0d9..5f461a3924cb 100644
--- a/xml/impl/src/com/intellij/psi/formatter/xml/XmlBlock.java
+++ b/xml/impl/src/com/intellij/psi/formatter/xml/XmlBlock.java
@@ -40,7 +40,7 @@ public class XmlBlock extends AbstractXmlBlock {
   private final Indent myIndent;
   private final TextRange myTextRange;
 
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.formatter.xml.XmlBlock");
+  private static final Logger LOG = Logger.getInstance(XmlBlock.class);
 
   public XmlBlock(final ASTNode node,
                     final Wrap wrap,
diff --git a/xml/impl/src/com/intellij/refactoring/rename/RenameXmlAttributeProcessor.java b/xml/impl/src/com/intellij/refactoring/rename/RenameXmlAttributeProcessor.java
index 8c2379be2ddd..9465de38fe86 100644
--- a/xml/impl/src/com/intellij/refactoring/rename/RenameXmlAttributeProcessor.java
+++ b/xml/impl/src/com/intellij/refactoring/rename/RenameXmlAttributeProcessor.java
@@ -20,7 +20,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 public class RenameXmlAttributeProcessor extends RenamePsiElementProcessor {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.rename.RenameXmlAttributeProcessor");
+  private static final Logger LOG = Logger.getInstance(RenameXmlAttributeProcessor.class);
 
   @Override
   public boolean canProcessElement(@NotNull final PsiElement element) {
diff --git a/xml/impl/src/com/intellij/xml/actions/validate/StdErrorReporter.java b/xml/impl/src/com/intellij/xml/actions/validate/StdErrorReporter.java
index bf9ab1a15dc9..d537200c536c 100644
--- a/xml/impl/src/com/intellij/xml/actions/validate/StdErrorReporter.java
+++ b/xml/impl/src/com/intellij/xml/actions/validate/StdErrorReporter.java
@@ -36,7 +36,7 @@ import org.xml.sax.SAXParseException;
 import java.util.concurrent.Future;
 
 public class StdErrorReporter extends ErrorReporter {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.xml.actions.validate.StdErrorReporter");
+  private static final Logger LOG = Logger.getInstance(StdErrorReporter.class);
   private static final Key<NewErrorTreeViewPanel> KEY = Key.create("ValidateXmlAction.KEY");
 
   private final NewErrorTreeViewPanel myErrorsView;
diff --git a/xml/impl/src/com/intellij/xml/breadcrumbs/PsiBreadcrumbs.java b/xml/impl/src/com/intellij/xml/breadcrumbs/PsiBreadcrumbs.java
index 0be8cb1f7c59..cdec54f0418e 100644
--- a/xml/impl/src/com/intellij/xml/breadcrumbs/PsiBreadcrumbs.java
+++ b/xml/impl/src/com/intellij/xml/breadcrumbs/PsiBreadcrumbs.java
@@ -45,7 +45,7 @@ import java.util.concurrent.TimeoutException;
  * @author Sergey.Malenkov
  */
 final class PsiBreadcrumbs extends Breadcrumbs {
-  private final static Logger LOG = Logger.getInstance("#com.intellij.xml.breadcrumbs.PsiBreadcrumbs");
+  private final static Logger LOG = Logger.getInstance(PsiBreadcrumbs.class);
   private final Map<Crumb, Promise<String>> scheduledTooltipTasks = new HashMap<>();
   boolean above = EditorSettingsExternalizable.getInstance().isBreadcrumbsAbove();
 
diff --git a/xml/impl/src/com/intellij/xml/refactoring/XmlTagRenameDialog.java b/xml/impl/src/com/intellij/xml/refactoring/XmlTagRenameDialog.java
index 6cf77f53602a..904d7295801a 100644
--- a/xml/impl/src/com/intellij/xml/refactoring/XmlTagRenameDialog.java
+++ b/xml/impl/src/com/intellij/xml/refactoring/XmlTagRenameDialog.java
@@ -32,7 +32,7 @@ import java.awt.event.InputEvent;
 import java.awt.event.KeyEvent;
 
 public class XmlTagRenameDialog extends RefactoringDialog {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.xml.refactoring.XmlTagRenameDialog");
+  private static final Logger LOG = Logger.getInstance(XmlTagRenameDialog.class);
   private static final String REFACTORING_NAME = RefactoringBundle.message("rename.title");
 
   private final PsiElement myElement;
diff --git a/xml/impl/src/com/intellij/xml/refactoring/XmlTagRenameHandler.java b/xml/impl/src/com/intellij/xml/refactoring/XmlTagRenameHandler.java
index d0ac0136caee..cd4088ac95d1 100644
--- a/xml/impl/src/com/intellij/xml/refactoring/XmlTagRenameHandler.java
+++ b/xml/impl/src/com/intellij/xml/refactoring/XmlTagRenameHandler.java
@@ -26,7 +26,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 public class XmlTagRenameHandler implements RenameHandler, TitledHandler {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.xml.refactoring.XmlTagRenameHandler");
+  private static final Logger LOG = Logger.getInstance(XmlTagRenameHandler.class);
 
 
   @Override
diff --git a/xml/impl/src/com/intellij/xml/util/documentation/XmlDocumentationProvider.java b/xml/impl/src/com/intellij/xml/util/documentation/XmlDocumentationProvider.java
index 41e588384007..43af9c474d95 100644
--- a/xml/impl/src/com/intellij/xml/util/documentation/XmlDocumentationProvider.java
+++ b/xml/impl/src/com/intellij/xml/util/documentation/XmlDocumentationProvider.java
@@ -35,7 +35,7 @@ import java.util.List;
 public class XmlDocumentationProvider implements DocumentationProvider {
   private static final Key<XmlElementDescriptor> DESCRIPTOR_KEY = Key.create("Original element");
 
-  private static final Logger LOG = Logger.getInstance("#com.intellij.xml.util.documentation.XmlDocumentationProvider");
+  private static final Logger LOG = Logger.getInstance(XmlDocumentationProvider.class);
 
   @NonNls private static final String NAME_ATTR_NAME = "name";
   @NonNls private static final String BASE_SITEPOINT_URL = "http://reference.sitepoint.com/html/";
diff --git a/xml/openapi/src/com/intellij/xml/breadcrumbs/BreadcrumbsComponent.java b/xml/openapi/src/com/intellij/xml/breadcrumbs/BreadcrumbsComponent.java
index fd68f31c44dd..5c3f4c69210a 100644
--- a/xml/openapi/src/com/intellij/xml/breadcrumbs/BreadcrumbsComponent.java
+++ b/xml/openapi/src/com/intellij/xml/breadcrumbs/BreadcrumbsComponent.java
@@ -44,7 +44,7 @@ import java.util.*;
  */
 public class BreadcrumbsComponent<T extends BreadcrumbsItem> extends JComponent implements Disposable, Weighted {
 
-  private static final Logger LOG = Logger.getInstance("#com.intellij.xml.breadcrumbs.BreadcrumbsComponent");
+  private static final Logger LOG = Logger.getInstance(BreadcrumbsComponent.class);
   private static final Painter DEFAULT_PAINTER = new DefaultPainter(new ButtonSettings());
 
   private static final int EXTRA_WIDTH = 10;
diff --git a/xml/relaxng/src/org/intellij/html/RelaxedHtmlFromRngNSDescriptor.java b/xml/relaxng/src/org/intellij/html/RelaxedHtmlFromRngNSDescriptor.java
index 7ca38541b012..c501cb1414aa 100644
--- a/xml/relaxng/src/org/intellij/html/RelaxedHtmlFromRngNSDescriptor.java
+++ b/xml/relaxng/src/org/intellij/html/RelaxedHtmlFromRngNSDescriptor.java
@@ -37,7 +37,7 @@ import static com.intellij.xml.util.HtmlUtil.SVG_NAMESPACE;
  * @author Eugene.Kudelevsky
  */
 public class RelaxedHtmlFromRngNSDescriptor extends RngNsDescriptor implements RelaxedHtmlNSDescriptor {
-  private static final Logger LOG = Logger.getInstance("#org.intellij.html.RelaxedHtmlFromRngNSDescriptor");
+  private static final Logger LOG = Logger.getInstance(RelaxedHtmlFromRngNSDescriptor.class);
 
   @Override
   public XmlElementDescriptor getElementDescriptor(@NotNull XmlTag tag) {
diff --git a/xml/relaxng/src/org/intellij/plugins/relaxNG/references/PrefixReferenceProvider.java b/xml/relaxng/src/org/intellij/plugins/relaxNG/references/PrefixReferenceProvider.java
index 1641a2171f55..124cf9ccbc5a 100644
--- a/xml/relaxng/src/org/intellij/plugins/relaxNG/references/PrefixReferenceProvider.java
+++ b/xml/relaxng/src/org/intellij/plugins/relaxNG/references/PrefixReferenceProvider.java
@@ -38,7 +38,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 public class PrefixReferenceProvider extends PsiReferenceProvider {
-  private static final Logger LOG = Logger.getInstance("#org.intellij.plugins.relaxNG.references.PrefixReferenceProvider");
+  private static final Logger LOG = Logger.getInstance(PrefixReferenceProvider.class);
 
   @Override
   @NotNull
diff --git a/xml/relaxng/src/org/intellij/plugins/relaxNG/validation/MessageViewHelper.java b/xml/relaxng/src/org/intellij/plugins/relaxNG/validation/MessageViewHelper.java
index 7fdc43feb50a..d31df5e1bb23 100644
--- a/xml/relaxng/src/org/intellij/plugins/relaxNG/validation/MessageViewHelper.java
+++ b/xml/relaxng/src/org/intellij/plugins/relaxNG/validation/MessageViewHelper.java
@@ -41,7 +41,7 @@ import java.util.Objects;
 import java.util.Set;
 
 public class MessageViewHelper {
-  private static final Logger LOG = Logger.getInstance("#org.intellij.plugins.relaxNG.validation.MessageViewHelper");
+  private static final Logger LOG = Logger.getInstance(MessageViewHelper.class);
 
   private final Project myProject;
 
diff --git a/xml/relaxng/src/org/intellij/plugins/relaxNG/validation/RngParser.java b/xml/relaxng/src/org/intellij/plugins/relaxNG/validation/RngParser.java
index cbeb5763f255..b26e6eb87e81 100644
--- a/xml/relaxng/src/org/intellij/plugins/relaxNG/validation/RngParser.java
+++ b/xml/relaxng/src/org/intellij/plugins/relaxNG/validation/RngParser.java
@@ -70,7 +70,7 @@ import java.io.StringReader;
 import java.util.concurrent.ConcurrentMap;
 
 public class RngParser {
-  private static final Logger LOG = Logger.getInstance("#org.intellij.plugins.relaxNG.validation.RngParser");
+  private static final Logger LOG = Logger.getInstance(RngParser.class);
 
   private static final NotNullLazyValue<DatatypeLibraryFactory> DT_LIBRARY_FACTORY = new AtomicNotNullLazyValue<DatatypeLibraryFactory>() {
     @NotNull
diff --git a/xml/xml-analysis-impl/src/com/intellij/codeInspection/htmlInspections/HtmlUnknownAttributeInspectionBase.java b/xml/xml-analysis-impl/src/com/intellij/codeInspection/htmlInspections/HtmlUnknownAttributeInspectionBase.java
index 82fec63759d7..f99d86cbd6b1 100644
--- a/xml/xml-analysis-impl/src/com/intellij/codeInspection/htmlInspections/HtmlUnknownAttributeInspectionBase.java
+++ b/xml/xml-analysis-impl/src/com/intellij/codeInspection/htmlInspections/HtmlUnknownAttributeInspectionBase.java
@@ -43,7 +43,7 @@ import java.util.ArrayList;
 
 public class HtmlUnknownAttributeInspectionBase extends HtmlUnknownElementInspection {
   private static final Key<HtmlUnknownElementInspection> ATTRIBUTE_KEY = Key.create(ATTRIBUTE_SHORT_NAME);
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInspection.htmlInspections.HtmlUnknownAttributeInspection");
+  private static final Logger LOG = Logger.getInstance(HtmlUnknownAttributeInspectionBase.class);
 
   public HtmlUnknownAttributeInspectionBase() {
     this("");
diff --git a/xml/xml-analysis-impl/src/com/intellij/codeInspection/htmlInspections/HtmlUnknownTagInspectionBase.java b/xml/xml-analysis-impl/src/com/intellij/codeInspection/htmlInspections/HtmlUnknownTagInspectionBase.java
index 82922d9d1463..c7411ad14390 100644
--- a/xml/xml-analysis-impl/src/com/intellij/codeInspection/htmlInspections/HtmlUnknownTagInspectionBase.java
+++ b/xml/xml-analysis-impl/src/com/intellij/codeInspection/htmlInspections/HtmlUnknownTagInspectionBase.java
@@ -46,7 +46,7 @@ import java.util.List;
 
 public class HtmlUnknownTagInspectionBase extends HtmlUnknownElementInspection {
   public static final Key<HtmlUnknownElementInspection> TAG_KEY = Key.create(TAG_SHORT_NAME);
-  private static final Logger LOG = Logger.getInstance("#com.intellij.codeInspection.htmlInspections.HtmlUnknownTagInspection");
+  private static final Logger LOG = Logger.getInstance(HtmlUnknownTagInspectionBase.class);
 
   public HtmlUnknownTagInspectionBase(@NotNull String defaultValues) {
     super(defaultValues);
diff --git a/xml/xml-analysis-impl/src/com/intellij/codeInspection/htmlInspections/RequiredAttributesInspectionBase.java b/xml/xml-analysis-impl/src/com/intellij/codeInspection/htmlInspections/RequiredAttributesInspectionBase.java
index 5c5ec6ed92a2..d3c3f3815386 100644
--- a/xml/xml-analysis-impl/src/com/intellij/codeInspection/htmlInspections/RequiredAttributesInspectionBase.java
+++ b/xml/xml-analysis-impl/src/com/intellij/codeInspection/htmlInspections/RequiredAttributesInspectionBase.java
@@ -44,7 +44,7 @@ import static com.intellij.codeInsight.daemon.impl.analysis.XmlHighlightVisitor.
 
 public class RequiredAttributesInspectionBase extends HtmlLocalInspectionTool implements XmlEntitiesInspection {
   @NonNls public static final Key<InspectionProfileEntry> SHORT_NAME_KEY = Key.create(REQUIRED_ATTRIBUTES_SHORT_NAME);
-  protected static final Logger LOG = Logger.getInstance("#com.intellij.codeInspection.htmlInspections.RequiredAttributesInspection");
+  protected static final Logger LOG = Logger.getInstance(RequiredAttributesInspectionBase.class);
   public String myAdditionalRequiredHtmlAttributes = "";
 
   private static String appendName(String toAppend, String text) {
diff --git a/xml/xml-psi-impl/src/com/intellij/lexer/HtmlHighlightingLexer.java b/xml/xml-psi-impl/src/com/intellij/lexer/HtmlHighlightingLexer.java
index 40df2281cff3..bd0e2dd081de 100644
--- a/xml/xml-psi-impl/src/com/intellij/lexer/HtmlHighlightingLexer.java
+++ b/xml/xml-psi-impl/src/com/intellij/lexer/HtmlHighlightingLexer.java
@@ -33,7 +33,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 public class HtmlHighlightingLexer extends BaseHtmlLexer {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.lexer.HtmlHighlightingLexer");
+  private static final Logger LOG = Logger.getInstance(HtmlHighlightingLexer.class);
 
   private static final int EMBEDDED_LEXER_ON = 0x1 << BASE_STATE_SHIFT;
   private static final int EMBEDDED_LEXER_STATE_SHIFT = BASE_STATE_SHIFT + 1;
diff --git a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/parsing/xml/DtdParsing.java b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/parsing/xml/DtdParsing.java
index 6f813b8a0b9a..4863ec9dc819 100644
--- a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/parsing/xml/DtdParsing.java
+++ b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/parsing/xml/DtdParsing.java
@@ -26,7 +26,7 @@ import org.jetbrains.annotations.NotNull;
  * @author Mike
  */
 public class DtdParsing extends XmlParsing implements XmlElementType {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.parsing.xml.XmlParser");
+  private static final Logger LOG = Logger.getInstance(XmlParser.class);
 
   private final IElementType myRootType;
   public static final XmlEntityDecl.EntityContextType TYPE_FOR_MARKUP_DECL = XmlEntityDecl.EntityContextType.ELEMENT_CONTENT_SPEC;
diff --git a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/manipulators/XmlAttributeValueManipulator.java b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/manipulators/XmlAttributeValueManipulator.java
index 353d044a2717..684f72642bb1 100644
--- a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/manipulators/XmlAttributeValueManipulator.java
+++ b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/manipulators/XmlAttributeValueManipulator.java
@@ -32,7 +32,7 @@ import com.intellij.util.IncorrectOperationException;
 import org.jetbrains.annotations.NotNull;
 
 public class XmlAttributeValueManipulator extends AbstractElementManipulator<XmlAttributeValue> {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.resolve.reference.impl.manipulators.XmlAttributeValueManipulator");
+  private static final Logger LOG = Logger.getInstance(XmlAttributeValueManipulator.class);
 
   @Override
   public XmlAttributeValue handleContentChange(@NotNull XmlAttributeValue element, @NotNull TextRange range, String newContent) throws IncorrectOperationException {
diff --git a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/tree/HtmlFileElement.java b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/tree/HtmlFileElement.java
index 267fc26eb222..e2e4a51b927a 100644
--- a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/tree/HtmlFileElement.java
+++ b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/tree/HtmlFileElement.java
@@ -23,7 +23,7 @@ import com.intellij.psi.xml.XmlElementType;
 import org.jetbrains.annotations.NotNull;
 
 public class HtmlFileElement extends FileElement implements XmlElementType  {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.tree.HtmlFileElement");
+  private static final Logger LOG = Logger.getInstance(HtmlFileElement.class);
 
   public HtmlFileElement(CharSequence text) {
     super(HTML_FILE, text);
diff --git a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/tree/XmlFileElement.java b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/tree/XmlFileElement.java
index 37608b69bad2..e3b17425b6cf 100644
--- a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/tree/XmlFileElement.java
+++ b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/tree/XmlFileElement.java
@@ -24,7 +24,7 @@ import com.intellij.psi.xml.XmlElementType;
 import org.jetbrains.annotations.NotNull;
 
 public class XmlFileElement extends FileElement implements XmlElementType {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.tree.XmlFileElement");
+  private static final Logger LOG = Logger.getInstance(XmlFileElement.class);
 
   public XmlFileElement(CharSequence text) {
     super(XML_FILE, text);
diff --git a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/TagNameReference.java b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/TagNameReference.java
index 660ff848dc96..d9757f701cf5 100644
--- a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/TagNameReference.java
+++ b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/TagNameReference.java
@@ -34,7 +34,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 public class TagNameReference implements PsiReference {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.xml.TagNameReference");
+  private static final Logger LOG = Logger.getInstance(TagNameReference.class);
 
   protected final boolean myStartTagFlag;
   private final ASTNode myNameElement;
diff --git a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlAttlistDeclImpl.java b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlAttlistDeclImpl.java
index b49d2fdc1280..088f82915f04 100644
--- a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlAttlistDeclImpl.java
+++ b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlAttlistDeclImpl.java
@@ -33,7 +33,7 @@ import java.util.List;
  * @author Mike
  */
 public class XmlAttlistDeclImpl extends XmlElementImpl implements XmlAttlistDecl {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.xml.XmlAttlistDeclImpl");
+  private static final Logger LOG = Logger.getInstance(XmlAttlistDeclImpl.class);
 
   public XmlAttlistDeclImpl() {
     super(XmlElementType.XML_ATTLIST_DECL);
diff --git a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlAttributeDeclImpl.java b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlAttributeDeclImpl.java
index d0701b466f64..ffa3a90f974f 100644
--- a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlAttributeDeclImpl.java
+++ b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlAttributeDeclImpl.java
@@ -37,7 +37,7 @@ import org.jetbrains.annotations.NotNull;
  * @author Mike
  */
 public class XmlAttributeDeclImpl extends XmlElementImpl implements XmlAttributeDecl, XmlElementType {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.xml.XmlAttributeDeclImpl");
+  private static final Logger LOG = Logger.getInstance(XmlAttributeDeclImpl.class);
   @NonNls private static final String ID_ATT = "ID";
   @NonNls private static final String IDREF_ATT = "IDREF";
 
diff --git a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlAttributeImpl.java b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlAttributeImpl.java
index 6c56e94cebce..a901a2615991 100644
--- a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlAttributeImpl.java
+++ b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlAttributeImpl.java
@@ -37,7 +37,7 @@ import static com.intellij.codeInsight.completion.CompletionUtilCore.DUMMY_IDENT
  * @author Mike
  */
 public class XmlAttributeImpl extends XmlElementImpl implements XmlAttribute, HintedReferenceHost {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.xml.XmlAttributeImpl");
+  private static final Logger LOG = Logger.getInstance(XmlAttributeImpl.class);
 
   @SuppressWarnings("AssignmentToStaticFieldFromInstanceMethod")
   private final int myHC = ourHC++;
diff --git a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlAttributeValueImpl.java b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlAttributeValueImpl.java
index fdbfda15421e..59f0941c6e2b 100644
--- a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlAttributeValueImpl.java
+++ b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlAttributeValueImpl.java
@@ -47,7 +47,7 @@ import javax.swing.*;
  * @author Mike
  */
 public class XmlAttributeValueImpl extends XmlElementImpl implements XmlAttributeValue, PsiLanguageInjectionHost, RegExpLanguageHost, PsiMetaOwner, PsiMetaData {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.xml.XmlAttributeValueImpl");
+  private static final Logger LOG = Logger.getInstance(XmlAttributeValueImpl.class);
 
   public XmlAttributeValueImpl() {
     super(XmlElementType.XML_ATTRIBUTE_VALUE);
diff --git a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlDoctypeImpl.java b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlDoctypeImpl.java
index 8776a9afb601..bda861be931f 100644
--- a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlDoctypeImpl.java
+++ b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlDoctypeImpl.java
@@ -35,7 +35,7 @@ import org.jetbrains.annotations.Nullable;
  * @author Mike
  */
 public class XmlDoctypeImpl extends XmlElementImpl implements XmlDoctype {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.xml.XmlDoctypeImpl");
+  private static final Logger LOG = Logger.getInstance(XmlDoctypeImpl.class);
 
   public XmlDoctypeImpl() {
     super(XmlElementType.XML_DOCTYPE);
diff --git a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlDocumentImpl.java b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlDocumentImpl.java
index c53b97b7ebdd..892610dc7389 100644
--- a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlDocumentImpl.java
+++ b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlDocumentImpl.java
@@ -74,7 +74,7 @@ public class XmlDocumentImpl extends XmlElementImpl implements XmlDocument {
     return file.getUserData(AUTO_GENERATED) != null;
   }
 
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.xml.XmlDocumentImpl");
+  private static final Logger LOG = Logger.getInstance(XmlDocumentImpl.class);
   private static final AtomicFieldUpdater<XmlDocumentImpl, XmlProlog>
     MY_PROLOG_UPDATER = AtomicFieldUpdater.forFieldOfType(XmlDocumentImpl.class, XmlProlog.class);
   private static final AtomicFieldUpdater<XmlDocumentImpl, XmlTag>
diff --git a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlElementContentSpecImpl.java b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlElementContentSpecImpl.java
index f1fbbf2f91af..506148803cfc 100644
--- a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlElementContentSpecImpl.java
+++ b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlElementContentSpecImpl.java
@@ -33,7 +33,7 @@ import org.jetbrains.annotations.NotNull;
  * @author Mike
  */
 public class XmlElementContentSpecImpl extends XmlElementImpl implements XmlElementContentSpec, XmlElementType {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.xml.XmlElementContentSpecImpl");
+  private static final Logger LOG = Logger.getInstance(XmlElementContentSpecImpl.class);
 
   public XmlElementContentSpecImpl() {
     super(XML_ELEMENT_CONTENT_SPEC);
diff --git a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlElementDeclImpl.java b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlElementDeclImpl.java
index b51d609094e5..f25ebe43b6eb 100644
--- a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlElementDeclImpl.java
+++ b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlElementDeclImpl.java
@@ -35,7 +35,7 @@ import org.jetbrains.annotations.NotNull;
  * @author Mike
  */
 public class XmlElementDeclImpl extends XmlElementImpl implements XmlElementDecl, XmlElementType {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.xml.XmlElementDeclImpl");
+  private static final Logger LOG = Logger.getInstance(XmlElementDeclImpl.class);
 
   public XmlElementDeclImpl() {
     super(XML_ELEMENT_DECL);
diff --git a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlNotationDeclImpl.java b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlNotationDeclImpl.java
index 7e64cd975762..fcc16e4bbad6 100644
--- a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlNotationDeclImpl.java
+++ b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlNotationDeclImpl.java
@@ -25,7 +25,7 @@ import org.jetbrains.annotations.NotNull;
  * @author Mike
  */
 public class XmlNotationDeclImpl extends XmlElementImpl implements XmlNotationDecl, XmlElementType {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.xml.XmlElementDeclImpl");
+  private static final Logger LOG = Logger.getInstance(XmlElementDeclImpl.class);
 
   public XmlNotationDeclImpl() {
     super(XML_NOTATION_DECL);
diff --git a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlPrologImpl.java b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlPrologImpl.java
index 759cb81cf319..3240b63ced43 100644
--- a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlPrologImpl.java
+++ b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlPrologImpl.java
@@ -30,7 +30,7 @@ import org.jetbrains.annotations.NotNull;
  * @author Mike
  */
 public class XmlPrologImpl extends XmlElementImpl implements XmlProlog, XmlElementType {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.xml.XmlPrologImpl");
+  private static final Logger LOG = Logger.getInstance(XmlPrologImpl.class);
 
   public XmlPrologImpl() {
     super(XML_PROLOG);
diff --git a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlTagValueImpl.java b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlTagValueImpl.java
index 13626bbc0af3..30468336a2fb 100644
--- a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlTagValueImpl.java
+++ b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlTagValueImpl.java
@@ -32,7 +32,7 @@ import java.util.Arrays;
 import java.util.List;
 
 public class XmlTagValueImpl implements XmlTagValue{
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.xml.XmlTagValueImpl");
+  private static final Logger LOG = Logger.getInstance(XmlTagValueImpl.class);
 
   private final XmlTag myTag;
   private final XmlTagChild[] myElements;
diff --git a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlTextImpl.java b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlTextImpl.java
index 94340e5998fc..ca8193097814 100644
--- a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlTextImpl.java
+++ b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlTextImpl.java
@@ -51,7 +51,7 @@ import org.jetbrains.annotations.Nullable;
 import java.util.Arrays;
 
 public class XmlTextImpl extends XmlElementImpl implements XmlText, PsiLanguageInjectionHost {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.xml.XmlTextImpl");
+  private static final Logger LOG = Logger.getInstance(XmlTextImpl.class);
   private volatile String myDisplayText;
   private volatile int[] myGapDisplayStarts;
   private volatile int[] myGapPhysicalStarts;
diff --git a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/behavior/DefaultXmlPsiPolicy.java b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/behavior/DefaultXmlPsiPolicy.java
index a145f1b2c336..b269ef14aefe 100644
--- a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/behavior/DefaultXmlPsiPolicy.java
+++ b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/behavior/DefaultXmlPsiPolicy.java
@@ -35,7 +35,7 @@ import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;
 
 public class DefaultXmlPsiPolicy implements XmlPsiPolicy{
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.xml.behavior.DefaultXmlPsiPolicy");
+  private static final Logger LOG = Logger.getInstance(DefaultXmlPsiPolicy.class);
 
   @Override
   public ASTNode encodeXmlTextContents(String displayText, PsiElement text) {
diff --git a/xml/xml-psi-impl/src/com/intellij/xml/Html5SchemaProvider.java b/xml/xml-psi-impl/src/com/intellij/xml/Html5SchemaProvider.java
index 8b15859cc9b1..86a29c95ed37 100644
--- a/xml/xml-psi-impl/src/com/intellij/xml/Html5SchemaProvider.java
+++ b/xml/xml-psi-impl/src/com/intellij/xml/Html5SchemaProvider.java
@@ -15,7 +15,7 @@ import java.net.URL;
  * @author Eugene.Kudelevsky
  */
 public abstract class Html5SchemaProvider {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.xml.Html5SchemaProvider");
+  private static final Logger LOG = Logger.getInstance(Html5SchemaProvider.class);
   private static final NotNullLazyValue<String> HTML5_SCHEMA_LOCATION = AtomicNotNullLazyValue.createValue(() -> loadLocation(getInstance().getHtmlSchemaLocation(), "HTML5_SCHEMA"));
   private static final NotNullLazyValue<String> XHTML5_SCHEMA_LOCATION = AtomicNotNullLazyValue.createValue(() -> loadLocation(getInstance().getXhtmlSchemaLocation(), "XHTML5_SCHEMA"));
   private static final NotNullLazyValue<String> CHARS_DTD_LOCATION = AtomicNotNullLazyValue.createValue(() -> loadLocation(getInstance().getCharsLocation(), "CHARS_DTD"));
diff --git a/xml/xml-psi-impl/src/com/intellij/xml/actions/validate/ValidateXmlActionHandler.java b/xml/xml-psi-impl/src/com/intellij/xml/actions/validate/ValidateXmlActionHandler.java
index 08f880254d94..febf22f40fa5 100644
--- a/xml/xml-psi-impl/src/com/intellij/xml/actions/validate/ValidateXmlActionHandler.java
+++ b/xml/xml-psi-impl/src/com/intellij/xml/actions/validate/ValidateXmlActionHandler.java
@@ -41,7 +41,7 @@ import java.util.Map;
  * @author Mike
  */
 public class ValidateXmlActionHandler implements ValidateXmlHandler {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.xml.actions.validate.ValidateXmlAction");
+  private static final Logger LOG = Logger.getInstance(ValidateXmlActionHandler.class);
 
   private static final String SCHEMA_FULL_CHECKING_FEATURE_ID = "http://apache.org/xml/features/validation/schema-full-checking";
   private static final String GRAMMAR_FEATURE_ID = Constants.XERCES_PROPERTY_PREFIX + Constants.XMLGRAMMAR_POOL_PROPERTY;
diff --git a/xml/xml-psi-impl/src/com/intellij/xml/impl/ExternalDocumentValidator.java b/xml/xml-psi-impl/src/com/intellij/xml/impl/ExternalDocumentValidator.java
index 0bb8ab249285..faedaebfe475 100644
--- a/xml/xml-psi-impl/src/com/intellij/xml/impl/ExternalDocumentValidator.java
+++ b/xml/xml-psi-impl/src/com/intellij/xml/impl/ExternalDocumentValidator.java
@@ -56,7 +56,7 @@ import java.util.List;
  * @author maxim
  */
 public class ExternalDocumentValidator {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.xml.impl.ExternalDocumentValidator");
+  private static final Logger LOG = Logger.getInstance(ExternalDocumentValidator.class);
   private static final Key<SoftReference<ExternalDocumentValidator>> validatorInstanceKey = Key.create("validatorInstance");
 
   public static final @NonNls String INSPECTION_SHORT_NAME = "CheckXmlFileWithXercesValidator";
diff --git a/xml/xml-psi-impl/src/com/intellij/xml/impl/schema/XmlNSDescriptorImpl.java b/xml/xml-psi-impl/src/com/intellij/xml/impl/schema/XmlNSDescriptorImpl.java
index 85a3fabdc936..53fbb5147c0b 100644
--- a/xml/xml-psi-impl/src/com/intellij/xml/impl/schema/XmlNSDescriptorImpl.java
+++ b/xml/xml-psi-impl/src/com/intellij/xml/impl/schema/XmlNSDescriptorImpl.java
@@ -52,7 +52,7 @@ public class XmlNSDescriptorImpl implements XmlNSDescriptorEx,Validator<XmlDocum
   @NonNls static final String ATTRIBUTE_TAG_NAME = "attribute";
   @NonNls static final String COMPLEX_TYPE_TAG_NAME = "complexType";
   @NonNls static final String SEQUENCE_TAG_NAME = "sequence";
-  private static final Logger LOG = Logger.getInstance("#com.intellij.xml.impl.schema.XmlNSDescriptorImpl");
+  private static final Logger LOG = Logger.getInstance(XmlNSDescriptorImpl.class);
   @NonNls private static final Set<String> STD_TYPES = new HashSet<>();
   private static final Set<String> UNDECLARED_STD_TYPES = new HashSet<>();
   @NonNls private static final String INCLUDE_TAG_NAME = "include";
diff --git a/xml/xml-psi-impl/src/com/intellij/xml/index/SchemaTypeInheritanceIndex.java b/xml/xml-psi-impl/src/com/intellij/xml/index/SchemaTypeInheritanceIndex.java
index 316796a4d704..ac0cb7f252d0 100644
--- a/xml/xml-psi-impl/src/com/intellij/xml/index/SchemaTypeInheritanceIndex.java
+++ b/xml/xml-psi-impl/src/com/intellij/xml/index/SchemaTypeInheritanceIndex.java
@@ -46,7 +46,7 @@ import java.util.function.BiFunction;
  */
 public class SchemaTypeInheritanceIndex extends XmlIndex<Set<SchemaTypeInfo>> {
   private static final ID<String, Set<SchemaTypeInfo>> NAME = ID.create("SchemaTypeInheritance");
-  private static final Logger LOG = Logger.getInstance("#com.intellij.xml.index.SchemaTypeInheritanceIndex");
+  private static final Logger LOG = Logger.getInstance(SchemaTypeInheritanceIndex.class);
 
   private static List<Set<SchemaTypeInfo>> getDirectChildrenOfType(final Project project,
                                                                   final String ns,
diff --git a/xml/xml-psi-impl/src/com/intellij/xml/util/HtmlUtil.java b/xml/xml-psi-impl/src/com/intellij/xml/util/HtmlUtil.java
index 3e8392219b97..0a0594c28b38 100644
--- a/xml/xml-psi-impl/src/com/intellij/xml/util/HtmlUtil.java
+++ b/xml/xml-psi-impl/src/com/intellij/xml/util/HtmlUtil.java
@@ -51,7 +51,7 @@ import java.util.*;
  * @author Maxim.Mossienko
  */
 public class HtmlUtil {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.xml.util.HtmlUtil");
+  private static final Logger LOG = Logger.getInstance(HtmlUtil.class);
 
   @NonNls private static final String JSFC = "jsfc";
   @NonNls private static final String CHARSET = "charset";
diff --git a/xml/xml-psi-impl/src/com/intellij/xml/util/IncludedXmlTag.java b/xml/xml-psi-impl/src/com/intellij/xml/util/IncludedXmlTag.java
index 22481b1f7876..bc8b2e9915b3 100644
--- a/xml/xml-psi-impl/src/com/intellij/xml/util/IncludedXmlTag.java
+++ b/xml/xml-psi-impl/src/com/intellij/xml/util/IncludedXmlTag.java
@@ -36,7 +36,7 @@ import java.util.Map;
  * @author peter
  */
 public class IncludedXmlTag extends IncludedXmlElement<XmlTag> implements XmlTag {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.xml.util.IncludedXmlTag");
+  private static final Logger LOG = Logger.getInstance(IncludedXmlTag.class);
   public IncludedXmlTag(@NotNull XmlTag original, @Nullable PsiElement parent) {
     super(original, parent);
   }
diff --git a/xml/xml-psi-impl/src/com/intellij/xml/util/XmlResourceResolver.java b/xml/xml-psi-impl/src/com/intellij/xml/util/XmlResourceResolver.java
index 2dc6bd602529..a5bdd338b30c 100644
--- a/xml/xml-psi-impl/src/com/intellij/xml/util/XmlResourceResolver.java
+++ b/xml/xml-psi-impl/src/com/intellij/xml/util/XmlResourceResolver.java
@@ -48,7 +48,7 @@ import java.util.Map;
  * @author Maxim.Mossienko
  */
 public class XmlResourceResolver implements XMLEntityResolver {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.xml.util.XmlResourceResolver");
+  private static final Logger LOG = Logger.getInstance(XmlResourceResolver.class);
   private final XmlFile myFile;
   private final Project myProject;
   private final Map<String,String> myExternalResourcesMap = new HashMap<>(1);
diff --git a/xml/xml-psi-impl/src/com/intellij/xml/util/XmlUtil.java b/xml/xml-psi-impl/src/com/intellij/xml/util/XmlUtil.java
index caca8ad7f78f..5d6b1358239e 100644
--- a/xml/xml-psi-impl/src/com/intellij/xml/util/XmlUtil.java
+++ b/xml/xml-psi-impl/src/com/intellij/xml/util/XmlUtil.java
@@ -131,7 +131,7 @@ public class XmlUtil {
   @NonNls public static final String WSDL_SCHEMA_URI = "http://schemas.xmlsoap.org/wsdl/";
   public static final String XHTML4_SCHEMA_LOCATION;
   public final static ThreadLocal<Boolean> BUILDING_DOM_STUBS = ThreadLocal.withInitial(() -> Boolean.FALSE);
-  private static final Logger LOG = Logger.getInstance("#com.intellij.xml.util.XmlUtil");
+  private static final Logger LOG = Logger.getInstance(XmlUtil.class);
   @NonNls private static final String JSTL_FORMAT_URI3 = "http://java.sun.com/jstl/fmt_rt";
   @NonNls public static final String[] JSTL_FORMAT_URIS = {JSTL_FORMAT_URI, JSTL_FORMAT_URI2, JSTL_FORMAT_URI3};
   @NonNls private static final String FILE = "file:";