diff --git a/plugins/gradle/java/testSources/service/project/MavenRepositoriesProjectResolverTest.kt b/plugins/gradle/java/testSources/service/project/MavenRepositoriesProjectResolverTest.kt
index 28cf04e1ef40..7de5cc084d8c 100644
--- a/plugins/gradle/java/testSources/service/project/MavenRepositoriesProjectResolverTest.kt
+++ b/plugins/gradle/java/testSources/service/project/MavenRepositoriesProjectResolverTest.kt
@@ -33,7 +33,7 @@ class MavenRepositoriesProjectResolverTest {
     myResolver.nextResolver = mock(GradleProjectResolverExtension::class.java)
 
     myRepoList.clear()
-    val fakeModel = TestRepositoriesModel(myRepoList)
+    val fakeModel = TestRepositoryModels(myRepoList)
 
     myProject = mock(IdeaProject::class.java)
     myModule = mock(IdeaModule::class.java)
@@ -107,7 +107,7 @@ class MavenRepositoriesProjectResolverTest {
     override fun getUrl(): String = myUrl
   }
 
-  private class TestRepositoriesModel(private val myRepositories: List<MavenRepositoryModel>) : RepositoryModels {
+  private class TestRepositoryModels(private val myRepositories: List<MavenRepositoryModel>) : RepositoryModels {
     override fun getRepositories(): List<MavenRepositoryModel> = myRepositories
   }
 }
\ No newline at end of file
diff --git a/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/builder/MavenRepositoriesModelBuilder.java b/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/builder/MavenRepositoriesModelBuilder.java
index 986a7320226c..62db1824e698 100644
--- a/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/builder/MavenRepositoriesModelBuilder.java
+++ b/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/builder/MavenRepositoriesModelBuilder.java
@@ -10,7 +10,7 @@ import org.jetbrains.plugins.gradle.model.RepositoryModels;
 import org.jetbrains.plugins.gradle.tooling.Message;
 import org.jetbrains.plugins.gradle.tooling.ModelBuilderContext;
 import org.jetbrains.plugins.gradle.tooling.ModelBuilderService;
-import org.jetbrains.plugins.gradle.tooling.internal.DefaultRepositoriesModel;
+import org.jetbrains.plugins.gradle.tooling.internal.DefaultRepositoryModels;
 import org.jetbrains.plugins.gradle.tooling.internal.MavenRepositoryModelImpl;
 
 import java.util.ArrayList;
@@ -29,7 +29,7 @@ public class MavenRepositoriesModelBuilder implements ModelBuilderService {
       final MavenRepositoryModel model = new MavenRepositoryModelImpl(artifactRepository.getName(), artifactRepository.getUrl().toString());
       repositories.add(model);
     }
-    return new DefaultRepositoriesModel(repositories);
+    return new DefaultRepositoryModels(repositories);
   }
 
   @Override
diff --git a/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/internal/DefaultRepositoriesModel.java b/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/internal/DefaultRepositoryModels.java
similarity index 81%
rename from plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/internal/DefaultRepositoriesModel.java
rename to plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/internal/DefaultRepositoryModels.java
index c9401348bd20..d282c10ede40 100644
--- a/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/internal/DefaultRepositoriesModel.java
+++ b/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/internal/DefaultRepositoryModels.java
@@ -8,11 +8,11 @@ import org.jetbrains.plugins.gradle.model.RepositoryModels;
 import java.util.Collections;
 import java.util.List;
 
