diff --git a/platform/configuration-store-impl/testSrc/ModuleStoreRenameTest.kt b/platform/configuration-store-impl/testSrc/ModuleStoreRenameTest.kt
index f97770785fd0..5431376dcd4c 100644
--- a/platform/configuration-store-impl/testSrc/ModuleStoreRenameTest.kt
+++ b/platform/configuration-store-impl/testSrc/ModuleStoreRenameTest.kt
@@ -70,7 +70,7 @@ internal class ModuleStoreRenameTest {
           ModuleRootModificationUtil.addDependency(dependentModule, module)
         }
 
-        module.messageBus.connect().subscribe(ProjectTopics.MODULES, object : ModuleListener {
+        projectRule.project.messageBus.connect(module).subscribe(ProjectTopics.MODULES, object : ModuleListener {
           override fun modulesRenamed(project: Project, modules: MutableList<Module>, oldNameProvider: Function<Module, String>) {
             assertThat(modules).containsOnly(module)
             oldModuleNames.add(oldNameProvider.`fun`(module))
diff --git a/platform/execution-impl/src/com/intellij/execution/impl/ModuleRunConfigurationManager.java b/platform/execution-impl/src/com/intellij/execution/impl/ModuleRunConfigurationManager.java
index 62beae57febf..7946164d623f 100644
--- a/platform/execution-impl/src/com/intellij/execution/impl/ModuleRunConfigurationManager.java
+++ b/platform/execution-impl/src/com/intellij/execution/impl/ModuleRunConfigurationManager.java
@@ -42,7 +42,7 @@ public final class ModuleRunConfigurationManager implements PersistentStateCompo
 
   public ModuleRunConfigurationManager(@NotNull Module module) {
     myModule = module;
-    myModule.getMessageBus().connect().subscribe(ProjectTopics.MODULES, new ModuleListener() {
+    myModule.getProject().getMessageBus().connect(myModule).subscribe(ProjectTopics.MODULES, new ModuleListener() {
       @Override
       public void beforeModuleRemoved(@NotNull Project project, @NotNull Module module) {
         if (myModule.equals(module)) {
diff --git a/platform/lang-impl/src/com/intellij/openapi/roots/impl/storage/ClasspathStorage.java b/platform/lang-impl/src/com/intellij/openapi/roots/impl/storage/ClasspathStorage.java
index b458532a3418..5350e6012993 100644
--- a/platform/lang-impl/src/com/intellij/openapi/roots/impl/storage/ClasspathStorage.java
+++ b/platform/lang-impl/src/com/intellij/openapi/roots/impl/storage/ClasspathStorage.java
@@ -49,7 +49,7 @@ public final class ClasspathStorage extends StateStorageBase<Boolean> {
 
   private final PathMacroSubstitutor myPathMacroSubstitutor;
 
-  public ClasspathStorage(@NotNull final Module module, @NotNull StateStorageManager storageManager) {
+  public ClasspathStorage(@NotNull Module module, @NotNull StateStorageManager storageManager) {
     String storageType = module.getOptionValue(JpsProjectLoader.CLASSPATH_ATTRIBUTE);
     if (storageType == null) {
       throw new IllegalStateException("Classpath storage requires non-default storage type");
@@ -67,7 +67,8 @@ public final class ClasspathStorage extends StateStorageBase<Boolean> {
       }
 
       myConverter = new MissingClasspathConverter();
-    } else {
+    }
+    else {
       myConverter = provider.createConverter(module);
     }
 
@@ -100,7 +101,7 @@ public final class ClasspathStorage extends StateStorageBase<Boolean> {
       }
     });
 
-    busConnection.subscribe(ProjectTopics.MODULES, new ModuleListener() {
+    module.getProject().getMessageBus().connect(module).subscribe(ProjectTopics.MODULES, new ModuleListener() {
       @Override
       public void modulesRenamed(@NotNull Project project,
                                  @NotNull List<Module> modules,
diff --git a/platform/projectModel-api/src/com/intellij/ProjectTopics.java b/platform/projectModel-api/src/com/intellij/ProjectTopics.java
index 6cb11bbf825c..d0a6099a2386 100644
--- a/platform/projectModel-api/src/com/intellij/ProjectTopics.java
+++ b/platform/projectModel-api/src/com/intellij/ProjectTopics.java
@@ -16,7 +16,7 @@ public final class ProjectTopics {
    * Modules added or removed from project.
    */
   @Topic.ProjectLevel
-  public static final Topic<ModuleListener> MODULES = new Topic<>(ModuleListener.class);
+  public static final Topic<ModuleListener> MODULES = new Topic<>(ModuleListener.class, Topic.BroadcastDirection.NONE);
 
   private ProjectTopics() {
   }