-public class DefaultRepositoriesModel implements RepositoryModels {
+public class DefaultRepositoryModels implements RepositoryModels {
 
   private final @NotNull List<MavenRepositoryModel> myRepositories;
 
-  public DefaultRepositoriesModel(@NotNull List<MavenRepositoryModel> repositories) {
+  public DefaultRepositoryModels(@NotNull List<MavenRepositoryModel> repositories) {
     myRepositories = Collections.unmodifiableList(repositories);
   }
 
@@ -26,7 +26,7 @@ public class DefaultRepositoriesModel implements RepositoryModels {
     if (this == o) return true;
     if (o == null || getClass() != o.getClass()) return false;
 
-    DefaultRepositoriesModel model = (DefaultRepositoriesModel)o;
+    DefaultRepositoryModels model = (DefaultRepositoryModels)o;
 
     if (!myRepositories.equals(model.myRepositories)) return false;
 
diff --git a/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/serialization/RepositoriesModelSerializationService.java b/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/serialization/RepositoriesModelSerializationService.java
index a4c1c7088c25..d4319997cf38 100644
--- a/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/serialization/RepositoriesModelSerializationService.java
+++ b/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/serialization/RepositoriesModelSerializationService.java
@@ -8,7 +8,7 @@ import com.amazon.ion.system.IonReaderBuilder;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.plugins.gradle.model.MavenRepositoryModel;
 import org.jetbrains.plugins.gradle.model.RepositoryModels;
-import org.jetbrains.plugins.gradle.tooling.internal.DefaultRepositoriesModel;
+import org.jetbrains.plugins.gradle.tooling.internal.DefaultRepositoryModels;
 import org.jetbrains.plugins.gradle.tooling.internal.MavenRepositoryModelImpl;
 import org.jetbrains.plugins.gradle.tooling.util.IntObjectMap;
 import org.jetbrains.plugins.gradle.tooling.util.IntObjectMap.SimpleObjectFactory;
@@ -101,12 +101,12 @@ public class RepositoriesModelSerializationService implements SerializationServi
     reader.stepIn();
 
     RepositoryModels model =
-      context.objectMap.computeIfAbsent(readInt(reader, OBJECT_ID_FIELD), new SimpleObjectFactory<DefaultRepositoriesModel>() {
+      context.objectMap.computeIfAbsent(readInt(reader, OBJECT_ID_FIELD), new SimpleObjectFactory<DefaultRepositoryModels>() {
 
         @Override
-        public DefaultRepositoriesModel create() {
+        public DefaultRepositoryModels create() {
           List<MavenRepositoryModel> repositories = readRepositories(reader, context);
-          return new DefaultRepositoriesModel(repositories);
+          return new DefaultRepositoryModels(repositories);
         }
       });
     reader.stepOut();
@@ -141,7 +141,7 @@ public class RepositoriesModelSerializationService implements SerializationServi
   }
 
   private static class ReadContext {
-    private final IntObjectMap<DefaultRepositoriesModel> objectMap = new IntObjectMap<>();
+    private final IntObjectMap<DefaultRepositoryModels> objectMap = new IntObjectMap<>();
     private final IntObjectMap<MavenRepositoryModel> repositoryMap = new IntObjectMap<>();
   }
 
diff --git a/plugins/gradle/tooling-extension-impl/testSources/org/jetbrains/plugins/gradle/tooling/serialization/ToolingSerializerTest.kt b/plugins/gradle/tooling-extension-impl/testSources/org/jetbrains/plugins/gradle/tooling/serialization/ToolingSerializerTest.kt
index be98e8ad43d6..694ea605b4a8 100644
--- a/plugins/gradle/tooling-extension-impl/testSources/org/jetbrains/plugins/gradle/tooling/serialization/ToolingSerializerTest.kt
+++ b/plugins/gradle/tooling-extension-impl/testSources/org/jetbrains/plugins/gradle/tooling/serialization/ToolingSerializerTest.kt
@@ -24,7 +24,7 @@ import org.jetbrains.plugins.gradle.model.tests.DefaultExternalTestsModel
 import org.jetbrains.plugins.gradle.tooling.internal.AnnotationProcessingModelImpl
 import com.intellij.gradle.toolingExtension.impl.model.buildScriptClasspathModel.DefaultGradleBuildScriptClasspathModel
 import com.intellij.gradle.toolingExtension.impl.modelSerialization.ToolingSerializer
-import org.jetbrains.plugins.gradle.tooling.internal.DefaultRepositoriesModel
+import org.jetbrains.plugins.gradle.tooling.internal.DefaultRepositoryModels
 import org.jetbrains.plugins.gradle.tooling.serialization.internal.adapter.*
 import org.jetbrains.plugins.gradle.tooling.util.GradleVersionComparator
 import org.junit.Before
@@ -97,8 +97,8 @@ class ToolingSerializerTest {
 
   @Test
   @Throws(Exception::class)
-  fun `repositories model serialization test`() {
-    doTest(DefaultRepositoriesModel::class.java)
+  fun `repository models serialization test`() {
+    doTest(DefaultRepositoryModels::class.java)
   }
 
   @Test