From f4822cd75747f659356a8d3cd9a8b1c2ba835b15 Mon Sep 17 00:00:00 2001
From: Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Date: Sat, 28 Nov 2015 01:42:20 +0300
Subject: [PATCH] Fix testData in compiler: add collections and ranges package
 to fq-names.

---
 .../testData/cli/jvm/conflictingOverloads.out |  4 +-
 .../tailRecursion/realIteratorFoldl.txt       |  2 +-
 .../reflection/platformTypeToString/K.kt      |  2 +-
 .../reflection/classes/qualifiedName.kt       |  2 +-
 .../extensionPropertyReceiverToString.kt      |  4 +-
 .../methodsFromAny/functionToString.kt        |  2 +-
 .../methodsFromAny/propertyToString.kt        |  2 +-
 .../reflection/methodsFromAny/typeToString.kt |  2 +-
 .../class/ExtendsAbstractListT.txt            | 18 ++---
 .../class/ImplementsListString.txt            | 18 ++---
 .../class/ImplementsMapPP.txt                 |  8 +-
 .../class/InnerClassConstructors.txt          |  2 +-
 .../class/InnerClassOfGeneric.txt             |  2 +-
 .../method/AccessorGenericSignature.txt       |  4 +-
 .../ClashingSignaturesWithoutReturnType.txt   |  6 +-
 .../method/ListOfInt.txt                      |  2 +-
 .../method/ListOfString.txt                   |  2 +-
 .../method/ListOfT.txt                        |  2 +-
 .../method/MapOfKString.txt                   |  2 +-
 .../method/MapOfStringIntQ.txt                |  2 +-
 .../method/QExtendsListString.txt             |  2 +-
 .../method/TraitImpl.txt                      |  4 +-
 .../method/Vararg.txt                         |  2 +-
 .../property/GenericProperty.txt              |  2 +-
 .../tests/AssignToArrayElement.txt            |  2 +-
 .../testData/diagnostics/tests/Builders.txt   |  2 +-
 .../tests/CovariantOverrideType.txt           |  6 +-
 .../diagnostics/tests/ForRangeConventions.txt |  2 +-
 .../diagnostics/tests/PackageQualified.txt    |  8 +-
 .../diagnostics/tests/PrimaryConstructors.txt |  6 +-
 .../tests/QualifiedExpressions.txt            |  2 +-
 .../diagnostics/tests/ResolveToJava.txt       |  2 +-
 .../diagnostics/tests/Serializable.txt        |  6 +-
 .../ValAndFunOverrideCompatibilityClash.txt   | 20 ++---
 .../annotationsOnNullableTypes.txt            |  8 +-
 .../annotations/options/targets/typeargs.txt  |  6 +-
 .../tests/annotations/typeAnnotations.txt     |  6 +-
 .../diagnostics/tests/cast/AsErasedError.txt  |  2 +-
 .../diagnostics/tests/cast/AsErasedFine.txt   |  2 +-
 .../diagnostics/tests/cast/AsErasedStar.txt   |  2 +-
 .../tests/cast/AsErasedWarning.txt            |  2 +-
 .../tests/cast/IsErasedAllowFromOut.txt       |  2 +-
 .../tests/cast/IsErasedAllowFromOut2.txt      |  2 +-
 .../cast/IsErasedAllowFromOutAtClass.txt      |  2 +-
 .../cast/IsErasedAllowParameterSubtype.txt    |  2 +-
 .../cast/IsErasedAllowSameClassParameter.txt  |  2 +-
 .../IsErasedAllowSameParameterParameter.txt   |  2 +-
 ...dDisallowDifferentArgInvariantPosition.txt |  2 +-
 .../tests/cast/IsErasedDisallowFromIn.txt     |  2 +-
 .../tests/cast/IsErasedDisallowFromOut.txt    |  2 +-
 .../cast/IsErasedDisallowFromOutAtClass.txt   |  2 +-
 .../testData/diagnostics/tests/cast/kt614.txt |  2 +-
 .../tests/classLiteral/genericClasses.txt     |  4 +-
 .../backingFieldInsideGetter.txt              |  2 +-
 .../tests/controlFlowAnalysis/kt1027.txt      |  2 +-
 .../tests/controlFlowAnalysis/kt1066.txt      |  2 +-
 .../tests/controlFlowAnalysis/kt1219.1301.txt |  4 +-
 .../varInitializationInIfInCycle.txt          |  2 +-
 .../tests/dataFlowInfoTraversal/WhenIn.txt    |  4 +-
 .../DataFlowInMultiDeclInFor.txt              |  2 +-
 .../CasesWithOneTypeParameter.txt             |  2 +-
 .../multiDeclarations/DoubleDeclForLoop.txt   |  2 +-
 .../FolLoopTypeComponentTypeMismatch.txt      |  2 +-
 .../ForLoopComponentFunctionAmbiguity.txt     |  2 +-
 .../ForLoopComponentFunctionMissing.txt       |  2 +-
 .../ForLoopWithExtensions.txt                 |  2 +-
 .../ForWithExplicitTypes.txt                  |  2 +-
 .../RedeclarationInForLoop.txt                |  2 +-
 .../multiDeclarations/SingleDeclForLoop.txt   |  2 +-
 .../genericClassFunction.txt                  |  6 +-
 .../erasure/collections.txt                   |  4 +-
 .../erasure/delegateToTwoTraits.txt           |  8 +-
 .../erasure/delegationAndOwnMethod.txt        |  6 +-
 .../delegationToTraitImplAndOwnMethod.txt     |  8 +-
 .../erasure/inheritFromTwoTraits.txt          |  8 +-
 .../erasure/kotlinAndJavaCollections.txt      |  2 +-
 .../superTraitAndDelegationToTraitImpl.txt    | 10 +--
 .../erasure/twoTraitsAndOwnFunction.txt       | 10 +--
 .../diagnostics/tests/exposed/typeArgs.txt    | 14 ++--
 .../tests/extensions/GenericIterator.txt      |  2 +-
 .../tests/extensions/GenericIterator2.txt     |  2 +-
 .../throwOutCandidatesByReceiver.txt          | 12 +--
 .../throwOutCandidatesByReceiver2.txt         |  2 +-
 .../tests/functionAsExpression/AutoLabels.txt |  6 +-
 .../InferenceParametersTypes.txt              |  4 +-
 .../tests/functionLiterals/kt6869.txt         |  4 +-
 .../return/LocalReturnWithExpectedType.txt    |  6 +-
 .../return/NoCommonSystem.txt                 |  8 +-
 .../tests/functionLiterals/returnNull.txt     |  4 +-
 .../functionLiterals/returnNullWithReturn.txt |  4 +-
 .../InconsistentTypeParameterBounds.txt       | 24 +++---
 .../tests/generics/PseudoRawTypes.txt         |  2 +-
 .../generics/innerClasses/innerVariance.txt   |  4 +-
 .../tests/generics/innerClasses/iterator.txt  | 10 +--
 .../tests/generics/projectionsScope/MLOut.txt |  4 +-
 .../flexibleProjectedScope.txt                |  4 +-
 .../collectionInheritedFromJava.txt           |  4 +-
 .../generics/suppressVarianceConflict.txt     |  6 +-
 .../ImportHidingDefinitionInTheSameFile.kt    |  2 +-
 .../controlStructuresErrors.txt               |  2 +-
 .../noTypeParamsInReturnType.txt              |  4 +-
 .../cannotCompleteResolveAmbiguity.txt        |  4 +-
 ...annotCompleteResolveNoInfoForParameter.txt |  8 +-
 .../cannotCompleteResolveNoneApplicable.txt   |  6 +-
 .../captureFromNullableTypeVariable.txt       |  2 +-
 .../tests/inference/capturedTypes/kt2570.txt  |  4 +-
 .../commonSystem/dontCaptureTypeVariable.txt  |  2 +-
 .../commonSystem/fixVariablesInRightOrder.txt |  4 +-
 .../genericCandidateInGenericClass.txt        |  2 +-
 .../inferenceWithUpperBoundsInLambda.txt      |  8 +-
 .../commonSystem/kt3372toCollection.txt       |  4 +-
 .../inference/commonSystem/nestedLambdas.txt  |  4 +-
 .../inference/conflictingSubstitutions.txt    |  4 +-
 .../constraintOnFunctionLiteral.txt           |  2 +-
 .../tests/inference/constraints/kt7433.txt    |  4 +-
 .../tests/inference/dependOnExpectedType.txt  |  4 +-
 .../inference/dependantOnVarianceNullable.txt |  2 +-
 .../inference/functionPlaceholderError.txt    |  4 +-
 .../inference/inferInFunctionLiterals.txt     |  4 +-
 .../inferInFunctionLiteralsWithReturn.txt     |  4 +-
 .../diagnostics/tests/inference/kt3184.txt    |  2 +-
 .../diagnostics/tests/inference/kt6175.txt    |  4 +-
 .../tests/inference/listConstructor.txt       |  6 +-
 .../tests/inference/mapFunction.txt           |  4 +-
 .../inference/mostSpecificAfterInference.txt  | 10 +--
 .../inference/nestedCalls/arrayAccess.txt     |  4 +-
 .../nestedCalls/binaryExpressions.txt         |  2 +-
 ...mpleteNestedCallsForArraySetExpression.txt |  4 +-
 .../completeNestedCallsInference.txt          |  2 +-
 .../nestedCalls/externalTypeParameter.txt     |  4 +-
 .../tests/inference/nestedCalls/kt3395.txt    |  4 +-
 .../nestedCalls/nontrivialCallExpression.txt  |  4 +-
 .../inference/possibleCycleOnConstraints.txt  |  2 +-
 .../tests/inference/regressions/kt1029.txt    |  4 +-
 .../tests/inference/regressions/kt1031.txt    |  4 +-
 .../tests/inference/regressions/kt1127.txt    |  2 +-
 .../tests/inference/regressions/kt1145.txt    |  6 +-
 .../tests/inference/regressions/kt1410.txt    |  6 +-
 .../tests/inference/regressions/kt1718.txt    |  2 +-
 .../tests/inference/regressions/kt2057.txt    |  2 +-
 .../tests/inference/regressions/kt2179.txt    |  8 +-
 .../tests/inference/regressions/kt2286.txt    |  4 +-
 .../tests/inference/regressions/kt2324.txt    |  4 +-
 .../tests/inference/regressions/kt2407.txt    |  4 +-
 .../tests/inference/regressions/kt2459.txt    |  4 +-
 .../tests/inference/regressions/kt2741.txt    |  4 +-
 .../tests/inference/regressions/kt2838.txt    |  4 +-
 .../tests/inference/regressions/kt2842.txt    |  6 +-
 .../tests/inference/regressions/kt2883.txt    |  2 +-
 .../tests/inference/regressions/kt3007.txt    | 10 +--
 .../tests/inference/regressions/kt3174.txt    |  4 +-
 .../tests/inference/regressions/kt3344.txt    |  4 +-
 .../tests/inference/regressions/kt3496.txt    |  2 +-
 .../tests/inference/regressions/kt8132.txt    |  4 +-
 .../tests/inference/regressions/kt943.txt     |  2 +-
 .../tests/inference/regressions/kt948.txt     |  4 +-
 .../subtypeForInvariantWithErrorGenerics.txt  |  6 +-
 .../substitutions/delegationAndInference.txt  | 10 +--
 .../tryNumberLowerBoundsBeforeUpperBounds.txt |  2 +-
 .../inference/typeConstructorMismatch.txt     |  6 +-
 ...conflictingSubstitutionsFromUpperBound.txt |  4 +-
 .../upperBounds/doNotInferFromBoundsOnly.txt  | 18 ++---
 .../tests/inference/upperBounds/kt2856.txt    |  2 +-
 .../useBoundsToInferTypeParamsSimple.txt      |  8 +-
 .../useFunctionLiteralsToInferType.txt        |  4 +-
 .../inline/binaryExpressions/rangeTo.txt      |  6 +-
 .../extensionLambdaInsideNestedClass.txt      |  2 +-
 .../qualifiedExpression/dataLocalVariable.txt |  2 +-
 .../tests/j+k/GenericsInSupertypes.txt        | 20 ++---
 .../collectionStringImpl.txt                  | 12 +--
 .../j+k/collectionOverrides/contains.txt      | 72 +++++++++---------
 .../j+k/collectionOverrides/containsAll.txt   | 74 +++++++++----------
 .../containsAndOverload.txt                   | 22 +++---
 .../irrelevantImplMutableList.txt             | 56 +++++++-------
 .../irrelevantImplMutableListKotlin.txt       | 56 +++++++-------
 .../collectionOverrides/mapGetOverride.txt    | 12 +--
 .../overridesBuiltinNoMagic.txt               | 38 +++++-----
 .../j+k/collectionOverrides/removeAt.txt      | 40 +++++-----
 .../j+k/collectionOverrides/removeAtInt.txt   | 40 +++++-----
 .../sizeFromKotlinOverriddenInJava.txt        | 10 +--
 .../tests/j+k/finalCollectionSize.txt         | 42 +++++------
 .../testData/diagnostics/tests/j+k/kt2394.txt |  4 +-
 .../testData/diagnostics/tests/j+k/kt2606.txt |  2 +-
 .../testData/diagnostics/tests/j+k/kt2890.txt |  2 +-
 .../diagnostics/tests/j+k/mutableIterator.txt |  2 +-
 .../diagnostics/tests/j+k/serializable.txt    |  4 +-
 .../diagnostics/tests/j+k/specialBridges.txt  | 20 ++---
 .../diagnostics/tests/j+k/types/arrayList.txt |  6 +-
 .../tests/j+k/types/returnCollection.txt      |  6 +-
 compiler/testData/diagnostics/tests/kt310.txt |  2 +-
 .../diagnostics/tests/library/Collections.txt | 16 ++--
 .../numbers/numbersInSimpleConstraints.txt    |  2 +-
 .../tests/objects/upperBoundViolated.txt      |  2 +-
 .../flexibleReturnTypeList.txt                | 34 ++++-----
 .../tests/override/typeParameters/kt9850.txt  |  4 +-
 .../commonSupertype/inferenceWithBound.txt    |  4 +-
 .../commonSupertype/mixedElvis.txt            |  2 +-
 .../commonSupertype/withNothing.txt           |  4 +-
 .../listSuperType.txt                         | 22 +++---
 .../genericVarianceViolation/rawTypes.txt     |  4 +-
 .../genericVarianceViolation/simple.txt       | 16 ++--
 .../genericVarianceViolation/smartCast.txt    |  2 +-
 .../strangeVariance.txt                       |  6 +-
 .../valueFromJava.txt                         |  4 +-
 .../genericVarianceViolation/wildcards.txt    | 14 ++--
 .../tests/platformTypes/intersection/map.txt  |  2 +-
 .../methodCall/javaCollectionToKotlin.txt     |  2 +-
 .../methodCall/kotlinCollectionToJava.txt     |  2 +-
 .../tests/platformTypes/methodCall/list.txt   |  2 +-
 .../methodCall/multipleExactBounds.txt        |  2 +-
 .../multipleExactBoundsNullable.txt           | 14 ++--
 .../nullabilityWarnings/delegation.txt        | 42 +++++------
 .../platformTypes/nullabilityWarnings/for.txt |  6 +-
 .../inferenceInConditionals.txt               |  2 +-
 .../nullabilityWarnings/kt6829.txt            |  4 +-
 ...otNullTypeMarkedWithNullableAnnotation.txt |  2 +-
 .../tests/platformTypes/rawOverrides.txt      | 18 ++---
 .../tests/platformTypes/rawTypes/arrays.txt   | 12 +--
 .../platformTypes/rawTypes/errorType.txt      |  4 +-
 .../rawTypes/genericInnerClass.txt            |  8 +-
 .../rawTypes/nonGenericRawMember.txt          |  4 +-
 .../rawTypes/nonTrivialErasure.txt            | 16 ++--
 .../platformTypes/rawTypes/rawSupertype.txt   | 14 ++--
 .../rawTypes/rawSupertypeOverride.txt         | 28 +++----
 .../rawTypes/rawTypeInUpperBound.txt          |  2 +-
 .../saveRawCapabilitiesAfterSubtitution.txt   |  4 +-
 .../tests/platformTypes/rawTypes/simple.txt   | 14 ++--
 .../rawTypes/typeEnhancement.txt              |  6 +-
 .../platformTypes/supertypeTypeArguments.txt  | 32 ++++----
 .../reflection/noReflectionInClassPath.txt    |  2 +-
 .../diagnostics/tests/regressions/Jet53.txt   |  2 +-
 .../tests/regressions/kt1639-JFrame.txt       | 20 ++---
 .../diagnostics/tests/regressions/kt258.txt   |  2 +-
 .../diagnostics/tests/regressions/kt287.txt   |  6 +-
 .../diagnostics/tests/regressions/kt313.txt   |  2 +-
 .../tests/regressions/kt335.336.txt           |  4 +-
 .../tests/regressions/kt385.109.441.txt       |  8 +-
 .../diagnostics/tests/regressions/kt459.txt   |  2 +-
 .../diagnostics/tests/regressions/kt469.txt   |  4 +-
 .../diagnostics/tests/regressions/kt549.txt   |  2 +-
 .../diagnostics/tests/regressions/kt580.txt   |  2 +-
 .../diagnostics/tests/regressions/kt860.txt   |  4 +-
 ...InLinkedLambdasDependentOnExpectedType.txt |  6 +-
 ...TypeInferenceForNestedInNoneApplicable.txt |  2 +-
 .../resolve/nestedCalls/twoTypeParameters.txt |  4 +-
 .../specialConstructions/elvisAsCall.txt      |  8 +-
 .../specialConstructions/exclExclAsCall.txt   |  6 +-
 .../initializerScopeOfExtensionProperty.txt   |  4 +-
 .../tests/scopes/kt1579_map_entry.kt          |  4 +-
 .../tests/scopes/kt1579_map_entry.txt         |  6 +-
 .../diagnostics/tests/scopes/visibility2.txt  | 20 ++---
 .../inference/intersectionTypes.txt           |  6 +-
 .../tests/smartCasts/inference/kt1355.txt     | 10 +--
 .../inference/smartCastOnReceiver.txt         |  2 +-
 .../diagnostics/tests/smartCasts/kt2865.txt   |  6 +-
 .../diagnostics/tests/smartCasts/kt3899.txt   |  4 +-
 .../tests/smartCasts/safecalls/anotherVal.txt |  2 +-
 .../tests/smartCasts/safecalls/argument.txt   |  2 +-
 .../smartCasts/safecalls/chainAndUse.txt      |  2 +-
 .../smartCasts/safecalls/chainInChain.txt     |  2 +-
 .../smartCasts/safecalls/chainMixedUnsafe.txt |  2 +-
 .../tests/smartCasts/safecalls/doubleCall.txt |  2 +-
 .../smartCasts/safecalls/falseArgument.txt    |  2 +-
 .../tests/smartCasts/safecalls/falseChain.txt |  2 +-
 .../smartCasts/safecalls/falseExtension.txt   |  2 +-
 .../safecalls/falseSecondArgument.txt         |  2 +-
 .../tests/smartCasts/safecalls/insideCall.txt |  2 +-
 .../tests/smartCasts/safecalls/longChain.txt  |  2 +-
 .../tests/smartCasts/safecalls/simple.txt     |  2 +-
 .../tests/smartCasts/safecalls/twoArgs.txt    |  2 +-
 .../varnotnull/unnecessaryWithMap.txt         | 10 +--
 .../tests/substitutions/kt1558-short.txt      |  4 +-
 .../tests/substitutions/starProjections.txt   |  2 +-
 ...tionForOverloadResolutionWithAmbiguity.txt |  6 +-
 ...ionForOverloadResolutionWithErrorTypes.txt |  4 +-
 .../diagnostics/tests/subtyping/kt-1457.txt   | 20 ++---
 .../diagnostics/tests/subtyping/kt2744.txt    |  2 +-
 .../typeParameters/propertyTypeParameters.txt | 16 ++--
 .../tests/varargs/varargIterator.txt          |  2 +-
 .../testsWithJsStdLib/Serializable.txt        |  6 +-
 .../dynamicTypes/dynamicCastTarget.txt        |  2 +-
 .../testsWithStdLib/addAllProjection.txt      |  2 +-
 .../testsWithStdLib/cast/AsInsideIn.txt       |  8 +-
 .../duplicateJvmSignature/platformNames.txt   |  4 +-
 .../platformNamesDuplicate.txt                |  4 +-
 .../annotationsForResolve/exactAnnotation.txt |  4 +-
 .../internalAnnotationsOnTypes.txt            | 10 +--
 .../noInferAndLowPriority.txt                 |  4 +-
 .../noInferAnnotation.txt                     |  4 +-
 .../onlyInputTypesAndLowPriority.txt          | 10 +--
 .../testsWithStdLib/inference/kt1558.txt      |  4 +-
 .../testsWithStdLib/inference/kt4975.txt      |  2 +-
 .../diagnostics/testsWithStdLib/instar.txt    |  2 +-
 .../diagnostics/testsWithStdLib/kt9078.txt    |  8 +-
 .../diagnostics/testsWithStdLib/outstar.txt   |  2 +-
 .../customClassMutableCollection.kt           |  2 +-
 .../customClassMutableCollection.txt          | 14 ++--
 .../customClassMutableList.kt                 |  2 +-
 .../customClassMutableList.txt                | 22 +++---
 .../invalidFqName.txt                         | 40 +++++-----
 .../wrongTypeParametersCount.kt               |  2 +-
 .../wrongTypeParametersCount.txt              | 22 +++---
 .../testsWithStdLib/regression/ea63992.txt    |  4 +-
 .../ea66827_dataClassWrongToString.txt        |  2 +-
 .../testsWithStdLib/regression/kt2082.txt     |  2 +-
 .../ClassWithTypePExtendsIterableP.txt        |  4 +-
 .../compiledJava/ClassWithTypePRefNext.txt    |  4 +-
 .../InnerClassesInGeneric.runtime.txt         |  2 +-
 .../compiledJava/InnerClassesInGeneric.txt    |  2 +-
 .../compiledJava/InnerOfGeneric.runtime.txt   |  6 +-
 .../loadJava/compiledJava/InnerOfGeneric.txt  |  6 +-
 .../loadJava/compiledJava/RawOverrides.txt    |  8 +-
 .../compiledJava/RawTypeWithUpperBound.txt    |  2 +-
 .../RemoveRedundantProjectionKind.txt         |  2 +-
 .../loadJava/compiledJava/UnboundWildcard.txt |  2 +-
 .../annotations/AnnotatedValueParameter.txt   |  2 +-
 .../kotlinSignature/CustomProjectionKind.txt  |  2 +-
 .../kotlinSignature/MethodWithGenerics.txt    |  2 +-
 .../MethodWithMappedClasses.txt               |  2 +-
 .../MethodWithTypeParameters.txt              |  2 +-
 .../error/WrongProjectionKind.txt             |  2 +-
 .../error/WrongReturnTypeStructure.txt        |  2 +-
 .../WrongTypeParameterBoundStructure1.txt     |  2 +-
 .../error/WrongValueParameterStructure1.txt   |  2 +-
 .../PropagateTypeArgumentNullable.txt         | 24 +++---
 .../parameter/ChangeProjectionKind1.txt       |  4 +-
 .../parameter/MutableToReadOnly.txt           |  4 +-
 .../parameter/ReadOnlyToMutable.txt           |  4 +-
 .../return/AddNullabilitySameGenericType1.txt |  4 +-
 .../return/AddNullabilitySameGenericType2.txt |  4 +-
 .../return/CantMakeImmutableInSubclass.txt    |  4 +-
 .../return/HalfSubstitutedTypeParameters.txt  | 22 +++---
 ...nheritNullabilityGenericSubclassSimple.txt |  4 +-
 .../InheritNullabilitySameGenericType.txt     |  4 +-
 .../return/InheritProjectionKind.txt          |  4 +-
 .../return/InheritReadOnlinessOfArgument.txt  |  4 +-
 .../return/InheritReadOnlinessSameClass.txt   |  4 +-
 .../return/InheritReadOnlinessSubclass.txt    |  4 +-
 .../propagation/return/SameProjectionKind.txt |  4 +-
 .../return/SubclassOfCollection.txt           | 12 +--
 .../propagation/return/SubclassOfMapEntry.txt |  2 +-
 ...SuperclassesConflictingProjectionKinds.txt |  6 +-
 ...esInvariantAndCovariantInferMutability.txt |  6 +-
 ...sInvariantAndCovariantInferNullability.txt |  6 +-
 .../return/TwoSuperclassesMutableAndNot.txt   |  6 +-
 .../TwoSuperclassesSupplementNotNull.txt      |  6 +-
 .../UseParameterInUpperBound.txt              |  4 +-
 ...rameterInUpperBoundWithKotlinSignature.txt |  4 +-
 .../compiledJava/library/LoadIterable.txt     |  4 +-
 .../compiledJava/library/LoadIterator.txt     |  4 +-
 .../loadJava/compiledJava/library/Max.txt     |  2 +-
 .../modality/ModalityOfFakeOverrides.txt      | 20 ++---
 .../compiledJava/mutability/LoadIterable.txt  |  8 +-
 .../mutability/LoadIterableWithConflict.txt   |  4 +-
 .../LoadIterableWithNullability.txt           |  8 +-
 .../LoadIterableWithPropagation.txt           | 16 ++--
 .../mutability/ReadOnlyExtendsWildcard.txt    |  2 +-
 .../compiledJava/rendering/Rendering.txt      | 26 +++----
 .../GenericInterfaceParametersWithBounds.txt  |  4 +-
 .../sam/GenericMethodParameters.txt           |  2 +-
 .../sam/adapters/TypeParameterOfMethod.txt    |  4 +-
 .../signaturePropagation/ArraysInSubtypes.txt |  4 +-
 .../SubclassWithRawType.txt                   | 32 ++++----
 ...woSuperclassesInconsistentGenericTypes.txt |  6 +-
 .../types/SimpleTypeAnnotation.txt            |  2 +-
 .../types/TypeAnnotationWithArguments.txt     |  2 +-
 .../annotations/types/TypeArgument.txt        |  2 +-
 .../EnumWithGenericConstructorParameter.txt   |  2 +-
 .../ConstructorCollectionParameter.txt        |  6 +-
 .../ClassWithTypePExtendsIterableP.kt         |  2 +-
 .../ClassWithTypePExtendsIterableP.txt        |  4 +-
 .../fromLoadJava/ClassWithTypePRefNext.kt     |  2 +-
 .../fromLoadJava/ClassWithTypePRefNext.txt    |  4 +-
 .../RemoveRedundantProjectionKind.txt         |  2 +-
 .../kotlinSignature/CustomProjectionKind.txt  |  2 +-
 .../kotlinSignature/MethodWithGenerics.txt    |  2 +-
 .../MethodWithMappedClasses.txt               |  2 +-
 .../MethodWithTypeParameters.txt              |  2 +-
 .../error/ConflictingProjectionKind.txt       |  2 +-
 .../error/RedundantProjectionKind.txt         |  2 +-
 .../error/WrongProjectionKind.txt             |  2 +-
 .../error/WrongReturnTypeStructure.txt        |  2 +-
 .../WrongTypeParameterBoundStructure1.txt     |  2 +-
 .../WrongTypeParameterBoundStructure2.txt     |  2 +-
 .../error/WrongTypeParametersCount.txt        |  2 +-
 .../error/WrongValueParameterStructure1.txt   |  2 +-
 .../error/WrongValueParameterStructure2.txt   |  2 +-
 .../PropagateTypeArgumentNullable.txt         | 24 +++---
 .../parameter/ChangeProjectionKind1.txt       |  4 +-
 .../parameter/ChangeProjectionKind2.txt       |  4 +-
 .../parameter/InheritMutability.txt           |  4 +-
 .../parameter/InheritProjectionKind.txt       |  4 +-
 .../parameter/InheritReadOnliness.txt         |  4 +-
 .../parameter/MutableToReadOnly.txt           |  4 +-
 .../parameter/ReadOnlyToMutable.txt           |  4 +-
 .../return/AddNullabilitySameGenericType1.txt |  4 +-
 .../return/AddNullabilitySameGenericType2.txt |  4 +-
 .../return/CantMakeImmutableInSubclass.txt    |  4 +-
 .../return/HalfSubstitutedTypeParameters.txt  | 22 +++---
 ...nheritNullabilityGenericSubclassSimple.txt |  4 +-
 .../InheritNullabilitySameGenericType.txt     |  4 +-
 .../return/InheritProjectionKind.txt          |  4 +-
 .../return/InheritReadOnlinessOfArgument.txt  |  4 +-
 .../return/InheritReadOnlinessSameClass.txt   |  4 +-
 .../return/InheritReadOnlinessSubclass.txt    |  4 +-
 .../propagation/return/SameProjectionKind.txt |  4 +-
 .../return/SubclassOfCollection.txt           | 12 +--
 .../propagation/return/SubclassOfMapEntry.txt |  2 +-
 ...SuperclassesConflictingProjectionKinds.txt |  6 +-
 ...esInvariantAndCovariantInferMutability.txt |  6 +-
 ...sInvariantAndCovariantInferNullability.txt |  6 +-
 .../return/TwoSuperclassesMutableAndNot.txt   |  6 +-
 .../TwoSuperclassesSupplementNotNull.txt      |  6 +-
 .../typeParameter/InheritMutability.txt       |  4 +-
 .../typeParameter/InheritReadOnliness.txt     |  4 +-
 .../UseParameterInUpperBound.txt              |  4 +-
 ...rameterInUpperBoundWithKotlinSignature.txt |  4 +-
 .../fromLoadJava/library/LoadIterable.txt     |  4 +-
 .../fromLoadJava/library/LoadIterator.txt     |  4 +-
 .../fromLoadJava/library/Max.txt              |  2 +-
 .../modality/ModalityOfFakeOverrides.txt      | 18 ++---
 .../FunClassParamNotNull.txt                  |  2 +-
 .../FunClassParamNullable.txt                 |  2 +-
 .../ReturnTypeClassParamNotNull.txt           |  2 +-
 .../ReturnTypeClassParamNullable.txt          |  2 +-
 .../platformTypes/notnullTypeArgument.txt     | 20 ++---
 .../platformTypes/nullableTypeArgument.txt    | 20 ++---
 .../compiledKotlin/prop/CollectionSize.txt    |  4 +-
 .../compiledKotlin/prop/ExtVarMapPQInt.txt    |  6 +-
 .../compiledKotlin/type/ListOfAny.txt         |  2 +-
 .../compiledKotlin/type/ListOfAnyQ.txt        |  2 +-
 .../compiledKotlin/type/ListOfStar.txt        |  2 +-
 .../loadJava/compiledKotlin/type/platform.txt |  2 +-
 .../mutability/LoadIterable.txt               |  8 +-
 .../mutability/LoadIterableWithConflict.txt   |  4 +-
 .../LoadIterableWithNullability.txt           |  8 +-
 .../LoadIterableWithPropagation.txt           | 16 ++--
 ...opagationAgainstDeserializedSuperclass.txt |  6 +-
 .../loadJava/sourceJava/ErrorTypes.txt        |  4 +-
 .../loadJava/sourceJava/ReturnNotSubtype.txt  |  2 +-
 .../ImportConflictsWithMappedToJava.resolve   |  6 +-
 .../kt5308IntRangeConstant.txt                |  2 +-
 .../binding/explicit/conflictingProjection.kt |  2 +-
 .../explicit/conflictingProjection2.kt        |  4 +-
 .../type/binding/explicit/errorPair.kt        |  2 +-
 .../type/binding/explicit/functionType.kt     |  4 +-
 .../type/binding/explicit/functionType2.kt    |  2 +-
 .../type/binding/explicit/functionType3.kt    |  2 +-
 .../testData/type/binding/explicit/list2.kt   |  2 +-
 .../type/binding/explicit/nullableType.kt     |  6 +-
 .../testData/type/binding/explicit/pair.kt    |  2 +-
 .../testData/type/binding/explicit/simple.kt  |  2 +-
 .../type/binding/explicit/unresolvedType.kt   |  4 +-
 .../binding/implicit/conflictingProjection.kt |  2 +-
 .../implicit/conflictingProjection2.kt        |  4 +-
 .../type/binding/implicit/errorPair.kt        |  2 +-
 .../type/binding/implicit/functionType.kt     |  4 +-
 .../type/binding/implicit/functionType2.kt    |  2 +-
 .../type/binding/implicit/functionType3.kt    |  2 +-
 .../testData/type/binding/implicit/list2.kt   |  2 +-
 .../type/binding/implicit/nullableType.kt     |  6 +-
 .../testData/type/binding/implicit/pair.kt    |  2 +-
 .../testData/type/binding/implicit/simple.kt  |  2 +-
 .../testData/type/binding/implicit/star.kt    |  2 +-
 .../kotlin/types/BoundsSubstitutorTest.java   | 10 +--
 .../parameterNameAndType/ParametersInFile.kt  |  4 +-
 .../ParametersInFileInaccessibleType.kt       |  2 +-
 .../ParametersInFileInaccessibleType2.kt      |  2 +-
 .../testData/smart/afterAs/2.kt               |  4 +-
 .../testData/smart/afterAs/3.kt               |  2 +-
 idea/testData/addImport/ImportNestedClass.kt  |  2 +-
 .../addImport/ImportNestedClass.kt.after      |  4 +-
 .../functionAndProperty/trait.kt              |  8 +-
 idea/testData/decompiler/builtIns/Int.stubs   | 16 +++-
 idea/testData/decompiler/builtIns/Int.text    |  8 +-
 .../decompiledText/FlexibleTypes.expected.kt  |  2 +-
 .../decompiledText/FunctionTypes.expected.kt  |  2 +-
 .../decompiledText/SimpleClass.expected.kt    |  4 +-
 .../AnnotatedFlexibleTypes.txt                |  4 +-
 .../stubBuilder/Annotations/Annotations.txt   |  4 +-
 .../FlexibleTypes/FlexibleTypes.txt           |  4 +-
 .../TypeBoundsAndDelegationSpecifiers.txt     |  4 +-
 .../stubBuilder/TypeParams/TypeParams.txt     |  8 +-
 .../decompiler/stubBuilder/Types/Types.txt    | 44 ++++++++---
 .../expectedNothingDueToProjections1.txt      |  2 +-
 .../diagnosticMessage/numberValueTypes3.html  |  2 +-
 .../diagnosticMessage/numberValueTypes4.html  |  8 +-
 .../renderCollectionOfTypes1.txt              |  2 +-
 .../typeInferenceExpectedTypeMismatch2.html   |  4 +-
 .../typeInferenceExpectedTypeMismatch3.html   |  4 +-
 .../typeMismatchDueToProjections1.html        |  8 +-
 .../typeMismatchDueToProjectionsTxt1.txt      |  2 +-
 .../diagnosticMessage/upperBoundViolated1.txt |  4 +-
 .../diagnosticMessage/upperBoundViolated2.txt |  2 +-
 .../addStarProjections/qualifiedList.kt       |  2 +-
 .../addStarProjections/qualifiedList.kt.after |  2 +-
 .../addStarProjections/qualifiedMap.kt        |  2 +-
 .../addStarProjections/qualifiedMap.kt.after  |  2 +-
 .../addStarProjections/when/qualifiedList.kt  |  2 +-
 .../when/qualifiedList.kt.after               |  2 +-
 .../addStarProjections/when/qualifiedMap.kt   |  2 +-
 .../when/qualifiedMap.kt.after                |  2 +-
 .../basicMultiple.after.kt                    |  2 +-
 .../basicMultiple.before.Main.kt              |  2 +-
 .../basic/callWithPlatformTypeReceiver.kt     |  4 +-
 .../callWithPlatformTypeReceiver.kt.after     |  4 +-
 .../candidateTypes/mutablyFlexibleType.kt     |  4 +-
 .../mutablyFlexibleType.kt.after              |  4 +-
 idea/testData/resolve/builtins/emptyRange.kt  |  4 +-
 .../LambdaInCurrentStatement.dump             |  2 +-
 .../multiDeclarationWithTypeParameters.kt     |  6 +-
 .../referenceWithLib/setWithTypeParameters.kt |  2 +-
 .../forLoopIn/inBuiltIns/extension.kt         |  6 +-
 .../references/forLoopIn/inBuiltIns/member.kt |  6 +-
 .../forLoopIn/inLibrary/extension.kt          |  4 +-
 .../testData/shortenRefs/type/GenericType3.kt |  2 +-
 .../equivalence/types/userTypeRuntime.kt      |  2 +-
 .../types/userTypeRuntime.kt.match            |  2 +-
 .../function/java8MRKFunctionExpectedType.kt  |  2 +-
 .../toKotlinClasses/iterableAndIterator.kt    |  4 +-
 .../toKotlinClasses/iterableAndIterator2.kt   |  4 +-
 .../toKotlinClasses/iterableAndIterator3.kt   |  2 +-
 .../typeParameters/rawTypeCast.kt             |  2 +-
 .../conflictingPlatformDeclarations/build.log |  8 +-
 524 files changed, 1594 insertions(+), 1552 deletions(-)

diff --git a/compiler/testData/cli/jvm/conflictingOverloads.out b/compiler/testData/cli/jvm/conflictingOverloads.out
index 40262f5594f..426e908948c 100644
--- a/compiler/testData/cli/jvm/conflictingOverloads.out
+++ b/compiler/testData/cli/jvm/conflictingOverloads.out
@@ -1,7 +1,7 @@
-compiler/testData/cli/jvm/conflictingOverloads.kt:1:1: error: 'public fun a(): kotlin.List<kotlin.Int>' is already defined in root package
+compiler/testData/cli/jvm/conflictingOverloads.kt:1:1: error: 'public fun a(): kotlin.collections.List<kotlin.Int>' is already defined in root package
 fun a(): List<Int> = null!!
 ^
-compiler/testData/cli/jvm/conflictingOverloads.kt:2:1: error: 'public fun a(): kotlin.List<kotlin.String>' is already defined in root package
+compiler/testData/cli/jvm/conflictingOverloads.kt:2:1: error: 'public fun a(): kotlin.collections.List<kotlin.String>' is already defined in root package
 fun a(): List<String> = null!!
 ^
 COMPILATION_ERROR
\ No newline at end of file
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/realIteratorFoldl.txt b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/realIteratorFoldl.txt
index 56ce9124c04..eec11394bf9 100644
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/realIteratorFoldl.txt
+++ b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/realIteratorFoldl.txt
@@ -1,4 +1,4 @@
 package
 
 public fun box(): kotlin.String
-public tailrec fun </*0*/ T, /*1*/ A> kotlin.Iterator<T>.foldl(/*0*/ acc: A, /*1*/ foldFunction: (T, A) -> A): A
+public tailrec fun </*0*/ T, /*1*/ A> kotlin.collections.Iterator<T>.foldl(/*0*/ acc: A, /*1*/ foldFunction: (T, A) -> A): A
diff --git a/compiler/testData/codegen/boxWithJava/reflection/platformTypeToString/K.kt b/compiler/testData/codegen/boxWithJava/reflection/platformTypeToString/K.kt
index 3b62a47b5e0..20f74b537ab 100644
--- a/compiler/testData/codegen/boxWithJava/reflection/platformTypeToString/K.kt
+++ b/compiler/testData/codegen/boxWithJava/reflection/platformTypeToString/K.kt
@@ -2,7 +2,7 @@ import kotlin.test.assertEquals
 
 fun box(): String {
     assertEquals("kotlin.String!", J::string.returnType.toString())
-    assertEquals("kotlin.(Mutable)List<kotlin.Any!>!", J::list.returnType.toString())
+    assertEquals("kotlin.collections.(Mutable)List<kotlin.Any!>!", J::list.returnType.toString())
 
     return "OK"
 }
diff --git a/compiler/testData/codegen/boxWithStdlib/reflection/classes/qualifiedName.kt b/compiler/testData/codegen/boxWithStdlib/reflection/classes/qualifiedName.kt
index 7ab6ad02966..26248238b38 100644
--- a/compiler/testData/codegen/boxWithStdlib/reflection/classes/qualifiedName.kt
+++ b/compiler/testData/codegen/boxWithStdlib/reflection/classes/qualifiedName.kt
@@ -14,7 +14,7 @@ fun box(): String {
     assertEquals("kotlin.Int", Int::class.qualifiedName)
     assertEquals("kotlin.Int.Companion", Int.Companion::class.qualifiedName)
     assertEquals("kotlin.IntArray", IntArray::class.qualifiedName)
-    assertEquals("kotlin.List", List::class.qualifiedName)
+    assertEquals("kotlin.collections.List", List::class.qualifiedName)
     assertEquals("kotlin.String", String::class.qualifiedName)
     assertEquals("kotlin.String", java.lang.String::class.qualifiedName)
 
diff --git a/compiler/testData/codegen/boxWithStdlib/reflection/methodsFromAny/extensionPropertyReceiverToString.kt b/compiler/testData/codegen/boxWithStdlib/reflection/methodsFromAny/extensionPropertyReceiverToString.kt
index 2f35b6ee766..5b26edcad0d 100644
--- a/compiler/testData/codegen/boxWithStdlib/reflection/methodsFromAny/extensionPropertyReceiverToString.kt
+++ b/compiler/testData/codegen/boxWithStdlib/reflection/methodsFromAny/extensionPropertyReceiverToString.kt
@@ -79,8 +79,8 @@ fun box(): String {
     check("kotlin.Array<kotlin.Array<kotlin.String>>", Array<Array<String>>::a3)
     check("kotlin.Array<kotlin.BooleanArray>", Array<BooleanArray>::a4)
 
-    check("kotlin.Map<kotlin.String, java.lang.Runnable>", Map<String, Runnable>::m)
-    check("kotlin.List<kotlin.MutableSet<kotlin.Array<kotlin.CharSequence>>>", List<MutableSet<Array<CharSequence>>>::l)
+    check("kotlin.collections.Map<kotlin.String, java.lang.Runnable>", Map<String, Runnable>::m)
+    check("kotlin.collections.List<kotlin.collections.MutableSet<kotlin.Array<kotlin.CharSequence>>>", List<MutableSet<Array<CharSequence>>>::l)
 
     return "OK"
 }
diff --git a/compiler/testData/codegen/boxWithStdlib/reflection/methodsFromAny/functionToString.kt b/compiler/testData/codegen/boxWithStdlib/reflection/methodsFromAny/functionToString.kt
index c0d912c985b..c31d26a62d5 100644
--- a/compiler/testData/codegen/boxWithStdlib/reflection/methodsFromAny/functionToString.kt
+++ b/compiler/testData/codegen/boxWithStdlib/reflection/methodsFromAny/functionToString.kt
@@ -18,7 +18,7 @@ fun assertToString(s: String, x: Any) {
 fun box(): String {
     assertToString("fun top(): kotlin.Int", ::top)
     assertToString("fun kotlin.String.ext(): kotlin.Int", String::ext)
-    assertToString("fun kotlin.IntRange?.ext2(): kotlin.Array<kotlin.Int?>", IntRange::ext2)
+    assertToString("fun kotlin.ranges.IntRange?.ext2(): kotlin.Array<kotlin.Int?>", IntRange::ext2)
     assertToString("fun test.A.mem(): kotlin.String", A::mem)
     return "OK"
 }
diff --git a/compiler/testData/codegen/boxWithStdlib/reflection/methodsFromAny/propertyToString.kt b/compiler/testData/codegen/boxWithStdlib/reflection/methodsFromAny/propertyToString.kt
index ab130cea03d..7107e4cdca1 100644
--- a/compiler/testData/codegen/boxWithStdlib/reflection/methodsFromAny/propertyToString.kt
+++ b/compiler/testData/codegen/boxWithStdlib/reflection/methodsFromAny/propertyToString.kt
@@ -19,7 +19,7 @@ fun box(): String {
     assertToString("val top: kotlin.Int", ::top)
     assertToString("var top2: kotlin.Int", ::top2)
     assertToString("val kotlin.String.ext: kotlin.Int", String::ext)
-    assertToString("var kotlin.IntRange?.ext2: kotlin.Int", IntRange::ext2)
+    assertToString("var kotlin.ranges.IntRange?.ext2: kotlin.Int", IntRange::ext2)
     assertToString("val test.A.mem: kotlin.String", A::mem)
     assertToString("var test.B.mem: kotlin.String", B::mem)
     return "OK"
diff --git a/compiler/testData/codegen/boxWithStdlib/reflection/methodsFromAny/typeToString.kt b/compiler/testData/codegen/boxWithStdlib/reflection/methodsFromAny/typeToString.kt
index 15946e2ff4c..a74b96e38b0 100644
--- a/compiler/testData/codegen/boxWithStdlib/reflection/methodsFromAny/typeToString.kt
+++ b/compiler/testData/codegen/boxWithStdlib/reflection/methodsFromAny/typeToString.kt
@@ -15,7 +15,7 @@ fun box(): String {
                     "kotlin.Int",
                     "kotlin.Array<kotlin.Int>",
                     "kotlin.IntArray",
-                    "kotlin.List<kotlin.Map<kotlin.Any, A<*>>>"
+                    "kotlin.collections.List<kotlin.collections.Map<kotlin.Any, A<*>>>"
             ),
             String?::foo.parameters.map { it.type.toString() }
     )
diff --git a/compiler/testData/compileJavaAgainstKotlin/class/ExtendsAbstractListT.txt b/compiler/testData/compileJavaAgainstKotlin/class/ExtendsAbstractListT.txt
index 9254e96f67e..68a6355e784 100644
--- a/compiler/testData/compileJavaAgainstKotlin/class/ExtendsAbstractListT.txt
+++ b/compiler/testData/compileJavaAgainstKotlin/class/ExtendsAbstractListT.txt
@@ -10,27 +10,27 @@ public abstract class Mine</*0*/ T> : java.util.AbstractList<T> {
     public abstract /*fake_override*/ val size: kotlin.Int
     public open /*fake_override*/ fun add(/*0*/ T!): kotlin.Boolean
     public open /*fake_override*/ fun add(/*0*/ kotlin.Int, /*1*/ T!): kotlin.Unit
-    public open /*fake_override*/ fun addAll(/*0*/ kotlin.Collection<T!>): kotlin.Boolean
-    public open /*fake_override*/ fun addAll(/*0*/ kotlin.Int, /*1*/ kotlin.Collection<T!>): kotlin.Boolean
+    public open /*fake_override*/ fun addAll(/*0*/ kotlin.Int, /*1*/ kotlin.collections.Collection<T!>): kotlin.Boolean
+    public open /*fake_override*/ fun addAll(/*0*/ kotlin.collections.Collection<T!>): kotlin.Boolean
     public open /*fake_override*/ fun clear(): kotlin.Unit
     public open /*fake_override*/ fun contains(/*0*/ T!): kotlin.Boolean
-    public open /*fake_override*/ fun containsAll(/*0*/ kotlin.Collection<T!>): kotlin.Boolean
+    public open /*fake_override*/ fun containsAll(/*0*/ kotlin.collections.Collection<T!>): kotlin.Boolean
     public abstract /*fake_override*/ fun get(/*0*/ kotlin.Int): T!
     public open /*fake_override*/ fun indexOf(/*0*/ T!): kotlin.Int
     public open /*fake_override*/ fun isEmpty(): kotlin.Boolean
-    public open /*fake_override*/ fun iterator(): kotlin.MutableIterator<T!>
+    public open /*fake_override*/ fun iterator(): kotlin.collections.MutableIterator<T!>
     public open /*fake_override*/ fun lastIndexOf(/*0*/ T!): kotlin.Int
-    public open /*fake_override*/ fun listIterator(): kotlin.MutableListIterator<T!>
-    public open /*fake_override*/ fun listIterator(/*0*/ kotlin.Int): kotlin.MutableListIterator<T!>
+    public open /*fake_override*/ fun listIterator(): kotlin.collections.MutableListIterator<T!>
+    public open /*fake_override*/ fun listIterator(/*0*/ kotlin.Int): kotlin.collections.MutableListIterator<T!>
     invisible_fake open /*fake_override*/ fun outOfBoundsMsg(/*0*/ kotlin.Int): kotlin.String!
     invisible_fake open /*fake_override*/ fun rangeCheckForAdd(/*0*/ kotlin.Int): kotlin.Unit
     public open /*fake_override*/ fun remove(/*0*/ T!): kotlin.Boolean
-    public open /*fake_override*/ fun removeAll(/*0*/ kotlin.Collection<T!>): kotlin.Boolean
+    public open /*fake_override*/ fun removeAll(/*0*/ kotlin.collections.Collection<T!>): kotlin.Boolean
     public open /*fake_override*/ fun removeAt(/*0*/ kotlin.Int): T!
     protected/*protected and package*/ open /*fake_override*/ fun removeRange(/*0*/ kotlin.Int, /*1*/ kotlin.Int): kotlin.Unit
-    public open /*fake_override*/ fun retainAll(/*0*/ kotlin.Collection<T!>): kotlin.Boolean
+    public open /*fake_override*/ fun retainAll(/*0*/ kotlin.collections.Collection<T!>): kotlin.Boolean
     public open /*fake_override*/ fun set(/*0*/ kotlin.Int, /*1*/ T!): T!
-    public open /*fake_override*/ fun subList(/*0*/ kotlin.Int, /*1*/ kotlin.Int): kotlin.MutableList<T!>
+    public open /*fake_override*/ fun subList(/*0*/ kotlin.Int, /*1*/ kotlin.Int): kotlin.collections.MutableList<T!>
     public open /*fake_override*/ fun toArray(): kotlin.Array<(out) kotlin.Any!>!
     public open /*fake_override*/ fun </*0*/ T : kotlin.Any!> toArray(/*0*/ kotlin.Array<(out) T!>!): kotlin.Array<(out) T!>!
 }
diff --git a/compiler/testData/compileJavaAgainstKotlin/class/ImplementsListString.txt b/compiler/testData/compileJavaAgainstKotlin/class/ImplementsListString.txt
index a900733691c..696b13e3150 100644
--- a/compiler/testData/compileJavaAgainstKotlin/class/ImplementsListString.txt
+++ b/compiler/testData/compileJavaAgainstKotlin/class/ImplementsListString.txt
@@ -5,24 +5,24 @@ public abstract class Mine : java.util.List<kotlin.String> {
     public abstract /*fake_override*/ val size: kotlin.Int
     public abstract /*fake_override*/ fun add(/*0*/ kotlin.Int, /*1*/ kotlin.String!): kotlin.Unit
     public abstract /*fake_override*/ fun add(/*0*/ kotlin.String!): kotlin.Boolean
-    public abstract /*fake_override*/ fun addAll(/*0*/ kotlin.Collection<kotlin.String!>): kotlin.Boolean
-    public abstract /*fake_override*/ fun addAll(/*0*/ kotlin.Int, /*1*/ (kotlin.MutableCollection<out kotlin.String!>..kotlin.Collection<kotlin.String!>?)): kotlin.Boolean
+    public abstract /*fake_override*/ fun addAll(/*0*/ kotlin.Int, /*1*/ (kotlin.collections.MutableCollection<out kotlin.String!>..kotlin.collections.Collection<kotlin.String!>?)): kotlin.Boolean
+    public abstract /*fake_override*/ fun addAll(/*0*/ kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
     public abstract /*fake_override*/ fun clear(): kotlin.Unit
     public abstract /*fake_override*/ fun contains(/*0*/ kotlin.String!): kotlin.Boolean
-    public abstract /*fake_override*/ fun containsAll(/*0*/ kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public abstract /*fake_override*/ fun containsAll(/*0*/ kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
     public abstract /*fake_override*/ fun get(/*0*/ kotlin.Int): kotlin.String!
     public abstract /*fake_override*/ fun indexOf(/*0*/ kotlin.Any!): kotlin.Int
     public abstract /*fake_override*/ fun isEmpty(): kotlin.Boolean
-    public abstract /*fake_override*/ fun iterator(): kotlin.MutableIterator<kotlin.String!>
+    public abstract /*fake_override*/ fun iterator(): kotlin.collections.MutableIterator<kotlin.String!>
     public abstract /*fake_override*/ fun lastIndexOf(/*0*/ kotlin.Any!): kotlin.Int
-    public abstract /*fake_override*/ fun listIterator(): kotlin.(Mutable)ListIterator<kotlin.String!>!
-    public abstract /*fake_override*/ fun listIterator(/*0*/ kotlin.Int): kotlin.(Mutable)ListIterator<kotlin.String!>!
+    public abstract /*fake_override*/ fun listIterator(): kotlin.collections.(Mutable)ListIterator<kotlin.String!>!
+    public abstract /*fake_override*/ fun listIterator(/*0*/ kotlin.Int): kotlin.collections.(Mutable)ListIterator<kotlin.String!>!
     public abstract /*fake_override*/ fun remove(/*0*/ kotlin.Int): kotlin.String!
     public abstract /*fake_override*/ fun remove(/*0*/ kotlin.String!): kotlin.Boolean
-    public abstract /*fake_override*/ fun removeAll(/*0*/ kotlin.Collection<kotlin.String!>): kotlin.Boolean
-    public abstract /*fake_override*/ fun retainAll(/*0*/ kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public abstract /*fake_override*/ fun removeAll(/*0*/ kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
+    public abstract /*fake_override*/ fun retainAll(/*0*/ kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
     public abstract /*fake_override*/ fun set(/*0*/ kotlin.Int, /*1*/ kotlin.String!): kotlin.String!
-    public abstract /*fake_override*/ fun subList(/*0*/ kotlin.Int, /*1*/ kotlin.Int): kotlin.(Mutable)List<kotlin.String!>!
+    public abstract /*fake_override*/ fun subList(/*0*/ kotlin.Int, /*1*/ kotlin.Int): kotlin.collections.(Mutable)List<kotlin.String!>!
     public abstract /*fake_override*/ fun toArray(): kotlin.Array<(out) kotlin.Any!>!
     public abstract /*fake_override*/ fun </*0*/ T : kotlin.Any!> toArray(/*0*/ kotlin.Array<(out) T!>!): kotlin.Array<(out) T!>!
 }
diff --git a/compiler/testData/compileJavaAgainstKotlin/class/ImplementsMapPP.txt b/compiler/testData/compileJavaAgainstKotlin/class/ImplementsMapPP.txt
index accb3d133c5..fff6a1b644b 100644
--- a/compiler/testData/compileJavaAgainstKotlin/class/ImplementsMapPP.txt
+++ b/compiler/testData/compileJavaAgainstKotlin/class/ImplementsMapPP.txt
@@ -9,13 +9,13 @@ public abstract class Mine</*0*/ P1, /*1*/ P2> : java.util.Map<P2, P1> {
     public abstract /*fake_override*/ fun clear(): kotlin.Unit
     public abstract /*fake_override*/ fun containsKey(/*0*/ kotlin.Any!): kotlin.Boolean
     public abstract /*fake_override*/ fun containsValue(/*0*/ kotlin.Any!): kotlin.Boolean
-    public abstract /*fake_override*/ fun entrySet(): kotlin.(Mutable)Set<kotlin.(Mutable)Map.(Mutable)Entry<P2!, P1!>!>!
+    public abstract /*fake_override*/ fun entrySet(): kotlin.collections.(Mutable)Set<kotlin.collections.(Mutable)Map.(Mutable)Entry<P2!, P1!>!>!
     public abstract /*fake_override*/ fun get(/*0*/ kotlin.Any!): P1!
     public abstract /*fake_override*/ fun isEmpty(): kotlin.Boolean
-    public abstract /*fake_override*/ fun keySet(): kotlin.(Mutable)Set<P2!>!
+    public abstract /*fake_override*/ fun keySet(): kotlin.collections.(Mutable)Set<P2!>!
     public abstract /*fake_override*/ fun put(/*0*/ P2!, /*1*/ P1!): P1!
-    public abstract /*fake_override*/ fun putAll(/*0*/ (kotlin.MutableMap<out P2!, out P1!>..kotlin.Map<out P2!, P1!>?)): kotlin.Unit
+    public abstract /*fake_override*/ fun putAll(/*0*/ (kotlin.collections.MutableMap<out P2!, out P1!>..kotlin.collections.Map<out P2!, P1!>?)): kotlin.Unit
     public abstract /*fake_override*/ fun remove(/*0*/ kotlin.Any!): P1!
     public abstract /*fake_override*/ fun size(): kotlin.Int
-    public abstract /*fake_override*/ fun values(): kotlin.(Mutable)Collection<P1!>!
+    public abstract /*fake_override*/ fun values(): kotlin.collections.(Mutable)Collection<P1!>!
 }
diff --git a/compiler/testData/compileJavaAgainstKotlin/class/InnerClassConstructors.txt b/compiler/testData/compileJavaAgainstKotlin/class/InnerClassConstructors.txt
index 60775320dfb..5861dbcb6b0 100644
--- a/compiler/testData/compileJavaAgainstKotlin/class/InnerClassConstructors.txt
+++ b/compiler/testData/compileJavaAgainstKotlin/class/InnerClassConstructors.txt
@@ -11,7 +11,7 @@ public final class Outer {
     public constructor Outer()
 
     public final inner class InnerGeneric {
-        public constructor InnerGeneric(/*0*/ kotlin.List<kotlin.String>)
+        public constructor InnerGeneric(/*0*/ kotlin.collections.List<kotlin.String>)
     }
 
     public final inner class InnerPrimitive {
diff --git a/compiler/testData/compileJavaAgainstKotlin/class/InnerClassOfGeneric.txt b/compiler/testData/compileJavaAgainstKotlin/class/InnerClassOfGeneric.txt
index ff82a5ad219..fcb19d0427b 100644
--- a/compiler/testData/compileJavaAgainstKotlin/class/InnerClassOfGeneric.txt
+++ b/compiler/testData/compileJavaAgainstKotlin/class/InnerClassOfGeneric.txt
@@ -11,7 +11,7 @@ public final class Outer</*0*/ T> {
     public constructor Outer</*0*/ T>()
 
     public final inner class Inner /*captured type parameters: /*0*/ T*/ {
-        public constructor Inner(/*0*/ kotlin.List<T>)
+        public constructor Inner(/*0*/ kotlin.collections.List<T>)
     }
 
     public final inner class InnerSimple /*captured type parameters: /*0*/ T*/ {
diff --git a/compiler/testData/compileJavaAgainstKotlin/method/AccessorGenericSignature.txt b/compiler/testData/compileJavaAgainstKotlin/method/AccessorGenericSignature.txt
index fcf5ec5f63b..11b318811c4 100644
--- a/compiler/testData/compileJavaAgainstKotlin/method/AccessorGenericSignature.txt
+++ b/compiler/testData/compileJavaAgainstKotlin/method/AccessorGenericSignature.txt
@@ -7,7 +7,7 @@ public open class AccessorGenericSignature {
 
 public final class BadClass {
     public constructor BadClass()
-    private final fun </*0*/ D> bar(/*0*/ kotlin.List<D>): kotlin.Unit
-    private final fun </*0*/ E : kotlin.Number, /*1*/ F : kotlin.MutableList<E>> baz(/*0*/ kotlin.List<F>): kotlin.Unit
+    private final fun </*0*/ D> bar(/*0*/ kotlin.collections.List<D>): kotlin.Unit
+    private final fun </*0*/ E : kotlin.Number, /*1*/ F : kotlin.collections.MutableList<E>> baz(/*0*/ kotlin.collections.List<F>): kotlin.Unit
     public final fun foo(): kotlin.Unit
 }
diff --git a/compiler/testData/compileJavaAgainstKotlin/method/ClashingSignaturesWithoutReturnType.txt b/compiler/testData/compileJavaAgainstKotlin/method/ClashingSignaturesWithoutReturnType.txt
index 046e147a660..43f4ffeeb80 100644
--- a/compiler/testData/compileJavaAgainstKotlin/method/ClashingSignaturesWithoutReturnType.txt
+++ b/compiler/testData/compileJavaAgainstKotlin/method/ClashingSignaturesWithoutReturnType.txt
@@ -2,11 +2,11 @@ package test
 
 public open class ClashingSignaturesWithoutReturnType {
     public constructor ClashingSignaturesWithoutReturnType()
-    public/*package*/ open fun test(/*0*/ kotlin.(Mutable)List<kotlin.String!>!, /*1*/ kotlin.(Mutable)List<kotlin.Int!>!): kotlin.Unit
+    public/*package*/ open fun test(/*0*/ kotlin.collections.(Mutable)List<kotlin.String!>!, /*1*/ kotlin.collections.(Mutable)List<kotlin.Int!>!): kotlin.Unit
 }
 
 public final class K {
     public constructor K()
-    public final fun foo(/*0*/ kotlin.List<kotlin.Int>): kotlin.Int
-    public final fun foo(/*0*/ kotlin.List<kotlin.String>): kotlin.String
+    public final fun foo(/*0*/ kotlin.collections.List<kotlin.Int>): kotlin.Int
+    public final fun foo(/*0*/ kotlin.collections.List<kotlin.String>): kotlin.String
 }
diff --git a/compiler/testData/compileJavaAgainstKotlin/method/ListOfInt.txt b/compiler/testData/compileJavaAgainstKotlin/method/ListOfInt.txt
index c3ba05b9d81..6f0e3259a1c 100644
--- a/compiler/testData/compileJavaAgainstKotlin/method/ListOfInt.txt
+++ b/compiler/testData/compileJavaAgainstKotlin/method/ListOfInt.txt
@@ -1,6 +1,6 @@
 package test
 
-public fun ggg(/*0*/ kotlin.List<kotlin.Int>): kotlin.List<kotlin.Int>
+public fun ggg(/*0*/ kotlin.collections.List<kotlin.Int>): kotlin.collections.List<kotlin.Int>
 
 public/*package*/ open class ListOfInt {
     public/*package*/ constructor ListOfInt()
diff --git a/compiler/testData/compileJavaAgainstKotlin/method/ListOfString.txt b/compiler/testData/compileJavaAgainstKotlin/method/ListOfString.txt
index 13bc0c948c7..3b1ad63eef8 100644
--- a/compiler/testData/compileJavaAgainstKotlin/method/ListOfString.txt
+++ b/compiler/testData/compileJavaAgainstKotlin/method/ListOfString.txt
@@ -1,6 +1,6 @@
 package test
 
-public fun ff(/*0*/ kotlin.List<kotlin.String>): kotlin.Int
+public fun ff(/*0*/ kotlin.collections.List<kotlin.String>): kotlin.Int
 
 public/*package*/ open class ListString {
     public/*package*/ constructor ListString()
diff --git a/compiler/testData/compileJavaAgainstKotlin/method/ListOfT.txt b/compiler/testData/compileJavaAgainstKotlin/method/ListOfT.txt
index 96904e2e9bd..77400fbf82c 100644
--- a/compiler/testData/compileJavaAgainstKotlin/method/ListOfT.txt
+++ b/compiler/testData/compileJavaAgainstKotlin/method/ListOfT.txt
@@ -1,6 +1,6 @@
 package test
 
-public fun </*0*/ P> listOfT(/*0*/ kotlin.List<P>): kotlin.List<P>
+public fun </*0*/ P> listOfT(/*0*/ kotlin.collections.List<P>): kotlin.collections.List<P>
 
 public/*package*/ open class ListOfT {
     public/*package*/ constructor ListOfT()
diff --git a/compiler/testData/compileJavaAgainstKotlin/method/MapOfKString.txt b/compiler/testData/compileJavaAgainstKotlin/method/MapOfKString.txt
index 9a3b6eb4d61..aa2d01b7ec9 100644
--- a/compiler/testData/compileJavaAgainstKotlin/method/MapOfKString.txt
+++ b/compiler/testData/compileJavaAgainstKotlin/method/MapOfKString.txt
@@ -1,6 +1,6 @@
 package test
 
-public fun </*0*/ K> fff(/*0*/ kotlin.Map<K, kotlin.String>): kotlin.Map<K, kotlin.String>
+public fun </*0*/ K> fff(/*0*/ kotlin.collections.Map<K, kotlin.String>): kotlin.collections.Map<K, kotlin.String>
 
 public/*package*/ open class MapOfKString {
     public/*package*/ constructor MapOfKString()
diff --git a/compiler/testData/compileJavaAgainstKotlin/method/MapOfStringIntQ.txt b/compiler/testData/compileJavaAgainstKotlin/method/MapOfStringIntQ.txt
index d3daf6dcc3c..fe016a53f9d 100644
--- a/compiler/testData/compileJavaAgainstKotlin/method/MapOfStringIntQ.txt
+++ b/compiler/testData/compileJavaAgainstKotlin/method/MapOfStringIntQ.txt
@@ -1,6 +1,6 @@
 package test
 
-public fun fff(/*0*/ kotlin.Map<kotlin.String, kotlin.Int?>): kotlin.Map<kotlin.String, kotlin.Int?>
+public fun fff(/*0*/ kotlin.collections.Map<kotlin.String, kotlin.Int?>): kotlin.collections.Map<kotlin.String, kotlin.Int?>
 
 public/*package*/ open class MapOfKString {
     public/*package*/ constructor MapOfKString()
diff --git a/compiler/testData/compileJavaAgainstKotlin/method/QExtendsListString.txt b/compiler/testData/compileJavaAgainstKotlin/method/QExtendsListString.txt
index f96d271aece..2753d3b8087 100644
--- a/compiler/testData/compileJavaAgainstKotlin/method/QExtendsListString.txt
+++ b/compiler/testData/compileJavaAgainstKotlin/method/QExtendsListString.txt
@@ -1,6 +1,6 @@
 package test
 
-public fun </*0*/ P1 : kotlin.List<kotlin.String>> id(/*0*/ P1): P1
+public fun </*0*/ P1 : kotlin.collections.List<kotlin.String>> id(/*0*/ P1): P1
 
 public/*package*/ open class Question {
     public/*package*/ constructor Question()
diff --git a/compiler/testData/compileJavaAgainstKotlin/method/TraitImpl.txt b/compiler/testData/compileJavaAgainstKotlin/method/TraitImpl.txt
index 284e28eaa20..a2f8f7c9376 100644
--- a/compiler/testData/compileJavaAgainstKotlin/method/TraitImpl.txt
+++ b/compiler/testData/compileJavaAgainstKotlin/method/TraitImpl.txt
@@ -1,12 +1,12 @@
 package test
 
 public interface Trait {
-    public open fun generic(/*0*/ kotlin.List<kotlin.String>): kotlin.Unit
+    public open fun generic(/*0*/ kotlin.collections.List<kotlin.String>): kotlin.Unit
     public open fun simple(): kotlin.Unit
 }
 
 public/*package*/ abstract class TraitImpl : test.Trait {
     public/*package*/ constructor TraitImpl()
-    public open /*fake_override*/ fun generic(/*0*/ kotlin.List<kotlin.String>): kotlin.Unit
+    public open /*fake_override*/ fun generic(/*0*/ kotlin.collections.List<kotlin.String>): kotlin.Unit
     public open /*fake_override*/ fun simple(): kotlin.Unit
 }
diff --git a/compiler/testData/compileJavaAgainstKotlin/method/Vararg.txt b/compiler/testData/compileJavaAgainstKotlin/method/Vararg.txt
index ec213803ddb..f25d4d1007e 100644
--- a/compiler/testData/compileJavaAgainstKotlin/method/Vararg.txt
+++ b/compiler/testData/compileJavaAgainstKotlin/method/Vararg.txt
@@ -1,6 +1,6 @@
 package test
 
-public fun gg(/*0*/ kotlin.List<kotlin.String>, /*1*/ vararg kotlin.Int /*kotlin.IntArray*/): kotlin.List<kotlin.String>
+public fun gg(/*0*/ kotlin.collections.List<kotlin.String>, /*1*/ vararg kotlin.Int /*kotlin.IntArray*/): kotlin.collections.List<kotlin.String>
 
 public/*package*/ open class Vararg {
     public/*package*/ constructor Vararg()
diff --git a/compiler/testData/compileJavaAgainstKotlin/property/GenericProperty.txt b/compiler/testData/compileJavaAgainstKotlin/property/GenericProperty.txt
index 6b65b22227d..0eb66d7ec18 100644
--- a/compiler/testData/compileJavaAgainstKotlin/property/GenericProperty.txt
+++ b/compiler/testData/compileJavaAgainstKotlin/property/GenericProperty.txt
@@ -1,6 +1,6 @@
 package test
 
-public val </*0*/ K, /*1*/ V> kotlin.Map<K, V>.test: kotlin.Map<V, K>
+public val </*0*/ K, /*1*/ V> kotlin.collections.Map<K, V>.test: kotlin.collections.Map<V, K>
 
 public/*package*/ open class GenericProperty {
     public/*package*/ constructor GenericProperty()
diff --git a/compiler/testData/diagnostics/tests/AssignToArrayElement.txt b/compiler/testData/diagnostics/tests/AssignToArrayElement.txt
index 755478d3e2d..005e1f56b37 100644
--- a/compiler/testData/diagnostics/tests/AssignToArrayElement.txt
+++ b/compiler/testData/diagnostics/tests/AssignToArrayElement.txt
@@ -2,4 +2,4 @@ package
 
 public fun fn(): kotlin.Unit
 public fun getArray(): kotlin.Array<kotlin.Int>
-public fun getList(): kotlin.MutableList<kotlin.Int>
+public fun getList(): kotlin.collections.MutableList<kotlin.Int>
diff --git a/compiler/testData/diagnostics/tests/Builders.txt b/compiler/testData/diagnostics/tests/Builders.txt
index 1717a2ad6ea..f41b7e2ffb0 100644
--- a/compiler/testData/diagnostics/tests/Builders.txt
+++ b/compiler/testData/diagnostics/tests/Builders.txt
@@ -5,7 +5,7 @@ package html {
     public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
     public fun print(/*0*/ message: kotlin.Any?): kotlin.Unit
     public fun println(/*0*/ message: kotlin.Any?): kotlin.Unit
-    public operator fun </*0*/ K, /*1*/ V> kotlin.MutableMap<K, V>.set(/*0*/ key: K, /*1*/ value: V): V?
+    public operator fun </*0*/ K, /*1*/ V> kotlin.collections.MutableMap<K, V>.set(/*0*/ key: K, /*1*/ value: V): V?
 
     public final class A : html.BodyTag {
         public constructor A()
diff --git a/compiler/testData/diagnostics/tests/CovariantOverrideType.txt b/compiler/testData/diagnostics/tests/CovariantOverrideType.txt
index a7db6f5e8e8..8f8f4f2ed97 100644
--- a/compiler/testData/diagnostics/tests/CovariantOverrideType.txt
+++ b/compiler/testData/diagnostics/tests/CovariantOverrideType.txt
@@ -3,7 +3,7 @@ package
 public interface A</*0*/ H> {
     public abstract val a: kotlin.Int
     public abstract val a1: kotlin.Int
-    public abstract val g: kotlin.Iterator<H>
+    public abstract val g: kotlin.collections.Iterator<H>
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open fun foo(): kotlin.Int
     public open fun foo1(): kotlin.Int
@@ -18,13 +18,13 @@ public abstract class B</*0*/ H> : A<H> {
     public constructor B</*0*/ H>()
     public open override /*1*/ val a: kotlin.Double = 1.0.toDouble()
     public open override /*1*/ val a1: kotlin.Double = 1.0.toDouble()
-    public abstract override /*1*/ val g: kotlin.Iterator<kotlin.Int>
+    public abstract override /*1*/ val g: kotlin.collections.Iterator<kotlin.Int>
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ fun foo(): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun foo1(): kotlin.Int
     public open override /*1*/ fun foo2(): kotlin.Unit
     public abstract override /*1*/ fun </*0*/ X> g(): kotlin.Int
-    public abstract override /*1*/ fun </*0*/ X> g1(): kotlin.List<X>
+    public abstract override /*1*/ fun </*0*/ X> g1(): kotlin.collections.List<X>
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
diff --git a/compiler/testData/diagnostics/tests/ForRangeConventions.txt b/compiler/testData/diagnostics/tests/ForRangeConventions.txt
index 1ed12ef85d5..2666c1f11ee 100644
--- a/compiler/testData/diagnostics/tests/ForRangeConventions.txt
+++ b/compiler/testData/diagnostics/tests/ForRangeConventions.txt
@@ -139,6 +139,6 @@ public abstract class Range1 {
     public constructor Range1()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public abstract operator fun iterator(): kotlin.Iterator<kotlin.Int>
+    public abstract operator fun iterator(): kotlin.collections.Iterator<kotlin.Int>
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
diff --git a/compiler/testData/diagnostics/tests/PackageQualified.txt b/compiler/testData/diagnostics/tests/PackageQualified.txt
index 800b945a399..4e8e71cb3af 100644
--- a/compiler/testData/diagnostics/tests/PackageQualified.txt
+++ b/compiler/testData/diagnostics/tests/PackageQualified.txt
@@ -3,15 +3,15 @@ package
 package foobar {
     public val x1: [ERROR : <ERROR PROPERTY TYPE>]
     public val x2: java.util.List<kotlin.Int>? = null
-    public val y1: kotlin.List<kotlin.Int>? = null
+    public val y1: kotlin.collections.List<kotlin.Int>? = null
     public fun </*0*/ O> done(/*0*/ result: O): foobar.Iteratee<kotlin.Any?, O>
 
-    public abstract class Collection</*0*/ E> : kotlin.Iterable<E> {
+    public abstract class Collection</*0*/ E> : kotlin.collections.Iterable<E> {
         public constructor Collection</*0*/ E>()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public final fun </*0*/ O> iterate(/*0*/ iteratee: foobar.Iteratee<E, O>): O
-        public abstract override /*1*/ /*fake_override*/ fun iterator(): kotlin.Iterator<E>
+        public abstract override /*1*/ /*fake_override*/ fun iterator(): kotlin.collections.Iterator<E>
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 
@@ -61,7 +61,7 @@ package foobar {
         public val a: java.util.List<kotlin.Int>? = null
         public val a2: [ERROR : util.List<Int>]<kotlin.Int>?
         public val a3: [ERROR : ArrayList<Int>]<kotlin.Int>?
-        public val b: kotlin.List<kotlin.Int>? = null
+        public val b: kotlin.collections.List<kotlin.Int>? = null
         public val b1: [ERROR : util.List<Int>]<kotlin.Int>?
     }
 }
diff --git a/compiler/testData/diagnostics/tests/PrimaryConstructors.txt b/compiler/testData/diagnostics/tests/PrimaryConstructors.txt
index 3828990dc7d..b7f802218ae 100644
--- a/compiler/testData/diagnostics/tests/PrimaryConstructors.txt
+++ b/compiler/testData/diagnostics/tests/PrimaryConstructors.txt
@@ -1,13 +1,13 @@
 package
 
-public final class MyIterable</*0*/ T> : kotlin.Iterable<T> {
+public final class MyIterable</*0*/ T> : kotlin.collections.Iterable<T> {
     public constructor MyIterable</*0*/ T>()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ fun iterator(): kotlin.Iterator<T>
+    public open override /*1*/ fun iterator(): kotlin.collections.Iterator<T>
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-    public final inner class MyIterator /*captured type parameters: /*0*/ T*/ : kotlin.Iterator<T> {
+    public final inner class MyIterator /*captured type parameters: /*0*/ T*/ : kotlin.collections.Iterator<T> {
         public constructor MyIterator()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public open override /*1*/ fun hasNext(): kotlin.Boolean
diff --git a/compiler/testData/diagnostics/tests/QualifiedExpressions.txt b/compiler/testData/diagnostics/tests/QualifiedExpressions.txt
index 71475b83c4c..0919e12f6d7 100644
--- a/compiler/testData/diagnostics/tests/QualifiedExpressions.txt
+++ b/compiler/testData/diagnostics/tests/QualifiedExpressions.txt
@@ -1,6 +1,6 @@
 package
 
 package qualified_expressions {
-    public fun test(/*0*/ s: kotlin.IntRange?): kotlin.Unit
+    public fun test(/*0*/ s: kotlin.ranges.IntRange?): kotlin.Unit
     public fun kotlin.String.startsWith(/*0*/ s: kotlin.String): kotlin.Boolean
 }
diff --git a/compiler/testData/diagnostics/tests/ResolveToJava.txt b/compiler/testData/diagnostics/tests/ResolveToJava.txt
index 154c464c04c..5b20f2d697f 100644
--- a/compiler/testData/diagnostics/tests/ResolveToJava.txt
+++ b/compiler/testData/diagnostics/tests/ResolveToJava.txt
@@ -1,6 +1,6 @@
 package
 
-public val l: kotlin.MutableList<in kotlin.Int>
+public val l: kotlin.collections.MutableList<in kotlin.Int>
 public fun test(/*0*/ l: java.util.List<kotlin.Int>): kotlin.Unit
 
 package xxx {
diff --git a/compiler/testData/diagnostics/tests/Serializable.txt b/compiler/testData/diagnostics/tests/Serializable.txt
index b475b3f63d2..df6db7f740a 100644
--- a/compiler/testData/diagnostics/tests/Serializable.txt
+++ b/compiler/testData/diagnostics/tests/Serializable.txt
@@ -2,12 +2,12 @@ package
 
 public fun testArrays(/*0*/ ia: kotlin.IntArray, /*1*/ ai: kotlin.Array<kotlin.Int>, /*2*/ an: kotlin.Array<N>, /*3*/ a: kotlin.Array<S>): kotlin.Unit
 public fun testEnums(/*0*/ a: kotlin.Enum<*>): kotlin.Unit
-public fun testLists(/*0*/ a: kotlin.List<kotlin.Int>): kotlin.Unit
+public fun testLists(/*0*/ a: kotlin.collections.List<kotlin.Int>): kotlin.Unit
 public fun testLiterals(): kotlin.Unit
-public fun testNotSerializable(/*0*/ l: kotlin.List<kotlin.Int>): kotlin.Unit
+public fun testNotSerializable(/*0*/ l: kotlin.collections.List<kotlin.Int>): kotlin.Unit
 public fun testPrimitives(/*0*/ b: kotlin.Byte, /*1*/ ss: kotlin.Short, /*2*/ i: kotlin.Int, /*3*/ l: kotlin.Long, /*4*/ d: kotlin.Double, /*5*/ s: kotlin.String, /*6*/ f: kotlin.Float, /*7*/ bool: kotlin.Boolean): kotlin.Unit
 public fun use(/*0*/ s: java.io.Serializable): kotlin.Unit
-public fun useList(/*0*/ s: kotlin.List<java.io.Serializable>): kotlin.Unit
+public fun useList(/*0*/ s: kotlin.collections.List<java.io.Serializable>): kotlin.Unit
 
 public final enum class C : kotlin.Enum<C> {
     enum entry E
diff --git a/compiler/testData/diagnostics/tests/ValAndFunOverrideCompatibilityClash.txt b/compiler/testData/diagnostics/tests/ValAndFunOverrideCompatibilityClash.txt
index 805a5b84c57..d14035738c6 100644
--- a/compiler/testData/diagnostics/tests/ValAndFunOverrideCompatibilityClash.txt
+++ b/compiler/testData/diagnostics/tests/ValAndFunOverrideCompatibilityClash.txt
@@ -26,13 +26,13 @@ public final class Foo1 : java.util.ArrayList<kotlin.Int> {
     public open override /*1*/ /*fake_override*/ val size: kotlin.Int
     public open override /*1*/ /*fake_override*/ fun add(/*0*/ element: kotlin.Int): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.Int): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.Collection<kotlin.Int>): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.Collection<kotlin.Int>): kotlin.Boolean
-    invisible_fake open override /*1*/ /*fake_override*/ fun batchRemove(/*0*/ p0: kotlin.(Mutable)Collection<*>!, /*1*/ p1: kotlin.Boolean): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.collections.Collection<kotlin.Int>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.collections.Collection<kotlin.Int>): kotlin.Boolean
+    invisible_fake open override /*1*/ /*fake_override*/ fun batchRemove(/*0*/ p0: kotlin.collections.(Mutable)Collection<*>!, /*1*/ p1: kotlin.Boolean): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public open override /*1*/ /*fake_override*/ fun contains(/*0*/ element: kotlin.Int): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.Collection<kotlin.Int>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection<kotlin.Int>): kotlin.Boolean
     invisible_fake open override /*1*/ /*fake_override*/ fun elementData(/*0*/ p0: kotlin.Int): kotlin.Int!
     public open override /*1*/ /*fake_override*/ fun ensureCapacity(/*0*/ p0: kotlin.Int): kotlin.Unit
     invisible_fake open override /*1*/ /*fake_override*/ fun ensureCapacityInternal(/*0*/ p0: kotlin.Int): kotlin.Unit
@@ -43,21 +43,21 @@ public final class Foo1 : java.util.ArrayList<kotlin.Int> {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ element: kotlin.Int): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator<kotlin.Int>
+    public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.collections.MutableIterator<kotlin.Int>
     public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ element: kotlin.Int): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.MutableListIterator<kotlin.Int>
-    public open override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.MutableListIterator<kotlin.Int>
+    public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.collections.MutableListIterator<kotlin.Int>
+    public open override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.collections.MutableListIterator<kotlin.Int>
     invisible_fake open override /*1*/ /*fake_override*/ fun outOfBoundsMsg(/*0*/ p0: kotlin.Int): kotlin.String!
     invisible_fake open override /*1*/ /*fake_override*/ fun rangeCheck(/*0*/ p0: kotlin.Int): kotlin.Unit
     invisible_fake open override /*1*/ /*fake_override*/ fun rangeCheckForAdd(/*0*/ p0: kotlin.Int): kotlin.Unit
     invisible_fake open override /*1*/ /*fake_override*/ fun readObject(/*0*/ p0: java.io.ObjectInputStream!): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun remove(/*0*/ element: kotlin.Int): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.Collection<kotlin.Int>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.collections.Collection<kotlin.Int>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun removeAt(/*0*/ p0: kotlin.Int): kotlin.Int
     protected/*protected and package*/ open override /*1*/ /*fake_override*/ fun removeRange(/*0*/ p0: kotlin.Int, /*1*/ p1: kotlin.Int): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.Collection<kotlin.Int>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.collections.Collection<kotlin.Int>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun set(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.Int): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.MutableList<kotlin.Int>
+    public open override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.collections.MutableList<kotlin.Int>
     public open override /*1*/ /*fake_override*/ fun toArray(): kotlin.Array<(out) kotlin.Any!>!
     public open override /*1*/ /*fake_override*/ fun </*0*/ T : kotlin.Any!> toArray(/*0*/ p0: kotlin.Array<(out) T!>!): kotlin.Array<(out) T!>!
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
diff --git a/compiler/testData/diagnostics/tests/annotations/annotationsOnNullableTypes.txt b/compiler/testData/diagnostics/tests/annotations/annotationsOnNullableTypes.txt
index cabf4460f0e..4f587a537a2 100644
--- a/compiler/testData/diagnostics/tests/annotations/annotationsOnNullableTypes.txt
+++ b/compiler/testData/diagnostics/tests/annotations/annotationsOnNullableTypes.txt
@@ -5,13 +5,13 @@ public val baz1: @b(i = 1) kotlin.Int? = 1
 public val baz2: @a() @b(i = 1) kotlin.Int? = 1
 public val baz3: @c() kotlin.Int? = 1
 public fun foo(/*0*/ i: @a() kotlin.Int?): kotlin.Unit
-public fun foo(/*0*/ l: kotlin.List<@a() kotlin.Int?>): kotlin.Unit
+public fun foo(/*0*/ l: kotlin.collections.List<@a() kotlin.Int?>): kotlin.Unit
 public fun foo1(/*0*/ i: @b(i = 1) kotlin.Int?): kotlin.Unit
-public fun foo1(/*0*/ l: kotlin.List<@b(i = 1) kotlin.Int?>): kotlin.Unit
+public fun foo1(/*0*/ l: kotlin.collections.List<@b(i = 1) kotlin.Int?>): kotlin.Unit
 public fun foo2(/*0*/ i: @a() @b(i = 1) kotlin.Int?): kotlin.Unit
-public fun foo2(/*0*/ l: kotlin.List<@a() @b(i = 1) kotlin.Int?>): kotlin.Unit
+public fun foo2(/*0*/ l: kotlin.collections.List<@a() @b(i = 1) kotlin.Int?>): kotlin.Unit
 public fun foo3(/*0*/ i: @c() kotlin.Int?): kotlin.Unit
-public fun foo3(/*0*/ l: kotlin.List<@c() kotlin.Int?>): kotlin.Unit
+public fun foo3(/*0*/ l: kotlin.collections.List<@c() kotlin.Int?>): kotlin.Unit
 public fun @a() kotlin.Int?.bar(): kotlin.Unit
 public fun @b(i = 1) kotlin.Int?.bar1(): kotlin.Unit
 public fun @a() @b(i = 1) kotlin.Int?.bar2(): kotlin.Unit
diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/typeargs.txt b/compiler/testData/diagnostics/tests/annotations/options/targets/typeargs.txt
index 9c0e5aed368..30989f527ce 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/targets/typeargs.txt
+++ b/compiler/testData/diagnostics/tests/annotations/options/targets/typeargs.txt
@@ -1,8 +1,8 @@
 package
 
-public val x: kotlin.List<@base() kotlin.String>? = null
-public val y: kotlin.List<@base() kotlin.String>? = null
-public fun foo(/*0*/ list: kotlin.List<@typeAnn() kotlin.Int>): kotlin.List<@typeAnn() kotlin.Int>
+public val x: kotlin.collections.List<@base() kotlin.String>? = null
+public val y: kotlin.collections.List<@base() kotlin.String>? = null
+public fun foo(/*0*/ list: kotlin.collections.List<@typeAnn() kotlin.Int>): kotlin.collections.List<@typeAnn() kotlin.Int>
 
 public final annotation class base : kotlin.Annotation {
     public constructor base()
diff --git a/compiler/testData/diagnostics/tests/annotations/typeAnnotations.txt b/compiler/testData/diagnostics/tests/annotations/typeAnnotations.txt
index b35bf1cb7b5..bd7709c27a8 100644
--- a/compiler/testData/diagnostics/tests/annotations/typeAnnotations.txt
+++ b/compiler/testData/diagnostics/tests/annotations/typeAnnotations.txt
@@ -1,9 +1,9 @@
 package
 
-public val </*0*/ T> @x() kotlin.List<@x() T>.f: kotlin.Int
-public fun </*0*/ T, /*1*/ U : T> kotlin.List<@x() T>.firstTyped(): U
+public val </*0*/ T> @x() kotlin.collections.List<@x() T>.f: kotlin.Int
+public fun </*0*/ T, /*1*/ U : T> kotlin.collections.List<@x() T>.firstTyped(): U
 public fun @x() A.foo(/*0*/ a: @x() kotlin.Int): kotlin.Unit
-public fun </*0*/ T> @x() kotlin.List<@x() T>.foo(/*0*/ l: kotlin.List<@x() T>): @x() kotlin.List<@x() T>
+public fun </*0*/ T> @x() kotlin.collections.List<@x() T>.foo(/*0*/ l: kotlin.collections.List<@x() T>): @x() kotlin.collections.List<@x() T>
 
 public final class A {
     public constructor A()
diff --git a/compiler/testData/diagnostics/tests/cast/AsErasedError.txt b/compiler/testData/diagnostics/tests/cast/AsErasedError.txt
index a1cae5dc533..42de5524480 100644
--- a/compiler/testData/diagnostics/tests/cast/AsErasedError.txt
+++ b/compiler/testData/diagnostics/tests/cast/AsErasedError.txt
@@ -1,3 +1,3 @@
 package
 
-public fun ff(/*0*/ c: kotlin.MutableCollection<kotlin.String>): kotlin.MutableList<kotlin.Int>
+public fun ff(/*0*/ c: kotlin.collections.MutableCollection<kotlin.String>): kotlin.collections.MutableList<kotlin.Int>
diff --git a/compiler/testData/diagnostics/tests/cast/AsErasedFine.txt b/compiler/testData/diagnostics/tests/cast/AsErasedFine.txt
index dbe12ca03b3..36aff4f95fb 100644
--- a/compiler/testData/diagnostics/tests/cast/AsErasedFine.txt
+++ b/compiler/testData/diagnostics/tests/cast/AsErasedFine.txt
@@ -1,3 +1,3 @@
 package
 
-public fun ff(/*0*/ c: kotlin.MutableCollection<kotlin.String>): kotlin.MutableList<kotlin.String>
+public fun ff(/*0*/ c: kotlin.collections.MutableCollection<kotlin.String>): kotlin.collections.MutableList<kotlin.String>
diff --git a/compiler/testData/diagnostics/tests/cast/AsErasedStar.txt b/compiler/testData/diagnostics/tests/cast/AsErasedStar.txt
index 24c8bef90fb..26307624d06 100644
--- a/compiler/testData/diagnostics/tests/cast/AsErasedStar.txt
+++ b/compiler/testData/diagnostics/tests/cast/AsErasedStar.txt
@@ -1,3 +1,3 @@
 package
 
-public fun ff(/*0*/ l: kotlin.Any): kotlin.MutableList<*>
+public fun ff(/*0*/ l: kotlin.Any): kotlin.collections.MutableList<*>
diff --git a/compiler/testData/diagnostics/tests/cast/AsErasedWarning.txt b/compiler/testData/diagnostics/tests/cast/AsErasedWarning.txt
index 583c39b75ea..22d660bcc3b 100644
--- a/compiler/testData/diagnostics/tests/cast/AsErasedWarning.txt
+++ b/compiler/testData/diagnostics/tests/cast/AsErasedWarning.txt
@@ -1,3 +1,3 @@
 package
 
-public fun ff(/*0*/ a: kotlin.Any): kotlin.MutableList<kotlin.String>
+public fun ff(/*0*/ a: kotlin.Any): kotlin.collections.MutableList<kotlin.String>
diff --git a/compiler/testData/diagnostics/tests/cast/IsErasedAllowFromOut.txt b/compiler/testData/diagnostics/tests/cast/IsErasedAllowFromOut.txt
index 4d2c50f1b8a..2613a0e0c5e 100644
--- a/compiler/testData/diagnostics/tests/cast/IsErasedAllowFromOut.txt
+++ b/compiler/testData/diagnostics/tests/cast/IsErasedAllowFromOut.txt
@@ -1,3 +1,3 @@
 package
 
-public fun f(/*0*/ a: kotlin.MutableList<out kotlin.Number>): kotlin.Boolean
+public fun f(/*0*/ a: kotlin.collections.MutableList<out kotlin.Number>): kotlin.Boolean
diff --git a/compiler/testData/diagnostics/tests/cast/IsErasedAllowFromOut2.txt b/compiler/testData/diagnostics/tests/cast/IsErasedAllowFromOut2.txt
index d1e2e1370fa..9f5a1e7c9e9 100644
--- a/compiler/testData/diagnostics/tests/cast/IsErasedAllowFromOut2.txt
+++ b/compiler/testData/diagnostics/tests/cast/IsErasedAllowFromOut2.txt
@@ -1,3 +1,3 @@
 package
 
-public fun f(/*0*/ a: kotlin.MutableList<kotlin.String>): kotlin.Boolean
+public fun f(/*0*/ a: kotlin.collections.MutableList<kotlin.String>): kotlin.Boolean
diff --git a/compiler/testData/diagnostics/tests/cast/IsErasedAllowFromOutAtClass.txt b/compiler/testData/diagnostics/tests/cast/IsErasedAllowFromOutAtClass.txt
index 9d09022aec0..a35db447228 100644
--- a/compiler/testData/diagnostics/tests/cast/IsErasedAllowFromOutAtClass.txt
+++ b/compiler/testData/diagnostics/tests/cast/IsErasedAllowFromOutAtClass.txt
@@ -1,3 +1,3 @@
 package
 
-public fun f(/*0*/ a: kotlin.List<kotlin.Number>): kotlin.Boolean
+public fun f(/*0*/ a: kotlin.collections.List<kotlin.Number>): kotlin.Boolean
diff --git a/compiler/testData/diagnostics/tests/cast/IsErasedAllowParameterSubtype.txt b/compiler/testData/diagnostics/tests/cast/IsErasedAllowParameterSubtype.txt
index dd60bc42340..2e483d80d36 100644
--- a/compiler/testData/diagnostics/tests/cast/IsErasedAllowParameterSubtype.txt
+++ b/compiler/testData/diagnostics/tests/cast/IsErasedAllowParameterSubtype.txt
@@ -1,6 +1,6 @@
 package
 
-public fun ff(/*0*/ l: kotlin.MutableCollection<B>): kotlin.Boolean
+public fun ff(/*0*/ l: kotlin.collections.MutableCollection<B>): kotlin.Boolean
 
 public open class A {
     public constructor A()
diff --git a/compiler/testData/diagnostics/tests/cast/IsErasedAllowSameClassParameter.txt b/compiler/testData/diagnostics/tests/cast/IsErasedAllowSameClassParameter.txt
index 8588671845e..b0ab7b77ced 100644
--- a/compiler/testData/diagnostics/tests/cast/IsErasedAllowSameClassParameter.txt
+++ b/compiler/testData/diagnostics/tests/cast/IsErasedAllowSameClassParameter.txt
@@ -1,3 +1,3 @@
 package
 
-public fun ff(/*0*/ l: kotlin.MutableCollection<kotlin.String>): kotlin.Boolean
+public fun ff(/*0*/ l: kotlin.collections.MutableCollection<kotlin.String>): kotlin.Boolean
diff --git a/compiler/testData/diagnostics/tests/cast/IsErasedAllowSameParameterParameter.txt b/compiler/testData/diagnostics/tests/cast/IsErasedAllowSameParameterParameter.txt
index 628f4665703..83c0d281093 100644
--- a/compiler/testData/diagnostics/tests/cast/IsErasedAllowSameParameterParameter.txt
+++ b/compiler/testData/diagnostics/tests/cast/IsErasedAllowSameParameterParameter.txt
@@ -1,3 +1,3 @@
 package
 
-public fun </*0*/ T> ff(/*0*/ l: kotlin.MutableCollection<T>): kotlin.Boolean
+public fun </*0*/ T> ff(/*0*/ l: kotlin.collections.MutableCollection<T>): kotlin.Boolean
diff --git a/compiler/testData/diagnostics/tests/cast/IsErasedDisallowDifferentArgInvariantPosition.txt b/compiler/testData/diagnostics/tests/cast/IsErasedDisallowDifferentArgInvariantPosition.txt
index d1e2e1370fa..9f5a1e7c9e9 100644
--- a/compiler/testData/diagnostics/tests/cast/IsErasedDisallowDifferentArgInvariantPosition.txt
+++ b/compiler/testData/diagnostics/tests/cast/IsErasedDisallowDifferentArgInvariantPosition.txt
@@ -1,3 +1,3 @@
 package
 
-public fun f(/*0*/ a: kotlin.MutableList<kotlin.String>): kotlin.Boolean
+public fun f(/*0*/ a: kotlin.collections.MutableList<kotlin.String>): kotlin.Boolean
diff --git a/compiler/testData/diagnostics/tests/cast/IsErasedDisallowFromIn.txt b/compiler/testData/diagnostics/tests/cast/IsErasedDisallowFromIn.txt
index 6f9f7337556..ef1cb2ae331 100644
--- a/compiler/testData/diagnostics/tests/cast/IsErasedDisallowFromIn.txt
+++ b/compiler/testData/diagnostics/tests/cast/IsErasedDisallowFromIn.txt
@@ -1,3 +1,3 @@
 package
 
-public fun f(/*0*/ a: kotlin.MutableList<in kotlin.String>): kotlin.Boolean
+public fun f(/*0*/ a: kotlin.collections.MutableList<in kotlin.String>): kotlin.Boolean
diff --git a/compiler/testData/diagnostics/tests/cast/IsErasedDisallowFromOut.txt b/compiler/testData/diagnostics/tests/cast/IsErasedDisallowFromOut.txt
index a4173808904..e47300f2847 100644
--- a/compiler/testData/diagnostics/tests/cast/IsErasedDisallowFromOut.txt
+++ b/compiler/testData/diagnostics/tests/cast/IsErasedDisallowFromOut.txt
@@ -1,3 +1,3 @@
 package
 
-public fun f(/*0*/ a: kotlin.MutableList<out kotlin.Any>): kotlin.Boolean
+public fun f(/*0*/ a: kotlin.collections.MutableList<out kotlin.Any>): kotlin.Boolean
diff --git a/compiler/testData/diagnostics/tests/cast/IsErasedDisallowFromOutAtClass.txt b/compiler/testData/diagnostics/tests/cast/IsErasedDisallowFromOutAtClass.txt
index 92ba940211e..78e12501d81 100644
--- a/compiler/testData/diagnostics/tests/cast/IsErasedDisallowFromOutAtClass.txt
+++ b/compiler/testData/diagnostics/tests/cast/IsErasedDisallowFromOutAtClass.txt
@@ -1,3 +1,3 @@
 package
 
-public fun f(/*0*/ a: kotlin.List<kotlin.Any>): kotlin.Boolean
+public fun f(/*0*/ a: kotlin.collections.List<kotlin.Any>): kotlin.Boolean
diff --git a/compiler/testData/diagnostics/tests/cast/kt614.txt b/compiler/testData/diagnostics/tests/cast/kt614.txt
index 5815fb1e692..5c007c74684 100644
--- a/compiler/testData/diagnostics/tests/cast/kt614.txt
+++ b/compiler/testData/diagnostics/tests/cast/kt614.txt
@@ -1,3 +1,3 @@
 package
 
-public fun f(/*0*/ a: kotlin.Collection<*>): kotlin.Boolean
+public fun f(/*0*/ a: kotlin.collections.Collection<*>): kotlin.Boolean
diff --git a/compiler/testData/diagnostics/tests/classLiteral/genericClasses.txt b/compiler/testData/diagnostics/tests/classLiteral/genericClasses.txt
index 1ff3802405e..cdb5fb2ee7f 100644
--- a/compiler/testData/diagnostics/tests/classLiteral/genericClasses.txt
+++ b/compiler/testData/diagnostics/tests/classLiteral/genericClasses.txt
@@ -9,9 +9,9 @@ public val b2: kotlin.reflect.KClass<kotlin.Nothing>
 public val i1: kotlin.reflect.KClass<A<*>.Inner<*>>
 public val i2: [ERROR : Unresolved class]
 public val i3: [ERROR : Unresolved class]
-public val m1: kotlin.reflect.KClass<kotlin.Map<*, *>>
+public val m1: kotlin.reflect.KClass<kotlin.collections.Map<*, *>>
 public val m2: [ERROR : Unresolved class]
-public val m3: kotlin.reflect.KClass<kotlin.Map.Entry<*, *>>
+public val m3: kotlin.reflect.KClass<kotlin.collections.Map.Entry<*, *>>
 public val n1: kotlin.reflect.KClass<A.Nested<*>>
 public val n2: [ERROR : Unresolved class]
 
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/backingFieldInsideGetter.txt b/compiler/testData/diagnostics/tests/controlFlowAnalysis/backingFieldInsideGetter.txt
index 149f0011cd8..c20819a92b9 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/backingFieldInsideGetter.txt
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/backingFieldInsideGetter.txt
@@ -1,7 +1,7 @@
 package
 
 package a {
-    public val a: kotlin.MutableSet<kotlin.String>? = null
+    public val a: kotlin.collections.MutableSet<kotlin.String>? = null
 
     public final class R {
         public constructor R()
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1027.txt b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1027.txt
index ae4cf169a50..4bea4691712 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1027.txt
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1027.txt
@@ -2,7 +2,7 @@ package
 
 package kt1027 {
     public fun doSmth(): kotlin.Unit
-    public fun foo(/*0*/ c: kotlin.List<kotlin.Int>): kotlin.Unit
+    public fun foo(/*0*/ c: kotlin.collections.List<kotlin.Int>): kotlin.Unit
     public fun t1(): kotlin.Unit
     public fun t2(): kotlin.Unit
     public fun t3(): kotlin.Unit
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1066.txt b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1066.txt
index 46c11618edb..453108892ac 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1066.txt
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1066.txt
@@ -1,7 +1,7 @@
 package
 
 package kt1066 {
-    public fun foo(/*0*/ excluded: kotlin.Set<kotlin.Char>): kotlin.Unit
+    public fun foo(/*0*/ excluded: kotlin.collections.Set<kotlin.Char>): kotlin.Unit
     public fun randomDigit(): kotlin.Char
     public fun test(): kotlin.Unit
 }
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1219.1301.txt b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1219.1301.txt
index 75c3e4183d0..48a7345459f 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1219.1301.txt
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1219.1301.txt
@@ -2,6 +2,6 @@ package
 
 package kt1219 {
     public fun foo(): kotlin.Unit
-    public fun </*0*/ T, /*1*/ R> kotlin.Iterable<T>.fold(/*0*/ a: R, /*1*/ op: (T, R) -> R): R
-    public fun </*0*/ T> kotlin.Iterable<T>.foreach(/*0*/ operation: (T) -> kotlin.Unit): kotlin.Unit
+    public fun </*0*/ T, /*1*/ R> kotlin.collections.Iterable<T>.fold(/*0*/ a: R, /*1*/ op: (T, R) -> R): R
+    public fun </*0*/ T> kotlin.collections.Iterable<T>.foreach(/*0*/ operation: (T) -> kotlin.Unit): kotlin.Unit
 }
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/varInitializationInIfInCycle.txt b/compiler/testData/diagnostics/tests/controlFlowAnalysis/varInitializationInIfInCycle.txt
index c9e387c9f2d..dba23151beb 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/varInitializationInIfInCycle.txt
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/varInitializationInIfInCycle.txt
@@ -1,4 +1,4 @@
 package
 
-public fun foo(/*0*/ numbers: kotlin.Collection<kotlin.Int>): kotlin.Unit
+public fun foo(/*0*/ numbers: kotlin.collections.Collection<kotlin.Int>): kotlin.Unit
 public fun use(/*0*/ vararg a: kotlin.Any? /*kotlin.Array<out kotlin.Any?>*/): kotlin.Array<out kotlin.Any?>
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/WhenIn.txt b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/WhenIn.txt
index 6dd3520f616..3505fa5eb33 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/WhenIn.txt
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/WhenIn.txt
@@ -1,4 +1,4 @@
 package
 
-public fun foo(/*0*/ x: kotlin.Int, /*1*/ list: kotlin.List<kotlin.Int>?): kotlin.Unit
-public fun whenWithoutSubject(/*0*/ x: kotlin.Int, /*1*/ list: kotlin.List<kotlin.Int>?): kotlin.Unit
+public fun foo(/*0*/ x: kotlin.Int, /*1*/ list: kotlin.collections.List<kotlin.Int>?): kotlin.Unit
+public fun whenWithoutSubject(/*0*/ x: kotlin.Int, /*1*/ list: kotlin.collections.List<kotlin.Int>?): kotlin.Unit
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/DataFlowInMultiDeclInFor.txt b/compiler/testData/diagnostics/tests/declarationChecks/DataFlowInMultiDeclInFor.txt
index 3ccc4de51e4..307a6c84ee1 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/DataFlowInMultiDeclInFor.txt
+++ b/compiler/testData/diagnostics/tests/declarationChecks/DataFlowInMultiDeclInFor.txt
@@ -1,7 +1,7 @@
 package
 
 package d {
-    public fun foo(/*0*/ list: kotlin.List<d.A>): kotlin.Unit
+    public fun foo(/*0*/ list: kotlin.collections.List<d.A>): kotlin.Unit
 
     public final class A {
         public constructor A()
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/finiteBoundRestriction/CasesWithOneTypeParameter.txt b/compiler/testData/diagnostics/tests/declarationChecks/finiteBoundRestriction/CasesWithOneTypeParameter.txt
index 8b9cf32486a..acfd6366da3 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/finiteBoundRestriction/CasesWithOneTypeParameter.txt
+++ b/compiler/testData/diagnostics/tests/declarationChecks/finiteBoundRestriction/CasesWithOneTypeParameter.txt
@@ -48,7 +48,7 @@ public interface B1</*0*/ T : B0<*>> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-public interface BB</*0*/ S : kotlin.List<AA<*>>> {
+public interface BB</*0*/ S : kotlin.collections.List<AA<*>>> {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/DoubleDeclForLoop.txt b/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/DoubleDeclForLoop.txt
index f53023fbca1..2fcf4c15b4a 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/DoubleDeclForLoop.txt
+++ b/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/DoubleDeclForLoop.txt
@@ -15,6 +15,6 @@ public final class C {
     public constructor C()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public final operator fun iterator(): kotlin.Iterator<A>
+    public final operator fun iterator(): kotlin.collections.Iterator<A>
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/FolLoopTypeComponentTypeMismatch.txt b/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/FolLoopTypeComponentTypeMismatch.txt
index dfabd810eed..fdc185b628f 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/FolLoopTypeComponentTypeMismatch.txt
+++ b/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/FolLoopTypeComponentTypeMismatch.txt
@@ -15,6 +15,6 @@ public final class C {
     public constructor C()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public final operator fun iterator(): kotlin.Iterator<A>
+    public final operator fun iterator(): kotlin.collections.Iterator<A>
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForLoopComponentFunctionAmbiguity.txt b/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForLoopComponentFunctionAmbiguity.txt
index 32325608b61..611327c205e 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForLoopComponentFunctionAmbiguity.txt
+++ b/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForLoopComponentFunctionAmbiguity.txt
@@ -16,6 +16,6 @@ public final class C {
     public constructor C()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public final operator fun iterator(): kotlin.Iterator<A>
+    public final operator fun iterator(): kotlin.collections.Iterator<A>
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForLoopComponentFunctionMissing.txt b/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForLoopComponentFunctionMissing.txt
index babba8620ac..973551bbe45 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForLoopComponentFunctionMissing.txt
+++ b/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForLoopComponentFunctionMissing.txt
@@ -14,6 +14,6 @@ public final class C {
     public constructor C()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public final operator fun iterator(): kotlin.Iterator<A>
+    public final operator fun iterator(): kotlin.collections.Iterator<A>
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForLoopWithExtensions.txt b/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForLoopWithExtensions.txt
index a88397b2bb2..51693370240 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForLoopWithExtensions.txt
+++ b/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForLoopWithExtensions.txt
@@ -15,6 +15,6 @@ public final class C {
     public constructor C()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public final operator fun iterator(): kotlin.Iterator<A>
+    public final operator fun iterator(): kotlin.collections.Iterator<A>
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForWithExplicitTypes.txt b/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForWithExplicitTypes.txt
index dfabd810eed..fdc185b628f 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForWithExplicitTypes.txt
+++ b/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForWithExplicitTypes.txt
@@ -15,6 +15,6 @@ public final class C {
     public constructor C()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public final operator fun iterator(): kotlin.Iterator<A>
+    public final operator fun iterator(): kotlin.collections.Iterator<A>
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/RedeclarationInForLoop.txt b/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/RedeclarationInForLoop.txt
index f53023fbca1..2fcf4c15b4a 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/RedeclarationInForLoop.txt
+++ b/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/RedeclarationInForLoop.txt
@@ -15,6 +15,6 @@ public final class C {
     public constructor C()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public final operator fun iterator(): kotlin.Iterator<A>
+    public final operator fun iterator(): kotlin.collections.Iterator<A>
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/SingleDeclForLoop.txt b/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/SingleDeclForLoop.txt
index babba8620ac..973551bbe45 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/SingleDeclForLoop.txt
+++ b/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/SingleDeclForLoop.txt
@@ -14,6 +14,6 @@ public final class C {
     public constructor C()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public final operator fun iterator(): kotlin.Iterator<A>
+    public final operator fun iterator(): kotlin.collections.Iterator<A>
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/genericClassFunction.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/genericClassFunction.txt
index 9024e812ecd..955553dfe8a 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/genericClassFunction.txt
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/genericClassFunction.txt
@@ -3,7 +3,7 @@ package
 public open class B {
     public constructor B()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final fun foo(/*0*/ l: kotlin.List<kotlin.String>): kotlin.Unit
+    public final fun foo(/*0*/ l: kotlin.collections.List<kotlin.String>): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
@@ -11,8 +11,8 @@ public open class B {
 public final class C : B {
     public constructor C()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final fun foo(/*0*/ l: kotlin.List<kotlin.Int>): kotlin.Unit
-    public final override /*1*/ /*fake_override*/ fun foo(/*0*/ l: kotlin.List<kotlin.String>): kotlin.Unit
+    public final fun foo(/*0*/ l: kotlin.collections.List<kotlin.Int>): kotlin.Unit
+    public final override /*1*/ /*fake_override*/ fun foo(/*0*/ l: kotlin.collections.List<kotlin.String>): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/collections.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/collections.txt
index 297e898408c..0d94bbd13d8 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/collections.txt
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/collections.txt
@@ -1,4 +1,4 @@
 package
 
-public fun foo(/*0*/ s: kotlin.List<kotlin.String>): kotlin.Unit
-public fun foo(/*0*/ s: kotlin.MutableList<kotlin.String>): kotlin.Unit
+public fun foo(/*0*/ s: kotlin.collections.List<kotlin.String>): kotlin.Unit
+public fun foo(/*0*/ s: kotlin.collections.MutableList<kotlin.String>): kotlin.Unit
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegateToTwoTraits.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegateToTwoTraits.txt
index 2c0325b7221..5464b583585 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegateToTwoTraits.txt
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegateToTwoTraits.txt
@@ -2,7 +2,7 @@ package
 
 public interface Bar</*0*/ T> {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public abstract fun foo(/*0*/ l: kotlin.List<T>): kotlin.Unit
+    public abstract fun foo(/*0*/ l: kotlin.collections.List<T>): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
@@ -10,15 +10,15 @@ public interface Bar</*0*/ T> {
 public final class Baz : Foo<kotlin.String>, Bar<kotlin.Int> {
     public constructor Baz(/*0*/ f: Foo<kotlin.String>, /*1*/ b: Bar<kotlin.Int>)
     public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*delegation*/ fun foo(/*0*/ l: kotlin.List<kotlin.Int>): kotlin.Unit
-    public open override /*1*/ /*delegation*/ fun foo(/*0*/ l: kotlin.List<kotlin.String>): kotlin.Unit
+    public open override /*1*/ /*delegation*/ fun foo(/*0*/ l: kotlin.collections.List<kotlin.Int>): kotlin.Unit
+    public open override /*1*/ /*delegation*/ fun foo(/*0*/ l: kotlin.collections.List<kotlin.String>): kotlin.Unit
     public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
 public interface Foo</*0*/ T> {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public abstract fun foo(/*0*/ l: kotlin.List<T>): kotlin.Unit
+    public abstract fun foo(/*0*/ l: kotlin.collections.List<T>): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegationAndOwnMethod.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegationAndOwnMethod.txt
index ae1bb6ed536..f68841dd916 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegationAndOwnMethod.txt
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegationAndOwnMethod.txt
@@ -3,15 +3,15 @@ package
 public final class Bar : Foo<kotlin.String> {
     public constructor Bar(/*0*/ f: Foo<kotlin.String>)
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final fun foo(/*0*/ l: kotlin.List<kotlin.Int>): kotlin.Unit
-    public open override /*1*/ /*delegation*/ fun foo(/*0*/ l: kotlin.List<kotlin.String>): kotlin.Unit
+    public final fun foo(/*0*/ l: kotlin.collections.List<kotlin.Int>): kotlin.Unit
+    public open override /*1*/ /*delegation*/ fun foo(/*0*/ l: kotlin.collections.List<kotlin.String>): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
 public interface Foo</*0*/ T> {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public abstract fun foo(/*0*/ l: kotlin.List<T>): kotlin.Unit
+    public abstract fun foo(/*0*/ l: kotlin.collections.List<T>): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegationToTraitImplAndOwnMethod.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegationToTraitImplAndOwnMethod.txt
index 9fd3b7593a3..fefea99f460 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegationToTraitImplAndOwnMethod.txt
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegationToTraitImplAndOwnMethod.txt
@@ -3,8 +3,8 @@ package
 public final class Bar : Foo<kotlin.String> {
     public constructor Bar(/*0*/ f: Foo<kotlin.String>)
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final fun foo(/*0*/ l: kotlin.List<kotlin.Int>): kotlin.Unit
-    public open override /*1*/ /*delegation*/ fun foo(/*0*/ l: kotlin.List<kotlin.String>): kotlin.Unit
+    public final fun foo(/*0*/ l: kotlin.collections.List<kotlin.Int>): kotlin.Unit
+    public open override /*1*/ /*delegation*/ fun foo(/*0*/ l: kotlin.collections.List<kotlin.String>): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
@@ -12,14 +12,14 @@ public final class Bar : Foo<kotlin.String> {
 public final class BarOther : Foo<kotlin.String> {
     public constructor BarOther(/*0*/ f: Foo<kotlin.String>)
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ fun foo(/*0*/ l: kotlin.List<kotlin.String>): kotlin.Unit
+    public open override /*1*/ fun foo(/*0*/ l: kotlin.collections.List<kotlin.String>): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
 public interface Foo</*0*/ T> {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open fun foo(/*0*/ l: kotlin.List<T>): kotlin.Unit
+    public open fun foo(/*0*/ l: kotlin.collections.List<T>): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/inheritFromTwoTraits.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/inheritFromTwoTraits.txt
index e1c02c05698..3ce36d5b257 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/inheritFromTwoTraits.txt
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/inheritFromTwoTraits.txt
@@ -2,7 +2,7 @@ package
 
 public interface Bar</*0*/ T> {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open fun foo(/*0*/ l: kotlin.List<T>): kotlin.Unit
+    public open fun foo(/*0*/ l: kotlin.collections.List<T>): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
@@ -10,15 +10,15 @@ public interface Bar</*0*/ T> {
 public final class Baz : Foo<kotlin.String>, Bar<kotlin.Int> {
     public constructor Baz()
     public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun foo(/*0*/ l: kotlin.List<kotlin.Int>): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun foo(/*0*/ l: kotlin.List<kotlin.String>): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun foo(/*0*/ l: kotlin.collections.List<kotlin.Int>): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun foo(/*0*/ l: kotlin.collections.List<kotlin.String>): kotlin.Unit
     public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
 public interface Foo</*0*/ T> {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open fun foo(/*0*/ l: kotlin.List<T>): kotlin.Unit
+    public open fun foo(/*0*/ l: kotlin.collections.List<T>): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/kotlinAndJavaCollections.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/kotlinAndJavaCollections.txt
index d5c8c82ecb7..336a4ddafba 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/kotlinAndJavaCollections.txt
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/kotlinAndJavaCollections.txt
@@ -1,4 +1,4 @@
 package
 
 public fun foo(/*0*/ s: java.util.List<kotlin.String>): kotlin.Unit
-public fun foo(/*0*/ s: kotlin.List<kotlin.String>): kotlin.Unit
+public fun foo(/*0*/ s: kotlin.collections.List<kotlin.String>): kotlin.Unit
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/superTraitAndDelegationToTraitImpl.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/superTraitAndDelegationToTraitImpl.txt
index d1704d36dbd..b4d51300d53 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/superTraitAndDelegationToTraitImpl.txt
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/superTraitAndDelegationToTraitImpl.txt
@@ -2,14 +2,14 @@ package
 
 public interface A</*0*/ T> {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public abstract fun foo(/*0*/ l: kotlin.List<T>): kotlin.Unit
+    public abstract fun foo(/*0*/ l: kotlin.collections.List<T>): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
 public interface B {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open fun foo(/*0*/ l: kotlin.List<kotlin.Int>): kotlin.Unit
+    public open fun foo(/*0*/ l: kotlin.collections.List<kotlin.Int>): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
@@ -17,8 +17,8 @@ public interface B {
 public final class C : A<kotlin.String>, B {
     public constructor C(/*0*/ f: A<kotlin.String>)
     public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun foo(/*0*/ l: kotlin.List<kotlin.Int>): kotlin.Unit
-    public open override /*1*/ /*delegation*/ fun foo(/*0*/ l: kotlin.List<kotlin.String>): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun foo(/*0*/ l: kotlin.collections.List<kotlin.Int>): kotlin.Unit
+    public open override /*1*/ /*delegation*/ fun foo(/*0*/ l: kotlin.collections.List<kotlin.String>): kotlin.Unit
     public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
 }
@@ -26,7 +26,7 @@ public final class C : A<kotlin.String>, B {
 public final class D : A<kotlin.Int>, B {
     public constructor D(/*0*/ f: A<kotlin.Int>)
     public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*2*/ /*delegation*/ fun foo(/*0*/ l: kotlin.List<kotlin.Int>): kotlin.Unit
+    public open override /*2*/ /*delegation*/ fun foo(/*0*/ l: kotlin.collections.List<kotlin.Int>): kotlin.Unit
     public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
 }
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/twoTraitsAndOwnFunction.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/twoTraitsAndOwnFunction.txt
index 2311dd7e5e7..aa6a96f3df2 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/twoTraitsAndOwnFunction.txt
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/twoTraitsAndOwnFunction.txt
@@ -2,7 +2,7 @@ package
 
 public interface Bar</*0*/ T> {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open fun foo(/*0*/ l: kotlin.List<T>): kotlin.Unit
+    public open fun foo(/*0*/ l: kotlin.collections.List<T>): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
@@ -10,16 +10,16 @@ public interface Bar</*0*/ T> {
 public final class Baz : Foo<kotlin.String>, Bar<kotlin.Int> {
     public constructor Baz()
     public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun foo(/*0*/ l: kotlin.List<kotlin.Int>): kotlin.Unit
-    public final fun foo(/*0*/ l: kotlin.List<kotlin.Long>): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun foo(/*0*/ l: kotlin.List<kotlin.String>): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun foo(/*0*/ l: kotlin.collections.List<kotlin.Int>): kotlin.Unit
+    public final fun foo(/*0*/ l: kotlin.collections.List<kotlin.Long>): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun foo(/*0*/ l: kotlin.collections.List<kotlin.String>): kotlin.Unit
     public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
 public interface Foo</*0*/ T> {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open fun foo(/*0*/ l: kotlin.List<T>): kotlin.Unit
+    public open fun foo(/*0*/ l: kotlin.collections.List<T>): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
diff --git a/compiler/testData/diagnostics/tests/exposed/typeArgs.txt b/compiler/testData/diagnostics/tests/exposed/typeArgs.txt
index 454d557daf9..9d8a8c27238 100644
--- a/compiler/testData/diagnostics/tests/exposed/typeArgs.txt
+++ b/compiler/testData/diagnostics/tests/exposed/typeArgs.txt
@@ -6,20 +6,20 @@ public interface Generic</*0*/ E : My> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-public interface His : kotlin.List<My> {
+public interface His : kotlin.collections.List<My> {
     public abstract override /*1*/ /*fake_override*/ val size: kotlin.Int
     public abstract override /*1*/ /*fake_override*/ fun contains(/*0*/ element: My): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.Collection<My>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection<My>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public abstract override /*1*/ /*fake_override*/ fun get(/*0*/ index: kotlin.Int): My
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public abstract override /*1*/ /*fake_override*/ fun indexOf(/*0*/ element: My): kotlin.Int
     public abstract override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun iterator(): kotlin.Iterator<My>
+    public abstract override /*1*/ /*fake_override*/ fun iterator(): kotlin.collections.Iterator<My>
     public abstract override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ element: My): kotlin.Int
-    public abstract override /*1*/ /*fake_override*/ fun listIterator(): kotlin.ListIterator<My>
-    public abstract override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.ListIterator<My>
-    public abstract override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.List<My>
+    public abstract override /*1*/ /*fake_override*/ fun listIterator(): kotlin.collections.ListIterator<My>
+    public abstract override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.collections.ListIterator<My>
+    public abstract override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.collections.List<My>
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
@@ -40,7 +40,7 @@ public interface Our {
 public abstract class Your {
     public constructor Your()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public abstract fun give(): kotlin.List<My>
+    public abstract fun give(): kotlin.collections.List<My>
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
diff --git a/compiler/testData/diagnostics/tests/extensions/GenericIterator.txt b/compiler/testData/diagnostics/tests/extensions/GenericIterator.txt
index 7c59a3e9443..8bc2427b35c 100644
--- a/compiler/testData/diagnostics/tests/extensions/GenericIterator.txt
+++ b/compiler/testData/diagnostics/tests/extensions/GenericIterator.txt
@@ -2,7 +2,7 @@ package
 
 public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
 public operator fun </*0*/ T : kotlin.Any> T?.iterator(): MyIterator<T>
-public fun </*0*/ T> java.util.Enumeration<T>.iterator(): kotlin.Iterator<T>
+public fun </*0*/ T> java.util.Enumeration<T>.iterator(): kotlin.collections.Iterator<T>
 
 public interface MyIterator</*0*/ T> {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
diff --git a/compiler/testData/diagnostics/tests/extensions/GenericIterator2.txt b/compiler/testData/diagnostics/tests/extensions/GenericIterator2.txt
index 2048dcd4024..386b52cecf0 100644
--- a/compiler/testData/diagnostics/tests/extensions/GenericIterator2.txt
+++ b/compiler/testData/diagnostics/tests/extensions/GenericIterator2.txt
@@ -1,4 +1,4 @@
 package
 
 public fun a(/*0*/ e: java.util.Enumeration<kotlin.Int>): kotlin.Unit
-public operator fun </*0*/ T> java.util.Enumeration<T>.iterator(): kotlin.Iterator<T>
+public operator fun </*0*/ T> java.util.Enumeration<T>.iterator(): kotlin.collections.Iterator<T>
diff --git a/compiler/testData/diagnostics/tests/extensions/throwOutCandidatesByReceiver.txt b/compiler/testData/diagnostics/tests/extensions/throwOutCandidatesByReceiver.txt
index 2181d6a8bef..f8f0cc87ffc 100644
--- a/compiler/testData/diagnostics/tests/extensions/throwOutCandidatesByReceiver.txt
+++ b/compiler/testData/diagnostics/tests/extensions/throwOutCandidatesByReceiver.txt
@@ -2,15 +2,15 @@ package
 
 package bar {
     public fun test1(/*0*/ i: kotlin.Int?): kotlin.Unit
-    public fun </*0*/ R> test2(/*0*/ c: kotlin.Collection<R>): kotlin.Unit
+    public fun </*0*/ R> test2(/*0*/ c: kotlin.collections.Collection<R>): kotlin.Unit
     public fun test3(/*0*/ s: kotlin.String?): kotlin.Unit
     public fun test4(): kotlin.Unit
     public fun test5(): kotlin.Unit
-    public fun </*0*/ T> test6(/*0*/ l: kotlin.List<T>?): kotlin.Unit
-    public fun test7(/*0*/ l: kotlin.List<kotlin.String?>): kotlin.Unit
-    public fun test8(/*0*/ l: kotlin.List<kotlin.Any>?): kotlin.Unit
-    public fun </*0*/ R> kotlin.List<R>.a(): kotlin.Unit
-    public fun kotlin.List<kotlin.String>.b(): kotlin.Unit
+    public fun </*0*/ T> test6(/*0*/ l: kotlin.collections.List<T>?): kotlin.Unit
+    public fun test7(/*0*/ l: kotlin.collections.List<kotlin.String?>): kotlin.Unit
+    public fun test8(/*0*/ l: kotlin.collections.List<kotlin.Any>?): kotlin.Unit
+    public fun </*0*/ R> kotlin.collections.List<R>.a(): kotlin.Unit
+    public fun kotlin.collections.List<kotlin.String>.b(): kotlin.Unit
     public fun </*0*/ T : bar.A> T.c(): kotlin.Unit
     public fun kotlin.Int.foo(): kotlin.Unit
     public fun </*0*/ R : kotlin.Any> R?.sure(): R
diff --git a/compiler/testData/diagnostics/tests/extensions/throwOutCandidatesByReceiver2.txt b/compiler/testData/diagnostics/tests/extensions/throwOutCandidatesByReceiver2.txt
index 6ae656dfa38..7b6f272be92 100644
--- a/compiler/testData/diagnostics/tests/extensions/throwOutCandidatesByReceiver2.txt
+++ b/compiler/testData/diagnostics/tests/extensions/throwOutCandidatesByReceiver2.txt
@@ -2,7 +2,7 @@ package
 
 package a {
     public fun test(/*0*/ a1: a.A, /*1*/ a2: a.A): kotlin.Unit
-    public operator fun </*0*/ T : kotlin.Comparable<T>> T.rangeTo(/*0*/ that: T): kotlin.ClosedRange<T>
+    public operator fun </*0*/ T : kotlin.Comparable<T>> T.rangeTo(/*0*/ that: T): kotlin.ranges.ClosedRange<T>
 
     public final class A {
         public constructor A()
diff --git a/compiler/testData/diagnostics/tests/functionAsExpression/AutoLabels.txt b/compiler/testData/diagnostics/tests/functionAsExpression/AutoLabels.txt
index 5a206970c32..a156064abd9 100644
--- a/compiler/testData/diagnostics/tests/functionAsExpression/AutoLabels.txt
+++ b/compiler/testData/diagnostics/tests/functionAsExpression/AutoLabels.txt
@@ -1,5 +1,5 @@
 package
 
-public fun autolabel(/*0*/ l: kotlin.List<kotlin.Int>): kotlin.List<kotlin.Int>
-public fun unresolvedMapLabel(/*0*/ l: kotlin.List<kotlin.Int>): kotlin.List<kotlin.Int>
-public fun </*0*/ T, /*1*/ R> kotlin.Iterable<T>.map(/*0*/ transform: (T) -> R): kotlin.List<R>
+public fun autolabel(/*0*/ l: kotlin.collections.List<kotlin.Int>): kotlin.collections.List<kotlin.Int>
+public fun unresolvedMapLabel(/*0*/ l: kotlin.collections.List<kotlin.Int>): kotlin.collections.List<kotlin.Int>
+public fun </*0*/ T, /*1*/ R> kotlin.collections.Iterable<T>.map(/*0*/ transform: (T) -> R): kotlin.collections.List<R>
diff --git a/compiler/testData/diagnostics/tests/functionAsExpression/InferenceParametersTypes.txt b/compiler/testData/diagnostics/tests/functionAsExpression/InferenceParametersTypes.txt
index 445f53a9454..57e9a19f0cb 100644
--- a/compiler/testData/diagnostics/tests/functionAsExpression/InferenceParametersTypes.txt
+++ b/compiler/testData/diagnostics/tests/functionAsExpression/InferenceParametersTypes.txt
@@ -2,6 +2,6 @@ package
 
 public val a: (kotlin.Int) -> kotlin.Unit
 public val b: (kotlin.Int) -> kotlin.Unit
-public fun </*0*/ T> listOf(): kotlin.List<T>
+public fun </*0*/ T> listOf(): kotlin.collections.List<T>
 public fun test(/*0*/ a: (kotlin.Int) -> kotlin.Int): kotlin.Unit
-public fun test2(/*0*/ a: () -> kotlin.List<kotlin.Int>): kotlin.Unit
+public fun test2(/*0*/ a: () -> kotlin.collections.List<kotlin.Int>): kotlin.Unit
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/kt6869.txt b/compiler/testData/diagnostics/tests/functionLiterals/kt6869.txt
index 9f292cb9a0a..b1bc96bd330 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/kt6869.txt
+++ b/compiler/testData/diagnostics/tests/functionLiterals/kt6869.txt
@@ -1,6 +1,6 @@
 package
 
-public fun </*0*/ T> listOf(/*0*/ vararg values: T /*kotlin.Array<out T>*/): kotlin.List<T>
+public fun </*0*/ T> listOf(/*0*/ vararg values: T /*kotlin.Array<out T>*/): kotlin.collections.List<T>
 public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
 public fun </*0*/ T : kotlin.Any, /*1*/ R> T.let(/*0*/ f: (T) -> R): R
-public operator fun </*0*/ T> kotlin.Iterable<T>.plus(/*0*/ element: T): kotlin.List<T>
+public operator fun </*0*/ T> kotlin.collections.Iterable<T>.plus(/*0*/ element: T): kotlin.collections.List<T>
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnWithExpectedType.txt b/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnWithExpectedType.txt
index 6439aac532e..c6507176234 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnWithExpectedType.txt
+++ b/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnWithExpectedType.txt
@@ -1,6 +1,6 @@
 package
 
-public val a: () -> kotlin.List<kotlin.Int>
+public val a: () -> kotlin.collections.List<kotlin.Int>
 public val flag: kotlin.Boolean = true
-public fun </*0*/ T> listOf(): kotlin.List<T>
-public fun </*0*/ T> listOf(/*0*/ vararg values: T /*kotlin.Array<out T>*/): kotlin.List<T>
+public fun </*0*/ T> listOf(): kotlin.collections.List<T>
+public fun </*0*/ T> listOf(/*0*/ vararg values: T /*kotlin.Array<out T>*/): kotlin.collections.List<T>
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/return/NoCommonSystem.txt b/compiler/testData/diagnostics/tests/functionLiterals/return/NoCommonSystem.txt
index 7d591445630..e2527e82eb2 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/return/NoCommonSystem.txt
+++ b/compiler/testData/diagnostics/tests/functionLiterals/return/NoCommonSystem.txt
@@ -1,6 +1,6 @@
 package
 
-public fun commonSystemFailed(/*0*/ a: kotlin.List<kotlin.Int>): kotlin.Unit
-public fun </*0*/ T> listOf(): kotlin.List<T>
-public fun </*0*/ T> listOf(/*0*/ vararg values: T /*kotlin.Array<out T>*/): kotlin.List<T>
-public fun </*0*/ T, /*1*/ R> kotlin.Iterable<T>.map(/*0*/ transform: (T) -> R): kotlin.List<R>
+public fun commonSystemFailed(/*0*/ a: kotlin.collections.List<kotlin.Int>): kotlin.Unit
+public fun </*0*/ T> listOf(): kotlin.collections.List<T>
+public fun </*0*/ T> listOf(/*0*/ vararg values: T /*kotlin.Array<out T>*/): kotlin.collections.List<T>
+public fun </*0*/ T, /*1*/ R> kotlin.collections.Iterable<T>.map(/*0*/ transform: (T) -> R): kotlin.collections.List<R>
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/returnNull.txt b/compiler/testData/diagnostics/tests/functionLiterals/returnNull.txt
index 499be2fe314..759ef055a28 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/returnNull.txt
+++ b/compiler/testData/diagnostics/tests/functionLiterals/returnNull.txt
@@ -1,8 +1,8 @@
 package
 
 package m {
-    public fun test(/*0*/ handlers: kotlin.Map<kotlin.String, m.Element.() -> kotlin.Unit>): kotlin.Unit
-    public fun </*0*/ K, /*1*/ V> kotlin.Map<K, V>.getOrElse(/*0*/ key: K, /*1*/ defaultValue: () -> V): V
+    public fun test(/*0*/ handlers: kotlin.collections.Map<kotlin.String, m.Element.() -> kotlin.Unit>): kotlin.Unit
+    public fun </*0*/ K, /*1*/ V> kotlin.collections.Map<K, V>.getOrElse(/*0*/ key: K, /*1*/ defaultValue: () -> V): V
 
     public interface Element {
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/returnNullWithReturn.txt b/compiler/testData/diagnostics/tests/functionLiterals/returnNullWithReturn.txt
index 499be2fe314..759ef055a28 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/returnNullWithReturn.txt
+++ b/compiler/testData/diagnostics/tests/functionLiterals/returnNullWithReturn.txt
@@ -1,8 +1,8 @@
 package
 
 package m {
-    public fun test(/*0*/ handlers: kotlin.Map<kotlin.String, m.Element.() -> kotlin.Unit>): kotlin.Unit
-    public fun </*0*/ K, /*1*/ V> kotlin.Map<K, V>.getOrElse(/*0*/ key: K, /*1*/ defaultValue: () -> V): V
+    public fun test(/*0*/ handlers: kotlin.collections.Map<kotlin.String, m.Element.() -> kotlin.Unit>): kotlin.Unit
+    public fun </*0*/ K, /*1*/ V> kotlin.collections.Map<K, V>.getOrElse(/*0*/ key: K, /*1*/ defaultValue: () -> V): V
 
     public interface Element {
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
diff --git a/compiler/testData/diagnostics/tests/generics/InconsistentTypeParameterBounds.txt b/compiler/testData/diagnostics/tests/generics/InconsistentTypeParameterBounds.txt
index 91618bd3285..c8028af630b 100644
--- a/compiler/testData/diagnostics/tests/generics/InconsistentTypeParameterBounds.txt
+++ b/compiler/testData/diagnostics/tests/generics/InconsistentTypeParameterBounds.txt
@@ -12,37 +12,37 @@ public interface B : A {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-public interface ListA : kotlin.List<A> {
+public interface ListA : kotlin.collections.List<A> {
     public abstract override /*1*/ /*fake_override*/ val size: kotlin.Int
     public abstract override /*1*/ /*fake_override*/ fun contains(/*0*/ element: A): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.Collection<A>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection<A>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public abstract override /*1*/ /*fake_override*/ fun get(/*0*/ index: kotlin.Int): A
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public abstract override /*1*/ /*fake_override*/ fun indexOf(/*0*/ element: A): kotlin.Int
     public abstract override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun iterator(): kotlin.Iterator<A>
+    public abstract override /*1*/ /*fake_override*/ fun iterator(): kotlin.collections.Iterator<A>
     public abstract override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ element: A): kotlin.Int
-    public abstract override /*1*/ /*fake_override*/ fun listIterator(): kotlin.ListIterator<A>
-    public abstract override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.ListIterator<A>
-    public abstract override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.List<A>
+    public abstract override /*1*/ /*fake_override*/ fun listIterator(): kotlin.collections.ListIterator<A>
+    public abstract override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.collections.ListIterator<A>
+    public abstract override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.collections.List<A>
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-public interface ListB : kotlin.List<B> {
+public interface ListB : kotlin.collections.List<B> {
     public abstract override /*1*/ /*fake_override*/ val size: kotlin.Int
     public abstract override /*1*/ /*fake_override*/ fun contains(/*0*/ element: B): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.Collection<B>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection<B>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public abstract override /*1*/ /*fake_override*/ fun get(/*0*/ index: kotlin.Int): B
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public abstract override /*1*/ /*fake_override*/ fun indexOf(/*0*/ element: B): kotlin.Int
     public abstract override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun iterator(): kotlin.Iterator<B>
+    public abstract override /*1*/ /*fake_override*/ fun iterator(): kotlin.collections.Iterator<B>
     public abstract override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ element: B): kotlin.Int
-    public abstract override /*1*/ /*fake_override*/ fun listIterator(): kotlin.ListIterator<B>
-    public abstract override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.ListIterator<B>
-    public abstract override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.List<B>
+    public abstract override /*1*/ /*fake_override*/ fun listIterator(): kotlin.collections.ListIterator<B>
+    public abstract override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.collections.ListIterator<B>
+    public abstract override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.collections.List<B>
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
diff --git a/compiler/testData/diagnostics/tests/generics/PseudoRawTypes.txt b/compiler/testData/diagnostics/tests/generics/PseudoRawTypes.txt
index 9d8651596da..d16d6479d39 100644
--- a/compiler/testData/diagnostics/tests/generics/PseudoRawTypes.txt
+++ b/compiler/testData/diagnostics/tests/generics/PseudoRawTypes.txt
@@ -6,7 +6,7 @@ package test {
     public open class Usage {
         public constructor Usage()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public/*package*/ open fun foo(/*0*/ c: kotlin.(Mutable)Collection<(raw) kotlin.Any?>!): kotlin.Unit
+        public/*package*/ open fun foo(/*0*/ c: kotlin.collections.(Mutable)Collection<(raw) kotlin.Any?>!): kotlin.Unit
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
diff --git a/compiler/testData/diagnostics/tests/generics/innerClasses/innerVariance.txt b/compiler/testData/diagnostics/tests/generics/innerClasses/innerVariance.txt
index 565e17a0305..720d7ceda5b 100644
--- a/compiler/testData/diagnostics/tests/generics/innerClasses/innerVariance.txt
+++ b/compiler/testData/diagnostics/tests/generics/innerClasses/innerVariance.txt
@@ -14,8 +14,8 @@ public final class Outer</*0*/ out E, /*1*/ in F> {
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
         public final fun unsafe1(/*0*/ x: E): kotlin.Unit
-        public final fun unsafe2(/*0*/ x: kotlin.Collection<E?>): kotlin.Unit
+        public final fun unsafe2(/*0*/ x: kotlin.collections.Collection<E?>): kotlin.Unit
         public final fun unsafe3(): F?
-        public final fun unsafe4(): kotlin.Collection<F>?
+        public final fun unsafe4(): kotlin.collections.Collection<F>?
     }
 }
diff --git a/compiler/testData/diagnostics/tests/generics/innerClasses/iterator.txt b/compiler/testData/diagnostics/tests/generics/innerClasses/iterator.txt
index 528545d03a4..2299fd6a00d 100644
--- a/compiler/testData/diagnostics/tests/generics/innerClasses/iterator.txt
+++ b/compiler/testData/diagnostics/tests/generics/innerClasses/iterator.txt
@@ -7,22 +7,22 @@ public final class A</*0*/ T> : java.util.AbstractCollection<T> {
     public constructor A</*0*/ T>()
     public open override /*1*/ val size: kotlin.Int
     public open override /*1*/ /*fake_override*/ fun add(/*0*/ element: T!): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.Collection<T!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.collections.Collection<T!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun contains(/*0*/ element: T!): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.Collection<T!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection<T!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
     public open override /*1*/ fun iterator(): A<T>.MyIt
     public open override /*1*/ /*fake_override*/ fun remove(/*0*/ element: T!): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.Collection<T!>): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.Collection<T!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.collections.Collection<T!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.collections.Collection<T!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun toArray(): kotlin.Array<(out) kotlin.Any!>!
     public open override /*1*/ /*fake_override*/ fun </*0*/ T : kotlin.Any!> toArray(/*0*/ p0: kotlin.Array<(out) T!>!): kotlin.Array<(out) T!>!
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-    public final inner class MyIt /*captured type parameters: /*0*/ T*/ : kotlin.MutableIterator<T> {
+    public final inner class MyIt /*captured type parameters: /*0*/ T*/ : kotlin.collections.MutableIterator<T> {
         public constructor MyIt()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public open override /*1*/ fun hasNext(): kotlin.Boolean
diff --git a/compiler/testData/diagnostics/tests/generics/projectionsScope/MLOut.txt b/compiler/testData/diagnostics/tests/generics/projectionsScope/MLOut.txt
index d27266c8fd0..f52db3db6d9 100644
--- a/compiler/testData/diagnostics/tests/generics/projectionsScope/MLOut.txt
+++ b/compiler/testData/diagnostics/tests/generics/projectionsScope/MLOut.txt
@@ -1,11 +1,11 @@
 package
 
-public fun foo2(/*0*/ x: A, /*1*/ y: kotlin.MutableList<out kotlin.CharSequence>): kotlin.Unit
+public fun foo2(/*0*/ x: A, /*1*/ y: kotlin.collections.MutableList<out kotlin.CharSequence>): kotlin.Unit
 
 public open class A {
     public constructor A()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open fun foo(): (kotlin.MutableList<out kotlin.CharSequence!>..kotlin.List<kotlin.CharSequence!>?)
+    public open fun foo(): (kotlin.collections.MutableList<out kotlin.CharSequence!>..kotlin.collections.List<kotlin.CharSequence!>?)
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
diff --git a/compiler/testData/diagnostics/tests/generics/projectionsScope/flexibleProjectedScope.txt b/compiler/testData/diagnostics/tests/generics/projectionsScope/flexibleProjectedScope.txt
index 4f8cd0921cc..6a9960b882f 100644
--- a/compiler/testData/diagnostics/tests/generics/projectionsScope/flexibleProjectedScope.txt
+++ b/compiler/testData/diagnostics/tests/generics/projectionsScope/flexibleProjectedScope.txt
@@ -1,12 +1,12 @@
 package
 
 public fun test(/*0*/ clazz: Clazz<out kotlin.Any>): kotlin.Unit
-public fun </*0*/ T, /*1*/ C : kotlin.MutableCollection<in T>> kotlin.Iterable<T>.filterTo(/*0*/ destination: C, /*1*/ predicate: (T) -> kotlin.Boolean): kotlin.Unit
+public fun </*0*/ T, /*1*/ C : kotlin.collections.MutableCollection<in T>> kotlin.collections.Iterable<T>.filterTo(/*0*/ destination: C, /*1*/ predicate: (T) -> kotlin.Boolean): kotlin.Unit
 
 public open class Clazz</*0*/ Psi : kotlin.Any!> {
     public constructor Clazz</*0*/ Psi : kotlin.Any!>()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open fun foo(): kotlin.(Mutable)Collection<Psi!>!
+    public open fun foo(): kotlin.collections.(Mutable)Collection<Psi!>!
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
diff --git a/compiler/testData/diagnostics/tests/generics/starProjections/collectionInheritedFromJava.txt b/compiler/testData/diagnostics/tests/generics/starProjections/collectionInheritedFromJava.txt
index d7e0332a23a..58375ae52cb 100644
--- a/compiler/testData/diagnostics/tests/generics/starProjections/collectionInheritedFromJava.txt
+++ b/compiler/testData/diagnostics/tests/generics/starProjections/collectionInheritedFromJava.txt
@@ -4,7 +4,7 @@ package p {
 
     public open class Base</*0*/ T : kotlin.Any!> {
         public constructor Base</*0*/ T : kotlin.Any!>()
-        public/*package*/ open fun coll(/*0*/ r: kotlin.(Mutable)Collection<*>!): kotlin.Unit
+        public/*package*/ open fun coll(/*0*/ r: kotlin.collections.(Mutable)Collection<*>!): kotlin.Unit
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
@@ -12,7 +12,7 @@ package p {
 
     public final class Derived : p.Base<kotlin.String> {
         public constructor Derived()
-        public/*package*/ open override /*1*/ /*fake_override*/ fun coll(/*0*/ r: kotlin.(Mutable)Collection<*>!): kotlin.Unit
+        public/*package*/ open override /*1*/ /*fake_override*/ fun coll(/*0*/ r: kotlin.collections.(Mutable)Collection<*>!): kotlin.Unit
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
diff --git a/compiler/testData/diagnostics/tests/generics/suppressVarianceConflict.txt b/compiler/testData/diagnostics/tests/generics/suppressVarianceConflict.txt
index d79c73aa4b1..f34ea65e020 100644
--- a/compiler/testData/diagnostics/tests/generics/suppressVarianceConflict.txt
+++ b/compiler/testData/diagnostics/tests/generics/suppressVarianceConflict.txt
@@ -1,13 +1,13 @@
 package
 
-public fun foo(/*0*/ x: A<kotlin.String, kotlin.Any?>, /*1*/ cs: kotlin.CharSequence, /*2*/ ls: kotlin.List<kotlin.CharSequence>): kotlin.Unit
+public fun foo(/*0*/ x: A<kotlin.String, kotlin.Any?>, /*1*/ cs: kotlin.CharSequence, /*2*/ ls: kotlin.collections.List<kotlin.CharSequence>): kotlin.Unit
 
 public final class A</*0*/ out T, /*1*/ in E> {
     public constructor A</*0*/ out T, /*1*/ in E>()
-    public final fun bar(): kotlin.List<@kotlin.UnsafeVariance() E>
+    public final fun bar(): kotlin.collections.List<@kotlin.UnsafeVariance() E>
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final fun foo(/*0*/ x: @kotlin.UnsafeVariance() T): kotlin.Unit
-    public final fun foo(/*0*/ x: @kotlin.UnsafeVariance() T, /*1*/ y: kotlin.List<@kotlin.UnsafeVariance() T>): @kotlin.UnsafeVariance() E
+    public final fun foo(/*0*/ x: @kotlin.UnsafeVariance() T, /*1*/ y: kotlin.collections.List<@kotlin.UnsafeVariance() T>): @kotlin.UnsafeVariance() E
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
diff --git a/compiler/testData/diagnostics/tests/imports/ImportHidingDefinitionInTheSameFile.kt b/compiler/testData/diagnostics/tests/imports/ImportHidingDefinitionInTheSameFile.kt
index 2c71a864ec9..3f3a6226ebc 100644
--- a/compiler/testData/diagnostics/tests/imports/ImportHidingDefinitionInTheSameFile.kt
+++ b/compiler/testData/diagnostics/tests/imports/ImportHidingDefinitionInTheSameFile.kt
@@ -1,6 +1,6 @@
 // ResolveSession.resolveToDescriptor used to crash on such code, so we just check that it's ok now
 import kotlin.Double
-import kotlin.List
+import kotlin.collections.List
 import kotlin.arrayOfNulls
 
 class List {}
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/controlStructuresErrors.txt b/compiler/testData/diagnostics/tests/incompleteCode/controlStructuresErrors.txt
index 078eaf5914e..00d475a9b9e 100644
--- a/compiler/testData/diagnostics/tests/incompleteCode/controlStructuresErrors.txt
+++ b/compiler/testData/diagnostics/tests/incompleteCode/controlStructuresErrors.txt
@@ -1,4 +1,4 @@
 package
 
 public fun test1(): kotlin.Unit
-public fun test2(/*0*/ l: kotlin.List<[ERROR : AA]>): kotlin.Unit
+public fun test2(/*0*/ l: kotlin.collections.List<[ERROR : AA]>): kotlin.Unit
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/noTypeParamsInReturnType.txt b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/noTypeParamsInReturnType.txt
index bd72e159402..2972c388620 100644
--- a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/noTypeParamsInReturnType.txt
+++ b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/noTypeParamsInReturnType.txt
@@ -2,6 +2,6 @@ package
 
 package b {
     public fun bar123(): kotlin.Unit
-    public fun </*0*/ T, /*1*/ R> foo(/*0*/ map: kotlin.Map<T, R>): R
-    public fun </*0*/ F, /*1*/ G> getMap(): kotlin.Map<F, G>
+    public fun </*0*/ T, /*1*/ R> foo(/*0*/ map: kotlin.collections.Map<T, R>): R
+    public fun </*0*/ F, /*1*/ G> getMap(): kotlin.collections.Map<F, G>
 }
diff --git a/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveAmbiguity.txt b/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveAmbiguity.txt
index 19451690cfa..6883f4f24dd 100644
--- a/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveAmbiguity.txt
+++ b/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveAmbiguity.txt
@@ -1,7 +1,7 @@
 package
 
 package f {
-    public fun </*0*/ T> g(/*0*/ a: kotlin.Any, /*1*/ i: kotlin.Int): kotlin.Collection<T>
-    public fun </*0*/ T> g(/*0*/ i: kotlin.Int, /*1*/ a: kotlin.Any): kotlin.List<T>
+    public fun </*0*/ T> g(/*0*/ a: kotlin.Any, /*1*/ i: kotlin.Int): kotlin.collections.Collection<T>
+    public fun </*0*/ T> g(/*0*/ i: kotlin.Int, /*1*/ a: kotlin.Any): kotlin.collections.List<T>
     public fun </*0*/ T> test(): kotlin.Unit
 }
diff --git a/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveNoInfoForParameter.txt b/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveNoInfoForParameter.txt
index 2198a9241b7..be2615c6e45 100644
--- a/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveNoInfoForParameter.txt
+++ b/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveNoInfoForParameter.txt
@@ -1,8 +1,8 @@
 package
 
 package f {
-    public fun </*0*/ T> emptyList(): kotlin.List<T>
-    public fun </*0*/ T> f(/*0*/ a: kotlin.Any, /*1*/ l: kotlin.List<T>): kotlin.Collection<T>
-    public fun </*0*/ T> f(/*0*/ i: kotlin.Int, /*1*/ c: kotlin.Collection<T>): kotlin.List<T>
-    public fun </*0*/ T> test(/*0*/ l: kotlin.List<T>): kotlin.Unit
+    public fun </*0*/ T> emptyList(): kotlin.collections.List<T>
+    public fun </*0*/ T> f(/*0*/ a: kotlin.Any, /*1*/ l: kotlin.collections.List<T>): kotlin.collections.Collection<T>
+    public fun </*0*/ T> f(/*0*/ i: kotlin.Int, /*1*/ c: kotlin.collections.Collection<T>): kotlin.collections.List<T>
+    public fun </*0*/ T> test(/*0*/ l: kotlin.collections.List<T>): kotlin.Unit
 }
diff --git a/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveNoneApplicable.txt b/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveNoneApplicable.txt
index 6a327b4bd04..21800bb3b11 100644
--- a/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveNoneApplicable.txt
+++ b/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveNoneApplicable.txt
@@ -1,7 +1,7 @@
 package
 
 package f {
-    public fun </*0*/ T> f(/*0*/ a: kotlin.Any, /*1*/ t: T, /*2*/ l: kotlin.MutableList<T>): kotlin.Unit
-    public fun </*0*/ T> f(/*0*/ i: kotlin.Int, /*1*/ t: T, /*2*/ c: kotlin.MutableCollection<T>): kotlin.Unit
-    public fun test(/*0*/ l: kotlin.List<kotlin.Int>): kotlin.Unit
+    public fun </*0*/ T> f(/*0*/ a: kotlin.Any, /*1*/ t: T, /*2*/ l: kotlin.collections.MutableList<T>): kotlin.Unit
+    public fun </*0*/ T> f(/*0*/ i: kotlin.Int, /*1*/ t: T, /*2*/ c: kotlin.collections.MutableCollection<T>): kotlin.Unit
+    public fun test(/*0*/ l: kotlin.collections.List<kotlin.Int>): kotlin.Unit
 }
diff --git a/compiler/testData/diagnostics/tests/inference/capturedTypes/captureFromNullableTypeVariable.txt b/compiler/testData/diagnostics/tests/inference/capturedTypes/captureFromNullableTypeVariable.txt
index 3ebb79cb132..d355d64e725 100644
--- a/compiler/testData/diagnostics/tests/inference/capturedTypes/captureFromNullableTypeVariable.txt
+++ b/compiler/testData/diagnostics/tests/inference/capturedTypes/captureFromNullableTypeVariable.txt
@@ -2,4 +2,4 @@ package
 
 public fun test1(/*0*/ a: kotlin.Array<out kotlin.Int?>): kotlin.Unit
 public fun test2(/*0*/ vararg a: kotlin.Int? /*kotlin.Array<out kotlin.Int?>*/): kotlin.Unit
-public fun </*0*/ T : kotlin.Any> kotlin.Array<T?>.filterNotNull(): kotlin.List<T>
+public fun </*0*/ T : kotlin.Any> kotlin.Array<T?>.filterNotNull(): kotlin.collections.List<T>
diff --git a/compiler/testData/diagnostics/tests/inference/capturedTypes/kt2570.txt b/compiler/testData/diagnostics/tests/inference/capturedTypes/kt2570.txt
index b3531e16ebc..9a36d0fecb1 100644
--- a/compiler/testData/diagnostics/tests/inference/capturedTypes/kt2570.txt
+++ b/compiler/testData/diagnostics/tests/inference/capturedTypes/kt2570.txt
@@ -1,4 +1,4 @@
 package
 
-public fun </*0*/ T> foo(/*0*/ l: kotlin.MutableList<T>): kotlin.MutableList<T>
-public fun test(/*0*/ l: kotlin.MutableList<out kotlin.Int>): kotlin.Unit
+public fun </*0*/ T> foo(/*0*/ l: kotlin.collections.MutableList<T>): kotlin.collections.MutableList<T>
+public fun test(/*0*/ l: kotlin.collections.MutableList<out kotlin.Int>): kotlin.Unit
diff --git a/compiler/testData/diagnostics/tests/inference/commonSystem/dontCaptureTypeVariable.txt b/compiler/testData/diagnostics/tests/inference/commonSystem/dontCaptureTypeVariable.txt
index 15d6f8db8b3..918fec87fff 100644
--- a/compiler/testData/diagnostics/tests/inference/commonSystem/dontCaptureTypeVariable.txt
+++ b/compiler/testData/diagnostics/tests/inference/commonSystem/dontCaptureTypeVariable.txt
@@ -1,4 +1,4 @@
 package
 
-public fun </*0*/ E> sort(/*0*/ list: kotlin.List<E>, /*1*/ c: java.util.Comparator<in E>): kotlin.Unit
+public fun </*0*/ E> sort(/*0*/ list: kotlin.collections.List<E>, /*1*/ c: java.util.Comparator<in E>): kotlin.Unit
 public fun test(/*0*/ list: java.util.ArrayList<kotlin.Int>, /*1*/ comparatorFun: (kotlin.Int, kotlin.Int) -> kotlin.Int): kotlin.Unit
diff --git a/compiler/testData/diagnostics/tests/inference/commonSystem/fixVariablesInRightOrder.txt b/compiler/testData/diagnostics/tests/inference/commonSystem/fixVariablesInRightOrder.txt
index 2b8ab1ff5d3..09795a211b7 100644
--- a/compiler/testData/diagnostics/tests/inference/commonSystem/fixVariablesInRightOrder.txt
+++ b/compiler/testData/diagnostics/tests/inference/commonSystem/fixVariablesInRightOrder.txt
@@ -1,9 +1,9 @@
 package
 
 public fun </*0*/ T> bar(/*0*/ t: T, /*1*/ ext: GenericClass<T>.() -> kotlin.Unit): kotlin.Unit
-public fun </*0*/ K, /*1*/ V> mapOf(/*0*/ keyValuePair: Pair<K, V>): kotlin.Map<K, V>
+public fun </*0*/ K, /*1*/ V> mapOf(/*0*/ keyValuePair: Pair<K, V>): kotlin.collections.Map<K, V>
 public fun test(): kotlin.Unit
-public fun </*0*/ K, /*1*/ V> GenericClass<kotlin.Map<K, V>>.foo(): kotlin.Unit
+public fun </*0*/ K, /*1*/ V> GenericClass<kotlin.collections.Map<K, V>>.foo(): kotlin.Unit
 public infix fun </*0*/ A, /*1*/ B> A.to(/*0*/ that: B): Pair<A, B>
 
 public final class GenericClass</*0*/ out T> {
diff --git a/compiler/testData/diagnostics/tests/inference/commonSystem/genericCandidateInGenericClass.txt b/compiler/testData/diagnostics/tests/inference/commonSystem/genericCandidateInGenericClass.txt
index c784319bb51..54948313b5f 100644
--- a/compiler/testData/diagnostics/tests/inference/commonSystem/genericCandidateInGenericClass.txt
+++ b/compiler/testData/diagnostics/tests/inference/commonSystem/genericCandidateInGenericClass.txt
@@ -1,6 +1,6 @@
 package
 
-public fun </*0*/ E> GenericClass<kotlin.List<E>>.bar(): kotlin.Unit
+public fun </*0*/ E> GenericClass<kotlin.collections.List<E>>.bar(): kotlin.Unit
 
 public final class GenericClass</*0*/ out T> {
     public constructor GenericClass</*0*/ out T>(/*0*/ value: T)
diff --git a/compiler/testData/diagnostics/tests/inference/commonSystem/inferenceWithUpperBoundsInLambda.txt b/compiler/testData/diagnostics/tests/inference/commonSystem/inferenceWithUpperBoundsInLambda.txt
index 4c78869ac9c..7bdc96e0a4e 100644
--- a/compiler/testData/diagnostics/tests/inference/commonSystem/inferenceWithUpperBoundsInLambda.txt
+++ b/compiler/testData/diagnostics/tests/inference/commonSystem/inferenceWithUpperBoundsInLambda.txt
@@ -1,11 +1,11 @@
 package
 
-public fun </*0*/ F : Foo> test(/*0*/ map: kotlin.MutableMap<kotlin.String, Bar<F>>): kotlin.Unit
-public fun </*0*/ K, /*1*/ V> kotlin.MutableMap<K, V>.getOrPut1(/*0*/ key: K, /*1*/ defaultValue: () -> V): V
+public fun </*0*/ F : Foo> test(/*0*/ map: kotlin.collections.MutableMap<kotlin.String, Bar<F>>): kotlin.Unit
+public fun </*0*/ K, /*1*/ V> kotlin.collections.MutableMap<K, V>.getOrPut1(/*0*/ key: K, /*1*/ defaultValue: () -> V): V
 
 public final class Bar</*0*/ B : Foo> {
-    public constructor Bar</*0*/ B : Foo>(/*0*/ list: kotlin.MutableList<B>)
-    public final val list: kotlin.MutableList<B>
+    public constructor Bar</*0*/ B : Foo>(/*0*/ list: kotlin.collections.MutableList<B>)
+    public final val list: kotlin.collections.MutableList<B>
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
diff --git a/compiler/testData/diagnostics/tests/inference/commonSystem/kt3372toCollection.txt b/compiler/testData/diagnostics/tests/inference/commonSystem/kt3372toCollection.txt
index 27be4074463..19196a6dd97 100644
--- a/compiler/testData/diagnostics/tests/inference/commonSystem/kt3372toCollection.txt
+++ b/compiler/testData/diagnostics/tests/inference/commonSystem/kt3372toCollection.txt
@@ -1,4 +1,4 @@
 package
 
-public fun test(/*0*/ list: kotlin.List<kotlin.Int>): kotlin.Unit
-public fun </*0*/ T, /*1*/ C : kotlin.MutableCollection<T>> kotlin.Iterable<T>.toCollection(/*0*/ result: C): C
+public fun test(/*0*/ list: kotlin.collections.List<kotlin.Int>): kotlin.Unit
+public fun </*0*/ T, /*1*/ C : kotlin.collections.MutableCollection<T>> kotlin.collections.Iterable<T>.toCollection(/*0*/ result: C): C
diff --git a/compiler/testData/diagnostics/tests/inference/commonSystem/nestedLambdas.txt b/compiler/testData/diagnostics/tests/inference/commonSystem/nestedLambdas.txt
index 419997ec931..9eb5eb26500 100644
--- a/compiler/testData/diagnostics/tests/inference/commonSystem/nestedLambdas.txt
+++ b/compiler/testData/diagnostics/tests/inference/commonSystem/nestedLambdas.txt
@@ -1,4 +1,4 @@
 package
 
-public fun test(/*0*/ list: kotlin.List<kotlin.List<kotlin.Int>>): kotlin.Unit
-public fun </*0*/ T, /*1*/ R> kotlin.Collection<T>.map(/*0*/ transform: (T) -> R): kotlin.List<R>
+public fun test(/*0*/ list: kotlin.collections.List<kotlin.collections.List<kotlin.Int>>): kotlin.Unit
+public fun </*0*/ T, /*1*/ R> kotlin.collections.Collection<T>.map(/*0*/ transform: (T) -> R): kotlin.collections.List<R>
diff --git a/compiler/testData/diagnostics/tests/inference/conflictingSubstitutions.txt b/compiler/testData/diagnostics/tests/inference/conflictingSubstitutions.txt
index 883f3d620ef..6af51b1000a 100644
--- a/compiler/testData/diagnostics/tests/inference/conflictingSubstitutions.txt
+++ b/compiler/testData/diagnostics/tests/inference/conflictingSubstitutions.txt
@@ -1,8 +1,8 @@
 package
 
 package conflictingSubstitutions {
-    public fun </*0*/ R> elemAndList(/*0*/ r: R, /*1*/ t: kotlin.MutableList<R>): R
+    public fun </*0*/ R> elemAndList(/*0*/ r: R, /*1*/ t: kotlin.collections.MutableList<R>): R
     public fun </*0*/ T> list(/*0*/ value: T): java.util.ArrayList<T>
     public fun test(): kotlin.Unit
-    public fun </*0*/ R> R.elemAndListWithReceiver(/*0*/ r: R, /*1*/ t: kotlin.MutableList<R>): R
+    public fun </*0*/ R> R.elemAndListWithReceiver(/*0*/ r: R, /*1*/ t: kotlin.collections.MutableList<R>): R
 }
diff --git a/compiler/testData/diagnostics/tests/inference/constraints/constraintOnFunctionLiteral.txt b/compiler/testData/diagnostics/tests/inference/constraints/constraintOnFunctionLiteral.txt
index 777f81bbc4c..4242d77d5ea 100644
--- a/compiler/testData/diagnostics/tests/inference/constraints/constraintOnFunctionLiteral.txt
+++ b/compiler/testData/diagnostics/tests/inference/constraints/constraintOnFunctionLiteral.txt
@@ -1,7 +1,7 @@
 package
 
 package c {
-    public fun </*0*/ T, /*1*/ R, /*2*/ C : kotlin.MutableCollection<in R>> kotlin.Array<out T>.mapTo(/*0*/ result: C, /*1*/ transform: (T) -> R): C
+    public fun </*0*/ T, /*1*/ R, /*2*/ C : kotlin.collections.MutableCollection<in R>> kotlin.Array<out T>.mapTo(/*0*/ result: C, /*1*/ transform: (T) -> R): C
     public fun kotlin.Array<kotlin.Int>.toArrayList(): java.util.ArrayList<kotlin.Int>
     public fun kotlin.Array<kotlin.Int>.toIntArray(): kotlin.IntArray
 }
diff --git a/compiler/testData/diagnostics/tests/inference/constraints/kt7433.txt b/compiler/testData/diagnostics/tests/inference/constraints/kt7433.txt
index 80c82873f2b..2168b0d1dd2 100644
--- a/compiler/testData/diagnostics/tests/inference/constraints/kt7433.txt
+++ b/compiler/testData/diagnostics/tests/inference/constraints/kt7433.txt
@@ -1,4 +1,4 @@
 package
 
-public fun test(/*0*/ ints: kotlin.List<kotlin.Int>): kotlin.Unit
-public inline fun </*0*/ S, /*1*/ T : S> kotlin.Iterable<T>.reduce1(/*0*/ operation: (S, T) -> S): S
+public fun test(/*0*/ ints: kotlin.collections.List<kotlin.Int>): kotlin.Unit
+public inline fun </*0*/ S, /*1*/ T : S> kotlin.collections.Iterable<T>.reduce1(/*0*/ operation: (S, T) -> S): S
diff --git a/compiler/testData/diagnostics/tests/inference/dependOnExpectedType.txt b/compiler/testData/diagnostics/tests/inference/dependOnExpectedType.txt
index c13b134b7ca..fbf0d00c79a 100644
--- a/compiler/testData/diagnostics/tests/inference/dependOnExpectedType.txt
+++ b/compiler/testData/diagnostics/tests/inference/dependOnExpectedType.txt
@@ -2,8 +2,8 @@ package
 
 package h {
     public fun </*0*/ T> both(/*0*/ t1: T, /*1*/ t2: T): T
-    public fun </*0*/ R> elem(/*0*/ t: kotlin.List<R>): R
-    public fun </*0*/ R> elemAndList(/*0*/ r: R, /*1*/ t: kotlin.List<R>): R
+    public fun </*0*/ R> elem(/*0*/ t: kotlin.collections.List<R>): R
+    public fun </*0*/ R> elemAndList(/*0*/ r: R, /*1*/ t: kotlin.collections.List<R>): R
     public fun </*0*/ T> id(/*0*/ t: T): T
     public fun </*0*/ T> id1(/*0*/ t: T): T
     public fun </*0*/ T> list(/*0*/ value: T): java.util.ArrayList<T>
diff --git a/compiler/testData/diagnostics/tests/inference/dependantOnVarianceNullable.txt b/compiler/testData/diagnostics/tests/inference/dependantOnVarianceNullable.txt
index 5f51f6eb816..57b3e88b376 100644
--- a/compiler/testData/diagnostics/tests/inference/dependantOnVarianceNullable.txt
+++ b/compiler/testData/diagnostics/tests/inference/dependantOnVarianceNullable.txt
@@ -2,5 +2,5 @@ package
 
 package b {
     public fun </*0*/ T> comparator(/*0*/ fn: (T, T) -> kotlin.Int): java.util.Comparator<T>
-    public fun foo(/*0*/ list: kotlin.List<kotlin.String>): kotlin.String
+    public fun foo(/*0*/ list: kotlin.collections.List<kotlin.String>): kotlin.String
 }
diff --git a/compiler/testData/diagnostics/tests/inference/functionPlaceholderError.txt b/compiler/testData/diagnostics/tests/inference/functionPlaceholderError.txt
index 6cb178587e4..36a79702282 100644
--- a/compiler/testData/diagnostics/tests/inference/functionPlaceholderError.txt
+++ b/compiler/testData/diagnostics/tests/inference/functionPlaceholderError.txt
@@ -1,7 +1,7 @@
 package
 
 package a {
-    public fun </*0*/ T> emptyList(): kotlin.List<T>
-    public fun </*0*/ T> foo(/*0*/ f: T.() -> kotlin.Unit, /*1*/ l: kotlin.List<T>): T
+    public fun </*0*/ T> emptyList(): kotlin.collections.List<T>
+    public fun </*0*/ T> foo(/*0*/ f: T.() -> kotlin.Unit, /*1*/ l: kotlin.collections.List<T>): T
     public fun test(): kotlin.Unit
 }
diff --git a/compiler/testData/diagnostics/tests/inference/inferInFunctionLiterals.txt b/compiler/testData/diagnostics/tests/inference/inferInFunctionLiterals.txt
index 1e1695107c1..fb40aee0dfa 100644
--- a/compiler/testData/diagnostics/tests/inference/inferInFunctionLiterals.txt
+++ b/compiler/testData/diagnostics/tests/inference/inferInFunctionLiterals.txt
@@ -2,6 +2,6 @@ package
 
 package n {
     public fun </*0*/ T> expected(/*0*/ t: T, /*1*/ f: () -> T): T
-    public fun test(/*0*/ arrayList: java.util.ArrayList<kotlin.Int>, /*1*/ list: kotlin.List<kotlin.Int>): kotlin.Unit
-    public fun </*0*/ T> kotlin.List<T>.reverse(): kotlin.List<T>
+    public fun test(/*0*/ arrayList: java.util.ArrayList<kotlin.Int>, /*1*/ list: kotlin.collections.List<kotlin.Int>): kotlin.Unit
+    public fun </*0*/ T> kotlin.collections.List<T>.reverse(): kotlin.collections.List<T>
 }
diff --git a/compiler/testData/diagnostics/tests/inference/inferInFunctionLiteralsWithReturn.txt b/compiler/testData/diagnostics/tests/inference/inferInFunctionLiteralsWithReturn.txt
index 1e1695107c1..fb40aee0dfa 100644
--- a/compiler/testData/diagnostics/tests/inference/inferInFunctionLiteralsWithReturn.txt
+++ b/compiler/testData/diagnostics/tests/inference/inferInFunctionLiteralsWithReturn.txt
@@ -2,6 +2,6 @@ package
 
 package n {
     public fun </*0*/ T> expected(/*0*/ t: T, /*1*/ f: () -> T): T
-    public fun test(/*0*/ arrayList: java.util.ArrayList<kotlin.Int>, /*1*/ list: kotlin.List<kotlin.Int>): kotlin.Unit
-    public fun </*0*/ T> kotlin.List<T>.reverse(): kotlin.List<T>
+    public fun test(/*0*/ arrayList: java.util.ArrayList<kotlin.Int>, /*1*/ list: kotlin.collections.List<kotlin.Int>): kotlin.Unit
+    public fun </*0*/ T> kotlin.collections.List<T>.reverse(): kotlin.collections.List<T>
 }
diff --git a/compiler/testData/diagnostics/tests/inference/kt3184.txt b/compiler/testData/diagnostics/tests/inference/kt3184.txt
index 142e9e88fb8..9ae904094f0 100644
--- a/compiler/testData/diagnostics/tests/inference/kt3184.txt
+++ b/compiler/testData/diagnostics/tests/inference/kt3184.txt
@@ -5,5 +5,5 @@ package a {
     public fun println(/*0*/ message: kotlin.Any?): kotlin.Unit
     private fun </*0*/ T> test(/*0*/ value: T, /*1*/ extf: kotlin.String.(T) -> kotlin.Unit): kotlin.Unit
     public fun tests(): kotlin.Unit
-    public operator fun </*0*/ K, /*1*/ V> kotlin.MutableMap<K, V>.set(/*0*/ key: K, /*1*/ value: V): V?
+    public operator fun </*0*/ K, /*1*/ V> kotlin.collections.MutableMap<K, V>.set(/*0*/ key: K, /*1*/ value: V): V?
 }
diff --git a/compiler/testData/diagnostics/tests/inference/kt6175.txt b/compiler/testData/diagnostics/tests/inference/kt6175.txt
index 113eccb8ad7..fe9184f6353 100644
--- a/compiler/testData/diagnostics/tests/inference/kt6175.txt
+++ b/compiler/testData/diagnostics/tests/inference/kt6175.txt
@@ -1,8 +1,8 @@
 package
 
 public fun </*0*/ T, /*1*/ R> bar(/*0*/ body: (R) -> T): T
-public fun </*0*/ T, /*1*/ R> baz(/*0*/ body: (kotlin.List<R>) -> T): T
-public fun </*0*/ T, /*1*/ R : kotlin.Any> brr(/*0*/ body: (kotlin.List<R?>) -> T): T
+public fun </*0*/ T, /*1*/ R> baz(/*0*/ body: (kotlin.collections.List<R>) -> T): T
+public fun </*0*/ T, /*1*/ R : kotlin.Any> brr(/*0*/ body: (kotlin.collections.List<R?>) -> T): T
 public fun fail(): kotlin.Nothing
 public fun </*0*/ T, /*1*/ R : kotlin.Any> foo(/*0*/ body: (R?) -> T): T
 public fun test1(): kotlin.Unit
diff --git a/compiler/testData/diagnostics/tests/inference/listConstructor.txt b/compiler/testData/diagnostics/tests/inference/listConstructor.txt
index f9137f0b786..cf43f312781 100644
--- a/compiler/testData/diagnostics/tests/inference/listConstructor.txt
+++ b/compiler/testData/diagnostics/tests/inference/listConstructor.txt
@@ -2,8 +2,8 @@ package
 
 package a {
     public fun </*0*/ T> arrayList(/*0*/ vararg values: T /*kotlin.Array<out T>*/): java.util.ArrayList<T>
-    public fun </*0*/ A> cons(/*0*/ x: A, /*1*/ xs: kotlin.List<A>): kotlin.List<A>
-    public fun </*0*/ B> nil(): kotlin.List<B>
+    public fun </*0*/ A> cons(/*0*/ x: A, /*1*/ xs: kotlin.collections.List<A>): kotlin.collections.List<A>
+    public fun </*0*/ B> nil(): kotlin.collections.List<B>
     public fun test(): kotlin.Unit
-    public fun </*0*/ T, /*1*/ C : kotlin.MutableCollection<in T>> kotlin.Array<T>.toCollection(/*0*/ result: C): C
+    public fun </*0*/ T, /*1*/ C : kotlin.collections.MutableCollection<in T>> kotlin.Array<T>.toCollection(/*0*/ result: C): C
 }
diff --git a/compiler/testData/diagnostics/tests/inference/mapFunction.txt b/compiler/testData/diagnostics/tests/inference/mapFunction.txt
index 1d79d84e318..c3a3b7d7578 100644
--- a/compiler/testData/diagnostics/tests/inference/mapFunction.txt
+++ b/compiler/testData/diagnostics/tests/inference/mapFunction.txt
@@ -3,6 +3,6 @@ package
 package a {
     @kotlin.Suppress(names = {"UNCHECKED_CAST"}) public fun </*0*/ T> array(/*0*/ vararg t: T /*kotlin.Array<out T>*/): kotlin.Array<T>
     public fun foo(): kotlin.Unit
-    public infix fun </*0*/ T, /*1*/ R> kotlin.Array<T>.map(/*0*/ transform: (T) -> R): kotlin.List<R>
-    public infix fun </*0*/ T, /*1*/ R> kotlin.Iterable<T>.map(/*0*/ transform: (T) -> R): kotlin.List<R>
+    public infix fun </*0*/ T, /*1*/ R> kotlin.Array<T>.map(/*0*/ transform: (T) -> R): kotlin.collections.List<R>
+    public infix fun </*0*/ T, /*1*/ R> kotlin.collections.Iterable<T>.map(/*0*/ transform: (T) -> R): kotlin.collections.List<R>
 }
diff --git a/compiler/testData/diagnostics/tests/inference/mostSpecificAfterInference.txt b/compiler/testData/diagnostics/tests/inference/mostSpecificAfterInference.txt
index fe615db5f66..0262f8ad051 100644
--- a/compiler/testData/diagnostics/tests/inference/mostSpecificAfterInference.txt
+++ b/compiler/testData/diagnostics/tests/inference/mostSpecificAfterInference.txt
@@ -1,10 +1,10 @@
 package
 
 package i {
-    public fun test(/*0*/ list: kotlin.List<kotlin.Int>): kotlin.Unit
-    public fun test1(/*0*/ list: kotlin.List<kotlin.Int>): kotlin.Unit
+    public fun test(/*0*/ list: kotlin.collections.List<kotlin.Int>): kotlin.Unit
+    public fun test1(/*0*/ list: kotlin.collections.List<kotlin.Int>): kotlin.Unit
     public fun </*0*/ T> java.lang.Iterable<T>.foo(): kotlin.Unit
-    public fun </*0*/ T> kotlin.Collection<T>.foo(): kotlin.Unit
-    public fun </*0*/ T, /*1*/ R> java.lang.Iterable<T>.map1(/*0*/ f: (T) -> R): kotlin.List<R>
-    public fun </*0*/ T, /*1*/ R> kotlin.Collection<T>.map1(/*0*/ f: (T) -> R): kotlin.List<R>
+    public fun </*0*/ T> kotlin.collections.Collection<T>.foo(): kotlin.Unit
+    public fun </*0*/ T, /*1*/ R> java.lang.Iterable<T>.map1(/*0*/ f: (T) -> R): kotlin.collections.List<R>
+    public fun </*0*/ T, /*1*/ R> kotlin.collections.Collection<T>.map1(/*0*/ f: (T) -> R): kotlin.collections.List<R>
 }
diff --git a/compiler/testData/diagnostics/tests/inference/nestedCalls/arrayAccess.txt b/compiler/testData/diagnostics/tests/inference/nestedCalls/arrayAccess.txt
index 2c6c62683cc..9c74302e646 100644
--- a/compiler/testData/diagnostics/tests/inference/nestedCalls/arrayAccess.txt
+++ b/compiler/testData/diagnostics/tests/inference/nestedCalls/arrayAccess.txt
@@ -1,13 +1,13 @@
 package
 
 package b {
-    public fun bar(/*0*/ l: kotlin.List<kotlin.Int>): kotlin.List<kotlin.Int>
+    public fun bar(/*0*/ l: kotlin.collections.List<kotlin.Int>): kotlin.collections.List<kotlin.Int>
     public fun test(/*0*/ a: b.A): kotlin.Unit
 
     public final class A {
         public constructor A()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final operator fun </*0*/ T> get(/*0*/ i: kotlin.Int): kotlin.List<T>
+        public final operator fun </*0*/ T> get(/*0*/ i: kotlin.Int): kotlin.collections.List<T>
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
diff --git a/compiler/testData/diagnostics/tests/inference/nestedCalls/binaryExpressions.txt b/compiler/testData/diagnostics/tests/inference/nestedCalls/binaryExpressions.txt
index 2949b66ef14..8b03b8775bc 100644
--- a/compiler/testData/diagnostics/tests/inference/nestedCalls/binaryExpressions.txt
+++ b/compiler/testData/diagnostics/tests/inference/nestedCalls/binaryExpressions.txt
@@ -7,7 +7,7 @@ package h {
     public fun test1(/*0*/ z: h.Z): kotlin.Unit
     public fun test2(/*0*/ z: h.Z): kotlin.Unit
     public fun test3(/*0*/ z: h.Z): kotlin.Unit
-    public fun test4(/*0*/ collection: kotlin.Collection<h.A<*>>): kotlin.Unit
+    public fun test4(/*0*/ collection: kotlin.collections.Collection<h.A<*>>): kotlin.Unit
     public fun test5(): kotlin.Unit
     public fun </*0*/ T> toBeOrNot(): kotlin.Boolean
     public fun use(/*0*/ vararg a: kotlin.Any? /*kotlin.Array<out kotlin.Any?>*/): kotlin.Array<out kotlin.Any?>
diff --git a/compiler/testData/diagnostics/tests/inference/nestedCalls/completeNestedCallsForArraySetExpression.txt b/compiler/testData/diagnostics/tests/inference/nestedCalls/completeNestedCallsForArraySetExpression.txt
index 4c51793151f..f300884715f 100644
--- a/compiler/testData/diagnostics/tests/inference/nestedCalls/completeNestedCallsForArraySetExpression.txt
+++ b/compiler/testData/diagnostics/tests/inference/nestedCalls/completeNestedCallsForArraySetExpression.txt
@@ -1,5 +1,5 @@
 package
 
 public fun </*0*/ T> foo(/*0*/ t: T): T
-public fun test(/*0*/ map: kotlin.MutableMap<kotlin.Int, kotlin.Int>, /*1*/ t: kotlin.Int): kotlin.Unit
-public operator fun </*0*/ K, /*1*/ V> kotlin.MutableMap<K, V>.set(/*0*/ key: K, /*1*/ value: V): V?
+public fun test(/*0*/ map: kotlin.collections.MutableMap<kotlin.Int, kotlin.Int>, /*1*/ t: kotlin.Int): kotlin.Unit
+public operator fun </*0*/ K, /*1*/ V> kotlin.collections.MutableMap<K, V>.set(/*0*/ key: K, /*1*/ value: V): V?
diff --git a/compiler/testData/diagnostics/tests/inference/nestedCalls/completeNestedCallsInference.txt b/compiler/testData/diagnostics/tests/inference/nestedCalls/completeNestedCallsInference.txt
index d99b438922e..802c7b93833 100644
--- a/compiler/testData/diagnostics/tests/inference/nestedCalls/completeNestedCallsInference.txt
+++ b/compiler/testData/diagnostics/tests/inference/nestedCalls/completeNestedCallsInference.txt
@@ -1,7 +1,7 @@
 package
 
 package a {
-    public fun </*0*/ T> kotlin.Iterable<T>.withIndices(): kotlin.List<a.Pair<kotlin.Int, T>>
+    public fun </*0*/ T> kotlin.collections.Iterable<T>.withIndices(): kotlin.collections.List<a.Pair<kotlin.Int, T>>
 
     public final class Pair</*0*/ out A, /*1*/ out B> {
         public constructor Pair</*0*/ out A, /*1*/ out B>(/*0*/ first: A, /*1*/ second: B)
diff --git a/compiler/testData/diagnostics/tests/inference/nestedCalls/externalTypeParameter.txt b/compiler/testData/diagnostics/tests/inference/nestedCalls/externalTypeParameter.txt
index ee0f817cf17..1937ca57da7 100644
--- a/compiler/testData/diagnostics/tests/inference/nestedCalls/externalTypeParameter.txt
+++ b/compiler/testData/diagnostics/tests/inference/nestedCalls/externalTypeParameter.txt
@@ -2,10 +2,10 @@ package
 
 public final class A</*0*/ T> {
     public constructor A</*0*/ T>()
-    public final fun </*0*/ U> bar(/*0*/ s: U): kotlin.List<T>
+    public final fun </*0*/ U> bar(/*0*/ s: U): kotlin.collections.List<T>
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final fun </*0*/ S> foo(/*0*/ s: S): S
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public final fun test(): kotlin.List<T>
+    public final fun test(): kotlin.collections.List<T>
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
diff --git a/compiler/testData/diagnostics/tests/inference/nestedCalls/kt3395.txt b/compiler/testData/diagnostics/tests/inference/nestedCalls/kt3395.txt
index 610ee7fb392..069da88e183 100644
--- a/compiler/testData/diagnostics/tests/inference/nestedCalls/kt3395.txt
+++ b/compiler/testData/diagnostics/tests/inference/nestedCalls/kt3395.txt
@@ -2,9 +2,9 @@ package
 
 package b {
     public fun </*0*/ T> foo(/*0*/ t: T): T
-    public fun </*0*/ K, /*1*/ V> mapOf(/*0*/ vararg values: b.Pair<K, V> /*kotlin.Array<out b.Pair<K, V>>*/): kotlin.Map<K, V>
+    public fun </*0*/ K, /*1*/ V> mapOf(/*0*/ vararg values: b.Pair<K, V> /*kotlin.Array<out b.Pair<K, V>>*/): kotlin.collections.Map<K, V>
     public fun println(/*0*/ message: kotlin.Any?): kotlin.Unit
-    public fun </*0*/ T> query(/*0*/ t: T, /*1*/ args: kotlin.Map<kotlin.String, kotlin.Any>): kotlin.List<T>
+    public fun </*0*/ T> query(/*0*/ t: T, /*1*/ args: kotlin.collections.Map<kotlin.String, kotlin.Any>): kotlin.collections.List<T>
     public fun test(/*0*/ pair: b.Pair<kotlin.String, kotlin.Int>): kotlin.Unit
     public fun test(/*0*/ t: kotlin.String): kotlin.Unit
     public infix fun </*0*/ A, /*1*/ B> A.to(/*0*/ that: B): b.Pair<A, B>
diff --git a/compiler/testData/diagnostics/tests/inference/nestedCalls/nontrivialCallExpression.txt b/compiler/testData/diagnostics/tests/inference/nestedCalls/nontrivialCallExpression.txt
index 3d48a1ff061..6be221a205f 100644
--- a/compiler/testData/diagnostics/tests/inference/nestedCalls/nontrivialCallExpression.txt
+++ b/compiler/testData/diagnostics/tests/inference/nestedCalls/nontrivialCallExpression.txt
@@ -3,8 +3,8 @@ package
 package a {
     public fun bar(/*0*/ a: kotlin.Any): kotlin.Any
     public fun bar(/*0*/ i: kotlin.Int): kotlin.Int
-    public fun </*0*/ T> emptyList(): kotlin.List<T>
-    public fun foo(/*0*/ l: kotlin.List<kotlin.Int>): kotlin.Int
+    public fun </*0*/ T> emptyList(): kotlin.collections.List<T>
+    public fun foo(/*0*/ l: kotlin.collections.List<kotlin.Int>): kotlin.Int
     public fun </*0*/ T : kotlin.Any> makeNullable(/*0*/ t: T): T?
     public fun test(/*0*/ array: kotlin.Array<kotlin.Int>): kotlin.Unit
 }
diff --git a/compiler/testData/diagnostics/tests/inference/possibleCycleOnConstraints.txt b/compiler/testData/diagnostics/tests/inference/possibleCycleOnConstraints.txt
index 34307b4a6c8..0d669bb164d 100644
--- a/compiler/testData/diagnostics/tests/inference/possibleCycleOnConstraints.txt
+++ b/compiler/testData/diagnostics/tests/inference/possibleCycleOnConstraints.txt
@@ -1,6 +1,6 @@
 package
 
 package a {
-    public fun </*0*/ T> g(/*0*/ f: () -> kotlin.List<T>): T
+    public fun </*0*/ T> g(/*0*/ f: () -> kotlin.collections.List<T>): T
     public fun test(): kotlin.Unit
 }
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt1029.txt b/compiler/testData/diagnostics/tests/inference/regressions/kt1029.txt
index 89617f24f82..64fa45acd00 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt1029.txt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt1029.txt
@@ -2,6 +2,6 @@ package
 
 package i {
     public fun a(): kotlin.Unit
-    public fun </*0*/ T> from(/*0*/ yielder: () -> kotlin.Iterable<T>): kotlin.Iterable<T>
-    public infix fun </*0*/ T> kotlin.Iterable<T>.where(/*0*/ predicate: (T) -> kotlin.Boolean): () -> kotlin.Iterable<T>
+    public fun </*0*/ T> from(/*0*/ yielder: () -> kotlin.collections.Iterable<T>): kotlin.collections.Iterable<T>
+    public infix fun </*0*/ T> kotlin.collections.Iterable<T>.where(/*0*/ predicate: (T) -> kotlin.Boolean): () -> kotlin.collections.Iterable<T>
 }
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt1031.txt b/compiler/testData/diagnostics/tests/inference/regressions/kt1031.txt
index 7a00188f81d..5e115ea5aed 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt1031.txt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt1031.txt
@@ -2,6 +2,6 @@ package
 
 package i {
     public fun a(): kotlin.Unit
-    public fun </*0*/ TItem, /*1*/ TResult> select(/*0*/ yielder: () -> kotlin.Iterable<TItem>, /*1*/ selector: (TItem) -> TResult): () -> kotlin.Iterable<TResult>
-    public infix fun </*0*/ TItem> kotlin.Iterable<TItem>.where(/*0*/ predicate: (TItem) -> kotlin.Boolean): () -> kotlin.Iterable<TItem>
+    public fun </*0*/ TItem, /*1*/ TResult> select(/*0*/ yielder: () -> kotlin.collections.Iterable<TItem>, /*1*/ selector: (TItem) -> TResult): () -> kotlin.collections.Iterable<TResult>
+    public infix fun </*0*/ TItem> kotlin.collections.Iterable<TItem>.where(/*0*/ predicate: (TItem) -> kotlin.Boolean): () -> kotlin.collections.Iterable<TItem>
 }
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt1127.txt b/compiler/testData/diagnostics/tests/inference/regressions/kt1127.txt
index a4e11bc6471..b998d532368 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt1127.txt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt1127.txt
@@ -1,6 +1,6 @@
 package
 
 package d {
-    public fun </*0*/ T> asList(/*0*/ t: T): kotlin.List<T>?
+    public fun </*0*/ T> asList(/*0*/ t: T): kotlin.collections.List<T>?
     public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
 }
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt1145.txt b/compiler/testData/diagnostics/tests/inference/regressions/kt1145.txt
index 633555c708b..89a30915a80 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt1145.txt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt1145.txt
@@ -1,7 +1,7 @@
 package
 
 package d {
-    public fun test(/*0*/ numbers: kotlin.Iterable<kotlin.Int>): kotlin.Unit
-    public fun </*0*/ T> kotlin.Iterable<T>.fold(/*0*/ initial: T, /*1*/ operation: (T, T) -> T): T
-    public fun </*0*/ T, /*1*/ R> kotlin.Iterable<T>.map(/*0*/ transform: (T) -> R): kotlin.List<R>
+    public fun test(/*0*/ numbers: kotlin.collections.Iterable<kotlin.Int>): kotlin.Unit
+    public fun </*0*/ T> kotlin.collections.Iterable<T>.fold(/*0*/ initial: T, /*1*/ operation: (T, T) -> T): T
+    public fun </*0*/ T, /*1*/ R> kotlin.collections.Iterable<T>.map(/*0*/ transform: (T) -> R): kotlin.collections.List<R>
 }
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt1410.txt b/compiler/testData/diagnostics/tests/inference/regressions/kt1410.txt
index 5151978d1e3..dc0992085b2 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt1410.txt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt1410.txt
@@ -1,8 +1,8 @@
 package
 
 package d {
-    public fun foo(/*0*/ result: kotlin.MutableList<in kotlin.String>, /*1*/ collection: kotlin.MutableCollection<kotlin.String>, /*2*/ prefix: kotlin.String): kotlin.Unit
-    public fun test(/*0*/ result: kotlin.MutableList<in kotlin.Any>, /*1*/ collection: kotlin.MutableCollection<kotlin.String>, /*2*/ prefix: kotlin.String): kotlin.Unit
-    public fun </*0*/ T> kotlin.MutableCollection<out T>.filterToMy(/*0*/ result: kotlin.MutableList<in T>, /*1*/ filter: (T) -> kotlin.Boolean): kotlin.MutableCollection<out T>
+    public fun foo(/*0*/ result: kotlin.collections.MutableList<in kotlin.String>, /*1*/ collection: kotlin.collections.MutableCollection<kotlin.String>, /*2*/ prefix: kotlin.String): kotlin.Unit
+    public fun test(/*0*/ result: kotlin.collections.MutableList<in kotlin.Any>, /*1*/ collection: kotlin.collections.MutableCollection<kotlin.String>, /*2*/ prefix: kotlin.String): kotlin.Unit
+    public fun </*0*/ T> kotlin.collections.MutableCollection<out T>.filterToMy(/*0*/ result: kotlin.collections.MutableList<in T>, /*1*/ filter: (T) -> kotlin.Boolean): kotlin.collections.MutableCollection<out T>
     public fun kotlin.String.startsWith(/*0*/ prefix: kotlin.String): kotlin.Boolean
 }
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt1718.txt b/compiler/testData/diagnostics/tests/inference/regressions/kt1718.txt
index 88dbbdb3bfc..bcbad1c2958 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt1718.txt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt1718.txt
@@ -3,5 +3,5 @@ package
 package n {
     public fun </*0*/ T> arrayList(/*0*/ vararg values: T /*kotlin.Array<out T>*/): java.util.ArrayList<T>
     public fun test(): kotlin.Unit
-    public operator fun </*0*/ T> kotlin.Iterable<T>.plus(/*0*/ elements: kotlin.Iterable<T>): kotlin.List<T>
+    public operator fun </*0*/ T> kotlin.collections.Iterable<T>.plus(/*0*/ elements: kotlin.collections.Iterable<T>): kotlin.collections.List<T>
 }
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2057.txt b/compiler/testData/diagnostics/tests/inference/regressions/kt2057.txt
index 07593eb3f17..66aa411fb9a 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2057.txt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2057.txt
@@ -3,4 +3,4 @@ package
 public val bar: kotlin.Unit
 public val bar2: kotlin.Unit
 public fun </*0*/ T> arrayListOf(/*0*/ vararg values: T /*kotlin.Array<out T>*/): java.util.ArrayList<T>
-public fun </*0*/ T> foo(/*0*/ a: T, /*1*/ b: kotlin.Collection<T>, /*2*/ c: kotlin.Int): kotlin.Unit
+public fun </*0*/ T> foo(/*0*/ a: T, /*1*/ b: kotlin.collections.Collection<T>, /*2*/ c: kotlin.Int): kotlin.Unit
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2179.txt b/compiler/testData/diagnostics/tests/inference/regressions/kt2179.txt
index 1c3c8480014..05139ffe1b2 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2179.txt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2179.txt
@@ -1,10 +1,10 @@
 package
 
 package i {
-    public val kotlin.Collection<*>.size: kotlin.Int
+    public val kotlin.collections.Collection<*>.size: kotlin.Int
     public fun </*0*/ T> arrayList(/*0*/ vararg values: T /*kotlin.Array<out T>*/): java.util.ArrayList<T>
     public fun test(): kotlin.Unit
-    public fun </*0*/ T, /*1*/ R> kotlin.Collection<T>.map(/*0*/ transform: (T) -> R): kotlin.List<R>
-    public fun </*0*/ T, /*1*/ R, /*2*/ C : kotlin.MutableCollection<in R>> kotlin.Collection<T>.mapTo(/*0*/ result: C, /*1*/ transform: (T) -> R): C
-    public fun </*0*/ T, /*1*/ C : kotlin.MutableCollection<in T>> kotlin.Array<T>.toCollection(/*0*/ result: C): C
+    public fun </*0*/ T, /*1*/ R> kotlin.collections.Collection<T>.map(/*0*/ transform: (T) -> R): kotlin.collections.List<R>
+    public fun </*0*/ T, /*1*/ R, /*2*/ C : kotlin.collections.MutableCollection<in R>> kotlin.collections.Collection<T>.mapTo(/*0*/ result: C, /*1*/ transform: (T) -> R): C
+    public fun </*0*/ T, /*1*/ C : kotlin.collections.MutableCollection<in T>> kotlin.Array<T>.toCollection(/*0*/ result: C): C
 }
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2286.txt b/compiler/testData/diagnostics/tests/inference/regressions/kt2286.txt
index 141d53b0d8d..9162f8370b3 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2286.txt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2286.txt
@@ -1,12 +1,12 @@
 package
 
 package n {
-    public fun </*0*/ T : kotlin.Any> kotlin.Iterable<T>.find(/*0*/ predicate: (T) -> kotlin.Boolean): T?
+    public fun </*0*/ T : kotlin.Any> kotlin.collections.Iterable<T>.find(/*0*/ predicate: (T) -> kotlin.Boolean): T?
 
     public abstract class Buggy {
         public constructor Buggy()
         public final val anotherThree: kotlin.Int
-        public abstract val coll: kotlin.Collection<kotlin.Int>
+        public abstract val coll: kotlin.collections.Collection<kotlin.Int>
         public final val extendedGetter: kotlin.Int
         public final val yetAnotherThree: kotlin.Int
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2324.txt b/compiler/testData/diagnostics/tests/inference/regressions/kt2324.txt
index c9afa49a8d3..636a824327e 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2324.txt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2324.txt
@@ -3,7 +3,7 @@ package
 package i {
     public fun </*0*/ T> arrayList(/*0*/ vararg values: T /*kotlin.Array<out T>*/): java.util.ArrayList<T>
     public fun assertEquals(/*0*/ expected: kotlin.Any?, /*1*/ actual: kotlin.Any?, /*2*/ message: kotlin.String = ...): kotlin.Unit
-    public fun </*0*/ T, /*1*/ K> someFunction(/*0*/ list: kotlin.List<T>, /*1*/ transform: (T) -> K): kotlin.List<K>
+    public fun </*0*/ T, /*1*/ K> someFunction(/*0*/ list: kotlin.collections.List<T>, /*1*/ transform: (T) -> K): kotlin.collections.List<K>
     public fun testSomeFunction(): kotlin.Unit
-    public fun </*0*/ T, /*1*/ C : kotlin.MutableCollection<in T>> kotlin.Array<T>.toCollection(/*0*/ result: C): C
+    public fun </*0*/ T, /*1*/ C : kotlin.collections.MutableCollection<in T>> kotlin.Array<T>.toCollection(/*0*/ result: C): C
 }
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2407.txt b/compiler/testData/diagnostics/tests/inference/regressions/kt2407.txt
index 6f8b9bd2770..c48466fc27f 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2407.txt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2407.txt
@@ -3,6 +3,6 @@ package
 package n {
     public fun </*0*/ T> arrayList(/*0*/ vararg values: T /*kotlin.Array<out T>*/): java.util.ArrayList<T>
     public fun test(): kotlin.Unit
-    public fun </*0*/ T> kotlin.Iterable<T>.fold(/*0*/ initial: T, /*1*/ operation: (T, T) -> T): T
-    public fun </*0*/ T, /*1*/ R> kotlin.Collection<T>.map(/*0*/ transform: (T) -> R): kotlin.List<R>
+    public fun </*0*/ T> kotlin.collections.Iterable<T>.fold(/*0*/ initial: T, /*1*/ operation: (T, T) -> T): T
+    public fun </*0*/ T, /*1*/ R> kotlin.collections.Collection<T>.map(/*0*/ transform: (T) -> R): kotlin.collections.List<R>
 }
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2459.txt b/compiler/testData/diagnostics/tests/inference/regressions/kt2459.txt
index ffa857ace87..1cb961d709d 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2459.txt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2459.txt
@@ -5,8 +5,8 @@ package b {
     public fun </*0*/ T> f(/*0*/ x: T): b.B<T>
 
     public final class B</*0*/ T> {
-        public constructor B</*0*/ T>(/*0*/ x: kotlin.List<T>)
-        public final val x: kotlin.List<T>
+        public constructor B</*0*/ T>(/*0*/ x: kotlin.collections.List<T>)
+        public final val x: kotlin.collections.List<T>
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2741.txt b/compiler/testData/diagnostics/tests/inference/regressions/kt2741.txt
index 0bee5979a16..26996036723 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2741.txt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2741.txt
@@ -1,9 +1,9 @@
 package
 
 package a {
-    public fun </*0*/ T> _arrayList(/*0*/ vararg values: T /*kotlin.Array<out T>*/): kotlin.List<T>
+    public fun </*0*/ T> _arrayList(/*0*/ vararg values: T /*kotlin.Array<out T>*/): kotlin.collections.List<T>
     public fun test(): kotlin.Unit
-    public fun </*0*/ T, /*1*/ R : kotlin.Comparable<R>> kotlin.Iterable<T>._sortBy(/*0*/ f: (T) -> R): kotlin.List<T>
+    public fun </*0*/ T, /*1*/ R : kotlin.Comparable<R>> kotlin.collections.Iterable<T>._sortBy(/*0*/ f: (T) -> R): kotlin.collections.List<T>
 
     public final class _Pair</*0*/ A> {
         public constructor _Pair</*0*/ A>(/*0*/ a: A)
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2838.txt b/compiler/testData/diagnostics/tests/inference/regressions/kt2838.txt
index 2c34569c57a..9d2897d2b6c 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2838.txt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2838.txt
@@ -1,8 +1,8 @@
 package
 
 package a {
-    public fun </*0*/ T> bar(/*0*/ a: T, /*1*/ b: kotlin.Map<T, kotlin.String>): kotlin.String?
-    public fun </*0*/ T> foo(/*0*/ a: T, /*1*/ b: kotlin.Map<T, kotlin.String>?): kotlin.String?
+    public fun </*0*/ T> bar(/*0*/ a: T, /*1*/ b: kotlin.collections.Map<T, kotlin.String>): kotlin.String?
+    public fun </*0*/ T> foo(/*0*/ a: T, /*1*/ b: kotlin.collections.Map<T, kotlin.String>?): kotlin.String?
     public fun test(/*0*/ a: kotlin.Int): kotlin.Unit
     public fun test1(/*0*/ a: kotlin.Int): kotlin.Unit
     public fun test2(/*0*/ a: kotlin.Int): kotlin.Unit
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2842.txt b/compiler/testData/diagnostics/tests/inference/regressions/kt2842.txt
index 4856c351959..4b12dde595b 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2842.txt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2842.txt
@@ -2,11 +2,11 @@ package
 
 package c {
     public fun foo(): kotlin.Boolean
-    public fun getNullableList(): kotlin.List<kotlin.String>?
+    public fun getNullableList(): kotlin.collections.List<kotlin.String>?
     public fun test(/*0*/ a: c.A<kotlin.Int>?): kotlin.Unit
-    public fun test(/*0*/ nullabilityInfoMap: kotlin.Map<kotlin.Int, kotlin.Any>?): kotlin.Unit
+    public fun test(/*0*/ nullabilityInfoMap: kotlin.collections.Map<kotlin.Int, kotlin.Any>?): kotlin.Unit
     public fun </*0*/ R> c.A<R>.foo(): kotlin.Unit
-    public fun </*0*/ K, /*1*/ V> kotlin.Map<K, V>.iterator(): kotlin.Iterator<kotlin.Map.Entry<K, V>>
+    public fun </*0*/ K, /*1*/ V> kotlin.collections.Map<K, V>.iterator(): kotlin.collections.Iterator<kotlin.collections.Map.Entry<K, V>>
 
     public interface A</*0*/ T> {
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2883.txt b/compiler/testData/diagnostics/tests/inference/regressions/kt2883.txt
index cce5f5b6ec3..480ec5dfca1 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2883.txt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2883.txt
@@ -6,7 +6,7 @@ package a {
     public fun doAction(/*0*/ action: () -> kotlin.Unit): kotlin.Unit
     public fun foo(): kotlin.Unit
     public fun test(): kotlin.Unit
-    public fun testWithoutInference(/*0*/ col: kotlin.MutableCollection<kotlin.Int>): kotlin.Unit
+    public fun testWithoutInference(/*0*/ col: kotlin.collections.MutableCollection<kotlin.Int>): kotlin.Unit
 
     public final class Y</*0*/ TItem> {
         public constructor Y</*0*/ TItem>(/*0*/ itemToString: (TItem) -> kotlin.String)
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt3007.txt b/compiler/testData/diagnostics/tests/inference/regressions/kt3007.txt
index 6c25a656847..466d89390ca 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt3007.txt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt3007.txt
@@ -2,11 +2,11 @@ package
 
 package a {
     public fun tempFun(): a.SomeEnum
-    public fun </*0*/ T, /*1*/ R> kotlin.Iterable<T>.fold(/*0*/ initial: R, /*1*/ operation: (R, T) -> R): R
-    public fun kotlin.Iterable<kotlin.Int>.some(): kotlin.Unit
-    public fun kotlin.Iterable<kotlin.Int>.someInt(): kotlin.Unit
-    public fun kotlin.Iterable<kotlin.Int>.someSimple(): kotlin.Unit
-    public fun kotlin.Iterable<kotlin.Int>.someSimpleWithFun(): kotlin.Unit
+    public fun </*0*/ T, /*1*/ R> kotlin.collections.Iterable<T>.fold(/*0*/ initial: R, /*1*/ operation: (R, T) -> R): R
+    public fun kotlin.collections.Iterable<kotlin.Int>.some(): kotlin.Unit
+    public fun kotlin.collections.Iterable<kotlin.Int>.someInt(): kotlin.Unit
+    public fun kotlin.collections.Iterable<kotlin.Int>.someSimple(): kotlin.Unit
+    public fun kotlin.collections.Iterable<kotlin.Int>.someSimpleWithFun(): kotlin.Unit
 
     public final enum class SomeEnum : kotlin.Enum<a.SomeEnum> {
         enum entry FIRST
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt3174.txt b/compiler/testData/diagnostics/tests/inference/regressions/kt3174.txt
index 1fe86d96168..3d9245a872e 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt3174.txt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt3174.txt
@@ -2,7 +2,7 @@ package
 
 package a {
     public fun foo(/*0*/ a: kotlin.Any?): kotlin.Any?
-    public fun test(/*0*/ s: kotlin.String?, /*1*/ l: kotlin.MutableList<kotlin.String>): kotlin.Unit
-    public fun </*0*/ T> T.fff(/*0*/ l: kotlin.MutableList<T>): kotlin.Boolean
+    public fun test(/*0*/ s: kotlin.String?, /*1*/ l: kotlin.collections.MutableList<kotlin.String>): kotlin.Unit
+    public fun </*0*/ T> T.fff(/*0*/ l: kotlin.collections.MutableList<T>): kotlin.Boolean
     public fun </*0*/ T : kotlin.Any> T.test(): T
 }
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt3344.txt b/compiler/testData/diagnostics/tests/inference/regressions/kt3344.txt
index 122dfee8556..db258295ccd 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt3344.txt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt3344.txt
@@ -12,8 +12,8 @@ package i {
     }
 
     public final class Foo {
-        public constructor Foo(/*0*/ attributes: kotlin.Map<kotlin.String, kotlin.String>)
-        public final val attributes: kotlin.Map<kotlin.String, kotlin.String>
+        public constructor Foo(/*0*/ attributes: kotlin.collections.Map<kotlin.String, kotlin.String>)
+        public final val attributes: kotlin.collections.Map<kotlin.String, kotlin.String>
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt3496.txt b/compiler/testData/diagnostics/tests/inference/regressions/kt3496.txt
index ad7df35d3f1..b6f77f6b6f8 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt3496.txt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt3496.txt
@@ -6,5 +6,5 @@ public final class B</*0*/ T> {
     public final operator fun </*0*/ S> get(/*0*/ s: kotlin.String): S
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    public final fun </*0*/ S> x(/*0*/ y: B<kotlin.Iterable<S>>): kotlin.Unit
+    public final fun </*0*/ S> x(/*0*/ y: B<kotlin.collections.Iterable<S>>): kotlin.Unit
 }
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt8132.txt b/compiler/testData/diagnostics/tests/inference/regressions/kt8132.txt
index f8bc527e1b3..9faa967f11b 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt8132.txt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt8132.txt
@@ -1,4 +1,4 @@
 package
 
-public fun </*0*/ T> test(/*0*/ foo: kotlin.List<T>): T
-public fun </*0*/ S, /*1*/ T : S> kotlin.Iterable<T>.reduce(/*0*/ operation: (S, T) -> S): S
+public fun </*0*/ T> test(/*0*/ foo: kotlin.collections.List<T>): T
+public fun </*0*/ S, /*1*/ T : S> kotlin.collections.Iterable<T>.reduce(/*0*/ operation: (S, T) -> S): S
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt943.txt b/compiler/testData/diagnostics/tests/inference/regressions/kt943.txt
index cd189ee7a28..4532511edec 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt943.txt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt943.txt
@@ -2,6 +2,6 @@ package
 
 package maze {
     public inline fun </*0*/ T> comparator(/*0*/ fn: (T, T) -> kotlin.Int): java.util.Comparator<T>
-    public fun foo(/*0*/ lines: kotlin.List<kotlin.String>): kotlin.Unit
+    public fun foo(/*0*/ lines: kotlin.collections.List<kotlin.String>): kotlin.Unit
     public fun </*0*/ T : kotlin.Any> T?.sure(): T
 }
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt948.txt b/compiler/testData/diagnostics/tests/inference/regressions/kt948.txt
index f1a39a62a59..1e1c76dedb6 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt948.txt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt948.txt
@@ -1,7 +1,7 @@
 package
 
 package a {
-    public fun doWithList(/*0*/ list: kotlin.List<kotlin.Int>): kotlin.List<kotlin.Int>
-    public fun </*0*/ T> emptyList(): kotlin.List<T>?
+    public fun doWithList(/*0*/ list: kotlin.collections.List<kotlin.Int>): kotlin.collections.List<kotlin.Int>
+    public fun </*0*/ T> emptyList(): kotlin.collections.List<T>?
     public fun foo(): kotlin.Unit
 }
diff --git a/compiler/testData/diagnostics/tests/inference/reportingImprovements/subtypeForInvariantWithErrorGenerics.txt b/compiler/testData/diagnostics/tests/inference/reportingImprovements/subtypeForInvariantWithErrorGenerics.txt
index 9c2e1fac932..f9d35254383 100644
--- a/compiler/testData/diagnostics/tests/inference/reportingImprovements/subtypeForInvariantWithErrorGenerics.txt
+++ b/compiler/testData/diagnostics/tests/inference/reportingImprovements/subtypeForInvariantWithErrorGenerics.txt
@@ -1,8 +1,8 @@
 package
 
 package a {
-    public fun </*0*/ T> arrayListOf(/*0*/ vararg values: T /*kotlin.Array<out T>*/): kotlin.MutableList<T>
-    public fun </*0*/ R> bar(/*0*/ r: kotlin.MutableList<R>, /*1*/ f: () -> R): kotlin.Boolean
-    public fun </*0*/ R> foo(/*0*/ f: () -> R, /*1*/ r: kotlin.MutableList<R>): kotlin.Boolean
+    public fun </*0*/ T> arrayListOf(/*0*/ vararg values: T /*kotlin.Array<out T>*/): kotlin.collections.MutableList<T>
+    public fun </*0*/ R> bar(/*0*/ r: kotlin.collections.MutableList<R>, /*1*/ f: () -> R): kotlin.Boolean
+    public fun </*0*/ R> foo(/*0*/ f: () -> R, /*1*/ r: kotlin.collections.MutableList<R>): kotlin.Boolean
     public fun test(): kotlin.Unit
 }
diff --git a/compiler/testData/diagnostics/tests/inference/substitutions/delegationAndInference.txt b/compiler/testData/diagnostics/tests/inference/substitutions/delegationAndInference.txt
index 63ffa529734..c4cf987b8f0 100644
--- a/compiler/testData/diagnostics/tests/inference/substitutions/delegationAndInference.txt
+++ b/compiler/testData/diagnostics/tests/inference/substitutions/delegationAndInference.txt
@@ -1,13 +1,13 @@
 package
 
-public operator fun </*0*/ G> kotlin.MutableMap<in kotlin.String, in G>.getValue(/*0*/ thisRef: kotlin.Any?, /*1*/ property: kotlin.reflect.KProperty<*>): G
-public operator fun </*0*/ S> kotlin.MutableMap<in kotlin.String, in S>.setValue(/*0*/ thisRef: kotlin.Any?, /*1*/ property: kotlin.reflect.KProperty<*>, /*2*/ value: S): kotlin.Unit
-public fun </*0*/ K, /*1*/ V> kotlin.MutableMap<K, V>.withDefault1(/*0*/ default: (K) -> V): kotlin.MutableMap<K, V>
+public operator fun </*0*/ G> kotlin.collections.MutableMap<in kotlin.String, in G>.getValue(/*0*/ thisRef: kotlin.Any?, /*1*/ property: kotlin.reflect.KProperty<*>): G
+public operator fun </*0*/ S> kotlin.collections.MutableMap<in kotlin.String, in S>.setValue(/*0*/ thisRef: kotlin.Any?, /*1*/ property: kotlin.reflect.KProperty<*>, /*2*/ value: S): kotlin.Unit
+public fun </*0*/ K, /*1*/ V> kotlin.collections.MutableMap<K, V>.withDefault1(/*0*/ default: (K) -> V): kotlin.collections.MutableMap<K, V>
 
 public final class A {
-    public constructor A(/*0*/ map: kotlin.MutableMap<kotlin.String, kotlin.CharSequence>)
+    public constructor A(/*0*/ map: kotlin.collections.MutableMap<kotlin.String, kotlin.CharSequence>)
     public final var a: kotlin.String
-    public final val map: kotlin.MutableMap<kotlin.String, kotlin.CharSequence>
+    public final val map: kotlin.collections.MutableMap<kotlin.String, kotlin.CharSequence>
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
diff --git a/compiler/testData/diagnostics/tests/inference/tryNumberLowerBoundsBeforeUpperBounds.txt b/compiler/testData/diagnostics/tests/inference/tryNumberLowerBoundsBeforeUpperBounds.txt
index 63a41a1c908..0789a14a196 100644
--- a/compiler/testData/diagnostics/tests/inference/tryNumberLowerBoundsBeforeUpperBounds.txt
+++ b/compiler/testData/diagnostics/tests/inference/tryNumberLowerBoundsBeforeUpperBounds.txt
@@ -1,4 +1,4 @@
 package
 
 public fun foo(): kotlin.Unit
-public fun </*0*/ T : kotlin.Any> iterate(/*0*/ initialValue: T, /*1*/ nextFunction: (T) -> T?): kotlin.Iterator<T>
+public fun </*0*/ T : kotlin.Any> iterate(/*0*/ initialValue: T, /*1*/ nextFunction: (T) -> T?): kotlin.collections.Iterator<T>
diff --git a/compiler/testData/diagnostics/tests/inference/typeConstructorMismatch.txt b/compiler/testData/diagnostics/tests/inference/typeConstructorMismatch.txt
index fabe8d9d65e..d60abe471b1 100644
--- a/compiler/testData/diagnostics/tests/inference/typeConstructorMismatch.txt
+++ b/compiler/testData/diagnostics/tests/inference/typeConstructorMismatch.txt
@@ -1,7 +1,7 @@
 package
 
 package typeConstructorMismatch {
-    public fun </*0*/ R> elemAndList(/*0*/ r: R, /*1*/ t: kotlin.List<R>): R
-    public fun test(/*0*/ set: kotlin.Set<kotlin.String>): kotlin.Unit
-    public fun </*0*/ R> R.elemAndListWithReceiver(/*0*/ r: R, /*1*/ t: kotlin.List<R>): R
+    public fun </*0*/ R> elemAndList(/*0*/ r: R, /*1*/ t: kotlin.collections.List<R>): R
+    public fun test(/*0*/ set: kotlin.collections.Set<kotlin.String>): kotlin.Unit
+    public fun </*0*/ R> R.elemAndListWithReceiver(/*0*/ r: R, /*1*/ t: kotlin.collections.List<R>): R
 }
diff --git a/compiler/testData/diagnostics/tests/inference/upperBounds/conflictingSubstitutionsFromUpperBound.txt b/compiler/testData/diagnostics/tests/inference/upperBounds/conflictingSubstitutionsFromUpperBound.txt
index bf1bba9e01b..e9ddd3cd149 100644
--- a/compiler/testData/diagnostics/tests/inference/upperBounds/conflictingSubstitutionsFromUpperBound.txt
+++ b/compiler/testData/diagnostics/tests/inference/upperBounds/conflictingSubstitutionsFromUpperBound.txt
@@ -1,6 +1,6 @@
 package
 
 package g {
-    public fun </*0*/ T, /*1*/ C : kotlin.Collection<T>> convert(/*0*/ src: kotlin.Collection<T>, /*1*/ dest: C): C
-    public fun test(/*0*/ l: kotlin.List<kotlin.Int>): kotlin.Unit
+    public fun </*0*/ T, /*1*/ C : kotlin.collections.Collection<T>> convert(/*0*/ src: kotlin.collections.Collection<T>, /*1*/ dest: C): C
+    public fun test(/*0*/ l: kotlin.collections.List<kotlin.Int>): kotlin.Unit
 }
diff --git a/compiler/testData/diagnostics/tests/inference/upperBounds/doNotInferFromBoundsOnly.txt b/compiler/testData/diagnostics/tests/inference/upperBounds/doNotInferFromBoundsOnly.txt
index 1140f63fead..78ee29a4b41 100644
--- a/compiler/testData/diagnostics/tests/inference/upperBounds/doNotInferFromBoundsOnly.txt
+++ b/compiler/testData/diagnostics/tests/inference/upperBounds/doNotInferFromBoundsOnly.txt
@@ -1,13 +1,13 @@
 package
 
 package a {
-    public fun </*0*/ T> emptyList(): kotlin.List<T>
-    public fun </*0*/ T : a.A> emptyListOfA(): kotlin.List<T>
-    public fun </*0*/ T : a.A, /*1*/ R : T> emptyStrangeMap(): kotlin.Map<T, R>
-    public fun </*0*/ T, /*1*/ R : T> emptyStrangeMap1(/*0*/ t: T): kotlin.Map<T, R>
-    public fun </*0*/ T : a.A, /*1*/ R : T> emptyStrangeMap2(/*0*/ t: T): kotlin.Map<T, R>
-    public fun </*0*/ T : a.A, /*1*/ R : T> emptyStrangeMap3(/*0*/ r: R): kotlin.Map<T, R>
-    public fun </*0*/ T, /*1*/ R : T> emptyStrangeMap4(/*0*/ l: kotlin.MutableList<T>): kotlin.Map<T, R>
+    public fun </*0*/ T> emptyList(): kotlin.collections.List<T>
+    public fun </*0*/ T : a.A> emptyListOfA(): kotlin.collections.List<T>
+    public fun </*0*/ T : a.A, /*1*/ R : T> emptyStrangeMap(): kotlin.collections.Map<T, R>
+    public fun </*0*/ T, /*1*/ R : T> emptyStrangeMap1(/*0*/ t: T): kotlin.collections.Map<T, R>
+    public fun </*0*/ T : a.A, /*1*/ R : T> emptyStrangeMap2(/*0*/ t: T): kotlin.collections.Map<T, R>
+    public fun </*0*/ T : a.A, /*1*/ R : T> emptyStrangeMap3(/*0*/ r: R): kotlin.collections.Map<T, R>
+    public fun </*0*/ T, /*1*/ R : T> emptyStrangeMap4(/*0*/ l: kotlin.collections.MutableList<T>): kotlin.collections.Map<T, R>
     public fun </*0*/ U, /*1*/ V : U> foo(): U
     public fun test1(): kotlin.Unit
     public fun test2(): kotlin.Unit
@@ -15,8 +15,8 @@ package a {
     public fun test4(): kotlin.Unit
     public fun test5(/*0*/ a: a.A): kotlin.Unit
     public fun test6(/*0*/ a: a.A): kotlin.Unit
-    public fun test7(): kotlin.Map<a.A, a.A>
-    public fun test7(/*0*/ list: kotlin.MutableList<kotlin.Int>): kotlin.Unit
+    public fun test7(): kotlin.collections.Map<a.A, a.A>
+    public fun test7(/*0*/ list: kotlin.collections.MutableList<kotlin.Int>): kotlin.Unit
     public fun test8(): kotlin.Int
 
     public interface A {
diff --git a/compiler/testData/diagnostics/tests/inference/upperBounds/kt2856.txt b/compiler/testData/diagnostics/tests/inference/upperBounds/kt2856.txt
index 799e7111621..a92d690092b 100644
--- a/compiler/testData/diagnostics/tests/inference/upperBounds/kt2856.txt
+++ b/compiler/testData/diagnostics/tests/inference/upperBounds/kt2856.txt
@@ -3,5 +3,5 @@ package
 package d {
     public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
     public fun println(/*0*/ message: kotlin.Any?): kotlin.Unit
-    public inline fun </*0*/ K, /*1*/ V1, /*2*/ V : V1> kotlin.Map<K, V>.getOrElse1(/*0*/ key: K, /*1*/ defaultValue: () -> V1): V1
+    public inline fun </*0*/ K, /*1*/ V1, /*2*/ V : V1> kotlin.collections.Map<K, V>.getOrElse1(/*0*/ key: K, /*1*/ defaultValue: () -> V1): V1
 }
diff --git a/compiler/testData/diagnostics/tests/inference/upperBounds/useBoundsToInferTypeParamsSimple.txt b/compiler/testData/diagnostics/tests/inference/upperBounds/useBoundsToInferTypeParamsSimple.txt
index 52710112406..ad9730149a4 100644
--- a/compiler/testData/diagnostics/tests/inference/upperBounds/useBoundsToInferTypeParamsSimple.txt
+++ b/compiler/testData/diagnostics/tests/inference/upperBounds/useBoundsToInferTypeParamsSimple.txt
@@ -1,11 +1,11 @@
 package
 
 package a {
-    public fun </*0*/ T> arrayListOf(/*0*/ vararg t: T /*kotlin.Array<out T>*/): kotlin.MutableList<T>
+    public fun </*0*/ T> arrayListOf(/*0*/ vararg t: T /*kotlin.Array<out T>*/): kotlin.collections.MutableList<T>
     public fun </*0*/ U, /*1*/ V : U> bar(/*0*/ v: V, /*1*/ u: U): U
-    public fun </*0*/ V : U, /*1*/ U> baz(/*0*/ v: V, /*1*/ u: kotlin.MutableSet<U>): kotlin.MutableSet<U>
-    public fun </*0*/ T> checkItIsExactlyAny(/*0*/ t: T, /*1*/ l: kotlin.MutableList<T>): kotlin.Unit
+    public fun </*0*/ V : U, /*1*/ U> baz(/*0*/ v: V, /*1*/ u: kotlin.collections.MutableSet<U>): kotlin.collections.MutableSet<U>
+    public fun </*0*/ T> checkItIsExactlyAny(/*0*/ t: T, /*1*/ l: kotlin.collections.MutableList<T>): kotlin.Unit
     public fun </*0*/ V : U, /*1*/ U> foo(/*0*/ v: V, /*1*/ u: U): U
-    public fun test(/*0*/ a: kotlin.Any, /*1*/ s: kotlin.MutableSet<kotlin.String>): kotlin.Unit
     public fun test(/*0*/ a: kotlin.Any, /*1*/ s: kotlin.String): kotlin.Unit
+    public fun test(/*0*/ a: kotlin.Any, /*1*/ s: kotlin.collections.MutableSet<kotlin.String>): kotlin.Unit
 }
diff --git a/compiler/testData/diagnostics/tests/inference/useFunctionLiteralsToInferType.txt b/compiler/testData/diagnostics/tests/inference/useFunctionLiteralsToInferType.txt
index f44ca534436..4aed194cd2c 100644
--- a/compiler/testData/diagnostics/tests/inference/useFunctionLiteralsToInferType.txt
+++ b/compiler/testData/diagnostics/tests/inference/useFunctionLiteralsToInferType.txt
@@ -1,10 +1,10 @@
 package
 
 package m {
-    public fun </*0*/ K, /*1*/ V> testGetOrPut(/*0*/ result: kotlin.MutableMap<K, kotlin.Set<V>>, /*1*/ key: K): kotlin.Unit
+    public fun </*0*/ K, /*1*/ V> testGetOrPut(/*0*/ result: kotlin.collections.MutableMap<K, kotlin.collections.Set<V>>, /*1*/ key: K): kotlin.Unit
     public fun testProperty(): m.Property<kotlin.Long>
     public fun testProperty1(): m.Property<kotlin.String>
-    public fun </*0*/ K, /*1*/ V> kotlin.MutableMap<K, V>.getOrPut(/*0*/ key: K, /*1*/ defaultValue: () -> V): V
+    public fun </*0*/ K, /*1*/ V> kotlin.collections.MutableMap<K, V>.getOrPut(/*0*/ key: K, /*1*/ defaultValue: () -> V): V
 
     public final class Property</*0*/ T : kotlin.Comparable<T>> {
         public constructor Property</*0*/ T : kotlin.Comparable<T>>(/*0*/ name: kotlin.String, /*1*/ default: () -> T)
diff --git a/compiler/testData/diagnostics/tests/inline/binaryExpressions/rangeTo.txt b/compiler/testData/diagnostics/tests/inline/binaryExpressions/rangeTo.txt
index e0723e0497a..78259c75620 100644
--- a/compiler/testData/diagnostics/tests/inline/binaryExpressions/rangeTo.txt
+++ b/compiler/testData/diagnostics/tests/inline/binaryExpressions/rangeTo.txt
@@ -2,6 +2,6 @@ package
 
 public inline fun </*0*/ T, /*1*/ U, /*2*/ V> inlineFunWithInvoke(/*0*/ s: (T) -> U): kotlin.Unit
 public inline fun </*0*/ T, /*1*/ U, /*2*/ V> inlineFunWithInvoke(/*0*/ s: (T, U) -> U, /*1*/ ext: T.(U, U) -> V): kotlin.Unit
-public operator inline fun </*0*/ T, /*1*/ U> ((T) -> U).rangeTo(/*0*/ p: (T) -> U): kotlin.ClosedRange<kotlin.Int>
-public operator fun </*0*/ T, /*1*/ U, /*2*/ V> ((T, U) -> V).rangeTo(/*0*/ p: (T, U) -> V): kotlin.ClosedRange<kotlin.Int>
-public operator fun </*0*/ T, /*1*/ U, /*2*/ V, /*3*/ W> (T.(U, V) -> W).rangeTo(/*0*/ ext: T.(U, V) -> W): kotlin.ClosedRange<kotlin.Int>
+public operator inline fun </*0*/ T, /*1*/ U> ((T) -> U).rangeTo(/*0*/ p: (T) -> U): kotlin.ranges.ClosedRange<kotlin.Int>
+public operator fun </*0*/ T, /*1*/ U, /*2*/ V> ((T, U) -> V).rangeTo(/*0*/ p: (T, U) -> V): kotlin.ranges.ClosedRange<kotlin.Int>
+public operator fun </*0*/ T, /*1*/ U, /*2*/ V, /*3*/ W> (T.(U, V) -> W).rangeTo(/*0*/ ext: T.(U, V) -> W): kotlin.ranges.ClosedRange<kotlin.Int>
diff --git a/compiler/testData/diagnostics/tests/inner/extensionLambdaInsideNestedClass.txt b/compiler/testData/diagnostics/tests/inner/extensionLambdaInsideNestedClass.txt
index cecbd42a373..284375c345a 100644
--- a/compiler/testData/diagnostics/tests/inner/extensionLambdaInsideNestedClass.txt
+++ b/compiler/testData/diagnostics/tests/inner/extensionLambdaInsideNestedClass.txt
@@ -18,7 +18,7 @@ package f {
     }
 
     public interface ActionContext {
-        public abstract val session: kotlin.Map<kotlin.String, kotlin.String>
+        public abstract val session: kotlin.collections.Map<kotlin.String, kotlin.String>
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
diff --git a/compiler/testData/diagnostics/tests/inner/qualifiedExpression/dataLocalVariable.txt b/compiler/testData/diagnostics/tests/inner/qualifiedExpression/dataLocalVariable.txt
index 2ea7ac510a0..4822d1a554a 100644
--- a/compiler/testData/diagnostics/tests/inner/qualifiedExpression/dataLocalVariable.txt
+++ b/compiler/testData/diagnostics/tests/inner/qualifiedExpression/dataLocalVariable.txt
@@ -1,4 +1,4 @@
 package
 
 public fun bar(/*0*/ b: kotlin.Boolean): kotlin.Boolean
-public fun foo(/*0*/ data: kotlin.List<kotlin.String>): kotlin.Unit
+public fun foo(/*0*/ data: kotlin.collections.List<kotlin.String>): kotlin.Unit
diff --git a/compiler/testData/diagnostics/tests/j+k/GenericsInSupertypes.txt b/compiler/testData/diagnostics/tests/j+k/GenericsInSupertypes.txt
index ff0a8c84dd8..20ae2b67f4b 100644
--- a/compiler/testData/diagnostics/tests/j+k/GenericsInSupertypes.txt
+++ b/compiler/testData/diagnostics/tests/j+k/GenericsInSupertypes.txt
@@ -8,13 +8,13 @@ public abstract class AL : java.util.ArrayList<p.P> {
     public open override /*1*/ /*fake_override*/ val size: kotlin.Int
     public open override /*1*/ /*fake_override*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: p.P): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun add(/*0*/ element: p.P): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.Collection<p.P>): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.Collection<p.P>): kotlin.Boolean
-    invisible_fake open override /*1*/ /*fake_override*/ fun batchRemove(/*0*/ p0: kotlin.(Mutable)Collection<*>!, /*1*/ p1: kotlin.Boolean): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.collections.Collection<p.P>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.collections.Collection<p.P>): kotlin.Boolean
+    invisible_fake open override /*1*/ /*fake_override*/ fun batchRemove(/*0*/ p0: kotlin.collections.(Mutable)Collection<*>!, /*1*/ p1: kotlin.Boolean): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public open override /*1*/ /*fake_override*/ fun contains(/*0*/ element: p.P): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.Collection<p.P>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection<p.P>): kotlin.Boolean
     invisible_fake open override /*1*/ /*fake_override*/ fun elementData(/*0*/ p0: kotlin.Int): p.P!
     public open override /*1*/ /*fake_override*/ fun ensureCapacity(/*0*/ p0: kotlin.Int): kotlin.Unit
     invisible_fake open override /*1*/ /*fake_override*/ fun ensureCapacityInternal(/*0*/ p0: kotlin.Int): kotlin.Unit
@@ -25,21 +25,21 @@ public abstract class AL : java.util.ArrayList<p.P> {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ element: p.P): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator<p.P>
+    public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.collections.MutableIterator<p.P>
     public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ element: p.P): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.MutableListIterator<p.P>
-    public open override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.MutableListIterator<p.P>
+    public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.collections.MutableListIterator<p.P>
+    public open override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.collections.MutableListIterator<p.P>
     invisible_fake open override /*1*/ /*fake_override*/ fun outOfBoundsMsg(/*0*/ p0: kotlin.Int): kotlin.String!
     invisible_fake open override /*1*/ /*fake_override*/ fun rangeCheck(/*0*/ p0: kotlin.Int): kotlin.Unit
     invisible_fake open override /*1*/ /*fake_override*/ fun rangeCheckForAdd(/*0*/ p0: kotlin.Int): kotlin.Unit
     invisible_fake open override /*1*/ /*fake_override*/ fun readObject(/*0*/ p0: java.io.ObjectInputStream!): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun remove(/*0*/ element: p.P): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.Collection<p.P>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.collections.Collection<p.P>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun removeAt(/*0*/ p0: kotlin.Int): p.P
     protected/*protected and package*/ open override /*1*/ /*fake_override*/ fun removeRange(/*0*/ p0: kotlin.Int, /*1*/ p1: kotlin.Int): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.Collection<p.P>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.collections.Collection<p.P>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun set(/*0*/ index: kotlin.Int, /*1*/ element: p.P): p.P
-    public open override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.MutableList<p.P>
+    public open override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.collections.MutableList<p.P>
     public open override /*1*/ /*fake_override*/ fun toArray(): kotlin.Array<(out) kotlin.Any!>!
     public open override /*1*/ /*fake_override*/ fun </*0*/ T : kotlin.Any!> toArray(/*0*/ p0: kotlin.Array<(out) T!>!): kotlin.Array<(out) T!>!
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
diff --git a/compiler/testData/diagnostics/tests/j+k/collectionOverrides/collectionStringImpl.txt b/compiler/testData/diagnostics/tests/j+k/collectionOverrides/collectionStringImpl.txt
index 3bc4ee4da29..42d7eeae391 100644
--- a/compiler/testData/diagnostics/tests/j+k/collectionOverrides/collectionStringImpl.txt
+++ b/compiler/testData/diagnostics/tests/j+k/collectionOverrides/collectionStringImpl.txt
@@ -2,22 +2,22 @@ package
 
 public fun test(/*0*/ x: CollectionStringImpl): kotlin.Unit
 
-public open class CollectionStringImpl : kotlin.MutableCollection<kotlin.String!> {
+public open class CollectionStringImpl : kotlin.collections.MutableCollection<kotlin.String!> {
     public constructor CollectionStringImpl()
     public open override /*1*/ val size: kotlin.Int
     @java.lang.Override() public open override /*1*/ fun add(/*0*/ element: kotlin.String!): kotlin.Boolean
-    @java.lang.Override() public open override /*1*/ fun addAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    @java.lang.Override() public open override /*1*/ fun addAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
     @java.lang.Override() public open override /*1*/ fun clear(): kotlin.Unit
     @java.lang.Override() public open override /*1*/ /*isHiddenToOvercomeSignatureClash*/ fun contains(/*0*/ o: kotlin.String!): kotlin.Boolean
     public open operator fun contains(/*0*/ element: kotlin.String!): kotlin.Boolean
-    @java.lang.Override() public open override /*1*/ fun containsAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    @java.lang.Override() public open override /*1*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     @java.lang.Override() public open override /*1*/ fun isEmpty(): kotlin.Boolean
-    @java.lang.Override() public open override /*1*/ fun iterator(): kotlin.MutableIterator<kotlin.String!>
+    @java.lang.Override() public open override /*1*/ fun iterator(): kotlin.collections.MutableIterator<kotlin.String!>
     @java.lang.Override() public open override /*1*/ fun remove(/*0*/ o: kotlin.String!): kotlin.Boolean
-    @java.lang.Override() public open override /*1*/ fun removeAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
-    @java.lang.Override() public open override /*1*/ fun retainAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    @java.lang.Override() public open override /*1*/ fun removeAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
+    @java.lang.Override() public open override /*1*/ fun retainAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
     @java.lang.Override() public open fun toArray(): kotlin.Array<(out) kotlin.Any!>!
     @java.lang.Override() public open fun </*0*/ T : kotlin.Any!> toArray(/*0*/ a: kotlin.Array<(out) T!>!): kotlin.Array<(out) T!>!
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
diff --git a/compiler/testData/diagnostics/tests/j+k/collectionOverrides/contains.txt b/compiler/testData/diagnostics/tests/j+k/collectionOverrides/contains.txt
index 69fcec7f486..e43e32a9e4a 100644
--- a/compiler/testData/diagnostics/tests/j+k/collectionOverrides/contains.txt
+++ b/compiler/testData/diagnostics/tests/j+k/collectionOverrides/contains.txt
@@ -2,56 +2,56 @@ package
 
 public fun foo(/*0*/ a: A<kotlin.String>, /*1*/ b: B, /*2*/ ic: IC, /*3*/ ka: KA<kotlin.String>, /*4*/ kb: KB, /*5*/ al: java.util.ArrayList<kotlin.String>): kotlin.Unit
 
-public abstract class A</*0*/ T : kotlin.Any!> : kotlin.MutableCollection<T!> {
+public abstract class A</*0*/ T : kotlin.Any!> : kotlin.collections.MutableCollection<T!> {
     public constructor A</*0*/ T : kotlin.Any!>()
     public abstract override /*1*/ /*fake_override*/ val size: kotlin.Int
     public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ element: T!): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.Collection<T!>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.collections.Collection<T!>): kotlin.Boolean
     public abstract override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit
     public open override /*1*/ fun contains(/*0*/ element: T!): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.Collection<T!>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection<T!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public abstract override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator<T!>
+    public abstract override /*1*/ /*fake_override*/ fun iterator(): kotlin.collections.MutableIterator<T!>
     public abstract override /*1*/ /*fake_override*/ fun remove(/*0*/ element: T!): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.Collection<T!>): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.Collection<T!>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.collections.Collection<T!>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.collections.Collection<T!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-public abstract class B : kotlin.MutableCollection<kotlin.String!> {
+public abstract class B : kotlin.collections.MutableCollection<kotlin.String!> {
     public constructor B()
     public abstract override /*1*/ /*fake_override*/ val size: kotlin.Int
     public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ element: kotlin.String!): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
     public abstract override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit
     public open override /*1*/ fun contains(/*0*/ x: kotlin.String!): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public abstract override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator<kotlin.String!>
+    public abstract override /*1*/ /*fake_override*/ fun iterator(): kotlin.collections.MutableIterator<kotlin.String!>
     public abstract override /*1*/ /*fake_override*/ fun remove(/*0*/ element: kotlin.String!): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-public interface IC : kotlin.MutableCollection<kotlin.String!> {
+public interface IC : kotlin.collections.MutableCollection<kotlin.String!> {
     public abstract override /*1*/ /*fake_override*/ val size: kotlin.Int
     public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ element: kotlin.String!): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
     public abstract override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit
     public abstract override /*1*/ fun contains(/*0*/ x: kotlin.String!): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public abstract override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator<kotlin.String!>
+    public abstract override /*1*/ /*fake_override*/ fun iterator(): kotlin.collections.MutableIterator<kotlin.String!>
     public abstract override /*1*/ /*fake_override*/ fun remove(/*0*/ element: kotlin.String!): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
@@ -61,29 +61,29 @@ public abstract class KA</*0*/ T> : java.util.AbstractList<T> {
     public abstract override /*1*/ /*fake_override*/ val size: kotlin.Int
     public open override /*1*/ /*fake_override*/ fun add(/*0*/ element: T!): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: T!): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.Collection<T!>): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.Collection<T!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.collections.Collection<T!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.collections.Collection<T!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit
     public open override /*1*/ fun contains(/*0*/ x: T): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.Collection<T!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection<T!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public abstract override /*1*/ /*fake_override*/ fun get(/*0*/ index: kotlin.Int): T!
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ element: T!): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator<T!>
+    public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.collections.MutableIterator<T!>
     public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ element: T!): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.MutableListIterator<T!>
-    public open override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.MutableListIterator<T!>
+    public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.collections.MutableListIterator<T!>
+    public open override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.collections.MutableListIterator<T!>
     invisible_fake open override /*1*/ /*fake_override*/ fun outOfBoundsMsg(/*0*/ p0: kotlin.Int): kotlin.String!
     invisible_fake open override /*1*/ /*fake_override*/ fun rangeCheckForAdd(/*0*/ p0: kotlin.Int): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun remove(/*0*/ element: T!): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.Collection<T!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.collections.Collection<T!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun removeAt(/*0*/ p0: kotlin.Int): T!
     protected/*protected and package*/ open override /*1*/ /*fake_override*/ fun removeRange(/*0*/ p0: kotlin.Int, /*1*/ p1: kotlin.Int): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.Collection<T!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.collections.Collection<T!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun set(/*0*/ index: kotlin.Int, /*1*/ element: T!): T!
-    public open override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.MutableList<T!>
+    public open override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.collections.MutableList<T!>
     public open override /*1*/ /*fake_override*/ fun toArray(): kotlin.Array<(out) kotlin.Any!>!
     public open override /*1*/ /*fake_override*/ fun </*0*/ T : kotlin.Any!> toArray(/*0*/ p0: kotlin.Array<(out) T!>!): kotlin.Array<(out) T!>!
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
@@ -95,29 +95,29 @@ public abstract class KB : java.util.AbstractList<kotlin.String>, IC {
     public abstract override /*2*/ /*fake_override*/ val size: kotlin.Int
     public open override /*1*/ /*fake_override*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String!): kotlin.Unit
     public open override /*2*/ /*fake_override*/ fun add(/*0*/ element: kotlin.String!): kotlin.Boolean
-    public open override /*2*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
+    public open override /*2*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
     public open override /*2*/ /*fake_override*/ fun clear(): kotlin.Unit
     public open override /*2*/ fun contains(/*0*/ element: kotlin.String): kotlin.Boolean
-    public open override /*2*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public open override /*2*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
     public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public abstract override /*1*/ /*fake_override*/ fun get(/*0*/ index: kotlin.Int): kotlin.String!
     public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ element: kotlin.String!): kotlin.Int
     public open override /*2*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
-    public open override /*2*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator<kotlin.String!>
+    public open override /*2*/ /*fake_override*/ fun iterator(): kotlin.collections.MutableIterator<kotlin.String!>
     public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ element: kotlin.String!): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.MutableListIterator<kotlin.String!>
-    public open override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.MutableListIterator<kotlin.String!>
+    public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.collections.MutableListIterator<kotlin.String!>
+    public open override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.collections.MutableListIterator<kotlin.String!>
     invisible_fake open override /*1*/ /*fake_override*/ fun outOfBoundsMsg(/*0*/ p0: kotlin.Int): kotlin.String!
     invisible_fake open override /*1*/ /*fake_override*/ fun rangeCheckForAdd(/*0*/ p0: kotlin.Int): kotlin.Unit
     public open override /*2*/ /*fake_override*/ fun remove(/*0*/ element: kotlin.String!): kotlin.Boolean
-    public open override /*2*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public open override /*2*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun removeAt(/*0*/ p0: kotlin.Int): kotlin.String!
     protected/*protected and package*/ open override /*1*/ /*fake_override*/ fun removeRange(/*0*/ p0: kotlin.Int, /*1*/ p1: kotlin.Int): kotlin.Unit
-    public open override /*2*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public open override /*2*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun set(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String!): kotlin.String!
-    public open override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.MutableList<kotlin.String!>
+    public open override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.collections.MutableList<kotlin.String!>
     public open override /*1*/ /*fake_override*/ fun toArray(): kotlin.Array<(out) kotlin.Any!>!
     public open override /*1*/ /*fake_override*/ fun </*0*/ T : kotlin.Any!> toArray(/*0*/ p0: kotlin.Array<(out) T!>!): kotlin.Array<(out) T!>!
     public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
diff --git a/compiler/testData/diagnostics/tests/j+k/collectionOverrides/containsAll.txt b/compiler/testData/diagnostics/tests/j+k/collectionOverrides/containsAll.txt
index bcbd124b35e..aa133d04069 100644
--- a/compiler/testData/diagnostics/tests/j+k/collectionOverrides/containsAll.txt
+++ b/compiler/testData/diagnostics/tests/j+k/collectionOverrides/containsAll.txt
@@ -1,57 +1,57 @@
 package
 
-public fun foo(/*0*/ a: A<kotlin.String>, /*1*/ b: B, /*2*/ ic: IC, /*3*/ ka: KA<kotlin.String>, /*4*/ kb: KB, /*5*/ al: java.util.ArrayList<kotlin.String>, /*6*/ cs: kotlin.Collection<kotlin.String>, /*7*/ ca: kotlin.Collection<kotlin.Any?>): kotlin.Unit
+public fun foo(/*0*/ a: A<kotlin.String>, /*1*/ b: B, /*2*/ ic: IC, /*3*/ ka: KA<kotlin.String>, /*4*/ kb: KB, /*5*/ al: java.util.ArrayList<kotlin.String>, /*6*/ cs: kotlin.collections.Collection<kotlin.String>, /*7*/ ca: kotlin.collections.Collection<kotlin.Any?>): kotlin.Unit
 
-public abstract class A</*0*/ T : kotlin.Any!> : kotlin.MutableCollection<T!> {
+public abstract class A</*0*/ T : kotlin.Any!> : kotlin.collections.MutableCollection<T!> {
     public constructor A</*0*/ T : kotlin.Any!>()
     public abstract override /*1*/ /*fake_override*/ val size: kotlin.Int
     public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ element: T!): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.Collection<T!>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.collections.Collection<T!>): kotlin.Boolean
     public abstract override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit
     public abstract override /*1*/ /*fake_override*/ fun contains(/*0*/ element: T!): kotlin.Boolean
-    public open override /*1*/ fun containsAll(/*0*/ elements: kotlin.Collection<T!>): kotlin.Boolean
+    public open override /*1*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection<T!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public abstract override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator<T!>
+    public abstract override /*1*/ /*fake_override*/ fun iterator(): kotlin.collections.MutableIterator<T!>
     public abstract override /*1*/ /*fake_override*/ fun remove(/*0*/ element: T!): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.Collection<T!>): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.Collection<T!>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.collections.Collection<T!>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.collections.Collection<T!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-public abstract class B : kotlin.MutableCollection<kotlin.String!> {
+public abstract class B : kotlin.collections.MutableCollection<kotlin.String!> {
     public constructor B()
     public abstract override /*1*/ /*fake_override*/ val size: kotlin.Int
     public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ element: kotlin.String!): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
     public abstract override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit
     public abstract override /*1*/ /*fake_override*/ fun contains(/*0*/ element: kotlin.String!): kotlin.Boolean
-    public open override /*1*/ fun containsAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public open override /*1*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public abstract override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator<kotlin.String!>
+    public abstract override /*1*/ /*fake_override*/ fun iterator(): kotlin.collections.MutableIterator<kotlin.String!>
     public abstract override /*1*/ /*fake_override*/ fun remove(/*0*/ element: kotlin.String!): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-public interface IC : kotlin.MutableCollection<kotlin.String!> {
+public interface IC : kotlin.collections.MutableCollection<kotlin.String!> {
     public abstract override /*1*/ /*fake_override*/ val size: kotlin.Int
     public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ element: kotlin.String!): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
     public abstract override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit
     public abstract override /*1*/ /*fake_override*/ fun contains(/*0*/ element: kotlin.String!): kotlin.Boolean
-    public abstract override /*1*/ fun containsAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public abstract override /*1*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public abstract override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator<kotlin.String!>
+    public abstract override /*1*/ /*fake_override*/ fun iterator(): kotlin.collections.MutableIterator<kotlin.String!>
     public abstract override /*1*/ /*fake_override*/ fun remove(/*0*/ element: kotlin.String!): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
@@ -61,29 +61,29 @@ public abstract class KA</*0*/ T> : java.util.AbstractList<T> {
     public abstract override /*1*/ /*fake_override*/ val size: kotlin.Int
     public open override /*1*/ /*fake_override*/ fun add(/*0*/ element: T!): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: T!): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.Collection<T!>): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.Collection<T!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.collections.Collection<T!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.collections.Collection<T!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun contains(/*0*/ element: T!): kotlin.Boolean
-    public open override /*1*/ fun containsAll(/*0*/ x: kotlin.Collection<T>): kotlin.Boolean
+    public open override /*1*/ fun containsAll(/*0*/ x: kotlin.collections.Collection<T>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public abstract override /*1*/ /*fake_override*/ fun get(/*0*/ index: kotlin.Int): T!
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ element: T!): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator<T!>
+    public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.collections.MutableIterator<T!>
     public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ element: T!): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.MutableListIterator<T!>
-    public open override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.MutableListIterator<T!>
+    public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.collections.MutableListIterator<T!>
+    public open override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.collections.MutableListIterator<T!>
     invisible_fake open override /*1*/ /*fake_override*/ fun outOfBoundsMsg(/*0*/ p0: kotlin.Int): kotlin.String!
     invisible_fake open override /*1*/ /*fake_override*/ fun rangeCheckForAdd(/*0*/ p0: kotlin.Int): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun remove(/*0*/ element: T!): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.Collection<T!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.collections.Collection<T!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun removeAt(/*0*/ p0: kotlin.Int): T!
     protected/*protected and package*/ open override /*1*/ /*fake_override*/ fun removeRange(/*0*/ p0: kotlin.Int, /*1*/ p1: kotlin.Int): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.Collection<T!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.collections.Collection<T!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun set(/*0*/ index: kotlin.Int, /*1*/ element: T!): T!
-    public open override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.MutableList<T!>
+    public open override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.collections.MutableList<T!>
     public open override /*1*/ /*fake_override*/ fun toArray(): kotlin.Array<(out) kotlin.Any!>!
     public open override /*1*/ /*fake_override*/ fun </*0*/ T : kotlin.Any!> toArray(/*0*/ p0: kotlin.Array<(out) T!>!): kotlin.Array<(out) T!>!
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
@@ -95,29 +95,29 @@ public abstract class KB : java.util.AbstractList<kotlin.String>, IC {
     public abstract override /*2*/ /*fake_override*/ val size: kotlin.Int
     public open override /*1*/ /*fake_override*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String!): kotlin.Unit
     public open override /*2*/ /*fake_override*/ fun add(/*0*/ element: kotlin.String!): kotlin.Boolean
-    public open override /*2*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
+    public open override /*2*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
     public open override /*2*/ /*fake_override*/ fun clear(): kotlin.Unit
     public open override /*2*/ /*fake_override*/ fun contains(/*0*/ element: kotlin.String!): kotlin.Boolean
-    public open override /*2*/ fun containsAll(/*0*/ elements: kotlin.Collection<kotlin.String>): kotlin.Boolean
+    public open override /*2*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String>): kotlin.Boolean
     public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public abstract override /*1*/ /*fake_override*/ fun get(/*0*/ index: kotlin.Int): kotlin.String!
     public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ element: kotlin.String!): kotlin.Int
     public open override /*2*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
-    public open override /*2*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator<kotlin.String!>
+    public open override /*2*/ /*fake_override*/ fun iterator(): kotlin.collections.MutableIterator<kotlin.String!>
     public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ element: kotlin.String!): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.MutableListIterator<kotlin.String!>
-    public open override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.MutableListIterator<kotlin.String!>
+    public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.collections.MutableListIterator<kotlin.String!>
+    public open override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.collections.MutableListIterator<kotlin.String!>
     invisible_fake open override /*1*/ /*fake_override*/ fun outOfBoundsMsg(/*0*/ p0: kotlin.Int): kotlin.String!
     invisible_fake open override /*1*/ /*fake_override*/ fun rangeCheckForAdd(/*0*/ p0: kotlin.Int): kotlin.Unit
     public open override /*2*/ /*fake_override*/ fun remove(/*0*/ element: kotlin.String!): kotlin.Boolean
-    public open override /*2*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public open override /*2*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun removeAt(/*0*/ p0: kotlin.Int): kotlin.String!
     protected/*protected and package*/ open override /*1*/ /*fake_override*/ fun removeRange(/*0*/ p0: kotlin.Int, /*1*/ p1: kotlin.Int): kotlin.Unit
-    public open override /*2*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public open override /*2*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun set(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String!): kotlin.String!
-    public open override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.MutableList<kotlin.String!>
+    public open override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.collections.MutableList<kotlin.String!>
     public open override /*1*/ /*fake_override*/ fun toArray(): kotlin.Array<(out) kotlin.Any!>!
     public open override /*1*/ /*fake_override*/ fun </*0*/ T : kotlin.Any!> toArray(/*0*/ p0: kotlin.Array<(out) T!>!): kotlin.Array<(out) T!>!
     public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
diff --git a/compiler/testData/diagnostics/tests/j+k/collectionOverrides/containsAndOverload.txt b/compiler/testData/diagnostics/tests/j+k/collectionOverrides/containsAndOverload.txt
index b92c3701d10..370a91685c2 100644
--- a/compiler/testData/diagnostics/tests/j+k/collectionOverrides/containsAndOverload.txt
+++ b/compiler/testData/diagnostics/tests/j+k/collectionOverrides/containsAndOverload.txt
@@ -2,22 +2,22 @@ package
 
 public fun foo(/*0*/ a: A, /*1*/ ka: KA): kotlin.Unit
 
-public abstract class A : kotlin.MutableCollection<kotlin.String!> {
+public abstract class A : kotlin.collections.MutableCollection<kotlin.String!> {
     public constructor A()
     public abstract override /*1*/ /*fake_override*/ val size: kotlin.Int
     public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ element: kotlin.String!): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
     public abstract override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit
     public open override /*1*/ /*isHiddenToOvercomeSignatureClash*/ fun contains(/*0*/ x: kotlin.String!): kotlin.Boolean
     public open operator fun contains(/*0*/ element: kotlin.String!): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public abstract override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator<kotlin.String!>
+    public abstract override /*1*/ /*fake_override*/ fun iterator(): kotlin.collections.MutableIterator<kotlin.String!>
     public abstract override /*1*/ /*fake_override*/ fun remove(/*0*/ element: kotlin.String!): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
@@ -25,17 +25,17 @@ public abstract class KA : A {
     public constructor KA()
     public abstract override /*1*/ /*fake_override*/ val size: kotlin.Int
     public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ element: kotlin.String!): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
     public abstract override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit
     public open override /*1*/ fun contains(/*0*/ x: kotlin.String): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ /*isHiddenToOvercomeSignatureClash*/ fun contains(/*0*/ x: kotlin.String!): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public abstract override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator<kotlin.String!>
+    public abstract override /*1*/ /*fake_override*/ fun iterator(): kotlin.collections.MutableIterator<kotlin.String!>
     public abstract override /*1*/ /*fake_override*/ fun remove(/*0*/ element: kotlin.String!): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
diff --git a/compiler/testData/diagnostics/tests/j+k/collectionOverrides/irrelevantImplMutableList.txt b/compiler/testData/diagnostics/tests/j+k/collectionOverrides/irrelevantImplMutableList.txt
index 675f33252ac..6fff5c27fdb 100644
--- a/compiler/testData/diagnostics/tests/j+k/collectionOverrides/irrelevantImplMutableList.txt
+++ b/compiler/testData/diagnostics/tests/j+k/collectionOverrides/irrelevantImplMutableList.txt
@@ -2,31 +2,31 @@ package
 
 public fun main(): kotlin.Unit
 
-public open class A : AImpl, kotlin.MutableList<kotlin.String!> {
+public open class A : AImpl, kotlin.collections.MutableList<kotlin.String!> {
     public constructor A()
     public open override /*2*/ /*fake_override*/ val size: kotlin.Int
     public open override /*2*/ /*fake_override*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String!): kotlin.Unit
     public open override /*2*/ /*fake_override*/ fun add(/*0*/ s: kotlin.String!): kotlin.Boolean
-    public open override /*2*/ /*fake_override*/ fun addAll(/*0*/ c: kotlin.Collection<kotlin.String!>): kotlin.Boolean
-    public open override /*2*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ c: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public open override /*2*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ c: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
+    public open override /*2*/ /*fake_override*/ fun addAll(/*0*/ c: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
     public open override /*2*/ /*fake_override*/ fun clear(): kotlin.Unit
     public open override /*2*/ /*fake_override*/ fun contains(/*0*/ element: kotlin.String!): kotlin.Boolean
-    public open override /*2*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public open override /*2*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
     public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*2*/ /*fake_override*/ fun get(/*0*/ index: kotlin.Int): kotlin.String!
     public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*2*/ /*fake_override*/ fun indexOf(/*0*/ element: kotlin.String!): kotlin.Int
     public open override /*2*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
-    public open override /*2*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator<kotlin.String!>
+    public open override /*2*/ /*fake_override*/ fun iterator(): kotlin.collections.MutableIterator<kotlin.String!>
     public open override /*2*/ /*fake_override*/ fun lastIndexOf(/*0*/ element: kotlin.String!): kotlin.Int
-    public open override /*2*/ /*fake_override*/ fun listIterator(): kotlin.MutableListIterator<kotlin.String!>
-    public open override /*2*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.MutableListIterator<kotlin.String!>
+    public open override /*2*/ /*fake_override*/ fun listIterator(): kotlin.collections.MutableListIterator<kotlin.String!>
+    public open override /*2*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.collections.MutableListIterator<kotlin.String!>
     public open override /*2*/ /*fake_override*/ fun remove(/*0*/ element: kotlin.String!): kotlin.Boolean
-    public open override /*2*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public open override /*2*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
     public open override /*2*/ /*fake_override*/ fun removeAt(/*0*/ index: kotlin.Int): kotlin.String!
-    public open override /*2*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public open override /*2*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
     public open override /*2*/ /*fake_override*/ fun set(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String!): kotlin.String!
-    public open override /*2*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.MutableList<kotlin.String!>
+    public open override /*2*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.collections.MutableList<kotlin.String!>
     public open override /*1*/ /*fake_override*/ fun toArray(): kotlin.Array<(out) kotlin.Any!>!
     public open override /*1*/ /*fake_override*/ fun </*0*/ T : kotlin.Any!> toArray(/*0*/ a: kotlin.Array<(out) T!>!): kotlin.Array<(out) T!>!
     public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
@@ -36,27 +36,27 @@ public abstract class AImpl {
     public constructor AImpl()
     public open fun add(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String!): kotlin.Unit
     public open fun add(/*0*/ s: kotlin.String!): kotlin.Boolean
-    public open fun addAll(/*0*/ c: (kotlin.MutableCollection<out kotlin.String!>..kotlin.Collection<kotlin.String!>?)): kotlin.Boolean
-    public open fun addAll(/*0*/ index: kotlin.Int, /*1*/ c: (kotlin.MutableCollection<out kotlin.String!>..kotlin.Collection<kotlin.String!>?)): kotlin.Boolean
+    public open fun addAll(/*0*/ c: (kotlin.collections.MutableCollection<out kotlin.String!>..kotlin.collections.Collection<kotlin.String!>?)): kotlin.Boolean
+    public open fun addAll(/*0*/ index: kotlin.Int, /*1*/ c: (kotlin.collections.MutableCollection<out kotlin.String!>..kotlin.collections.Collection<kotlin.String!>?)): kotlin.Boolean
     public open fun clear(): kotlin.Unit
     public open operator fun contains(/*0*/ o: kotlin.Any!): kotlin.Boolean
-    public open fun containsAll(/*0*/ c: kotlin.(Mutable)Collection<*>!): kotlin.Boolean
+    public open fun containsAll(/*0*/ c: kotlin.collections.(Mutable)Collection<*>!): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open operator fun get(/*0*/ index: kotlin.Int): kotlin.String!
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open fun indexOf(/*0*/ o: kotlin.Any!): kotlin.Int
     public open fun isEmpty(): kotlin.Boolean
-    public open operator fun iterator(): kotlin.(Mutable)Iterator<kotlin.String!>!
+    public open operator fun iterator(): kotlin.collections.(Mutable)Iterator<kotlin.String!>!
     public open fun lastIndexOf(/*0*/ o: kotlin.Any!): kotlin.Int
-    public open fun listIterator(): kotlin.(Mutable)ListIterator<kotlin.String!>!
-    public open fun listIterator(/*0*/ index: kotlin.Int): kotlin.(Mutable)ListIterator<kotlin.String!>!
+    public open fun listIterator(): kotlin.collections.(Mutable)ListIterator<kotlin.String!>!
+    public open fun listIterator(/*0*/ index: kotlin.Int): kotlin.collections.(Mutable)ListIterator<kotlin.String!>!
     public open fun remove(/*0*/ o: kotlin.Any!): kotlin.Boolean
     public open fun remove(/*0*/ index: kotlin.Int): kotlin.String!
-    public open fun removeAll(/*0*/ c: kotlin.(Mutable)Collection<*>!): kotlin.Boolean
-    public open fun retainAll(/*0*/ c: kotlin.(Mutable)Collection<*>!): kotlin.Boolean
+    public open fun removeAll(/*0*/ c: kotlin.collections.(Mutable)Collection<*>!): kotlin.Boolean
+    public open fun retainAll(/*0*/ c: kotlin.collections.(Mutable)Collection<*>!): kotlin.Boolean
     public open operator fun set(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String!): kotlin.String!
     public open fun size(): kotlin.Int
-    public open fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.(Mutable)List<kotlin.String!>!
+    public open fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.collections.(Mutable)List<kotlin.String!>!
     public open fun toArray(): kotlin.Array<(out) kotlin.Any!>!
     public open fun </*0*/ T : kotlin.Any!> toArray(/*0*/ a: kotlin.Array<(out) T!>!): kotlin.Array<(out) T!>!
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
@@ -67,26 +67,26 @@ public final class X : A {
     public open override /*1*/ /*fake_override*/ val size: kotlin.Int
     public open override /*1*/ /*fake_override*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String!): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun add(/*0*/ s: kotlin.String!): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ c: kotlin.Collection<kotlin.String!>): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ c: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ c: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ c: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun contains(/*0*/ element: kotlin.String!): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun get(/*0*/ index: kotlin.Int): kotlin.String!
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ element: kotlin.String!): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator<kotlin.String!>
+    public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.collections.MutableIterator<kotlin.String!>
     public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ element: kotlin.String!): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.MutableListIterator<kotlin.String!>
-    public open override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.MutableListIterator<kotlin.String!>
+    public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.collections.MutableListIterator<kotlin.String!>
+    public open override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.collections.MutableListIterator<kotlin.String!>
     public open override /*1*/ /*fake_override*/ fun remove(/*0*/ element: kotlin.String!): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun removeAt(/*0*/ index: kotlin.Int): kotlin.String!
-    public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun set(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String!): kotlin.String!
-    public open override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.MutableList<kotlin.String!>
+    public open override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.collections.MutableList<kotlin.String!>
     public open override /*1*/ /*fake_override*/ fun toArray(): kotlin.Array<(out) kotlin.Any!>!
     public open override /*1*/ /*fake_override*/ fun </*0*/ T : kotlin.Any!> toArray(/*0*/ a: kotlin.Array<(out) T!>!): kotlin.Array<(out) T!>!
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
diff --git a/compiler/testData/diagnostics/tests/j+k/collectionOverrides/irrelevantImplMutableListKotlin.txt b/compiler/testData/diagnostics/tests/j+k/collectionOverrides/irrelevantImplMutableListKotlin.txt
index 7d4011e854b..5bd8f681c46 100644
--- a/compiler/testData/diagnostics/tests/j+k/collectionOverrides/irrelevantImplMutableListKotlin.txt
+++ b/compiler/testData/diagnostics/tests/j+k/collectionOverrides/irrelevantImplMutableListKotlin.txt
@@ -2,31 +2,31 @@ package
 
 public fun main(): kotlin.Unit
 
-public open class A : AImpl, kotlin.MutableList<kotlin.String!> {
+public open class A : AImpl, kotlin.collections.MutableList<kotlin.String!> {
     public constructor A()
     public final override /*2*/ /*fake_override*/ val size: kotlin.Int
     public final override /*2*/ /*fake_override*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String): kotlin.Unit
     public final override /*2*/ /*fake_override*/ fun add(/*0*/ element: kotlin.String): kotlin.Boolean
-    public final override /*2*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.Collection<kotlin.String>): kotlin.Boolean
-    public final override /*2*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.Collection<kotlin.String>): kotlin.Boolean
+    public final override /*2*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.collections.Collection<kotlin.String>): kotlin.Boolean
+    public final override /*2*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String>): kotlin.Boolean
     public final override /*2*/ /*fake_override*/ fun clear(): kotlin.Unit
     public final override /*2*/ /*fake_override*/ fun contains(/*0*/ element: kotlin.String!): kotlin.Boolean
-    public final override /*2*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public final override /*2*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
     public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*2*/ /*fake_override*/ fun get(/*0*/ index: kotlin.Int): kotlin.String
     public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public final override /*2*/ /*fake_override*/ fun indexOf(/*0*/ element: kotlin.String): kotlin.Int
     public final override /*2*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
-    public final override /*2*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator<kotlin.String>
+    public final override /*2*/ /*fake_override*/ fun iterator(): kotlin.collections.MutableIterator<kotlin.String>
     public final override /*2*/ /*fake_override*/ fun lastIndexOf(/*0*/ element: kotlin.String): kotlin.Int
-    public final override /*2*/ /*fake_override*/ fun listIterator(): kotlin.MutableListIterator<kotlin.String>
-    public final override /*2*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.MutableListIterator<kotlin.String>
+    public final override /*2*/ /*fake_override*/ fun listIterator(): kotlin.collections.MutableListIterator<kotlin.String>
+    public final override /*2*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.collections.MutableListIterator<kotlin.String>
     public final override /*2*/ /*fake_override*/ fun remove(/*0*/ element: kotlin.String): kotlin.Boolean
-    public final override /*2*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.Collection<kotlin.String>): kotlin.Boolean
+    public final override /*2*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String>): kotlin.Boolean
     public final override /*2*/ /*fake_override*/ fun removeAt(/*0*/ index: kotlin.Int): kotlin.String
-    public final override /*2*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.Collection<kotlin.String>): kotlin.Boolean
+    public final override /*2*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String>): kotlin.Boolean
     public final override /*2*/ /*fake_override*/ fun set(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String): kotlin.String
-    public final override /*2*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.MutableList<kotlin.String>
+    public final override /*2*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.collections.MutableList<kotlin.String>
     public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
@@ -35,26 +35,26 @@ public abstract class AImpl {
     public final val size: kotlin.Int
     public final fun add(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String): kotlin.Unit
     public final fun add(/*0*/ element: kotlin.String): kotlin.Boolean
-    public final fun addAll(/*0*/ elements: kotlin.Collection<kotlin.String>): kotlin.Boolean
-    public final fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.Collection<kotlin.String>): kotlin.Boolean
+    public final fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.collections.Collection<kotlin.String>): kotlin.Boolean
+    public final fun addAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String>): kotlin.Boolean
     public final fun clear(): kotlin.Unit
     public final fun contains(/*0*/ element: kotlin.Any?): kotlin.Boolean
-    public final fun containsAll(/*0*/ elements: kotlin.Collection<*>): kotlin.Boolean
+    public final fun containsAll(/*0*/ elements: kotlin.collections.Collection<*>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final fun get(/*0*/ index: kotlin.Int): kotlin.String
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public final fun indexOf(/*0*/ element: kotlin.String): kotlin.Int
     public final fun isEmpty(): kotlin.Boolean
-    public final fun iterator(): kotlin.MutableIterator<kotlin.String>
+    public final fun iterator(): kotlin.collections.MutableIterator<kotlin.String>
     public final fun lastIndexOf(/*0*/ element: kotlin.String): kotlin.Int
-    public final fun listIterator(): kotlin.MutableListIterator<kotlin.String>
-    public final fun listIterator(/*0*/ index: kotlin.Int): kotlin.MutableListIterator<kotlin.String>
+    public final fun listIterator(): kotlin.collections.MutableListIterator<kotlin.String>
+    public final fun listIterator(/*0*/ index: kotlin.Int): kotlin.collections.MutableListIterator<kotlin.String>
     public final fun remove(/*0*/ index: kotlin.Int): kotlin.String
     public final fun remove(/*0*/ element: kotlin.String): kotlin.Boolean
-    public final fun removeAll(/*0*/ elements: kotlin.Collection<kotlin.String>): kotlin.Boolean
-    public final fun retainAll(/*0*/ elements: kotlin.Collection<kotlin.String>): kotlin.Boolean
+    public final fun removeAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String>): kotlin.Boolean
+    public final fun retainAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String>): kotlin.Boolean
     public final fun set(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String): kotlin.String
-    public final fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.MutableList<kotlin.String>
+    public final fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.collections.MutableList<kotlin.String>
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
@@ -63,25 +63,25 @@ public final class X : A {
     public final override /*1*/ /*fake_override*/ val size: kotlin.Int
     public final override /*1*/ /*fake_override*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String): kotlin.Unit
     public final override /*1*/ /*fake_override*/ fun add(/*0*/ element: kotlin.String): kotlin.Boolean
-    public final override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.Collection<kotlin.String>): kotlin.Boolean
-    public final override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.Collection<kotlin.String>): kotlin.Boolean
+    public final override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.collections.Collection<kotlin.String>): kotlin.Boolean
+    public final override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String>): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit
     public final override /*1*/ /*fake_override*/ fun contains(/*0*/ element: kotlin.String!): kotlin.Boolean
-    public final override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public final override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun get(/*0*/ index: kotlin.Int): kotlin.String
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun indexOf(/*0*/ element: kotlin.String): kotlin.Int
     public final override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
-    public final override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator<kotlin.String>
+    public final override /*1*/ /*fake_override*/ fun iterator(): kotlin.collections.MutableIterator<kotlin.String>
     public final override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ element: kotlin.String): kotlin.Int
-    public final override /*1*/ /*fake_override*/ fun listIterator(): kotlin.MutableListIterator<kotlin.String>
-    public final override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.MutableListIterator<kotlin.String>
+    public final override /*1*/ /*fake_override*/ fun listIterator(): kotlin.collections.MutableListIterator<kotlin.String>
+    public final override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.collections.MutableListIterator<kotlin.String>
     public final override /*1*/ /*fake_override*/ fun remove(/*0*/ element: kotlin.String): kotlin.Boolean
-    public final override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.Collection<kotlin.String>): kotlin.Boolean
+    public final override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String>): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun removeAt(/*0*/ index: kotlin.Int): kotlin.String
-    public final override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.Collection<kotlin.String>): kotlin.Boolean
+    public final override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String>): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun set(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String): kotlin.String
-    public final override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.MutableList<kotlin.String>
+    public final override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.collections.MutableList<kotlin.String>
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
diff --git a/compiler/testData/diagnostics/tests/j+k/collectionOverrides/mapGetOverride.txt b/compiler/testData/diagnostics/tests/j+k/collectionOverrides/mapGetOverride.txt
index 622bd8572f7..9fcbd7169b4 100644
--- a/compiler/testData/diagnostics/tests/j+k/collectionOverrides/mapGetOverride.txt
+++ b/compiler/testData/diagnostics/tests/j+k/collectionOverrides/mapGetOverride.txt
@@ -4,12 +4,12 @@ public fun foo(/*0*/ m: MyMap): kotlin.Unit
 
 public abstract class MyMap : java.util.AbstractMap<kotlin.Double!, kotlin.CharSequence!> {
     public constructor MyMap()
-    public abstract override /*1*/ /*fake_override*/ val entries: kotlin.MutableSet<kotlin.MutableMap.MutableEntry<kotlin.Double!, kotlin.CharSequence!>>
-    invisible_fake final override /*1*/ /*fake_override*/ var keySet: kotlin.(Mutable)Set<kotlin.Double!>!
-    public open override /*1*/ /*fake_override*/ val keys: kotlin.MutableSet<kotlin.Double!>
+    public abstract override /*1*/ /*fake_override*/ val entries: kotlin.collections.MutableSet<kotlin.collections.MutableMap.MutableEntry<kotlin.Double!, kotlin.CharSequence!>>
+    invisible_fake final override /*1*/ /*fake_override*/ var keySet: kotlin.collections.(Mutable)Set<kotlin.Double!>!
+    public open override /*1*/ /*fake_override*/ val keys: kotlin.collections.MutableSet<kotlin.Double!>
     public open override /*1*/ /*fake_override*/ val size: kotlin.Int
-    invisible_fake final override /*1*/ /*fake_override*/ var values: kotlin.(Mutable)Collection<kotlin.CharSequence!>!
-    public open override /*1*/ /*fake_override*/ val values: kotlin.MutableCollection<kotlin.CharSequence!>
+    invisible_fake final override /*1*/ /*fake_override*/ var values: kotlin.collections.(Mutable)Collection<kotlin.CharSequence!>!
+    public open override /*1*/ /*fake_override*/ val values: kotlin.collections.MutableCollection<kotlin.CharSequence!>
     public open override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit
     protected/*protected and package*/ open override /*1*/ /*fake_override*/ fun clone(): kotlin.Any!
     public open override /*1*/ /*fake_override*/ fun containsKey(/*0*/ key: kotlin.Double!): kotlin.Boolean
@@ -19,7 +19,7 @@ public abstract class MyMap : java.util.AbstractMap<kotlin.Double!, kotlin.CharS
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun put(/*0*/ key: kotlin.Double!, /*1*/ value: kotlin.CharSequence!): kotlin.CharSequence?
-    public open override /*1*/ /*fake_override*/ fun putAll(/*0*/ from: kotlin.Map<out kotlin.Double!, kotlin.CharSequence!>): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun putAll(/*0*/ from: kotlin.collections.Map<out kotlin.Double!, kotlin.CharSequence!>): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun remove(/*0*/ key: kotlin.Double!): kotlin.CharSequence?
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
diff --git a/compiler/testData/diagnostics/tests/j+k/collectionOverrides/overridesBuiltinNoMagic.txt b/compiler/testData/diagnostics/tests/j+k/collectionOverrides/overridesBuiltinNoMagic.txt
index a75f9789190..2111dfe2c76 100644
--- a/compiler/testData/diagnostics/tests/j+k/collectionOverrides/overridesBuiltinNoMagic.txt
+++ b/compiler/testData/diagnostics/tests/j+k/collectionOverrides/overridesBuiltinNoMagic.txt
@@ -2,33 +2,33 @@ package
 
 public fun main(): kotlin.Unit
 
-public open class X : kotlin.MutableList<kotlin.String!> {
+public open class X : kotlin.collections.MutableList<kotlin.String!> {
     public constructor X()
     public open override /*1*/ val size: kotlin.Int
     @java.lang.Override() public open override /*1*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String!): kotlin.Unit
     @java.lang.Override() public open override /*1*/ fun add(/*0*/ element: kotlin.String!): kotlin.Boolean
-    @java.lang.Override() public open override /*1*/ fun addAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
-    @java.lang.Override() public open override /*1*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    @java.lang.Override() public open override /*1*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
+    @java.lang.Override() public open override /*1*/ fun addAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
     @java.lang.Override() public open override /*1*/ fun clear(): kotlin.Unit
     @java.lang.Override() public open override /*1*/ /*isHiddenToOvercomeSignatureClash*/ fun contains(/*0*/ o: kotlin.String!): kotlin.Boolean
     public open operator fun contains(/*0*/ element: kotlin.String!): kotlin.Boolean
-    @java.lang.Override() public open override /*1*/ fun containsAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    @java.lang.Override() public open override /*1*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     @java.lang.Override() public open override /*1*/ fun get(/*0*/ index: kotlin.Int): kotlin.String!
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     @java.lang.Override() public open override /*1*/ fun indexOf(/*0*/ o: kotlin.String!): kotlin.Int
     @java.lang.Override() public open override /*1*/ fun isEmpty(): kotlin.Boolean
-    @org.jetbrains.annotations.NotNull() @java.lang.Override() public open override /*1*/ fun iterator(): kotlin.MutableIterator<kotlin.String!>
+    @org.jetbrains.annotations.NotNull() @java.lang.Override() public open override /*1*/ fun iterator(): kotlin.collections.MutableIterator<kotlin.String!>
     @java.lang.Override() public open override /*1*/ fun lastIndexOf(/*0*/ o: kotlin.String!): kotlin.Int
-    @org.jetbrains.annotations.NotNull() @java.lang.Override() public open override /*1*/ fun listIterator(): kotlin.MutableListIterator<kotlin.String!>
-    @org.jetbrains.annotations.NotNull() @java.lang.Override() public open override /*1*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.MutableListIterator<kotlin.String!>
+    @org.jetbrains.annotations.NotNull() @java.lang.Override() public open override /*1*/ fun listIterator(): kotlin.collections.MutableListIterator<kotlin.String!>
+    @org.jetbrains.annotations.NotNull() @java.lang.Override() public open override /*1*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.collections.MutableListIterator<kotlin.String!>
     @java.lang.Override() public open override /*1*/ fun remove(/*0*/ o: kotlin.String!): kotlin.Boolean
-    @java.lang.Override() public open override /*1*/ fun removeAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    @java.lang.Override() public open override /*1*/ fun removeAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
     @java.lang.Override() public open override /*1*/ /*isHiddenToOvercomeSignatureClash*/ fun removeAt(/*0*/ index: kotlin.Int): kotlin.String!
     public open fun removeAt(/*0*/ index: kotlin.Int): kotlin.String!
-    @java.lang.Override() public open override /*1*/ fun retainAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    @java.lang.Override() public open override /*1*/ fun retainAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
     @java.lang.Override() public open override /*1*/ fun set(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String!): kotlin.String!
-    @org.jetbrains.annotations.NotNull() @java.lang.Override() public open override /*1*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.MutableList<kotlin.String!>
+    @org.jetbrains.annotations.NotNull() @java.lang.Override() public open override /*1*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.collections.MutableList<kotlin.String!>
     @org.jetbrains.annotations.NotNull() @java.lang.Override() public open fun toArray(): kotlin.Array<(out) kotlin.Any!>
     @org.jetbrains.annotations.NotNull() @java.lang.Override() public open fun </*0*/ T : kotlin.Any!> toArray(/*0*/ a: kotlin.Array<(out) T!>!): kotlin.Array<(out) T!>
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
@@ -39,28 +39,28 @@ public final class Y : X {
     public open override /*1*/ /*fake_override*/ val size: kotlin.Int
     @java.lang.Override() public open override /*1*/ /*fake_override*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String!): kotlin.Unit
     @java.lang.Override() public open override /*1*/ /*fake_override*/ fun add(/*0*/ element: kotlin.String!): kotlin.Boolean
-    @java.lang.Override() public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
-    @java.lang.Override() public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    @java.lang.Override() public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
+    @java.lang.Override() public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
     @java.lang.Override() public open override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit
     @java.lang.Override() public open override /*1*/ /*fake_override*/ /*isHiddenToOvercomeSignatureClash*/ fun contains(/*0*/ o: kotlin.String!): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun contains(/*0*/ element: kotlin.String!): kotlin.Boolean
-    @java.lang.Override() public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    @java.lang.Override() public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     @java.lang.Override() public open override /*1*/ /*fake_override*/ fun get(/*0*/ index: kotlin.Int): kotlin.String!
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     @java.lang.Override() public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ o: kotlin.String!): kotlin.Int
     @java.lang.Override() public open override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
-    @org.jetbrains.annotations.NotNull() @java.lang.Override() public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator<kotlin.String!>
+    @org.jetbrains.annotations.NotNull() @java.lang.Override() public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.collections.MutableIterator<kotlin.String!>
     @java.lang.Override() public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ o: kotlin.String!): kotlin.Int
-    @org.jetbrains.annotations.NotNull() @java.lang.Override() public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.MutableListIterator<kotlin.String!>
-    @org.jetbrains.annotations.NotNull() @java.lang.Override() public open override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.MutableListIterator<kotlin.String!>
+    @org.jetbrains.annotations.NotNull() @java.lang.Override() public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.collections.MutableListIterator<kotlin.String!>
+    @org.jetbrains.annotations.NotNull() @java.lang.Override() public open override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.collections.MutableListIterator<kotlin.String!>
     @java.lang.Override() public open override /*1*/ /*fake_override*/ fun remove(/*0*/ o: kotlin.String!): kotlin.Boolean
-    @java.lang.Override() public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    @java.lang.Override() public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
     @java.lang.Override() public open override /*1*/ /*fake_override*/ /*isHiddenToOvercomeSignatureClash*/ fun removeAt(/*0*/ index: kotlin.Int): kotlin.String!
     public open override /*1*/ /*fake_override*/ fun removeAt(/*0*/ index: kotlin.Int): kotlin.String!
-    @java.lang.Override() public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    @java.lang.Override() public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
     @java.lang.Override() public open override /*1*/ /*fake_override*/ fun set(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String!): kotlin.String!
-    @org.jetbrains.annotations.NotNull() @java.lang.Override() public open override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.MutableList<kotlin.String!>
+    @org.jetbrains.annotations.NotNull() @java.lang.Override() public open override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.collections.MutableList<kotlin.String!>
     @org.jetbrains.annotations.NotNull() @java.lang.Override() public open override /*1*/ /*fake_override*/ fun toArray(): kotlin.Array<(out) kotlin.Any!>
     @org.jetbrains.annotations.NotNull() @java.lang.Override() public open override /*1*/ /*fake_override*/ fun </*0*/ T : kotlin.Any!> toArray(/*0*/ a: kotlin.Array<(out) T!>!): kotlin.Array<(out) T!>
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
diff --git a/compiler/testData/diagnostics/tests/j+k/collectionOverrides/removeAt.txt b/compiler/testData/diagnostics/tests/j+k/collectionOverrides/removeAt.txt
index 84b1899485e..76ead6f7276 100644
--- a/compiler/testData/diagnostics/tests/j+k/collectionOverrides/removeAt.txt
+++ b/compiler/testData/diagnostics/tests/j+k/collectionOverrides/removeAt.txt
@@ -8,68 +8,68 @@ public abstract class A</*0*/ F : kotlin.Any!> : B<F!> {
     public abstract override /*1*/ /*fake_override*/ val size: kotlin.Int
     public open override /*1*/ /*fake_override*/ fun add(/*0*/ element: F!): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: F!): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.Collection<F!>): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.Collection<F!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.collections.Collection<F!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.collections.Collection<F!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun contains(/*0*/ element: F!): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.Collection<F!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection<F!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public abstract override /*1*/ /*fake_override*/ fun get(/*0*/ index: kotlin.Int): F!
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ element: F!): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator<F!>
+    public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.collections.MutableIterator<F!>
     public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ element: F!): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.MutableListIterator<F!>
-    public open override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.MutableListIterator<F!>
+    public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.collections.MutableListIterator<F!>
+    public open override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.collections.MutableListIterator<F!>
     invisible_fake open override /*1*/ /*fake_override*/ fun outOfBoundsMsg(/*0*/ p0: kotlin.Int): kotlin.String!
     invisible_fake open override /*1*/ /*fake_override*/ fun rangeCheckForAdd(/*0*/ p0: kotlin.Int): kotlin.Unit
     public open override /*1*/ fun remove(/*0*/ element: F!): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.Collection<F!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.collections.Collection<F!>): kotlin.Boolean
     public open override /*1*/ fun removeAt(/*0*/ x: kotlin.Int): F!
     protected/*protected and package*/ open override /*1*/ /*fake_override*/ fun removeRange(/*0*/ p0: kotlin.Int, /*1*/ p1: kotlin.Int): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.Collection<F!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.collections.Collection<F!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun set(/*0*/ index: kotlin.Int, /*1*/ element: F!): F!
-    public open override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.MutableList<F!>
+    public open override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.collections.MutableList<F!>
     public open override /*1*/ /*fake_override*/ fun toArray(): kotlin.Array<(out) kotlin.Any!>!
     public open override /*1*/ /*fake_override*/ fun </*0*/ T : kotlin.Any!> toArray(/*0*/ p0: kotlin.Array<(out) T!>!): kotlin.Array<(out) T!>!
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
     invisible_fake const final override /*1*/ /*fake_override*/ val MAX_ARRAY_SIZE: kotlin.Int
-    invisible_fake open override /*1*/ /*fake_override*/ fun </*0*/ T : kotlin.Any!> finishToArray(/*0*/ p0: kotlin.Array<(out) T!>!, /*1*/ p1: kotlin.(Mutable)Iterator<*>!): kotlin.Array<(out) T!>!
+    invisible_fake open override /*1*/ /*fake_override*/ fun </*0*/ T : kotlin.Any!> finishToArray(/*0*/ p0: kotlin.Array<(out) T!>!, /*1*/ p1: kotlin.collections.(Mutable)Iterator<*>!): kotlin.Array<(out) T!>!
     invisible_fake open override /*1*/ /*fake_override*/ fun hugeCapacity(/*0*/ p0: kotlin.Int): kotlin.Int
 }
 
-public abstract class B</*0*/ T> : kotlin.MutableList<T>, java.util.AbstractList<T> {
+public abstract class B</*0*/ T> : kotlin.collections.MutableList<T>, java.util.AbstractList<T> {
     public constructor B</*0*/ T>()
     protected/*protected and package*/ final override /*1*/ /*fake_override*/ var modCount: kotlin.Int
     public abstract override /*2*/ /*fake_override*/ val size: kotlin.Int
     public open override /*2*/ /*fake_override*/ fun add(/*0*/ element: T): kotlin.Boolean
     public open override /*2*/ /*fake_override*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: T): kotlin.Unit
-    public open override /*2*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.Collection<T>): kotlin.Boolean
-    public open override /*2*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.Collection<T>): kotlin.Boolean
+    public open override /*2*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.collections.Collection<T>): kotlin.Boolean
+    public open override /*2*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.collections.Collection<T>): kotlin.Boolean
     public open override /*2*/ /*fake_override*/ fun clear(): kotlin.Unit
     public open override /*2*/ /*fake_override*/ fun contains(/*0*/ element: T): kotlin.Boolean
-    public open override /*2*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.Collection<T>): kotlin.Boolean
+    public open override /*2*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection<T>): kotlin.Boolean
     public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public abstract override /*2*/ /*fake_override*/ fun get(/*0*/ index: kotlin.Int): T
     public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*2*/ /*fake_override*/ fun indexOf(/*0*/ element: T): kotlin.Int
     public open override /*2*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
-    public open override /*2*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator<T>
+    public open override /*2*/ /*fake_override*/ fun iterator(): kotlin.collections.MutableIterator<T>
     public open override /*2*/ /*fake_override*/ fun lastIndexOf(/*0*/ element: T): kotlin.Int
-    public open override /*2*/ /*fake_override*/ fun listIterator(): kotlin.MutableListIterator<T>
-    public open override /*2*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.MutableListIterator<T>
+    public open override /*2*/ /*fake_override*/ fun listIterator(): kotlin.collections.MutableListIterator<T>
+    public open override /*2*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.collections.MutableListIterator<T>
     invisible_fake open override /*1*/ /*fake_override*/ fun outOfBoundsMsg(/*0*/ p0: kotlin.Int): kotlin.String!
     invisible_fake open override /*1*/ /*fake_override*/ fun rangeCheckForAdd(/*0*/ p0: kotlin.Int): kotlin.Unit
     public open override /*2*/ fun remove(/*0*/ element: T): kotlin.Boolean
-    public open override /*2*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.Collection<T>): kotlin.Boolean
+    public open override /*2*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.collections.Collection<T>): kotlin.Boolean
     public open override /*2*/ fun removeAt(/*0*/ index: kotlin.Int): T
     protected/*protected and package*/ open override /*1*/ /*fake_override*/ fun removeRange(/*0*/ p0: kotlin.Int, /*1*/ p1: kotlin.Int): kotlin.Unit
-    public open override /*2*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.Collection<T>): kotlin.Boolean
+    public open override /*2*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.collections.Collection<T>): kotlin.Boolean
     public open override /*2*/ /*fake_override*/ fun set(/*0*/ index: kotlin.Int, /*1*/ element: T): T
-    public open override /*2*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.MutableList<T>
+    public open override /*2*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.collections.MutableList<T>
     public open override /*1*/ /*fake_override*/ fun toArray(): kotlin.Array<(out) kotlin.Any!>!
     public open override /*1*/ /*fake_override*/ fun </*0*/ T : kotlin.Any!> toArray(/*0*/ p0: kotlin.Array<(out) T!>!): kotlin.Array<(out) T!>!
     public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
diff --git a/compiler/testData/diagnostics/tests/j+k/collectionOverrides/removeAtInt.txt b/compiler/testData/diagnostics/tests/j+k/collectionOverrides/removeAtInt.txt
index 708b185a4e1..9ac8a2eb68c 100644
--- a/compiler/testData/diagnostics/tests/j+k/collectionOverrides/removeAtInt.txt
+++ b/compiler/testData/diagnostics/tests/j+k/collectionOverrides/removeAtInt.txt
@@ -8,68 +8,68 @@ public abstract class A : B {
     public abstract override /*1*/ /*fake_override*/ val size: kotlin.Int
     public open override /*1*/ /*fake_override*/ fun add(/*0*/ element: kotlin.Int): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.Int): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.Collection<kotlin.Int>): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.Collection<kotlin.Int>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.collections.Collection<kotlin.Int>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.collections.Collection<kotlin.Int>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun contains(/*0*/ element: kotlin.Int): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.Collection<kotlin.Int>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection<kotlin.Int>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public abstract override /*1*/ /*fake_override*/ fun get(/*0*/ index: kotlin.Int): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ element: kotlin.Int): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator<kotlin.Int>
+    public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.collections.MutableIterator<kotlin.Int>
     public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ element: kotlin.Int): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.MutableListIterator<kotlin.Int>
-    public open override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.MutableListIterator<kotlin.Int>
+    public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.collections.MutableListIterator<kotlin.Int>
+    public open override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.collections.MutableListIterator<kotlin.Int>
     invisible_fake open override /*1*/ /*fake_override*/ fun outOfBoundsMsg(/*0*/ p0: kotlin.Int): kotlin.String!
     invisible_fake open override /*1*/ /*fake_override*/ fun rangeCheckForAdd(/*0*/ p0: kotlin.Int): kotlin.Unit
     public open override /*1*/ fun remove(/*0*/ element: kotlin.Int): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.Collection<kotlin.Int>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.collections.Collection<kotlin.Int>): kotlin.Boolean
     public open override /*1*/ fun removeAt(/*0*/ index: kotlin.Int): kotlin.Int
     protected/*protected and package*/ open override /*1*/ /*fake_override*/ fun removeRange(/*0*/ p0: kotlin.Int, /*1*/ p1: kotlin.Int): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.Collection<kotlin.Int>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.collections.Collection<kotlin.Int>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun set(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.Int): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.MutableList<kotlin.Int>
+    public open override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.collections.MutableList<kotlin.Int>
     public open override /*1*/ /*fake_override*/ fun toArray(): kotlin.Array<(out) kotlin.Any!>!
     public open override /*1*/ /*fake_override*/ fun </*0*/ T : kotlin.Any!> toArray(/*0*/ p0: kotlin.Array<(out) T!>!): kotlin.Array<(out) T!>!
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
     invisible_fake const final override /*1*/ /*fake_override*/ val MAX_ARRAY_SIZE: kotlin.Int
-    invisible_fake open override /*1*/ /*fake_override*/ fun </*0*/ T : kotlin.Any!> finishToArray(/*0*/ p0: kotlin.Array<(out) T!>!, /*1*/ p1: kotlin.(Mutable)Iterator<*>!): kotlin.Array<(out) T!>!
+    invisible_fake open override /*1*/ /*fake_override*/ fun </*0*/ T : kotlin.Any!> finishToArray(/*0*/ p0: kotlin.Array<(out) T!>!, /*1*/ p1: kotlin.collections.(Mutable)Iterator<*>!): kotlin.Array<(out) T!>!
     invisible_fake open override /*1*/ /*fake_override*/ fun hugeCapacity(/*0*/ p0: kotlin.Int): kotlin.Int
 }
 
-public abstract class B : kotlin.MutableList<kotlin.Int>, java.util.AbstractList<kotlin.Int> {
+public abstract class B : kotlin.collections.MutableList<kotlin.Int>, java.util.AbstractList<kotlin.Int> {
     public constructor B()
     protected/*protected and package*/ final override /*1*/ /*fake_override*/ var modCount: kotlin.Int
     public abstract override /*2*/ /*fake_override*/ val size: kotlin.Int
     public open override /*2*/ /*fake_override*/ fun add(/*0*/ element: kotlin.Int): kotlin.Boolean
     public open override /*2*/ /*fake_override*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.Int): kotlin.Unit
-    public open override /*2*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.Collection<kotlin.Int>): kotlin.Boolean
-    public open override /*2*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.Collection<kotlin.Int>): kotlin.Boolean
+    public open override /*2*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.collections.Collection<kotlin.Int>): kotlin.Boolean
+    public open override /*2*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.collections.Collection<kotlin.Int>): kotlin.Boolean
     public open override /*2*/ /*fake_override*/ fun clear(): kotlin.Unit
     public open override /*2*/ /*fake_override*/ fun contains(/*0*/ element: kotlin.Int): kotlin.Boolean
-    public open override /*2*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.Collection<kotlin.Int>): kotlin.Boolean
+    public open override /*2*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection<kotlin.Int>): kotlin.Boolean
     public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public abstract override /*2*/ /*fake_override*/ fun get(/*0*/ index: kotlin.Int): kotlin.Int
     public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*2*/ /*fake_override*/ fun indexOf(/*0*/ element: kotlin.Int): kotlin.Int
     public open override /*2*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
-    public open override /*2*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator<kotlin.Int>
+    public open override /*2*/ /*fake_override*/ fun iterator(): kotlin.collections.MutableIterator<kotlin.Int>
     public open override /*2*/ /*fake_override*/ fun lastIndexOf(/*0*/ element: kotlin.Int): kotlin.Int
-    public open override /*2*/ /*fake_override*/ fun listIterator(): kotlin.MutableListIterator<kotlin.Int>
-    public open override /*2*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.MutableListIterator<kotlin.Int>
+    public open override /*2*/ /*fake_override*/ fun listIterator(): kotlin.collections.MutableListIterator<kotlin.Int>
+    public open override /*2*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.collections.MutableListIterator<kotlin.Int>
     invisible_fake open override /*1*/ /*fake_override*/ fun outOfBoundsMsg(/*0*/ p0: kotlin.Int): kotlin.String!
     invisible_fake open override /*1*/ /*fake_override*/ fun rangeCheckForAdd(/*0*/ p0: kotlin.Int): kotlin.Unit
     public open override /*2*/ fun remove(/*0*/ element: kotlin.Int): kotlin.Boolean
-    public open override /*2*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.Collection<kotlin.Int>): kotlin.Boolean
+    public open override /*2*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.collections.Collection<kotlin.Int>): kotlin.Boolean
     public open override /*2*/ fun removeAt(/*0*/ index: kotlin.Int): kotlin.Int
     protected/*protected and package*/ open override /*1*/ /*fake_override*/ fun removeRange(/*0*/ p0: kotlin.Int, /*1*/ p1: kotlin.Int): kotlin.Unit
-    public open override /*2*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.Collection<kotlin.Int>): kotlin.Boolean
+    public open override /*2*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.collections.Collection<kotlin.Int>): kotlin.Boolean
     public open override /*2*/ /*fake_override*/ fun set(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.Int): kotlin.Int
-    public open override /*2*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.MutableList<kotlin.Int>
+    public open override /*2*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.collections.MutableList<kotlin.Int>
     public open override /*1*/ /*fake_override*/ fun toArray(): kotlin.Array<(out) kotlin.Any!>!
     public open override /*1*/ /*fake_override*/ fun </*0*/ T : kotlin.Any!> toArray(/*0*/ p0: kotlin.Array<(out) T!>!): kotlin.Array<(out) T!>!
     public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
diff --git a/compiler/testData/diagnostics/tests/j+k/collectionOverrides/sizeFromKotlinOverriddenInJava.txt b/compiler/testData/diagnostics/tests/j+k/collectionOverrides/sizeFromKotlinOverriddenInJava.txt
index a4c9bcde85d..4e4aa8a50b6 100644
--- a/compiler/testData/diagnostics/tests/j+k/collectionOverrides/sizeFromKotlinOverriddenInJava.txt
+++ b/compiler/testData/diagnostics/tests/j+k/collectionOverrides/sizeFromKotlinOverriddenInJava.txt
@@ -6,22 +6,22 @@ public abstract class A</*0*/ F : kotlin.Any!> : MyList<F!> {
     public constructor A</*0*/ F : kotlin.Any!>()
     public/*package*/ open override /*1*/ val size: kotlin.Int
     public abstract override /*1*/ /*fake_override*/ fun contains(/*0*/ element: F!): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.Collection<F!>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection<F!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public abstract override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun iterator(): kotlin.Iterator<F!>
+    public abstract override /*1*/ /*fake_override*/ fun iterator(): kotlin.collections.Iterator<F!>
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-public abstract class MyList</*0*/ G> : kotlin.Collection<G> {
+public abstract class MyList</*0*/ G> : kotlin.collections.Collection<G> {
     public constructor MyList</*0*/ G>()
     public abstract override /*1*/ /*fake_override*/ val size: kotlin.Int
     public abstract override /*1*/ /*fake_override*/ fun contains(/*0*/ element: G): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.Collection<G>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection<G>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public abstract override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun iterator(): kotlin.Iterator<G>
+    public abstract override /*1*/ /*fake_override*/ fun iterator(): kotlin.collections.Iterator<G>
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
diff --git a/compiler/testData/diagnostics/tests/j+k/finalCollectionSize.txt b/compiler/testData/diagnostics/tests/j+k/finalCollectionSize.txt
index 0b6777ef10a..9d607f517f3 100644
--- a/compiler/testData/diagnostics/tests/j+k/finalCollectionSize.txt
+++ b/compiler/testData/diagnostics/tests/j+k/finalCollectionSize.txt
@@ -8,13 +8,13 @@ public abstract class A : java.util.ArrayList<kotlin.String!> {
     invisible_fake final override /*1*/ /*fake_override*/ var size: kotlin.Int
     public open override /*1*/ /*fake_override*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String!): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun add(/*0*/ element: kotlin.String!): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
-    invisible_fake open override /*1*/ /*fake_override*/ fun batchRemove(/*0*/ p0: kotlin.(Mutable)Collection<*>!, /*1*/ p1: kotlin.Boolean): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
+    invisible_fake open override /*1*/ /*fake_override*/ fun batchRemove(/*0*/ p0: kotlin.collections.(Mutable)Collection<*>!, /*1*/ p1: kotlin.Boolean): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public open override /*1*/ /*fake_override*/ fun contains(/*0*/ element: kotlin.String!): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
     invisible_fake open override /*1*/ /*fake_override*/ fun elementData(/*0*/ p0: kotlin.Int): kotlin.String!
     public open override /*1*/ /*fake_override*/ fun ensureCapacity(/*0*/ p0: kotlin.Int): kotlin.Unit
     invisible_fake open override /*1*/ /*fake_override*/ fun ensureCapacityInternal(/*0*/ p0: kotlin.Int): kotlin.Unit
@@ -25,21 +25,21 @@ public abstract class A : java.util.ArrayList<kotlin.String!> {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ element: kotlin.String!): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator<kotlin.String!>
+    public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.collections.MutableIterator<kotlin.String!>
     public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ element: kotlin.String!): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.MutableListIterator<kotlin.String!>
-    public open override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.MutableListIterator<kotlin.String!>
+    public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.collections.MutableListIterator<kotlin.String!>
+    public open override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.collections.MutableListIterator<kotlin.String!>
     invisible_fake open override /*1*/ /*fake_override*/ fun outOfBoundsMsg(/*0*/ p0: kotlin.Int): kotlin.String!
     invisible_fake open override /*1*/ /*fake_override*/ fun rangeCheck(/*0*/ p0: kotlin.Int): kotlin.Unit
     invisible_fake open override /*1*/ /*fake_override*/ fun rangeCheckForAdd(/*0*/ p0: kotlin.Int): kotlin.Unit
     invisible_fake open override /*1*/ /*fake_override*/ fun readObject(/*0*/ p0: java.io.ObjectInputStream!): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun remove(/*0*/ element: kotlin.String!): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun removeAt(/*0*/ p0: kotlin.Int): kotlin.String!
     protected/*protected and package*/ open override /*1*/ /*fake_override*/ fun removeRange(/*0*/ p0: kotlin.Int, /*1*/ p1: kotlin.Int): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun set(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String!): kotlin.String!
-    public open override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.MutableList<kotlin.String!>
+    public open override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.collections.MutableList<kotlin.String!>
     public open override /*1*/ /*fake_override*/ fun toArray(): kotlin.Array<(out) kotlin.Any!>!
     public open override /*1*/ /*fake_override*/ fun </*0*/ T : kotlin.Any!> toArray(/*0*/ p0: kotlin.Array<(out) T!>!): kotlin.Array<(out) T!>!
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
@@ -49,7 +49,7 @@ public abstract class A : java.util.ArrayList<kotlin.String!> {
     // Static members
     invisible_fake const final override /*1*/ /*fake_override*/ val MAX_ARRAY_SIZE: kotlin.Int
     invisible_fake const final override /*1*/ /*fake_override*/ val serialVersionUID: kotlin.Long
-    invisible_fake open override /*1*/ /*fake_override*/ fun </*0*/ T : kotlin.Any!> finishToArray(/*0*/ p0: kotlin.Array<(out) T!>!, /*1*/ p1: kotlin.(Mutable)Iterator<*>!): kotlin.Array<(out) T!>!
+    invisible_fake open override /*1*/ /*fake_override*/ fun </*0*/ T : kotlin.Any!> finishToArray(/*0*/ p0: kotlin.Array<(out) T!>!, /*1*/ p1: kotlin.collections.(Mutable)Iterator<*>!): kotlin.Array<(out) T!>!
     invisible_fake open override /*1*/ /*fake_override*/ fun hugeCapacity(/*0*/ p0: kotlin.Int): kotlin.Int
     invisible_fake open override /*1*/ /*fake_override*/ fun subListRangeCheck(/*0*/ p0: kotlin.Int, /*1*/ p1: kotlin.Int, /*2*/ p2: kotlin.Int): kotlin.Unit
 }
@@ -62,13 +62,13 @@ public final class B : A {
     invisible_fake final override /*1*/ /*fake_override*/ var size: kotlin.Int
     public open override /*1*/ /*fake_override*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String!): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun add(/*0*/ element: kotlin.String!): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
-    invisible_fake open override /*1*/ /*fake_override*/ fun batchRemove(/*0*/ p0: kotlin.(Mutable)Collection<*>!, /*1*/ p1: kotlin.Boolean): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
+    invisible_fake open override /*1*/ /*fake_override*/ fun batchRemove(/*0*/ p0: kotlin.collections.(Mutable)Collection<*>!, /*1*/ p1: kotlin.Boolean): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public open override /*1*/ /*fake_override*/ fun contains(/*0*/ element: kotlin.String!): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
     invisible_fake open override /*1*/ /*fake_override*/ fun elementData(/*0*/ p0: kotlin.Int): kotlin.String!
     public open override /*1*/ /*fake_override*/ fun ensureCapacity(/*0*/ p0: kotlin.Int): kotlin.Unit
     invisible_fake open override /*1*/ /*fake_override*/ fun ensureCapacityInternal(/*0*/ p0: kotlin.Int): kotlin.Unit
@@ -79,21 +79,21 @@ public final class B : A {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ element: kotlin.String!): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator<kotlin.String!>
+    public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.collections.MutableIterator<kotlin.String!>
     public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ element: kotlin.String!): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.MutableListIterator<kotlin.String!>
-    public open override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.MutableListIterator<kotlin.String!>
+    public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.collections.MutableListIterator<kotlin.String!>
+    public open override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.collections.MutableListIterator<kotlin.String!>
     invisible_fake open override /*1*/ /*fake_override*/ fun outOfBoundsMsg(/*0*/ p0: kotlin.Int): kotlin.String!
     invisible_fake open override /*1*/ /*fake_override*/ fun rangeCheck(/*0*/ p0: kotlin.Int): kotlin.Unit
     invisible_fake open override /*1*/ /*fake_override*/ fun rangeCheckForAdd(/*0*/ p0: kotlin.Int): kotlin.Unit
     invisible_fake open override /*1*/ /*fake_override*/ fun readObject(/*0*/ p0: java.io.ObjectInputStream!): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun remove(/*0*/ element: kotlin.String!): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun removeAt(/*0*/ p0: kotlin.Int): kotlin.String!
     protected/*protected and package*/ open override /*1*/ /*fake_override*/ fun removeRange(/*0*/ p0: kotlin.Int, /*1*/ p1: kotlin.Int): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun set(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String!): kotlin.String!
-    public open override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.MutableList<kotlin.String!>
+    public open override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.collections.MutableList<kotlin.String!>
     public open override /*1*/ /*fake_override*/ fun toArray(): kotlin.Array<(out) kotlin.Any!>!
     public open override /*1*/ /*fake_override*/ fun </*0*/ T : kotlin.Any!> toArray(/*0*/ p0: kotlin.Array<(out) T!>!): kotlin.Array<(out) T!>!
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
diff --git a/compiler/testData/diagnostics/tests/j+k/kt2394.txt b/compiler/testData/diagnostics/tests/j+k/kt2394.txt
index 280a8c3c946..d7bd3812ba5 100644
--- a/compiler/testData/diagnostics/tests/j+k/kt2394.txt
+++ b/compiler/testData/diagnostics/tests/j+k/kt2394.txt
@@ -1,6 +1,6 @@
 package
 
 package d {
-    public fun bar(/*0*/ c: kotlin.Collection<kotlin.Int>): kotlin.Unit
-    public fun foo(/*0*/ iterable: kotlin.Iterable<kotlin.Int>, /*1*/ iterator: kotlin.Iterator<kotlin.Int>, /*2*/ comparable: kotlin.Comparable<kotlin.Any>): kotlin.Unit
+    public fun bar(/*0*/ c: kotlin.collections.Collection<kotlin.Int>): kotlin.Unit
+    public fun foo(/*0*/ iterable: kotlin.collections.Iterable<kotlin.Int>, /*1*/ iterator: kotlin.collections.Iterator<kotlin.Int>, /*2*/ comparable: kotlin.Comparable<kotlin.Any>): kotlin.Unit
 }
diff --git a/compiler/testData/diagnostics/tests/j+k/kt2606.txt b/compiler/testData/diagnostics/tests/j+k/kt2606.txt
index f96e5fa1450..c0e38a79c11 100644
--- a/compiler/testData/diagnostics/tests/j+k/kt2606.txt
+++ b/compiler/testData/diagnostics/tests/j+k/kt2606.txt
@@ -1,5 +1,5 @@
 package
 
 package n {
-    public fun bar(): kotlin.Iterator<kotlin.Int>?
+    public fun bar(): kotlin.collections.Iterator<kotlin.Int>?
 }
diff --git a/compiler/testData/diagnostics/tests/j+k/kt2890.txt b/compiler/testData/diagnostics/tests/j+k/kt2890.txt
index c366c1f1223..6bed53e2808 100644
--- a/compiler/testData/diagnostics/tests/j+k/kt2890.txt
+++ b/compiler/testData/diagnostics/tests/j+k/kt2890.txt
@@ -10,6 +10,6 @@ package _03_collections {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
         // Static members
-        public open fun add(/*0*/ ints: kotlin.(Mutable)List<kotlin.Int!>!): kotlin.Unit
+        public open fun add(/*0*/ ints: kotlin.collections.(Mutable)List<kotlin.Int!>!): kotlin.Unit
     }
 }
diff --git a/compiler/testData/diagnostics/tests/j+k/mutableIterator.txt b/compiler/testData/diagnostics/tests/j+k/mutableIterator.txt
index b5d0810222c..3210f7895da 100644
--- a/compiler/testData/diagnostics/tests/j+k/mutableIterator.txt
+++ b/compiler/testData/diagnostics/tests/j+k/mutableIterator.txt
@@ -1,5 +1,5 @@
 package
 
 package n {
-    public fun foo(/*0*/ c: a.JC<kotlin.Int>, /*1*/ iterator: kotlin.Iterator<kotlin.Int>, /*2*/ iterable: kotlin.Iterable<kotlin.Int>): kotlin.Unit
+    public fun foo(/*0*/ c: a.JC<kotlin.Int>, /*1*/ iterator: kotlin.collections.Iterator<kotlin.Int>, /*2*/ iterable: kotlin.collections.Iterable<kotlin.Int>): kotlin.Unit
 }
diff --git a/compiler/testData/diagnostics/tests/j+k/serializable.txt b/compiler/testData/diagnostics/tests/j+k/serializable.txt
index 488f475f194..7d6387e1acb 100644
--- a/compiler/testData/diagnostics/tests/j+k/serializable.txt
+++ b/compiler/testData/diagnostics/tests/j+k/serializable.txt
@@ -2,9 +2,9 @@ package
 
 public fun testArrays(/*0*/ ia: kotlin.IntArray, /*1*/ ai: kotlin.Array<kotlin.Int>, /*2*/ an: kotlin.Array<N>, /*3*/ a: kotlin.Array<S>): kotlin.Unit
 public fun testEnums(/*0*/ a: kotlin.Enum<*>): kotlin.Unit
-public fun testLists(/*0*/ a: kotlin.List<kotlin.Int>): kotlin.Unit
+public fun testLists(/*0*/ a: kotlin.collections.List<kotlin.Int>): kotlin.Unit
 public fun testLiterals(): kotlin.Unit
-public fun testNotSerializable(/*0*/ l: kotlin.List<kotlin.Int>): kotlin.Unit
+public fun testNotSerializable(/*0*/ l: kotlin.collections.List<kotlin.Int>): kotlin.Unit
 public fun testPrimitives(/*0*/ b: kotlin.Byte, /*1*/ ss: kotlin.Short, /*2*/ i: kotlin.Int, /*3*/ l: kotlin.Long, /*4*/ d: kotlin.Double, /*5*/ s: kotlin.String, /*6*/ f: kotlin.Float, /*7*/ bool: kotlin.Boolean): kotlin.Unit
 
 public final enum class C : kotlin.Enum<C> {
diff --git a/compiler/testData/diagnostics/tests/j+k/specialBridges.txt b/compiler/testData/diagnostics/tests/j+k/specialBridges.txt
index ad86b0c2d9b..f3df4572210 100644
--- a/compiler/testData/diagnostics/tests/j+k/specialBridges.txt
+++ b/compiler/testData/diagnostics/tests/j+k/specialBridges.txt
@@ -8,13 +8,13 @@ public final class B2 : java.util.ArrayList<kotlin.String>, I2 {
     public open override /*2*/ /*fake_override*/ val size: kotlin.Int
     public open override /*1*/ /*fake_override*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun add(/*0*/ element: kotlin.String): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.Collection<kotlin.String>): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.Collection<kotlin.String>): kotlin.Boolean
-    invisible_fake open override /*1*/ /*fake_override*/ fun batchRemove(/*0*/ p0: kotlin.(Mutable)Collection<*>!, /*1*/ p1: kotlin.Boolean): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.collections.Collection<kotlin.String>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String>): kotlin.Boolean
+    invisible_fake open override /*1*/ /*fake_override*/ fun batchRemove(/*0*/ p0: kotlin.collections.(Mutable)Collection<*>!, /*1*/ p1: kotlin.Boolean): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public open override /*1*/ /*fake_override*/ fun contains(/*0*/ element: kotlin.String): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.Collection<kotlin.String>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String>): kotlin.Boolean
     invisible_fake open override /*1*/ /*fake_override*/ fun elementData(/*0*/ p0: kotlin.Int): kotlin.String!
     public open override /*1*/ /*fake_override*/ fun ensureCapacity(/*0*/ p0: kotlin.Int): kotlin.Unit
     invisible_fake open override /*1*/ /*fake_override*/ fun ensureCapacityInternal(/*0*/ p0: kotlin.Int): kotlin.Unit
@@ -25,21 +25,21 @@ public final class B2 : java.util.ArrayList<kotlin.String>, I2 {
     public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ element: kotlin.String): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator<kotlin.String>
+    public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.collections.MutableIterator<kotlin.String>
     public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ element: kotlin.String): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.MutableListIterator<kotlin.String>
-    public open override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.MutableListIterator<kotlin.String>
+    public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.collections.MutableListIterator<kotlin.String>
+    public open override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.collections.MutableListIterator<kotlin.String>
     invisible_fake open override /*1*/ /*fake_override*/ fun outOfBoundsMsg(/*0*/ p0: kotlin.Int): kotlin.String!
     invisible_fake open override /*1*/ /*fake_override*/ fun rangeCheck(/*0*/ p0: kotlin.Int): kotlin.Unit
     invisible_fake open override /*1*/ /*fake_override*/ fun rangeCheckForAdd(/*0*/ p0: kotlin.Int): kotlin.Unit
     invisible_fake open override /*1*/ /*fake_override*/ fun readObject(/*0*/ p0: java.io.ObjectInputStream!): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun remove(/*0*/ element: kotlin.String): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.Collection<kotlin.String>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun removeAt(/*0*/ p0: kotlin.Int): kotlin.String
     protected/*protected and package*/ open override /*1*/ /*fake_override*/ fun removeRange(/*0*/ p0: kotlin.Int, /*1*/ p1: kotlin.Int): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.Collection<kotlin.String>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun set(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String): kotlin.String
-    public open override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.MutableList<kotlin.String>
+    public open override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.collections.MutableList<kotlin.String>
     public open override /*1*/ /*fake_override*/ fun toArray(): kotlin.Array<(out) kotlin.Any!>!
     public open override /*1*/ /*fake_override*/ fun </*0*/ T : kotlin.Any!> toArray(/*0*/ p0: kotlin.Array<(out) T!>!): kotlin.Array<(out) T!>!
     public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
diff --git a/compiler/testData/diagnostics/tests/j+k/types/arrayList.txt b/compiler/testData/diagnostics/tests/j+k/types/arrayList.txt
index 840cd67c417..2cbaa964626 100644
--- a/compiler/testData/diagnostics/tests/j+k/types/arrayList.txt
+++ b/compiler/testData/diagnostics/tests/j+k/types/arrayList.txt
@@ -3,7 +3,7 @@ package
 public open class J</*0*/ T : kotlin.Any!> : ML<T!> {
     public constructor J</*0*/ T : kotlin.Any!>()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ fun foo(): kotlin.MutableList<T!>
+    public open override /*1*/ fun foo(): kotlin.collections.MutableList<T!>
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
@@ -11,14 +11,14 @@ public open class J</*0*/ T : kotlin.Any!> : ML<T!> {
 public final class K : J<kotlin.String>, ML<kotlin.String> {
     public constructor K()
     public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*2*/ /*fake_override*/ fun foo(): kotlin.MutableList<kotlin.String!>
+    public open override /*2*/ /*fake_override*/ fun foo(): kotlin.collections.MutableList<kotlin.String!>
     public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
 public interface ML</*0*/ T> {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public abstract fun foo(): kotlin.MutableList<T>
+    public abstract fun foo(): kotlin.collections.MutableList<T>
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
diff --git a/compiler/testData/diagnostics/tests/j+k/types/returnCollection.txt b/compiler/testData/diagnostics/tests/j+k/types/returnCollection.txt
index 47c3a939d12..5ac7d687cda 100644
--- a/compiler/testData/diagnostics/tests/j+k/types/returnCollection.txt
+++ b/compiler/testData/diagnostics/tests/j+k/types/returnCollection.txt
@@ -1,17 +1,17 @@
 package
 
-public/*package*/ /*synthesized*/ fun J(/*0*/ function: () -> kotlin.(Mutable)List<kotlin.String!>!): J
+public/*package*/ /*synthesized*/ fun J(/*0*/ function: () -> kotlin.collections.(Mutable)List<kotlin.String!>!): J
 
 public/*package*/ interface J : K {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public abstract override /*1*/ fun foo(): kotlin.List<kotlin.String>
+    public abstract override /*1*/ fun foo(): kotlin.collections.List<kotlin.String>
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
 public interface K {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public abstract fun foo(): kotlin.List<kotlin.String>
+    public abstract fun foo(): kotlin.collections.List<kotlin.String>
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
diff --git a/compiler/testData/diagnostics/tests/kt310.txt b/compiler/testData/diagnostics/tests/kt310.txt
index 80e9e5906ad..b6be538af85 100644
--- a/compiler/testData/diagnostics/tests/kt310.txt
+++ b/compiler/testData/diagnostics/tests/kt310.txt
@@ -1,3 +1,3 @@
 package
 
-public fun f(/*0*/ c: kotlin.LongRange): kotlin.Int
+public fun f(/*0*/ c: kotlin.ranges.LongRange): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/library/Collections.txt b/compiler/testData/diagnostics/tests/library/Collections.txt
index e62732e4f73..2362605fe2c 100644
--- a/compiler/testData/diagnostics/tests/library/Collections.txt
+++ b/compiler/testData/diagnostics/tests/library/Collections.txt
@@ -2,12 +2,12 @@ package
 
 package collections {
     public fun </*0*/ T> array(/*0*/ vararg t: T /*kotlin.Array<out T>*/): kotlin.Array<T>
-    public fun </*0*/ T> testCollection(/*0*/ c: kotlin.Collection<T>, /*1*/ t: T): kotlin.Unit
-    public fun </*0*/ T> testList(/*0*/ l: kotlin.List<T>, /*1*/ t: T): kotlin.Unit
-    public fun </*0*/ K, /*1*/ V> testMap(/*0*/ m: kotlin.Map<K, V>): kotlin.Unit
-    public fun </*0*/ T> testMutableCollection(/*0*/ c: kotlin.MutableCollection<T>, /*1*/ t: T): kotlin.Unit
-    public fun </*0*/ T> testMutableList(/*0*/ l: kotlin.MutableList<T>, /*1*/ t: T): kotlin.Unit
-    public fun </*0*/ K, /*1*/ V> testMutableMap(/*0*/ m: kotlin.MutableMap<K, V>): kotlin.Unit
-    public fun </*0*/ T> testMutableSet(/*0*/ s: kotlin.MutableSet<T>, /*1*/ t: T): kotlin.Unit
-    public fun </*0*/ T> testSet(/*0*/ s: kotlin.Set<T>, /*1*/ t: T): kotlin.Unit
+    public fun </*0*/ T> testCollection(/*0*/ c: kotlin.collections.Collection<T>, /*1*/ t: T): kotlin.Unit
+    public fun </*0*/ T> testList(/*0*/ l: kotlin.collections.List<T>, /*1*/ t: T): kotlin.Unit
+    public fun </*0*/ K, /*1*/ V> testMap(/*0*/ m: kotlin.collections.Map<K, V>): kotlin.Unit
+    public fun </*0*/ T> testMutableCollection(/*0*/ c: kotlin.collections.MutableCollection<T>, /*1*/ t: T): kotlin.Unit
+    public fun </*0*/ T> testMutableList(/*0*/ l: kotlin.collections.MutableList<T>, /*1*/ t: T): kotlin.Unit
+    public fun </*0*/ K, /*1*/ V> testMutableMap(/*0*/ m: kotlin.collections.MutableMap<K, V>): kotlin.Unit
+    public fun </*0*/ T> testMutableSet(/*0*/ s: kotlin.collections.MutableSet<T>, /*1*/ t: T): kotlin.Unit
+    public fun </*0*/ T> testSet(/*0*/ s: kotlin.collections.Set<T>, /*1*/ t: T): kotlin.Unit
 }
diff --git a/compiler/testData/diagnostics/tests/numbers/numbersInSimpleConstraints.txt b/compiler/testData/diagnostics/tests/numbers/numbersInSimpleConstraints.txt
index a0a33a54721..b71c01dd6ba 100644
--- a/compiler/testData/diagnostics/tests/numbers/numbersInSimpleConstraints.txt
+++ b/compiler/testData/diagnostics/tests/numbers/numbersInSimpleConstraints.txt
@@ -6,7 +6,7 @@ package a {
     public fun </*0*/ T> id(/*0*/ t: T): T
     public fun </*0*/ T> lowerBound(/*0*/ t: T, /*1*/ l: a.Cov<T>): T
     public fun other(/*0*/ s: kotlin.String): kotlin.Unit
-    public fun </*0*/ T> otherGeneric(/*0*/ l: kotlin.List<T>): kotlin.Unit
+    public fun </*0*/ T> otherGeneric(/*0*/ l: kotlin.collections.List<T>): kotlin.Unit
     public fun test(): kotlin.Unit
     public fun testExactBound(/*0*/ invS: a.Inv<kotlin.String>, /*1*/ invI: a.Inv<kotlin.Int>, /*2*/ invB: a.Inv<kotlin.Byte>): kotlin.Unit
     public fun testLowerBound(/*0*/ cov: a.Cov<kotlin.String>, /*1*/ covN: a.Cov<kotlin.Number>): kotlin.Unit
diff --git a/compiler/testData/diagnostics/tests/objects/upperBoundViolated.txt b/compiler/testData/diagnostics/tests/objects/upperBoundViolated.txt
index e853002db8f..20931d87582 100644
--- a/compiler/testData/diagnostics/tests/objects/upperBoundViolated.txt
+++ b/compiler/testData/diagnostics/tests/objects/upperBoundViolated.txt
@@ -6,7 +6,7 @@ public final class C {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-    public companion object Companion : Trait<kotlin.IntRange> {
+    public companion object Companion : Trait<kotlin.ranges.IntRange> {
         private constructor Companion()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/override/clashesOnInheritance/flexibleReturnTypeList.txt b/compiler/testData/diagnostics/tests/override/clashesOnInheritance/flexibleReturnTypeList.txt
index 3a5af10116f..095052e0566 100644
--- a/compiler/testData/diagnostics/tests/override/clashesOnInheritance/flexibleReturnTypeList.txt
+++ b/compiler/testData/diagnostics/tests/override/clashesOnInheritance/flexibleReturnTypeList.txt
@@ -1,115 +1,115 @@
 package
 
-public /*synthesized*/ fun J(/*0*/ function: () -> kotlin.(Mutable)List<kotlin.String!>!): J
+public /*synthesized*/ fun J(/*0*/ function: () -> kotlin.collections.(Mutable)List<kotlin.String!>!): J
 
 public interface ILNS {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public abstract fun foo(): kotlin.List<kotlin.String?>
+    public abstract fun foo(): kotlin.collections.List<kotlin.String?>
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
 public interface ILS {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public abstract fun foo(): kotlin.List<kotlin.String>
+    public abstract fun foo(): kotlin.collections.List<kotlin.String>
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
 public interface IMLNS {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public abstract fun foo(): kotlin.MutableList<kotlin.String?>
+    public abstract fun foo(): kotlin.collections.MutableList<kotlin.String?>
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
 public interface IMLS {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public abstract fun foo(): kotlin.MutableList<kotlin.String>
+    public abstract fun foo(): kotlin.collections.MutableList<kotlin.String>
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
 public interface J {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public abstract fun foo(): kotlin.(Mutable)List<kotlin.String!>!
+    public abstract fun foo(): kotlin.collections.(Mutable)List<kotlin.String!>!
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
 public interface Test1 : ILNS, J {
     public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public abstract override /*2*/ /*fake_override*/ fun foo(): kotlin.List<kotlin.String?>
+    public abstract override /*2*/ /*fake_override*/ fun foo(): kotlin.collections.List<kotlin.String?>
     public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
 public interface Test10 : IMLNS, ILS, J {
     public open override /*3*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public abstract override /*3*/ /*fake_override*/ fun foo(): kotlin.(Mutable)List<kotlin.String!>!
+    public abstract override /*3*/ /*fake_override*/ fun foo(): kotlin.collections.(Mutable)List<kotlin.String!>!
     public open override /*3*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*3*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
 public interface Test11 : IMLNS, ILS {
     public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public abstract override /*2*/ /*fake_override*/ fun foo(): kotlin.MutableList<kotlin.String?>
+    public abstract override /*2*/ /*fake_override*/ fun foo(): kotlin.collections.MutableList<kotlin.String?>
     public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
 public interface Test2 : J, ILNS {
     public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public abstract override /*2*/ /*fake_override*/ fun foo(): kotlin.List<kotlin.String?>
+    public abstract override /*2*/ /*fake_override*/ fun foo(): kotlin.collections.List<kotlin.String?>
     public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
 public interface Test3 : IMLS, J {
     public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public abstract override /*2*/ /*fake_override*/ fun foo(): kotlin.MutableList<kotlin.String>
+    public abstract override /*2*/ /*fake_override*/ fun foo(): kotlin.collections.MutableList<kotlin.String>
     public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
 public interface Test4 : J, IMLS {
     public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public abstract override /*2*/ /*fake_override*/ fun foo(): kotlin.MutableList<kotlin.String>
+    public abstract override /*2*/ /*fake_override*/ fun foo(): kotlin.collections.MutableList<kotlin.String>
     public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
 public interface Test5 : ILNS, IMLS, J {
     public open override /*3*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public abstract override /*3*/ /*fake_override*/ fun foo(): kotlin.MutableList<kotlin.String>
+    public abstract override /*3*/ /*fake_override*/ fun foo(): kotlin.collections.MutableList<kotlin.String>
     public open override /*3*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*3*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
 public interface Test6 : ILNS, J, IMLS {
     public open override /*3*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public abstract override /*3*/ /*fake_override*/ fun foo(): kotlin.MutableList<kotlin.String>
+    public abstract override /*3*/ /*fake_override*/ fun foo(): kotlin.collections.MutableList<kotlin.String>
     public open override /*3*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*3*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
 public interface Test7 : J, ILNS, IMLS {
     public open override /*3*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public abstract override /*3*/ /*fake_override*/ fun foo(): kotlin.MutableList<kotlin.String>
+    public abstract override /*3*/ /*fake_override*/ fun foo(): kotlin.collections.MutableList<kotlin.String>
     public open override /*3*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*3*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
 public interface Test8 : J, IMLNS, ILS {
     public open override /*3*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public abstract override /*3*/ /*fake_override*/ fun foo(): kotlin.(Mutable)List<kotlin.String!>!
+    public abstract override /*3*/ /*fake_override*/ fun foo(): kotlin.collections.(Mutable)List<kotlin.String!>!
     public open override /*3*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*3*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
 public interface Test9 : IMLNS, J, ILS {
     public open override /*3*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public abstract override /*3*/ /*fake_override*/ fun foo(): kotlin.(Mutable)List<kotlin.String!>!
+    public abstract override /*3*/ /*fake_override*/ fun foo(): kotlin.collections.(Mutable)List<kotlin.String!>!
     public open override /*3*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*3*/ /*fake_override*/ fun toString(): kotlin.String
 }
diff --git a/compiler/testData/diagnostics/tests/override/typeParameters/kt9850.txt b/compiler/testData/diagnostics/tests/override/typeParameters/kt9850.txt
index d7e769d51c1..2e9f8e418b9 100644
--- a/compiler/testData/diagnostics/tests/override/typeParameters/kt9850.txt
+++ b/compiler/testData/diagnostics/tests/override/typeParameters/kt9850.txt
@@ -3,7 +3,7 @@ package
 public abstract class Base {
     public constructor Base()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public abstract fun </*0*/ T : kotlin.Number> foo(/*0*/ list: kotlin.List<T>): kotlin.Unit where T : kotlin.Comparable<T>
+    public abstract fun </*0*/ T : kotlin.Number> foo(/*0*/ list: kotlin.collections.List<T>): kotlin.Unit where T : kotlin.Comparable<T>
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
@@ -11,7 +11,7 @@ public abstract class Base {
 public final class Derived : Base {
     public constructor Derived()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ fun </*0*/ T : kotlin.Number> foo(/*0*/ list: kotlin.List<T>): kotlin.Unit where T : kotlin.Comparable<T>
+    public open override /*1*/ fun </*0*/ T : kotlin.Number> foo(/*0*/ list: kotlin.collections.List<T>): kotlin.Unit where T : kotlin.Comparable<T>
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/inferenceWithBound.txt b/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/inferenceWithBound.txt
index 781c812ee86..45f944c43b0 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/inferenceWithBound.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/inferenceWithBound.txt
@@ -1,5 +1,5 @@
 package
 
-public fun </*0*/ T> listOf(/*0*/ t: T): kotlin.List<T>
+public fun </*0*/ T> listOf(/*0*/ t: T): kotlin.collections.List<T>
 public fun test(): kotlin.Unit
-public fun </*0*/ T : p.Super> kotlin.Collection<T>.foo(): T
+public fun </*0*/ T : p.Super> kotlin.collections.Collection<T>.foo(): T
diff --git a/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/mixedElvis.txt b/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/mixedElvis.txt
index 913620309c7..5ba277e5e97 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/mixedElvis.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/mixedElvis.txt
@@ -1,3 +1,3 @@
 package
 
-public fun foo(/*0*/ handlers: kotlin.Array<kotlin.MutableList<kotlin.String>?>): kotlin.Unit
+public fun foo(/*0*/ handlers: kotlin.Array<kotlin.collections.MutableList<kotlin.String>?>): kotlin.Unit
diff --git a/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/withNothing.txt b/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/withNothing.txt
index f2196f91c58..2a802f90cc9 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/withNothing.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/withNothing.txt
@@ -1,8 +1,8 @@
 package
 
 public fun </*0*/ T> f(/*0*/ a: Out<T>, /*1*/ b: Out<T>, /*2*/ c: Out<T>): T
-public fun </*0*/ T> out(/*0*/ t: T): Out<kotlin.MutableList<T>>
-public fun test(/*0*/ a: Out<kotlin.Nothing>, /*1*/ b: Out<kotlin.MutableList<p.J>>): kotlin.Unit
+public fun </*0*/ T> out(/*0*/ t: T): Out<kotlin.collections.MutableList<T>>
+public fun test(/*0*/ a: Out<kotlin.Nothing>, /*1*/ b: Out<kotlin.collections.MutableList<p.J>>): kotlin.Unit
 
 public interface Out</*0*/ out T1> {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
diff --git a/compiler/testData/diagnostics/tests/platformTypes/genericVarianceViolation/listSuperType.txt b/compiler/testData/diagnostics/tests/platformTypes/genericVarianceViolation/listSuperType.txt
index b6e301dc864..bfc0cbf0cc9 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/genericVarianceViolation/listSuperType.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/genericVarianceViolation/listSuperType.txt
@@ -5,35 +5,35 @@ public fun main(/*0*/ a: A, /*1*/ b: B): kotlin.Unit
 public open class A {
     public constructor A()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public/*package*/ open fun foo(/*0*/ x: kotlin.(Mutable)List<kotlin.Any!>!): kotlin.Unit
+    public/*package*/ open fun foo(/*0*/ x: kotlin.collections.(Mutable)List<kotlin.Any!>!): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-public abstract class B : kotlin.MutableList<kotlin.String> {
+public abstract class B : kotlin.collections.MutableList<kotlin.String> {
     public constructor B()
     public abstract override /*1*/ /*fake_override*/ val size: kotlin.Int
     public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String): kotlin.Unit
     public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ element: kotlin.String): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.Collection<kotlin.String>): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.Collection<kotlin.String>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.collections.Collection<kotlin.String>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String>): kotlin.Boolean
     public abstract override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit
     public abstract override /*1*/ /*fake_override*/ fun contains(/*0*/ element: kotlin.String): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.Collection<kotlin.String>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public abstract override /*1*/ /*fake_override*/ fun get(/*0*/ index: kotlin.Int): kotlin.String
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public abstract override /*1*/ /*fake_override*/ fun indexOf(/*0*/ element: kotlin.String): kotlin.Int
     public abstract override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator<kotlin.String>
+    public abstract override /*1*/ /*fake_override*/ fun iterator(): kotlin.collections.MutableIterator<kotlin.String>
     public abstract override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ element: kotlin.String): kotlin.Int
-    public abstract override /*1*/ /*fake_override*/ fun listIterator(): kotlin.MutableListIterator<kotlin.String>
-    public abstract override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.MutableListIterator<kotlin.String>
+    public abstract override /*1*/ /*fake_override*/ fun listIterator(): kotlin.collections.MutableListIterator<kotlin.String>
+    public abstract override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.collections.MutableListIterator<kotlin.String>
     public abstract override /*1*/ /*fake_override*/ fun remove(/*0*/ element: kotlin.String): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.Collection<kotlin.String>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String>): kotlin.Boolean
     public abstract override /*1*/ /*fake_override*/ fun removeAt(/*0*/ index: kotlin.Int): kotlin.String
-    public abstract override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.Collection<kotlin.String>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String>): kotlin.Boolean
     public abstract override /*1*/ /*fake_override*/ fun set(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String): kotlin.String
-    public abstract override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.MutableList<kotlin.String>
+    public abstract override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.collections.MutableList<kotlin.String>
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/genericVarianceViolation/rawTypes.txt b/compiler/testData/diagnostics/tests/platformTypes/genericVarianceViolation/rawTypes.txt
index ed9d59dd9cd..488db4567fb 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/genericVarianceViolation/rawTypes.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/genericVarianceViolation/rawTypes.txt
@@ -1,11 +1,11 @@
 package
 
-public fun main(/*0*/ a: A, /*1*/ ml: kotlin.MutableList<kotlin.String>, /*2*/ l: kotlin.List<kotlin.String>): kotlin.Unit
+public fun main(/*0*/ a: A, /*1*/ ml: kotlin.collections.MutableList<kotlin.String>, /*2*/ l: kotlin.collections.List<kotlin.String>): kotlin.Unit
 
 public open class A {
     public constructor A()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public/*package*/ open fun foo(/*0*/ x: kotlin.(Mutable)List<(raw) kotlin.Any?>!): kotlin.Unit
+    public/*package*/ open fun foo(/*0*/ x: kotlin.collections.(Mutable)List<(raw) kotlin.Any?>!): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/genericVarianceViolation/simple.txt b/compiler/testData/diagnostics/tests/platformTypes/genericVarianceViolation/simple.txt
index 07efd9b3ed5..865c30abc4f 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/genericVarianceViolation/simple.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/genericVarianceViolation/simple.txt
@@ -1,17 +1,17 @@
 package
 
-public fun main(/*0*/ a: A, /*1*/ ml: kotlin.MutableList<kotlin.String>, /*2*/ l: kotlin.List<kotlin.String>, /*3*/ ms: kotlin.MutableSet<kotlin.String>, /*4*/ s: kotlin.Set<kotlin.String>, /*5*/ mm: kotlin.MutableMap<kotlin.Any, kotlin.String>, /*6*/ m: kotlin.Map<kotlin.Any, kotlin.String>, /*7*/ mme: kotlin.MutableMap.MutableEntry<kotlin.Any, kotlin.String>, /*8*/ me: kotlin.Map.Entry<kotlin.Any, kotlin.String>, /*9*/ mll: kotlin.MutableList<kotlin.MutableList<kotlin.String>>, /*10*/ ll: kotlin.List<kotlin.List<kotlin.String>>): kotlin.Unit
+public fun main(/*0*/ a: A, /*1*/ ml: kotlin.collections.MutableList<kotlin.String>, /*2*/ l: kotlin.collections.List<kotlin.String>, /*3*/ ms: kotlin.collections.MutableSet<kotlin.String>, /*4*/ s: kotlin.collections.Set<kotlin.String>, /*5*/ mm: kotlin.collections.MutableMap<kotlin.Any, kotlin.String>, /*6*/ m: kotlin.collections.Map<kotlin.Any, kotlin.String>, /*7*/ mme: kotlin.collections.MutableMap.MutableEntry<kotlin.Any, kotlin.String>, /*8*/ me: kotlin.collections.Map.Entry<kotlin.Any, kotlin.String>, /*9*/ mll: kotlin.collections.MutableList<kotlin.collections.MutableList<kotlin.String>>, /*10*/ ll: kotlin.collections.List<kotlin.collections.List<kotlin.String>>): kotlin.Unit
 
 public open class A {
     public constructor A()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public/*package*/ open fun foo(/*0*/ x: kotlin.(Mutable)Iterable<kotlin.Any!>!): kotlin.Unit
-    public/*package*/ open fun foo(/*0*/ x: kotlin.(Mutable)Iterator<kotlin.Any!>!): kotlin.Unit
-    public/*package*/ open fun foo(/*0*/ x: kotlin.(Mutable)List<kotlin.(Mutable)List<kotlin.Any!>!>!): kotlin.Unit
-    public/*package*/ open fun foo(/*0*/ x: kotlin.(Mutable)List<kotlin.Any!>!): kotlin.Unit
-    public/*package*/ open fun foo(/*0*/ x: kotlin.(Mutable)Map.(Mutable)Entry<kotlin.Any!, kotlin.Any!>!): kotlin.Unit
-    public/*package*/ open fun foo(/*0*/ x: kotlin.(Mutable)Map<kotlin.Any!, kotlin.Any!>!): kotlin.Unit
-    public/*package*/ open fun foo(/*0*/ x: kotlin.(Mutable)Set<kotlin.Any!>!): kotlin.Unit
+    public/*package*/ open fun foo(/*0*/ x: kotlin.collections.(Mutable)Iterable<kotlin.Any!>!): kotlin.Unit
+    public/*package*/ open fun foo(/*0*/ x: kotlin.collections.(Mutable)Iterator<kotlin.Any!>!): kotlin.Unit
+    public/*package*/ open fun foo(/*0*/ x: kotlin.collections.(Mutable)List<kotlin.Any!>!): kotlin.Unit
+    public/*package*/ open fun foo(/*0*/ x: kotlin.collections.(Mutable)List<kotlin.collections.(Mutable)List<kotlin.Any!>!>!): kotlin.Unit
+    public/*package*/ open fun foo(/*0*/ x: kotlin.collections.(Mutable)Map.(Mutable)Entry<kotlin.Any!, kotlin.Any!>!): kotlin.Unit
+    public/*package*/ open fun foo(/*0*/ x: kotlin.collections.(Mutable)Map<kotlin.Any!, kotlin.Any!>!): kotlin.Unit
+    public/*package*/ open fun foo(/*0*/ x: kotlin.collections.(Mutable)Set<kotlin.Any!>!): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/genericVarianceViolation/smartCast.txt b/compiler/testData/diagnostics/tests/platformTypes/genericVarianceViolation/smartCast.txt
index 672b0f32b26..e7f61daa555 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/genericVarianceViolation/smartCast.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/genericVarianceViolation/smartCast.txt
@@ -5,7 +5,7 @@ public fun main(/*0*/ a: A, /*1*/ ml: kotlin.Any): kotlin.Unit
 public open class A {
     public constructor A()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public/*package*/ open fun foo(/*0*/ x: kotlin.(Mutable)List<kotlin.Any!>!): kotlin.Unit
+    public/*package*/ open fun foo(/*0*/ x: kotlin.collections.(Mutable)List<kotlin.Any!>!): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/genericVarianceViolation/strangeVariance.txt b/compiler/testData/diagnostics/tests/platformTypes/genericVarianceViolation/strangeVariance.txt
index 531b6cbc4b3..f56957ddef4 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/genericVarianceViolation/strangeVariance.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/genericVarianceViolation/strangeVariance.txt
@@ -1,12 +1,12 @@
 package
 
-public fun main(/*0*/ a: A, /*1*/ ml: kotlin.MutableList<kotlin.String>, /*2*/ l: kotlin.List<kotlin.String>): kotlin.Unit
+public fun main(/*0*/ a: A, /*1*/ ml: kotlin.collections.MutableList<kotlin.String>, /*2*/ l: kotlin.collections.List<kotlin.String>): kotlin.Unit
 
 public open class A {
     public constructor A()
-    public/*package*/ open fun bar(/*0*/ x: kotlin.(Mutable)List<in kotlin.Any!>!): kotlin.Unit
+    public/*package*/ open fun bar(/*0*/ x: kotlin.collections.(Mutable)List<in kotlin.Any!>!): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public/*package*/ open fun foo(/*0*/ x: kotlin.(Mutable)List<in kotlin.String!>!): kotlin.Unit
+    public/*package*/ open fun foo(/*0*/ x: kotlin.collections.(Mutable)List<in kotlin.String!>!): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/genericVarianceViolation/valueFromJava.txt b/compiler/testData/diagnostics/tests/platformTypes/genericVarianceViolation/valueFromJava.txt
index c7cca47c4b6..51f614b7268 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/genericVarianceViolation/valueFromJava.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/genericVarianceViolation/valueFromJava.txt
@@ -4,9 +4,9 @@ public fun main(/*0*/ a: A): kotlin.Unit
 
 public open class A {
     public constructor A()
-    public/*package*/ open fun bar(): kotlin.(Mutable)List<kotlin.String!>!
+    public/*package*/ open fun bar(): kotlin.collections.(Mutable)List<kotlin.String!>!
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public/*package*/ open fun foo(/*0*/ x: kotlin.(Mutable)List<kotlin.Any!>!): kotlin.Unit
+    public/*package*/ open fun foo(/*0*/ x: kotlin.collections.(Mutable)List<kotlin.Any!>!): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/genericVarianceViolation/wildcards.txt b/compiler/testData/diagnostics/tests/platformTypes/genericVarianceViolation/wildcards.txt
index 437fb1fd7d5..7e0f94238ca 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/genericVarianceViolation/wildcards.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/genericVarianceViolation/wildcards.txt
@@ -1,16 +1,16 @@
 package
 
-public fun main(/*0*/ a: A, /*1*/ ml: kotlin.MutableList<kotlin.String>, /*2*/ l: kotlin.List<kotlin.String>, /*3*/ ms: kotlin.MutableSet<kotlin.String>, /*4*/ s: kotlin.Set<kotlin.String>, /*5*/ mm: kotlin.MutableMap<kotlin.Any, kotlin.String>, /*6*/ m: kotlin.Map<kotlin.Any, kotlin.String>, /*7*/ mme: kotlin.MutableMap.MutableEntry<kotlin.Any, kotlin.String>, /*8*/ me: kotlin.Map.Entry<kotlin.Any, kotlin.String>): kotlin.Unit
+public fun main(/*0*/ a: A, /*1*/ ml: kotlin.collections.MutableList<kotlin.String>, /*2*/ l: kotlin.collections.List<kotlin.String>, /*3*/ ms: kotlin.collections.MutableSet<kotlin.String>, /*4*/ s: kotlin.collections.Set<kotlin.String>, /*5*/ mm: kotlin.collections.MutableMap<kotlin.Any, kotlin.String>, /*6*/ m: kotlin.collections.Map<kotlin.Any, kotlin.String>, /*7*/ mme: kotlin.collections.MutableMap.MutableEntry<kotlin.Any, kotlin.String>, /*8*/ me: kotlin.collections.Map.Entry<kotlin.Any, kotlin.String>): kotlin.Unit
 
 public open class A {
     public constructor A()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public/*package*/ open fun foo(/*0*/ x: kotlin.(Mutable)Iterable<*>!): kotlin.Unit
-    public/*package*/ open fun foo(/*0*/ x: kotlin.(Mutable)Iterator<*>!): kotlin.Unit
-    public/*package*/ open fun foo(/*0*/ x: kotlin.(Mutable)List<*>!): kotlin.Unit
-    public/*package*/ open fun foo(/*0*/ x: kotlin.(Mutable)Map.(Mutable)Entry<*, *>!): kotlin.Unit
-    public/*package*/ open fun foo(/*0*/ x: kotlin.(Mutable)Map<*, *>!): kotlin.Unit
-    public/*package*/ open fun foo(/*0*/ x: kotlin.(Mutable)Set<*>!): kotlin.Unit
+    public/*package*/ open fun foo(/*0*/ x: kotlin.collections.(Mutable)Iterable<*>!): kotlin.Unit
+    public/*package*/ open fun foo(/*0*/ x: kotlin.collections.(Mutable)Iterator<*>!): kotlin.Unit
+    public/*package*/ open fun foo(/*0*/ x: kotlin.collections.(Mutable)List<*>!): kotlin.Unit
+    public/*package*/ open fun foo(/*0*/ x: kotlin.collections.(Mutable)Map.(Mutable)Entry<*, *>!): kotlin.Unit
+    public/*package*/ open fun foo(/*0*/ x: kotlin.collections.(Mutable)Map<*, *>!): kotlin.Unit
+    public/*package*/ open fun foo(/*0*/ x: kotlin.collections.(Mutable)Set<*>!): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/intersection/map.txt b/compiler/testData/diagnostics/tests/platformTypes/intersection/map.txt
index 9eee0e4d6b3..ecc60dc6cf2 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/intersection/map.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/intersection/map.txt
@@ -1,4 +1,4 @@
 package
 
-public fun foo(/*0*/ p1: kotlin.(Mutable)Map<kotlin.Int, kotlin.String>!, /*1*/ p2: kotlin.Map<kotlin.Int, kotlin.String>): kotlin.Boolean
 public fun foo(/*0*/ p1: kotlin.String!, /*1*/ p2: kotlin.String): kotlin.Boolean
+public fun foo(/*0*/ p1: kotlin.collections.(Mutable)Map<kotlin.Int, kotlin.String>!, /*1*/ p2: kotlin.collections.Map<kotlin.Int, kotlin.String>): kotlin.Boolean
diff --git a/compiler/testData/diagnostics/tests/platformTypes/methodCall/javaCollectionToKotlin.txt b/compiler/testData/diagnostics/tests/platformTypes/methodCall/javaCollectionToKotlin.txt
index a978310ba6c..ae3418bb676 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/methodCall/javaCollectionToKotlin.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/methodCall/javaCollectionToKotlin.txt
@@ -1,4 +1,4 @@
 package
 
-public fun takeJ(/*0*/ map: kotlin.Map<kotlin.Any, kotlin.Any>): kotlin.Unit
+public fun takeJ(/*0*/ map: kotlin.collections.Map<kotlin.Any, kotlin.Any>): kotlin.Unit
 public fun test(): kotlin.Unit
diff --git a/compiler/testData/diagnostics/tests/platformTypes/methodCall/kotlinCollectionToJava.txt b/compiler/testData/diagnostics/tests/platformTypes/methodCall/kotlinCollectionToJava.txt
index 0b0979e390e..7bb28fff138 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/methodCall/kotlinCollectionToJava.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/methodCall/kotlinCollectionToJava.txt
@@ -1,3 +1,3 @@
 package
 
-public fun test(/*0*/ map: kotlin.Map<kotlin.Any, kotlin.Any>): kotlin.Unit
+public fun test(/*0*/ map: kotlin.collections.Map<kotlin.Any, kotlin.Any>): kotlin.Unit
diff --git a/compiler/testData/diagnostics/tests/platformTypes/methodCall/list.txt b/compiler/testData/diagnostics/tests/platformTypes/methodCall/list.txt
index 5b55754d546..abf7a9ec0da 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/methodCall/list.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/methodCall/list.txt
@@ -1,3 +1,3 @@
 package
 
-public fun test(/*0*/ ls: kotlin.List<kotlin.String>, /*1*/ mls: kotlin.MutableList<kotlin.String>, /*2*/ lsn: kotlin.List<kotlin.String?>, /*3*/ mlsn: kotlin.MutableList<kotlin.String?>?): kotlin.Unit
+public fun test(/*0*/ ls: kotlin.collections.List<kotlin.String>, /*1*/ mls: kotlin.collections.MutableList<kotlin.String>, /*2*/ lsn: kotlin.collections.List<kotlin.String?>, /*3*/ mlsn: kotlin.collections.MutableList<kotlin.String?>?): kotlin.Unit
diff --git a/compiler/testData/diagnostics/tests/platformTypes/methodCall/multipleExactBounds.txt b/compiler/testData/diagnostics/tests/platformTypes/methodCall/multipleExactBounds.txt
index 49bb1fa9c70..88845edf23d 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/methodCall/multipleExactBounds.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/methodCall/multipleExactBounds.txt
@@ -27,7 +27,7 @@ public interface ResolverForProject</*0*/ M1, /*1*/ R1> {
 }
 
 public final class ResolverForProjectImpl</*0*/ M : ModuleInfo, /*1*/ R : ResolverForModule> : ResolverForProject<M, R> {
-    public constructor ResolverForProjectImpl</*0*/ M : ModuleInfo, /*1*/ R : ResolverForModule>(/*0*/ descriptorByModule: kotlin.Map<M, ModuleDescriptorImpl>, /*1*/ delegateResolver: ResolverForProject<M, R>)
+    public constructor ResolverForProjectImpl</*0*/ M : ModuleInfo, /*1*/ R : ResolverForModule>(/*0*/ descriptorByModule: kotlin.collections.Map<M, ModuleDescriptorImpl>, /*1*/ delegateResolver: ResolverForProject<M, R>)
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
diff --git a/compiler/testData/diagnostics/tests/platformTypes/methodCall/multipleExactBoundsNullable.txt b/compiler/testData/diagnostics/tests/platformTypes/methodCall/multipleExactBoundsNullable.txt
index 4783648ed97..05295e0be07 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/methodCall/multipleExactBoundsNullable.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/methodCall/multipleExactBoundsNullable.txt
@@ -4,12 +4,12 @@ public fun </*0*/ M2 : WithFoo> foo(/*0*/ delegateResolver: ResolverForProject<M
 
 public/*package*/ open class MyMap</*0*/ K : kotlin.Any!, /*1*/ V : kotlin.Any!> : java.util.AbstractMap<K!, V!> {
     public/*package*/ constructor MyMap</*0*/ K : kotlin.Any!, /*1*/ V : kotlin.Any!>()
-    public open override /*1*/ val entries: kotlin.MutableSet<kotlin.MutableMap.MutableEntry<K!, V!>>
-    invisible_fake final override /*1*/ /*fake_override*/ var keySet: kotlin.(Mutable)Set<K!>!
-    public open override /*1*/ /*fake_override*/ val keys: kotlin.MutableSet<K!>
+    public open override /*1*/ val entries: kotlin.collections.MutableSet<kotlin.collections.MutableMap.MutableEntry<K!, V!>>
+    invisible_fake final override /*1*/ /*fake_override*/ var keySet: kotlin.collections.(Mutable)Set<K!>!
+    public open override /*1*/ /*fake_override*/ val keys: kotlin.collections.MutableSet<K!>
     public open override /*1*/ /*fake_override*/ val size: kotlin.Int
-    invisible_fake final override /*1*/ /*fake_override*/ var values: kotlin.(Mutable)Collection<V!>!
-    public open override /*1*/ /*fake_override*/ val values: kotlin.MutableCollection<V!>
+    invisible_fake final override /*1*/ /*fake_override*/ var values: kotlin.collections.(Mutable)Collection<V!>!
+    public open override /*1*/ /*fake_override*/ val values: kotlin.collections.MutableCollection<V!>
     public open override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit
     protected/*protected and package*/ open override /*1*/ /*fake_override*/ fun clone(): kotlin.Any!
     public open override /*1*/ /*fake_override*/ fun containsKey(/*0*/ key: K!): kotlin.Boolean
@@ -19,7 +19,7 @@ public/*package*/ open class MyMap</*0*/ K : kotlin.Any!, /*1*/ V : kotlin.Any!>
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun put(/*0*/ key: K!, /*1*/ value: V!): V?
-    public open override /*1*/ /*fake_override*/ fun putAll(/*0*/ from: kotlin.Map<out K!, V!>): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun putAll(/*0*/ from: kotlin.collections.Map<out K!, V!>): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun remove(/*0*/ key: K!): V?
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
@@ -35,7 +35,7 @@ public interface ResolverForProject</*0*/ M1> {
 }
 
 public final class ResolverForProjectImpl</*0*/ M> : ResolverForProject<M> {
-    public constructor ResolverForProjectImpl</*0*/ M>(/*0*/ descriptorByModule: kotlin.Map<M, kotlin.String>, /*1*/ delegateResolver: ResolverForProject<M>)
+    public constructor ResolverForProjectImpl</*0*/ M>(/*0*/ descriptorByModule: kotlin.collections.Map<M, kotlin.String>, /*1*/ delegateResolver: ResolverForProject<M>)
     public open override /*1*/ /*fake_override*/ val exposeM: M
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/delegation.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/delegation.txt
index af2767b3ef8..aa175267871 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/delegation.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/delegation.txt
@@ -1,56 +1,56 @@
 package
 
-public final class A : kotlin.List<kotlin.String> {
+public final class A : kotlin.collections.List<kotlin.String> {
     public constructor A()
     public open override /*1*/ /*delegation*/ val size: kotlin.Int
     public open override /*1*/ /*delegation*/ fun contains(/*0*/ element: kotlin.String): kotlin.Boolean
-    public open override /*1*/ /*delegation*/ fun containsAll(/*0*/ elements: kotlin.Collection<kotlin.String>): kotlin.Boolean
+    public open override /*1*/ /*delegation*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*delegation*/ fun get(/*0*/ index: kotlin.Int): kotlin.String
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*delegation*/ fun indexOf(/*0*/ element: kotlin.String): kotlin.Int
     public open override /*1*/ /*delegation*/ fun isEmpty(): kotlin.Boolean
-    public open override /*1*/ /*delegation*/ fun iterator(): kotlin.Iterator<kotlin.String>
+    public open override /*1*/ /*delegation*/ fun iterator(): kotlin.collections.Iterator<kotlin.String>
     public open override /*1*/ /*delegation*/ fun lastIndexOf(/*0*/ element: kotlin.String): kotlin.Int
-    public open override /*1*/ /*delegation*/ fun listIterator(): kotlin.ListIterator<kotlin.String>
-    public open override /*1*/ /*delegation*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.ListIterator<kotlin.String>
-    public open override /*1*/ /*delegation*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.List<kotlin.String>
+    public open override /*1*/ /*delegation*/ fun listIterator(): kotlin.collections.ListIterator<kotlin.String>
+    public open override /*1*/ /*delegation*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.collections.ListIterator<kotlin.String>
+    public open override /*1*/ /*delegation*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.collections.List<kotlin.String>
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-public final class B : kotlin.List<kotlin.String> {
+public final class B : kotlin.collections.List<kotlin.String> {
     public constructor B()
     public open override /*1*/ /*delegation*/ val size: kotlin.Int
     public open override /*1*/ /*delegation*/ fun contains(/*0*/ element: kotlin.String): kotlin.Boolean
-    public open override /*1*/ /*delegation*/ fun containsAll(/*0*/ elements: kotlin.Collection<kotlin.String>): kotlin.Boolean
+    public open override /*1*/ /*delegation*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*delegation*/ fun get(/*0*/ index: kotlin.Int): kotlin.String
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*delegation*/ fun indexOf(/*0*/ element: kotlin.String): kotlin.Int
     public open override /*1*/ /*delegation*/ fun isEmpty(): kotlin.Boolean
-    public open override /*1*/ /*delegation*/ fun iterator(): kotlin.Iterator<kotlin.String>
+    public open override /*1*/ /*delegation*/ fun iterator(): kotlin.collections.Iterator<kotlin.String>
     public open override /*1*/ /*delegation*/ fun lastIndexOf(/*0*/ element: kotlin.String): kotlin.Int
-    public open override /*1*/ /*delegation*/ fun listIterator(): kotlin.ListIterator<kotlin.String>
-    public open override /*1*/ /*delegation*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.ListIterator<kotlin.String>
-    public open override /*1*/ /*delegation*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.List<kotlin.String>
+    public open override /*1*/ /*delegation*/ fun listIterator(): kotlin.collections.ListIterator<kotlin.String>
+    public open override /*1*/ /*delegation*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.collections.ListIterator<kotlin.String>
+    public open override /*1*/ /*delegation*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.collections.List<kotlin.String>
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-public final class C : kotlin.List<kotlin.String> {
+public final class C : kotlin.collections.List<kotlin.String> {
     public constructor C()
     public open override /*1*/ /*delegation*/ val size: kotlin.Int
     public open override /*1*/ /*delegation*/ fun contains(/*0*/ element: kotlin.String): kotlin.Boolean
-    public open override /*1*/ /*delegation*/ fun containsAll(/*0*/ elements: kotlin.Collection<kotlin.String>): kotlin.Boolean
+    public open override /*1*/ /*delegation*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*delegation*/ fun get(/*0*/ index: kotlin.Int): kotlin.String
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*delegation*/ fun indexOf(/*0*/ element: kotlin.String): kotlin.Int
     public open override /*1*/ /*delegation*/ fun isEmpty(): kotlin.Boolean
-    public open override /*1*/ /*delegation*/ fun iterator(): kotlin.Iterator<kotlin.String>
+    public open override /*1*/ /*delegation*/ fun iterator(): kotlin.collections.Iterator<kotlin.String>
     public open override /*1*/ /*delegation*/ fun lastIndexOf(/*0*/ element: kotlin.String): kotlin.Int
-    public open override /*1*/ /*delegation*/ fun listIterator(): kotlin.ListIterator<kotlin.String>
-    public open override /*1*/ /*delegation*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.ListIterator<kotlin.String>
-    public open override /*1*/ /*delegation*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.List<kotlin.String>
+    public open override /*1*/ /*delegation*/ fun listIterator(): kotlin.collections.ListIterator<kotlin.String>
+    public open override /*1*/ /*delegation*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.collections.ListIterator<kotlin.String>
+    public open override /*1*/ /*delegation*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.collections.List<kotlin.String>
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
@@ -61,7 +61,7 @@ public open class J {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final var staticJ: kotlin.(Mutable)List<kotlin.String!>!
-    @org.jetbrains.annotations.Nullable() public final var staticN: kotlin.(Mutable)List<kotlin.String!>?
-    @org.jetbrains.annotations.NotNull() public final var staticNN: kotlin.(Mutable)List<kotlin.String!>
+    public final var staticJ: kotlin.collections.(Mutable)List<kotlin.String!>!
+    @org.jetbrains.annotations.Nullable() public final var staticN: kotlin.collections.(Mutable)List<kotlin.String!>?
+    @org.jetbrains.annotations.NotNull() public final var staticNN: kotlin.collections.(Mutable)List<kotlin.String!>
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/for.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/for.txt
index bd38b3fb7e5..0adc8cb4c8d 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/for.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/for.txt
@@ -9,7 +9,7 @@ public open class J {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
-    public final var staticJ: kotlin.(Mutable)List<kotlin.String!>!
-    @org.jetbrains.annotations.Nullable() public final var staticN: kotlin.(Mutable)List<kotlin.String!>?
-    @org.jetbrains.annotations.NotNull() public final var staticNN: kotlin.(Mutable)List<kotlin.String!>
+    public final var staticJ: kotlin.collections.(Mutable)List<kotlin.String!>!
+    @org.jetbrains.annotations.Nullable() public final var staticN: kotlin.collections.(Mutable)List<kotlin.String!>?
+    @org.jetbrains.annotations.NotNull() public final var staticNN: kotlin.collections.(Mutable)List<kotlin.String!>
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/inferenceInConditionals.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/inferenceInConditionals.txt
index bdf5469dc5e..7ab0124eef4 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/inferenceInConditionals.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/inferenceInConditionals.txt
@@ -8,7 +8,7 @@ public open class J {
     public constructor J()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    @org.jetbrains.annotations.Nullable() public open fun n(): kotlin.(Mutable)List<kotlin.String!>?
+    @org.jetbrains.annotations.Nullable() public open fun n(): kotlin.collections.(Mutable)List<kotlin.String!>?
     @org.jetbrains.annotations.NotNull() public open fun nn(): kotlin.String
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/kt6829.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/kt6829.txt
index 86bacd487a7..f7e6d9a4788 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/kt6829.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/kt6829.txt
@@ -1,7 +1,7 @@
 package
 
-public fun foo(/*0*/ collection: kotlin.Collection<J>): kotlin.Unit
-public fun </*0*/ T, /*1*/ R> kotlin.Iterable<T>.map(/*0*/ transform: (T) -> R): kotlin.List<R>
+public fun foo(/*0*/ collection: kotlin.collections.Collection<J>): kotlin.Unit
+public fun </*0*/ T, /*1*/ R> kotlin.collections.Iterable<T>.map(/*0*/ transform: (T) -> R): kotlin.collections.List<R>
 
 public open class J {
     public constructor J()
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/notNullTypeMarkedWithNullableAnnotation.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/notNullTypeMarkedWithNullableAnnotation.txt
index 0dbaa9b36be..2995f5dddd8 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/notNullTypeMarkedWithNullableAnnotation.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/notNullTypeMarkedWithNullableAnnotation.txt
@@ -6,6 +6,6 @@ public open class J {
     public constructor J()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    @org.jetbrains.annotations.Nullable() public open fun n(): kotlin.(Mutable)List<kotlin.String!>?
+    @org.jetbrains.annotations.Nullable() public open fun n(): kotlin.collections.(Mutable)List<kotlin.String!>?
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/rawOverrides.txt b/compiler/testData/diagnostics/tests/platformTypes/rawOverrides.txt
index 1d4414ebae3..035ec4df2c5 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/rawOverrides.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/rawOverrides.txt
@@ -2,21 +2,21 @@ package
 
 public interface A</*0*/ T : kotlin.Any!> {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public abstract fun </*0*/ E : kotlin.CharSequence!> foo(/*0*/ x: T!, /*1*/ y: (kotlin.MutableList<out T!>..kotlin.List<T!>?)): E!
+    public abstract fun </*0*/ E : kotlin.CharSequence!> foo(/*0*/ x: T!, /*1*/ y: (kotlin.collections.MutableList<out T!>..kotlin.collections.List<T!>?)): E!
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
 public interface B : A<kotlin.Any!> {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any(raw)?): kotlin.Boolean(raw)
-    @java.lang.Override() public abstract override /*1*/ fun foo(/*0*/ x: kotlin.Any!, /*1*/ y: kotlin.(Mutable)List<(raw) kotlin.Any?>!): kotlin.String!
+    @java.lang.Override() public abstract override /*1*/ fun foo(/*0*/ x: kotlin.Any!, /*1*/ y: kotlin.collections.(Mutable)List<(raw) kotlin.Any?>!): kotlin.String!
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int(raw)
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String(raw)
 }
 
 public abstract class C {
     public constructor C()
-    public/*package*/ open fun </*0*/ E : kotlin.CharSequence!, /*1*/ F : E!> bar(/*0*/ x: F!, /*1*/ y: kotlin.(Mutable)List<kotlin.(Mutable)Map<E!, F!>!>!): E!
+    public/*package*/ open fun </*0*/ E : kotlin.CharSequence!, /*1*/ F : E!> bar(/*0*/ x: F!, /*1*/ y: kotlin.collections.(Mutable)List<kotlin.collections.(Mutable)Map<E!, F!>!>!): E!
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
@@ -24,7 +24,7 @@ public abstract class C {
 
 public open class D : C {
     public constructor D()
-    @java.lang.Override() public open override /*1*/ fun bar(/*0*/ x: kotlin.CharSequence!, /*1*/ y: kotlin.(Mutable)List<(raw) kotlin.Any?>!): kotlin.String!
+    @java.lang.Override() public open override /*1*/ fun bar(/*0*/ x: kotlin.CharSequence!, /*1*/ y: kotlin.collections.(Mutable)List<(raw) kotlin.Any?>!): kotlin.String!
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
@@ -32,9 +32,9 @@ public open class D : C {
 
 public final class E : D, B {
     public constructor E()
-    public open override /*1*/ fun bar(/*0*/ x: kotlin.CharSequence?, /*1*/ y: kotlin.List<*>?): kotlin.String
+    public open override /*1*/ fun bar(/*0*/ x: kotlin.CharSequence?, /*1*/ y: kotlin.collections.List<*>?): kotlin.String
     public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ fun foo(/*0*/ x: kotlin.Any, /*1*/ y: kotlin.List<kotlin.Any?>): kotlin.String
+    public open override /*1*/ fun foo(/*0*/ x: kotlin.Any, /*1*/ y: kotlin.collections.List<kotlin.Any?>): kotlin.String
     public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
 }
@@ -42,15 +42,15 @@ public final class E : D, B {
 public final class E2 : B {
     public constructor E2()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any(raw)?): kotlin.Boolean(raw)
-    public open fun foo(/*0*/ x: kotlin.Any, /*1*/ y: kotlin.List<kotlin.String?>): kotlin.String
-    @java.lang.Override() public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ x: kotlin.Any!, /*1*/ y: kotlin.(Mutable)List<(raw) kotlin.Any?>!): kotlin.String!
+    public open fun foo(/*0*/ x: kotlin.Any, /*1*/ y: kotlin.collections.List<kotlin.String?>): kotlin.String
+    @java.lang.Override() public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ x: kotlin.Any!, /*1*/ y: kotlin.collections.(Mutable)List<(raw) kotlin.Any?>!): kotlin.String!
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int(raw)
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String(raw)
 }
 
 public final class F : D {
     public constructor F()
-    @java.lang.Override() public open override /*1*/ /*fake_override*/ fun bar(/*0*/ x: kotlin.CharSequence!, /*1*/ y: kotlin.(Mutable)List<(raw) kotlin.Any?>!): kotlin.String!
+    @java.lang.Override() public open override /*1*/ /*fake_override*/ fun bar(/*0*/ x: kotlin.CharSequence!, /*1*/ y: kotlin.collections.(Mutable)List<(raw) kotlin.Any?>!): kotlin.String!
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
diff --git a/compiler/testData/diagnostics/tests/platformTypes/rawTypes/arrays.txt b/compiler/testData/diagnostics/tests/platformTypes/rawTypes/arrays.txt
index 44b6de4aee1..695f5c580eb 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/rawTypes/arrays.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/rawTypes/arrays.txt
@@ -6,10 +6,10 @@ public fun main(): kotlin.Unit
 public open class A</*0*/ T : kotlin.CharSequence!, /*1*/ E : kotlin.Any!> {
     public constructor A</*0*/ T : kotlin.CharSequence!, /*1*/ E : kotlin.Any!>()
     public/*package*/ final var arraysOfAny: kotlin.Array<(out) kotlin.Array<(out) E!>!>!
-    public/*package*/ final var arraysOfLists: kotlin.Array<(out) kotlin.Array<(out) kotlin.(Mutable)List<kotlin.Double!>!>!>!
+    public/*package*/ final var arraysOfLists: kotlin.Array<(out) kotlin.Array<(out) kotlin.collections.(Mutable)List<kotlin.Double!>!>!>!
     public/*package*/ final var charSequences: kotlin.Array<(out) T!>!
-    public/*package*/ final var erasedLists: kotlin.Array<(out) kotlin.(Mutable)List<kotlin.Array<(out) kotlin.Double!>!>!>!
-    public/*package*/ final var maps: kotlin.Array<(out) kotlin.(Mutable)Map<kotlin.String!, T!>!>!
+    public/*package*/ final var erasedLists: kotlin.Array<(out) kotlin.collections.(Mutable)List<kotlin.Array<(out) kotlin.Double!>!>!>!
+    public/*package*/ final var maps: kotlin.Array<(out) kotlin.collections.(Mutable)Map<kotlin.String!, T!>!>!
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
@@ -24,10 +24,10 @@ public/*package*/ open class Test {
     public/*package*/ open class RawADerived : A<kotlin.CharSequence!, kotlin.Any!> {
         public/*package*/ constructor RawADerived()
         public/*package*/ final override /*1*/ /*fake_override*/ var arraysOfAny: kotlin.Array<(out) kotlin.Array<(out) kotlin.Any(raw)!>!>!
-        public/*package*/ final override /*1*/ /*fake_override*/ var arraysOfLists: kotlin.Array<(out) kotlin.Array<(out) kotlin.(Mutable)List<(raw) kotlin.Any?>!>!>!
+        public/*package*/ final override /*1*/ /*fake_override*/ var arraysOfLists: kotlin.Array<(out) kotlin.Array<(out) kotlin.collections.(Mutable)List<(raw) kotlin.Any?>!>!>!
         public/*package*/ final override /*1*/ /*fake_override*/ var charSequences: kotlin.Array<(out) kotlin.CharSequence(raw)!>!
-        public/*package*/ final override /*1*/ /*fake_override*/ var erasedLists: kotlin.Array<(out) kotlin.(Mutable)List<(raw) kotlin.Any?>!>!
-        public/*package*/ final override /*1*/ /*fake_override*/ var maps: kotlin.Array<(out) kotlin.(Mutable)Map<(raw) kotlin.Any?, (raw) kotlin.Any?>!>!
+        public/*package*/ final override /*1*/ /*fake_override*/ var erasedLists: kotlin.Array<(out) kotlin.collections.(Mutable)List<(raw) kotlin.Any?>!>!
+        public/*package*/ final override /*1*/ /*fake_override*/ var maps: kotlin.Array<(out) kotlin.collections.(Mutable)Map<(raw) kotlin.Any?, (raw) kotlin.Any?>!>!
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any(raw)?): kotlin.Boolean(raw)
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int(raw)
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String(raw)
diff --git a/compiler/testData/diagnostics/tests/platformTypes/rawTypes/errorType.txt b/compiler/testData/diagnostics/tests/platformTypes/rawTypes/errorType.txt
index 377c2f6ecde..e985b9ec255 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/rawTypes/errorType.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/rawTypes/errorType.txt
@@ -3,7 +3,7 @@ package
 public open class A</*0*/ T : kotlin.Any!> {
     public constructor A</*0*/ T : kotlin.Any!>()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open fun foo(/*0*/ x: [ERROR : Unresolved java classifier: Err<String>]!, /*1*/ y: kotlin.(Mutable)List<kotlin.String!>!): kotlin.Unit
+    public open fun foo(/*0*/ x: [ERROR : Unresolved java classifier: Err<String>]!, /*1*/ y: kotlin.collections.(Mutable)List<kotlin.String!>!): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
@@ -11,7 +11,7 @@ public open class A</*0*/ T : kotlin.Any!> {
 public open class B : A<kotlin.Any!> {
     public constructor B()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any(raw)?): kotlin.Boolean(raw)
-    public open override /*1*/ /*fake_override*/ fun foo(/*0*/ x: [ERROR : Unresolved java classifier: Err<String>]!, /*1*/ y: kotlin.(Mutable)List<(raw) kotlin.Any?>!): kotlin.Unit(raw)
+    public open override /*1*/ /*fake_override*/ fun foo(/*0*/ x: [ERROR : Unresolved java classifier: Err<String>]!, /*1*/ y: kotlin.collections.(Mutable)List<(raw) kotlin.Any?>!): kotlin.Unit(raw)
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int(raw)
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String(raw)
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/rawTypes/genericInnerClass.txt b/compiler/testData/diagnostics/tests/platformTypes/rawTypes/genericInnerClass.txt
index c16d3a84514..42a3e894bc0 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/rawTypes/genericInnerClass.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/rawTypes/genericInnerClass.txt
@@ -1,6 +1,6 @@
 package
 
-public val strList: kotlin.List<kotlin.String>
+public val strList: kotlin.collections.List<kotlin.String>
 public fun main(): kotlin.Unit
 
 public/*package*/ open class A</*0*/ T : kotlin.Any!> {
@@ -11,10 +11,10 @@ public/*package*/ open class A</*0*/ T : kotlin.Any!> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     public open inner class Inner</*0*/ E : kotlin.Any!> /*captured type parameters: /*1*/ T : kotlin.Any!*/ {
-        public/*package*/ constructor Inner</*0*/ E : kotlin.Any!>(/*0*/ x0: E!, /*1*/ x: T!, /*2*/ y: kotlin.(Mutable)List<T!>!)
-        public/*package*/ open fun bar(): A<kotlin.(Mutable)Map<E!, T!>!>!
+        public/*package*/ constructor Inner</*0*/ E : kotlin.Any!>(/*0*/ x0: E!, /*1*/ x: T!, /*2*/ y: kotlin.collections.(Mutable)List<T!>!)
+        public/*package*/ open fun bar(): A<kotlin.collections.(Mutable)Map<E!, T!>!>!
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public/*package*/ open fun foo(/*0*/ x0: E!, /*1*/ x: T!, /*2*/ y: kotlin.(Mutable)List<T!>!): kotlin.Unit
+        public/*package*/ open fun foo(/*0*/ x0: E!, /*1*/ x: T!, /*2*/ y: kotlin.collections.(Mutable)List<T!>!): kotlin.Unit
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/rawTypes/nonGenericRawMember.txt b/compiler/testData/diagnostics/tests/platformTypes/rawTypes/nonGenericRawMember.txt
index ee5120b4b00..960273a3f27 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/rawTypes/nonGenericRawMember.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/rawTypes/nonGenericRawMember.txt
@@ -1,6 +1,6 @@
 package
 
-public val strList: kotlin.List<kotlin.String>
+public val strList: kotlin.collections.List<kotlin.String>
 public fun main(): kotlin.Unit
 
 public/*package*/ open class A</*0*/ T : kotlin.Any!> {
@@ -13,7 +13,7 @@ public/*package*/ open class A</*0*/ T : kotlin.Any!> {
 
 public/*package*/ open class B {
     public/*package*/ constructor B()
-    public/*package*/ open fun bar(/*0*/ x: kotlin.(Mutable)List<kotlin.Double!>!): kotlin.Unit
+    public/*package*/ open fun bar(/*0*/ x: kotlin.collections.(Mutable)List<kotlin.Double!>!): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
diff --git a/compiler/testData/diagnostics/tests/platformTypes/rawTypes/nonTrivialErasure.txt b/compiler/testData/diagnostics/tests/platformTypes/rawTypes/nonTrivialErasure.txt
index ea341e3f92a..ea3708c424c 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/rawTypes/nonTrivialErasure.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/rawTypes/nonTrivialErasure.txt
@@ -1,10 +1,10 @@
 package
 
-public val strList: kotlin.List<kotlin.String>
+public val strList: kotlin.collections.List<kotlin.String>
 public fun main(): kotlin.Unit
 
-public/*package*/ open class A</*0*/ T : A<(raw) A<*, *, *>, (raw) A<*, *, *>, (raw) kotlin.(Mutable)List<*>!>!, /*1*/ E : T!, /*2*/ F : (kotlin.MutableList<out kotlin.Double!>..kotlin.List<kotlin.Double!>?)> {
-    public/*package*/ constructor A</*0*/ T : A<(raw) A<*, *, *>, (raw) A<*, *, *>, (raw) kotlin.(Mutable)List<*>!>!, /*1*/ E : T!, /*2*/ F : (kotlin.MutableList<out kotlin.Double!>..kotlin.List<kotlin.Double!>?)>()
+public/*package*/ open class A</*0*/ T : A<(raw) A<*, *, *>, (raw) A<*, *, *>, (raw) kotlin.collections.(Mutable)List<*>!>!, /*1*/ E : T!, /*2*/ F : (kotlin.collections.MutableList<out kotlin.Double!>..kotlin.collections.List<kotlin.Double!>?)> {
+    public/*package*/ constructor A</*0*/ T : A<(raw) A<*, *, *>, (raw) A<*, *, *>, (raw) kotlin.collections.(Mutable)List<*>!>!, /*1*/ E : T!, /*2*/ F : (kotlin.collections.MutableList<out kotlin.Double!>..kotlin.collections.List<kotlin.Double!>?)>()
     public/*package*/ final var first: T!
     public/*package*/ final var listOfDoubles: F!
     public/*package*/ final var second: E!
@@ -19,16 +19,16 @@ public/*package*/ open class Test {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
-    public/*package*/ open class DerivedRawA : A<out A<*, *, *>!, out A<*, *, *>!, out kotlin.(Mutable)List<*>!> {
+    public/*package*/ open class DerivedRawA : A<out A<*, *, *>!, out A<*, *, *>!, out kotlin.collections.(Mutable)List<*>!> {
         public/*package*/ constructor DerivedRawA()
-        public/*package*/ final override /*1*/ /*fake_override*/ var first: A<(raw) A<*, *, *>!, (raw) A<*, *, *>!, (raw) kotlin.(Mutable)List<*>!>!
-        public/*package*/ final override /*1*/ /*fake_override*/ var listOfDoubles: kotlin.(Mutable)List<(raw) kotlin.Any?>!
-        public/*package*/ final override /*1*/ /*fake_override*/ var second: A<(raw) A<*, *, *>!, (raw) A<*, *, *>!, (raw) kotlin.(Mutable)List<*>!>!
+        public/*package*/ final override /*1*/ /*fake_override*/ var first: A<(raw) A<*, *, *>!, (raw) A<*, *, *>!, (raw) kotlin.collections.(Mutable)List<*>!>!
+        public/*package*/ final override /*1*/ /*fake_override*/ var listOfDoubles: kotlin.collections.(Mutable)List<(raw) kotlin.Any?>!
+        public/*package*/ final override /*1*/ /*fake_override*/ var second: A<(raw) A<*, *, *>!, (raw) A<*, *, *>!, (raw) kotlin.collections.(Mutable)List<*>!>!
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any(raw)?): kotlin.Boolean(raw)
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int(raw)
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String(raw)
     }
 
     // Static members
-    public/*package*/ final var rawAField: A<(raw) A<*, *, *>!, (raw) A<*, *, *>!, (raw) kotlin.(Mutable)List<*>!>!
+    public/*package*/ final var rawAField: A<(raw) A<*, *, *>!, (raw) A<*, *, *>!, (raw) kotlin.collections.(Mutable)List<*>!>!
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/rawTypes/rawSupertype.txt b/compiler/testData/diagnostics/tests/platformTypes/rawTypes/rawSupertype.txt
index 61c746542d7..5fbed01b074 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/rawTypes/rawSupertype.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/rawTypes/rawSupertype.txt
@@ -1,15 +1,15 @@
 package
 
-public val strList: kotlin.List<kotlin.String>
-public val strMap: kotlin.Map<kotlin.String, kotlin.String>
+public val strList: kotlin.collections.List<kotlin.String>
+public val strMap: kotlin.collections.Map<kotlin.String, kotlin.String>
 public fun main(): kotlin.Unit
 
 public/*package*/ open class A</*0*/ T : kotlin.Any!> {
     public/*package*/ constructor A</*0*/ T : kotlin.Any!>()
-    public/*package*/ final var x: kotlin.(Mutable)List<T!>!
-    public/*package*/ open fun bar(): A<kotlin.(Mutable)List<T!>!>!
+    public/*package*/ final var x: kotlin.collections.(Mutable)List<T!>!
+    public/*package*/ open fun bar(): A<kotlin.collections.(Mutable)List<T!>!>!
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public/*package*/ open fun foo(/*0*/ x: T!, /*1*/ y: kotlin.(Mutable)List<T!>!): kotlin.Unit
+    public/*package*/ open fun foo(/*0*/ x: T!, /*1*/ y: kotlin.collections.(Mutable)List<T!>!): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
@@ -22,10 +22,10 @@ public/*package*/ open class Test {
 
     public/*package*/ open class RawADerived : A<kotlin.Any!> {
         public/*package*/ constructor RawADerived()
-        public/*package*/ final override /*1*/ /*fake_override*/ var x: kotlin.(Mutable)List<(raw) kotlin.Any?>!
+        public/*package*/ final override /*1*/ /*fake_override*/ var x: kotlin.collections.(Mutable)List<(raw) kotlin.Any?>!
         public/*package*/ open override /*1*/ /*fake_override*/ fun bar(): A<(raw) kotlin.Any!>!
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any(raw)?): kotlin.Boolean(raw)
-        public/*package*/ open override /*1*/ /*fake_override*/ fun foo(/*0*/ x: kotlin.Any(raw)!, /*1*/ y: kotlin.(Mutable)List<(raw) kotlin.Any?>!): kotlin.Unit(raw)
+        public/*package*/ open override /*1*/ /*fake_override*/ fun foo(/*0*/ x: kotlin.Any(raw)!, /*1*/ y: kotlin.collections.(Mutable)List<(raw) kotlin.Any?>!): kotlin.Unit(raw)
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int(raw)
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String(raw)
     }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/rawTypes/rawSupertypeOverride.txt b/compiler/testData/diagnostics/tests/platformTypes/rawTypes/rawSupertypeOverride.txt
index 3c45bfeed4b..04d55a98098 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/rawTypes/rawSupertypeOverride.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/rawTypes/rawSupertypeOverride.txt
@@ -2,56 +2,56 @@ package
 
 public open class A</*0*/ T : kotlin.CharSequence!> {
     public constructor A</*0*/ T : kotlin.CharSequence!>()
-    public/*package*/ open fun bar(/*0*/ d: kotlin.Array<(out) kotlin.Array<(out) kotlin.(Mutable)List<kotlin.Array<(out) kotlin.Double!>!>!>!>!): kotlin.Unit
+    public/*package*/ open fun bar(/*0*/ d: kotlin.Array<(out) kotlin.Array<(out) kotlin.collections.(Mutable)List<kotlin.Array<(out) kotlin.Double!>!>!>!>!): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public/*package*/ open fun foo(/*0*/ x: T!, /*1*/ y: kotlin.(Mutable)Map<kotlin.String!, kotlin.(Mutable)List<T!>!>!, /*2*/ z: java.util.HashMap<T!, T!>!): A<kotlin.(Mutable)List<T!>!>!
+    public/*package*/ open fun foo(/*0*/ x: T!, /*1*/ y: kotlin.collections.(Mutable)Map<kotlin.String!, kotlin.collections.(Mutable)List<T!>!>!, /*2*/ z: java.util.HashMap<T!, T!>!): A<kotlin.collections.(Mutable)List<T!>!>!
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
 public final class B1 : RawADerived {
     public constructor B1()
-    protected open override /*1*/ fun bar(/*0*/ d: kotlin.Array<kotlin.Array<kotlin.List<*>>>): kotlin.Unit
+    protected open override /*1*/ fun bar(/*0*/ d: kotlin.Array<kotlin.Array<kotlin.collections.List<*>>>): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any(raw)?): kotlin.Boolean(raw)
-    protected open override /*1*/ fun foo(/*0*/ x: kotlin.CharSequence, /*1*/ y: kotlin.Map<kotlin.Any?, kotlin.Any?>, /*2*/ z: java.util.HashMap<kotlin.Any, kotlin.Any>): A<*>
+    protected open override /*1*/ fun foo(/*0*/ x: kotlin.CharSequence, /*1*/ y: kotlin.collections.Map<kotlin.Any?, kotlin.Any?>, /*2*/ z: java.util.HashMap<kotlin.Any, kotlin.Any>): A<*>
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int(raw)
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String(raw)
 }
 
 public final class B2 : RawADerived {
     public constructor B2()
-    protected open override /*1*/ fun bar(/*0*/ d: kotlin.Array<kotlin.Array<kotlin.MutableList<*>>>): kotlin.Unit
+    protected open override /*1*/ fun bar(/*0*/ d: kotlin.Array<kotlin.Array<kotlin.collections.MutableList<*>>>): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any(raw)?): kotlin.Boolean(raw)
-    protected open override /*1*/ fun foo(/*0*/ x: kotlin.CharSequence?, /*1*/ y: kotlin.MutableMap<kotlin.Any?, kotlin.Any?>, /*2*/ z: java.util.HashMap<kotlin.Any?, kotlin.Any?>): A<kotlin.String>
+    protected open override /*1*/ fun foo(/*0*/ x: kotlin.CharSequence?, /*1*/ y: kotlin.collections.MutableMap<kotlin.Any?, kotlin.Any?>, /*2*/ z: java.util.HashMap<kotlin.Any?, kotlin.Any?>): A<kotlin.String>
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int(raw)
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String(raw)
 }
 
 public final class B3 : RawADerived {
     public constructor B3()
-    public/*package*/ open override /*1*/ /*fake_override*/ fun bar(/*0*/ d: kotlin.Array<(out) kotlin.Array<(out) kotlin.(Mutable)List<(raw) kotlin.Any?>!>!>!): kotlin.Unit(raw)
+    public/*package*/ open override /*1*/ /*fake_override*/ fun bar(/*0*/ d: kotlin.Array<(out) kotlin.Array<(out) kotlin.collections.(Mutable)List<(raw) kotlin.Any?>!>!>!): kotlin.Unit(raw)
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any(raw)?): kotlin.Boolean(raw)
-    public open fun foo(/*0*/ x: kotlin.CharSequence, /*1*/ y: kotlin.Map<kotlin.Any?, kotlin.Any>, /*2*/ z: java.util.HashMap<kotlin.Any, kotlin.Any>): A<*>
-    public/*package*/ open override /*1*/ /*fake_override*/ fun foo(/*0*/ x: kotlin.CharSequence(raw)!, /*1*/ y: kotlin.(Mutable)Map<(raw) kotlin.Any?, (raw) kotlin.Any?>!, /*2*/ z: java.util.HashMap<(raw) kotlin.Any!, (raw) kotlin.Any!>!): A<(raw) kotlin.CharSequence!>!
+    public open fun foo(/*0*/ x: kotlin.CharSequence, /*1*/ y: kotlin.collections.Map<kotlin.Any?, kotlin.Any>, /*2*/ z: java.util.HashMap<kotlin.Any, kotlin.Any>): A<*>
+    public/*package*/ open override /*1*/ /*fake_override*/ fun foo(/*0*/ x: kotlin.CharSequence(raw)!, /*1*/ y: kotlin.collections.(Mutable)Map<(raw) kotlin.Any?, (raw) kotlin.Any?>!, /*2*/ z: java.util.HashMap<(raw) kotlin.Any!, (raw) kotlin.Any!>!): A<(raw) kotlin.CharSequence!>!
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int(raw)
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String(raw)
 }
 
 public final class B4 : RawADerived {
     public constructor B4()
-    public/*package*/ open override /*1*/ /*fake_override*/ fun bar(/*0*/ d: kotlin.Array<(out) kotlin.Array<(out) kotlin.(Mutable)List<(raw) kotlin.Any?>!>!>!): kotlin.Unit(raw)
-    public open fun bar(/*0*/ d: kotlin.Array<kotlin.Array<kotlin.MutableList<kotlin.Array<kotlin.Double>>>>): kotlin.Unit
+    public/*package*/ open override /*1*/ /*fake_override*/ fun bar(/*0*/ d: kotlin.Array<(out) kotlin.Array<(out) kotlin.collections.(Mutable)List<(raw) kotlin.Any?>!>!>!): kotlin.Unit(raw)
+    public open fun bar(/*0*/ d: kotlin.Array<kotlin.Array<kotlin.collections.MutableList<kotlin.Array<kotlin.Double>>>>): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any(raw)?): kotlin.Boolean(raw)
-    public/*package*/ open override /*1*/ /*fake_override*/ fun foo(/*0*/ x: kotlin.CharSequence(raw)!, /*1*/ y: kotlin.(Mutable)Map<(raw) kotlin.Any?, (raw) kotlin.Any?>!, /*2*/ z: java.util.HashMap<(raw) kotlin.Any!, (raw) kotlin.Any!>!): A<(raw) kotlin.CharSequence!>!
+    public/*package*/ open override /*1*/ /*fake_override*/ fun foo(/*0*/ x: kotlin.CharSequence(raw)!, /*1*/ y: kotlin.collections.(Mutable)Map<(raw) kotlin.Any?, (raw) kotlin.Any?>!, /*2*/ z: java.util.HashMap<(raw) kotlin.Any!, (raw) kotlin.Any!>!): A<(raw) kotlin.CharSequence!>!
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int(raw)
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String(raw)
 }
 
 public open class RawADerived : A<kotlin.CharSequence!> {
     public constructor RawADerived()
-    public/*package*/ open override /*1*/ /*fake_override*/ fun bar(/*0*/ d: kotlin.Array<(out) kotlin.Array<(out) kotlin.(Mutable)List<(raw) kotlin.Any?>!>!>!): kotlin.Unit(raw)
+    public/*package*/ open override /*1*/ /*fake_override*/ fun bar(/*0*/ d: kotlin.Array<(out) kotlin.Array<(out) kotlin.collections.(Mutable)List<(raw) kotlin.Any?>!>!>!): kotlin.Unit(raw)
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any(raw)?): kotlin.Boolean(raw)
-    public/*package*/ open override /*1*/ /*fake_override*/ fun foo(/*0*/ x: kotlin.CharSequence(raw)!, /*1*/ y: kotlin.(Mutable)Map<(raw) kotlin.Any?, (raw) kotlin.Any?>!, /*2*/ z: java.util.HashMap<(raw) kotlin.Any!, (raw) kotlin.Any!>!): A<(raw) kotlin.CharSequence!>!
+    public/*package*/ open override /*1*/ /*fake_override*/ fun foo(/*0*/ x: kotlin.CharSequence(raw)!, /*1*/ y: kotlin.collections.(Mutable)Map<(raw) kotlin.Any?, (raw) kotlin.Any?>!, /*2*/ z: java.util.HashMap<(raw) kotlin.Any!, (raw) kotlin.Any!>!): A<(raw) kotlin.CharSequence!>!
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int(raw)
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String(raw)
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/rawTypes/rawTypeInUpperBound.txt b/compiler/testData/diagnostics/tests/platformTypes/rawTypes/rawTypeInUpperBound.txt
index ce2128dc9e4..74a54b773a8 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/rawTypes/rawTypeInUpperBound.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/rawTypes/rawTypeInUpperBound.txt
@@ -6,7 +6,7 @@ public open class A</*0*/ T : kotlin.Any!> {
     public constructor A</*0*/ T : kotlin.Any!>()
     public/*package*/ open fun consume(/*0*/ x: T!): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public/*package*/ open fun getChildrenStubs(): kotlin.(Mutable)List<kotlin.String!>!
+    public/*package*/ open fun getChildrenStubs(): kotlin.collections.(Mutable)List<kotlin.String!>!
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public/*package*/ open fun produce(): T!
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
diff --git a/compiler/testData/diagnostics/tests/platformTypes/rawTypes/saveRawCapabilitiesAfterSubtitution.txt b/compiler/testData/diagnostics/tests/platformTypes/rawTypes/saveRawCapabilitiesAfterSubtitution.txt
index 7fe0d19c6eb..f7a4cbfb9bf 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/rawTypes/saveRawCapabilitiesAfterSubtitution.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/rawTypes/saveRawCapabilitiesAfterSubtitution.txt
@@ -1,6 +1,6 @@
 package
 
-public val result: kotlin.(Mutable)List<(raw) kotlin.Any?>!
+public val result: kotlin.collections.(Mutable)List<(raw) kotlin.Any?>!
 
 public/*package*/ open class A</*0*/ T : kotlin.Any!> {
     public/*package*/ constructor A</*0*/ T : kotlin.Any!>()
@@ -11,7 +11,7 @@ public/*package*/ open class A</*0*/ T : kotlin.Any!> {
     public open inner class Inner</*0*/ E : kotlin.Any!> /*captured type parameters: /*1*/ T : kotlin.Any!*/ {
         public constructor Inner</*0*/ E : kotlin.Any!>()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public/*package*/ open fun foo(): kotlin.(Mutable)List<T!>!
+        public/*package*/ open fun foo(): kotlin.collections.(Mutable)List<T!>!
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/rawTypes/simple.txt b/compiler/testData/diagnostics/tests/platformTypes/rawTypes/simple.txt
index 78ef8a2cda1..5f4d4041273 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/rawTypes/simple.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/rawTypes/simple.txt
@@ -1,17 +1,17 @@
 package
 
-public val strList: kotlin.List<kotlin.String>
-public val strMap: kotlin.Map<kotlin.String, kotlin.String>
+public val strList: kotlin.collections.List<kotlin.String>
+public val strMap: kotlin.collections.Map<kotlin.String, kotlin.String>
 public fun main(): kotlin.Unit
 
 public/*package*/ open class A</*0*/ T : kotlin.Any!> {
     public/*package*/ constructor A</*0*/ T : kotlin.Any!>()
-    public/*package*/ final var x: kotlin.(Mutable)List<T!>!
-    public/*package*/ final var y: kotlin.(Mutable)Map<T!, T!>!
-    public/*package*/ final var z: A<kotlin.(Mutable)Map<kotlin.String!, T!>!>!
-    public/*package*/ open fun bar(): A<kotlin.(Mutable)List<T!>!>!
+    public/*package*/ final var x: kotlin.collections.(Mutable)List<T!>!
+    public/*package*/ final var y: kotlin.collections.(Mutable)Map<T!, T!>!
+    public/*package*/ final var z: A<kotlin.collections.(Mutable)Map<kotlin.String!, T!>!>!
+    public/*package*/ open fun bar(): A<kotlin.collections.(Mutable)List<T!>!>!
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public/*package*/ open fun foo(/*0*/ x: T!, /*1*/ y: kotlin.(Mutable)List<T!>!, /*2*/ z: kotlin.(Mutable)List<kotlin.(Mutable)Map<kotlin.Int!, T!>!>!): kotlin.Unit
+    public/*package*/ open fun foo(/*0*/ x: T!, /*1*/ y: kotlin.collections.(Mutable)List<T!>!, /*2*/ z: kotlin.collections.(Mutable)List<kotlin.collections.(Mutable)Map<kotlin.Int!, T!>!>!): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/rawTypes/typeEnhancement.txt b/compiler/testData/diagnostics/tests/platformTypes/rawTypes/typeEnhancement.txt
index 13a1bcada32..31ac5cfd860 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/rawTypes/typeEnhancement.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/rawTypes/typeEnhancement.txt
@@ -1,12 +1,12 @@
 package
 
-public val doubleList: kotlin.List<kotlin.Double?>
+public val doubleList: kotlin.collections.List<kotlin.Double?>
 public fun main(): kotlin.Unit
 
 public/*package*/ open class A</*0*/ T : kotlin.Any!> {
     public/*package*/ constructor A</*0*/ T : kotlin.Any!>()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    @org.jetbrains.annotations.NotNull() public/*package*/ open fun foo(/*0*/ @org.jetbrains.annotations.NotNull() x: T, /*1*/ @org.jetbrains.annotations.Nullable() y: kotlin.(Mutable)List<kotlin.String>?): kotlin.(Mutable)List<kotlin.String?>
+    @org.jetbrains.annotations.NotNull() public/*package*/ open fun foo(/*0*/ @org.jetbrains.annotations.NotNull() x: T, /*1*/ @org.jetbrains.annotations.Nullable() y: kotlin.collections.(Mutable)List<kotlin.String>?): kotlin.collections.(Mutable)List<kotlin.String?>
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
@@ -20,7 +20,7 @@ public/*package*/ open class Test {
     public/*package*/ open class DerivedRawA : A<kotlin.Any!> {
         public/*package*/ constructor DerivedRawA()
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any(raw)?): kotlin.Boolean(raw)
-        @org.jetbrains.annotations.NotNull() public/*package*/ open override /*1*/ /*fake_override*/ fun foo(/*0*/ @org.jetbrains.annotations.NotNull() x: kotlin.Any(raw), /*1*/ @org.jetbrains.annotations.Nullable() y: kotlin.(Mutable)List<(raw) kotlin.Any?>?): kotlin.(Mutable)List<(raw) kotlin.Any?>
+        @org.jetbrains.annotations.NotNull() public/*package*/ open override /*1*/ /*fake_override*/ fun foo(/*0*/ @org.jetbrains.annotations.NotNull() x: kotlin.Any(raw), /*1*/ @org.jetbrains.annotations.Nullable() y: kotlin.collections.(Mutable)List<(raw) kotlin.Any?>?): kotlin.collections.(Mutable)List<(raw) kotlin.Any?>
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int(raw)
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String(raw)
     }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/supertypeTypeArguments.txt b/compiler/testData/diagnostics/tests/platformTypes/supertypeTypeArguments.txt
index 5d5179293d9..6bae08ecddb 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/supertypeTypeArguments.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/supertypeTypeArguments.txt
@@ -1,10 +1,10 @@
 package
 
-public interface ExtMap</*0*/ K, /*1*/ V> : kotlin.Map<K, V> {
-    public abstract override /*1*/ /*fake_override*/ val entries: kotlin.Set<kotlin.Map.Entry<K, V>>
-    public abstract override /*1*/ /*fake_override*/ val keys: kotlin.Set<K>
+public interface ExtMap</*0*/ K, /*1*/ V> : kotlin.collections.Map<K, V> {
+    public abstract override /*1*/ /*fake_override*/ val entries: kotlin.collections.Set<kotlin.collections.Map.Entry<K, V>>
+    public abstract override /*1*/ /*fake_override*/ val keys: kotlin.collections.Set<K>
     public abstract override /*1*/ /*fake_override*/ val size: kotlin.Int
-    public abstract override /*1*/ /*fake_override*/ val values: kotlin.Collection<V>
+    public abstract override /*1*/ /*fake_override*/ val values: kotlin.collections.Collection<V>
     public abstract override /*1*/ /*fake_override*/ fun containsKey(/*0*/ key: K): kotlin.Boolean
     public abstract override /*1*/ /*fake_override*/ fun containsValue(/*0*/ value: V): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -16,11 +16,11 @@ public interface ExtMap</*0*/ K, /*1*/ V> : kotlin.Map<K, V> {
 
 public final class HashMapEx</*0*/ K, /*1*/ V> : java.util.HashMap<K, V>, ExtMap<K, V> {
     public constructor HashMapEx</*0*/ K, /*1*/ V>()
-    public open override /*2*/ /*fake_override*/ val entries: kotlin.MutableSet<kotlin.MutableMap.MutableEntry<K, V>>
-    invisible_fake final override /*1*/ /*fake_override*/ var entrySet: kotlin.(Mutable)Set<kotlin.(Mutable)Map.(Mutable)Entry<K!, V!>!>!
+    public open override /*2*/ /*fake_override*/ val entries: kotlin.collections.MutableSet<kotlin.collections.MutableMap.MutableEntry<K, V>>
+    invisible_fake final override /*1*/ /*fake_override*/ var entrySet: kotlin.collections.(Mutable)Set<kotlin.collections.(Mutable)Map.(Mutable)Entry<K!, V!>!>!
     invisible_fake final override /*1*/ /*fake_override*/ val hashSeed: kotlin.Int
-    invisible_fake final override /*1*/ /*fake_override*/ var keySet: kotlin.(Mutable)Set<K!>!
-    public open override /*2*/ /*fake_override*/ val keys: kotlin.MutableSet<K>
+    invisible_fake final override /*1*/ /*fake_override*/ var keySet: kotlin.collections.(Mutable)Set<K!>!
+    public open override /*2*/ /*fake_override*/ val keys: kotlin.collections.MutableSet<K>
     invisible_fake final override /*1*/ /*fake_override*/ val loadFactor: kotlin.Float
     invisible_fake final override /*1*/ /*fake_override*/ var modCount: kotlin.Int
     invisible_fake final override /*1*/ /*fake_override*/ var size: kotlin.Int
@@ -28,8 +28,8 @@ public final class HashMapEx</*0*/ K, /*1*/ V> : java.util.HashMap<K, V>, ExtMap
     invisible_fake final override /*1*/ /*fake_override*/ var table: kotlin.Array<(out) java.util.HashMap.Entry<K!, V!>!>!
     invisible_fake final override /*1*/ /*fake_override*/ var threshold: kotlin.Int
     invisible_fake final override /*1*/ /*fake_override*/ var useAltHashing: kotlin.Boolean
-    invisible_fake final override /*1*/ /*fake_override*/ var values: kotlin.(Mutable)Collection<V!>!
-    public open override /*2*/ /*fake_override*/ val values: kotlin.MutableCollection<V>
+    invisible_fake final override /*1*/ /*fake_override*/ var values: kotlin.collections.(Mutable)Collection<V!>!
+    public open override /*2*/ /*fake_override*/ val values: kotlin.collections.MutableCollection<V>
     invisible_fake open override /*1*/ /*fake_override*/ fun addEntry(/*0*/ p0: kotlin.Int, /*1*/ p1: K!, /*2*/ p2: V!, /*3*/ p3: kotlin.Int): kotlin.Unit
     invisible_fake open override /*1*/ /*fake_override*/ fun capacity(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit
@@ -38,7 +38,7 @@ public final class HashMapEx</*0*/ K, /*1*/ V> : java.util.HashMap<K, V>, ExtMap
     invisible_fake open override /*1*/ /*fake_override*/ fun containsNullValue(): kotlin.Boolean
     public open override /*2*/ /*fake_override*/ fun containsValue(/*0*/ value: V): kotlin.Boolean
     invisible_fake open override /*1*/ /*fake_override*/ fun createEntry(/*0*/ p0: kotlin.Int, /*1*/ p1: K!, /*2*/ p2: V!, /*3*/ p3: kotlin.Int): kotlin.Unit
-    invisible_fake open override /*1*/ /*fake_override*/ fun entrySet0(): kotlin.(Mutable)Set<kotlin.(Mutable)Map.(Mutable)Entry<K!, V!>!>!
+    invisible_fake open override /*1*/ /*fake_override*/ fun entrySet0(): kotlin.collections.(Mutable)Set<kotlin.collections.(Mutable)Map.(Mutable)Entry<K!, V!>!>!
     public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*2*/ /*fake_override*/ fun get(/*0*/ key: K): V?
     invisible_fake final override /*1*/ /*fake_override*/ fun getEntry(/*0*/ p0: kotlin.Any!): java.util.HashMap.Entry<K!, V!>!
@@ -48,12 +48,12 @@ public final class HashMapEx</*0*/ K, /*1*/ V> : java.util.HashMap<K, V>, ExtMap
     invisible_fake open override /*1*/ /*fake_override*/ fun init(): kotlin.Unit
     public open override /*2*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
     invisible_fake open override /*1*/ /*fake_override*/ fun loadFactor(): kotlin.Float
-    invisible_fake open override /*1*/ /*fake_override*/ fun newEntryIterator(): kotlin.(Mutable)Iterator<kotlin.(Mutable)Map.(Mutable)Entry<K!, V!>!>!
-    invisible_fake open override /*1*/ /*fake_override*/ fun newKeyIterator(): kotlin.(Mutable)Iterator<K!>!
-    invisible_fake open override /*1*/ /*fake_override*/ fun newValueIterator(): kotlin.(Mutable)Iterator<V!>!
+    invisible_fake open override /*1*/ /*fake_override*/ fun newEntryIterator(): kotlin.collections.(Mutable)Iterator<kotlin.collections.(Mutable)Map.(Mutable)Entry<K!, V!>!>!
+    invisible_fake open override /*1*/ /*fake_override*/ fun newKeyIterator(): kotlin.collections.(Mutable)Iterator<K!>!
+    invisible_fake open override /*1*/ /*fake_override*/ fun newValueIterator(): kotlin.collections.(Mutable)Iterator<V!>!
     public open override /*1*/ /*fake_override*/ fun put(/*0*/ key: K, /*1*/ value: V): V?
-    public open override /*1*/ /*fake_override*/ fun putAll(/*0*/ from: kotlin.Map<out K, V>): kotlin.Unit
-    invisible_fake open override /*1*/ /*fake_override*/ fun putAllForCreate(/*0*/ p0: (kotlin.MutableMap<out K!, out V!>..kotlin.Map<out K!, V!>?)): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun putAll(/*0*/ from: kotlin.collections.Map<out K, V>): kotlin.Unit
+    invisible_fake open override /*1*/ /*fake_override*/ fun putAllForCreate(/*0*/ p0: (kotlin.collections.MutableMap<out K!, out V!>..kotlin.collections.Map<out K!, V!>?)): kotlin.Unit
     invisible_fake open override /*1*/ /*fake_override*/ fun putForCreate(/*0*/ p0: K!, /*1*/ p1: V!): kotlin.Unit
     invisible_fake open override /*1*/ /*fake_override*/ fun putForNullKey(/*0*/ p0: V!): V!
     invisible_fake open override /*1*/ /*fake_override*/ fun readObject(/*0*/ p0: java.io.ObjectInputStream!): kotlin.Unit
diff --git a/compiler/testData/diagnostics/tests/reflection/noReflectionInClassPath.txt b/compiler/testData/diagnostics/tests/reflection/noReflectionInClassPath.txt
index 765558518fb..74bb197f156 100644
--- a/compiler/testData/diagnostics/tests/reflection/noReflectionInClassPath.txt
+++ b/compiler/testData/diagnostics/tests/reflection/noReflectionInClassPath.txt
@@ -12,7 +12,7 @@ public fun n09(/*0*/ p: kotlin.reflect.KProperty2<kotlin.String, kotlin.String,
 public fun n10(): kotlin.Unit
 public fun n11(): kotlin.Unit
 public fun y01(): kotlin.reflect.KProperty1.Getter<Foo, kotlin.Any>
-public fun y02(): kotlin.Collection<kotlin.reflect.KCallable<*>>
+public fun y02(): kotlin.collections.Collection<kotlin.reflect.KCallable<*>>
 public fun y03(): kotlin.String?
 public fun y04(): [ERROR : Error function type]
 
diff --git a/compiler/testData/diagnostics/tests/regressions/Jet53.txt b/compiler/testData/diagnostics/tests/regressions/Jet53.txt
index 48af05e82c9..860779bea85 100644
--- a/compiler/testData/diagnostics/tests/regressions/Jet53.txt
+++ b/compiler/testData/diagnostics/tests/regressions/Jet53.txt
@@ -1,3 +1,3 @@
 package
 
-public val ab: kotlin.List<kotlin.Int>?
+public val ab: kotlin.collections.List<kotlin.Int>?
diff --git a/compiler/testData/diagnostics/tests/regressions/kt1639-JFrame.txt b/compiler/testData/diagnostics/tests/regressions/kt1639-JFrame.txt
index 4b9afe3e70d..6522a169d2a 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt1639-JFrame.txt
+++ b/compiler/testData/diagnostics/tests/regressions/kt1639-JFrame.txt
@@ -18,7 +18,7 @@ package test {
         invisible_fake final override /*1*/ /*fake_override*/ var bufferStrategy: [ERROR : Unresolved java classifier: BufferStrategy]!
         invisible_fake final override /*1*/ /*fake_override*/ var changeSupport: [ERROR : Unresolved java classifier: PropertyChangeSupport]!
         invisible_fake final override /*1*/ /*fake_override*/ var coalescingEnabled: kotlin.Boolean
-        invisible_fake final override /*1*/ /*fake_override*/ var component: kotlin.(Mutable)List<java.awt.Component!>!
+        invisible_fake final override /*1*/ /*fake_override*/ var component: kotlin.collections.(Mutable)List<java.awt.Component!>!
         invisible_fake final override /*1*/ /*fake_override*/ var componentListener: [ERROR : Unresolved java classifier: ComponentListener]!
         invisible_fake final override /*1*/ /*fake_override*/ var componentOrientation: [ERROR : Unresolved java classifier: ComponentOrientation]!
         invisible_fake final override /*1*/ /*fake_override*/ var componentSerializedDataVersion: kotlin.Int
@@ -37,7 +37,7 @@ package test {
         invisible_fake final override /*1*/ /*fake_override*/ var focusCycleRoot: kotlin.Boolean
         invisible_fake final override /*1*/ /*fake_override*/ var focusListener: [ERROR : Unresolved java classifier: FocusListener]!
         invisible_fake final override /*1*/ /*fake_override*/ var focusMgr: [ERROR : Unresolved java classifier: FocusManager]!
-        invisible_fake final override /*1*/ /*fake_override*/ var focusTraversalKeys: kotlin.Array<(out) kotlin.(Mutable)Set<(raw) kotlin.Any?>!>!
+        invisible_fake final override /*1*/ /*fake_override*/ var focusTraversalKeys: kotlin.Array<(out) kotlin.collections.(Mutable)Set<(raw) kotlin.Any?>!>!
         invisible_fake final override /*1*/ /*fake_override*/ var focusTraversalKeysEnabled: kotlin.Boolean
         invisible_fake final override /*1*/ /*fake_override*/ var focusTraversalPolicy: [ERROR : Unresolved java classifier: FocusTraversalPolicy]!
         invisible_fake final override /*1*/ /*fake_override*/ var focusTraversalPolicyProvider: kotlin.Boolean
@@ -50,7 +50,7 @@ package test {
         invisible_fake final override /*1*/ /*fake_override*/ var height: kotlin.Int
         invisible_fake final override /*1*/ /*fake_override*/ var hierarchyBoundsListener: [ERROR : Unresolved java classifier: HierarchyBoundsListener]!
         invisible_fake final override /*1*/ /*fake_override*/ var hierarchyListener: [ERROR : Unresolved java classifier: HierarchyListener]!
-        invisible_fake final override /*1*/ /*fake_override*/ var icons: kotlin.(Mutable)List<[ERROR : Unresolved java classifier: Image]!>!
+        invisible_fake final override /*1*/ /*fake_override*/ var icons: kotlin.collections.(Mutable)List<[ERROR : Unresolved java classifier: Image]!>!
         invisible_fake final override /*1*/ /*fake_override*/ var ignoreRepaint: kotlin.Boolean
         invisible_fake final override /*1*/ /*fake_override*/ var inputContext: [ERROR : Unresolved java classifier: InputContext]!
         invisible_fake final override /*1*/ /*fake_override*/ var inputContextLock: kotlin.Any!
@@ -98,7 +98,7 @@ package test {
         invisible_fake final override /*1*/ /*fake_override*/ var prefSizeSet: kotlin.Boolean
         invisible_fake final override /*1*/ /*fake_override*/ var preserveBackgroundColor: [ERROR : Unresolved java classifier: Color]!
         invisible_fake final override /*1*/ /*fake_override*/ var printing: kotlin.Boolean
-        invisible_fake final override /*1*/ /*fake_override*/ var printingThreads: kotlin.(Mutable)Set<(raw) kotlin.Any?>!
+        invisible_fake final override /*1*/ /*fake_override*/ var printingThreads: kotlin.collections.(Mutable)Set<(raw) kotlin.Any?>!
         invisible_fake final override /*1*/ /*fake_override*/ var resizable: kotlin.Boolean
         protected/*protected and package*/ final override /*1*/ /*fake_override*/ var rootPane: [ERROR : Unresolved java classifier: JRootPane]!
         protected/*protected and package*/ final override /*1*/ /*fake_override*/ var rootPaneCheckingEnabled: kotlin.Boolean
@@ -288,9 +288,9 @@ package test {
         public final override /*1*/ /*fake_override*/ fun getFocusCycleRootAncestor(): java.awt.Container!
         public open override /*1*/ /*fake_override*/ fun getFocusListeners(): kotlin.Array<(out) [ERROR : Unresolved java classifier: FocusListener]!>!
         public open override /*1*/ /*fake_override*/ fun getFocusOwner(): java.awt.Component!
-        public open override /*1*/ /*fake_override*/ fun getFocusTraversalKeys(/*0*/ p0: kotlin.Int): kotlin.(Mutable)Set<java.awt.AWTKeyStroke!>!
+        public open override /*1*/ /*fake_override*/ fun getFocusTraversalKeys(/*0*/ p0: kotlin.Int): kotlin.collections.(Mutable)Set<java.awt.AWTKeyStroke!>!
         public open override /*1*/ /*fake_override*/ fun getFocusTraversalKeysEnabled(): kotlin.Boolean
-        invisible_fake final override /*1*/ /*fake_override*/ fun getFocusTraversalKeys_NoIDCheck(/*0*/ p0: kotlin.Int): kotlin.(Mutable)Set<(raw) kotlin.Any?>!
+        invisible_fake final override /*1*/ /*fake_override*/ fun getFocusTraversalKeys_NoIDCheck(/*0*/ p0: kotlin.Int): kotlin.collections.(Mutable)Set<(raw) kotlin.Any?>!
         public open override /*1*/ /*fake_override*/ fun getFocusTraversalPolicy(): [ERROR : Unresolved java classifier: FocusTraversalPolicy]!
         public open override /*1*/ /*fake_override*/ fun getFocusableWindowState(): kotlin.Boolean
         @[ERROR : java.beans.Transient]() public open override /*1*/ /*fake_override*/ fun getFont(): [ERROR : Unresolved java classifier: Font]!
@@ -308,7 +308,7 @@ package test {
         public open override /*1*/ /*fake_override*/ fun getHierarchyBoundsListeners(): kotlin.Array<(out) [ERROR : Unresolved java classifier: HierarchyBoundsListener]!>!
         public open override /*1*/ /*fake_override*/ fun getHierarchyListeners(): kotlin.Array<(out) [ERROR : Unresolved java classifier: HierarchyListener]!>!
         public open override /*1*/ /*fake_override*/ fun getIconImage(): [ERROR : Unresolved java classifier: Image]!
-        public open override /*1*/ /*fake_override*/ fun getIconImages(): kotlin.(Mutable)List<[ERROR : Unresolved java classifier: Image]!>!
+        public open override /*1*/ /*fake_override*/ fun getIconImages(): kotlin.collections.(Mutable)List<[ERROR : Unresolved java classifier: Image]!>!
         public open override /*1*/ /*fake_override*/ fun getIgnoreRepaint(): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun getInputContext(): [ERROR : Unresolved java classifier: InputContext]!
         public open override /*1*/ /*fake_override*/ fun getInputMethodListeners(): kotlin.Array<(out) [ERROR : Unresolved java classifier: InputMethodListener]!>!
@@ -587,9 +587,9 @@ package test {
         public open override /*1*/ /*fake_override*/ fun setEnabled(/*0*/ p0: kotlin.Boolean): kotlin.Unit
         public open override /*1*/ /*fake_override*/ fun setExtendedState(/*0*/ p0: kotlin.Int): kotlin.Unit
         public final override /*1*/ /*fake_override*/ fun setFocusCycleRoot(/*0*/ p0: kotlin.Boolean): kotlin.Unit
-        public open override /*1*/ /*fake_override*/ fun setFocusTraversalKeys(/*0*/ p0: kotlin.Int, /*1*/ p1: (kotlin.MutableSet<out java.awt.AWTKeyStroke!>..kotlin.Set<java.awt.AWTKeyStroke!>?)): kotlin.Unit
+        public open override /*1*/ /*fake_override*/ fun setFocusTraversalKeys(/*0*/ p0: kotlin.Int, /*1*/ p1: (kotlin.collections.MutableSet<out java.awt.AWTKeyStroke!>..kotlin.collections.Set<java.awt.AWTKeyStroke!>?)): kotlin.Unit
         public open override /*1*/ /*fake_override*/ fun setFocusTraversalKeysEnabled(/*0*/ p0: kotlin.Boolean): kotlin.Unit
-        invisible_fake final override /*1*/ /*fake_override*/ fun setFocusTraversalKeys_NoIDCheck(/*0*/ p0: kotlin.Int, /*1*/ p1: (kotlin.MutableSet<out java.awt.AWTKeyStroke!>..kotlin.Set<java.awt.AWTKeyStroke!>?)): kotlin.Unit
+        invisible_fake final override /*1*/ /*fake_override*/ fun setFocusTraversalKeys_NoIDCheck(/*0*/ p0: kotlin.Int, /*1*/ p1: (kotlin.collections.MutableSet<out java.awt.AWTKeyStroke!>..kotlin.collections.Set<java.awt.AWTKeyStroke!>?)): kotlin.Unit
         public open override /*1*/ /*fake_override*/ fun setFocusTraversalPolicy(/*0*/ p0: [ERROR : Unresolved java classifier: FocusTraversalPolicy]!): kotlin.Unit
         public final override /*1*/ /*fake_override*/ fun setFocusTraversalPolicyProvider(/*0*/ p0: kotlin.Boolean): kotlin.Unit
         public open override /*1*/ /*fake_override*/ fun setFocusable(/*0*/ p0: kotlin.Boolean): kotlin.Unit
@@ -599,7 +599,7 @@ package test {
         public open override /*1*/ /*fake_override*/ fun setGlassPane(/*0*/ p0: java.awt.Component!): kotlin.Unit
         invisible_fake open override /*1*/ /*fake_override*/ fun setGraphicsConfiguration(/*0*/ p0: [ERROR : Unresolved java classifier: GraphicsConfiguration]!): kotlin.Unit
         public open override /*1*/ /*fake_override*/ fun setIconImage(/*0*/ p0: [ERROR : Unresolved java classifier: Image]!): kotlin.Unit
-        public open override /*1*/ /*fake_override*/ fun setIconImages(/*0*/ p0: (kotlin.MutableList<out [ERROR : Unresolved java classifier: Image]!>..kotlin.List<[ERROR : Unresolved java classifier: Image]!>?)): kotlin.Unit
+        public open override /*1*/ /*fake_override*/ fun setIconImages(/*0*/ p0: (kotlin.collections.MutableList<out [ERROR : Unresolved java classifier: Image]!>..kotlin.collections.List<[ERROR : Unresolved java classifier: Image]!>?)): kotlin.Unit
         public open override /*1*/ /*fake_override*/ fun setIgnoreRepaint(/*0*/ p0: kotlin.Boolean): kotlin.Unit
         public open override /*1*/ /*fake_override*/ fun setJMenuBar(/*0*/ p0: [ERROR : Unresolved java classifier: JMenuBar]!): kotlin.Unit
         public open override /*1*/ /*fake_override*/ fun setLayeredPane(/*0*/ p0: [ERROR : Unresolved java classifier: JLayeredPane]!): kotlin.Unit
diff --git a/compiler/testData/diagnostics/tests/regressions/kt258.txt b/compiler/testData/diagnostics/tests/regressions/kt258.txt
index 612f1a96e9f..4aa1addf63b 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt258.txt
+++ b/compiler/testData/diagnostics/tests/regressions/kt258.txt
@@ -1,4 +1,4 @@
 package
 
 public fun test(): kotlin.Unit
-public operator fun </*0*/ K, /*1*/ V> kotlin.MutableMap<K, V>.set(/*0*/ key: K, /*1*/ value: V): kotlin.Unit
+public operator fun </*0*/ K, /*1*/ V> kotlin.collections.MutableMap<K, V>.set(/*0*/ key: K, /*1*/ value: V): kotlin.Unit
diff --git a/compiler/testData/diagnostics/tests/regressions/kt287.txt b/compiler/testData/diagnostics/tests/regressions/kt287.txt
index 3a1092c7fbf..dd3c4b96777 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt287.txt
+++ b/compiler/testData/diagnostics/tests/regressions/kt287.txt
@@ -1,6 +1,6 @@
 package
 
-public val attributes: kotlin.Map<kotlin.String, kotlin.String>
-public fun attributes(): kotlin.Map<kotlin.String, kotlin.String>
-public fun foo(/*0*/ m: kotlin.Map<kotlin.String, kotlin.String>): kotlin.Unit
+public val attributes: kotlin.collections.Map<kotlin.String, kotlin.String>
+public fun attributes(): kotlin.collections.Map<kotlin.String, kotlin.String>
+public fun foo(/*0*/ m: kotlin.collections.Map<kotlin.String, kotlin.String>): kotlin.Unit
 public fun test(): kotlin.Unit
diff --git a/compiler/testData/diagnostics/tests/regressions/kt313.txt b/compiler/testData/diagnostics/tests/regressions/kt313.txt
index 340d35bd9de..5afb3d080de 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt313.txt
+++ b/compiler/testData/diagnostics/tests/regressions/kt313.txt
@@ -1,4 +1,4 @@
 package
 
-public fun </*0*/ T> kotlin.Iterable<T>.join(/*0*/ separator: kotlin.String?): kotlin.String
+public fun </*0*/ T> kotlin.collections.Iterable<T>.join(/*0*/ separator: kotlin.String?): kotlin.String
 public fun </*0*/ T : kotlin.Any> T?.npe(): T
diff --git a/compiler/testData/diagnostics/tests/regressions/kt335.336.txt b/compiler/testData/diagnostics/tests/regressions/kt335.336.txt
index a17ce03ae9a..e6448d5e8b4 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt335.336.txt
+++ b/compiler/testData/diagnostics/tests/regressions/kt335.336.txt
@@ -1,4 +1,4 @@
 package
 
-public fun </*0*/ T> kotlin.List<T>.plus(/*0*/ other: kotlin.List<T>): kotlin.List<T>
-public fun </*0*/ T : kotlin.Comparable<T>> kotlin.MutableList<T>.sort(): kotlin.Unit
+public fun </*0*/ T> kotlin.collections.List<T>.plus(/*0*/ other: kotlin.collections.List<T>): kotlin.collections.List<T>
+public fun </*0*/ T : kotlin.Comparable<T>> kotlin.collections.MutableList<T>.sort(): kotlin.Unit
diff --git a/compiler/testData/diagnostics/tests/regressions/kt385.109.441.txt b/compiler/testData/diagnostics/tests/regressions/kt385.109.441.txt
index 32597035087..cd33e2bf96e 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt385.109.441.txt
+++ b/compiler/testData/diagnostics/tests/regressions/kt385.109.441.txt
@@ -6,7 +6,7 @@ public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
 public fun println(/*0*/ message: kotlin.Int): kotlin.Unit
 public fun println(/*0*/ message: kotlin.Long): kotlin.Unit
 public inline fun </*0*/ T> run(/*0*/ body: () -> T): T
-public fun </*0*/ T> kotlin.Iterable<T>.foreach(/*0*/ operation: (T) -> kotlin.Unit): kotlin.Unit
-public fun </*0*/ T> kotlin.Iterable<T>.foreach(/*0*/ operation: (kotlin.Int, T) -> kotlin.Unit): kotlin.Unit
-public infix fun </*0*/ T> kotlin.Iterator<T>.foreach(/*0*/ operation: (T) -> kotlin.Unit): kotlin.Unit
-public infix fun </*0*/ T> kotlin.Iterator<T>.foreach(/*0*/ operation: (kotlin.Int, T) -> kotlin.Unit): kotlin.Unit
+public fun </*0*/ T> kotlin.collections.Iterable<T>.foreach(/*0*/ operation: (T) -> kotlin.Unit): kotlin.Unit
+public fun </*0*/ T> kotlin.collections.Iterable<T>.foreach(/*0*/ operation: (kotlin.Int, T) -> kotlin.Unit): kotlin.Unit
+public infix fun </*0*/ T> kotlin.collections.Iterator<T>.foreach(/*0*/ operation: (T) -> kotlin.Unit): kotlin.Unit
+public infix fun </*0*/ T> kotlin.collections.Iterator<T>.foreach(/*0*/ operation: (kotlin.Int, T) -> kotlin.Unit): kotlin.Unit
diff --git a/compiler/testData/diagnostics/tests/regressions/kt459.txt b/compiler/testData/diagnostics/tests/regressions/kt459.txt
index 316786523da..61e9e85b262 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt459.txt
+++ b/compiler/testData/diagnostics/tests/regressions/kt459.txt
@@ -1,4 +1,4 @@
 package
 
 public fun test(): kotlin.Unit
-public operator fun </*0*/ K, /*1*/ V> kotlin.Map<K, V>.set(/*0*/ key: K, /*1*/ value: V): kotlin.Unit
+public operator fun </*0*/ K, /*1*/ V> kotlin.collections.Map<K, V>.set(/*0*/ key: K, /*1*/ value: V): kotlin.Unit
diff --git a/compiler/testData/diagnostics/tests/regressions/kt469.txt b/compiler/testData/diagnostics/tests/regressions/kt469.txt
index 4ceb445a5a9..228c27baf1d 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt469.txt
+++ b/compiler/testData/diagnostics/tests/regressions/kt469.txt
@@ -1,9 +1,9 @@
 package
 
 package kt469 {
-    public fun bar(/*0*/ list: kotlin.MutableList<kotlin.Int>): kotlin.Unit
+    public fun bar(/*0*/ list: kotlin.collections.MutableList<kotlin.Int>): kotlin.Unit
     public fun foo(): kotlin.Unit
-    public operator fun </*0*/ T> kotlin.MutableList<T>.plusAssign(/*0*/ t: T): kotlin.Unit
+    public operator fun </*0*/ T> kotlin.collections.MutableList<T>.plusAssign(/*0*/ t: T): kotlin.Unit
 
     public final class MyNumber {
         public constructor MyNumber(/*0*/ i: kotlin.Int)
diff --git a/compiler/testData/diagnostics/tests/regressions/kt549.txt b/compiler/testData/diagnostics/tests/regressions/kt549.txt
index 8c7d0230207..fc3b37c94dd 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt549.txt
+++ b/compiler/testData/diagnostics/tests/regressions/kt549.txt
@@ -1,6 +1,6 @@
 package
 
 package demo {
-    public fun </*0*/ T> filter(/*0*/ list: kotlin.Array<T>, /*1*/ filter: (T) -> kotlin.Boolean): kotlin.List<T>
+    public fun </*0*/ T> filter(/*0*/ list: kotlin.Array<T>, /*1*/ filter: (T) -> kotlin.Boolean): kotlin.collections.List<T>
     public fun main(/*0*/ args: kotlin.Array<kotlin.String>): kotlin.Unit
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/kt580.txt b/compiler/testData/diagnostics/tests/regressions/kt580.txt
index 05da8c4e201..842035ee7ae 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt580.txt
+++ b/compiler/testData/diagnostics/tests/regressions/kt580.txt
@@ -5,7 +5,7 @@ package whats {
     package whats.the {
 
         package whats.the.difference {
-            public val </*0*/ T> kotlin.Array<T>.indices: kotlin.IntRange
+            public val </*0*/ T> kotlin.Array<T>.indices: kotlin.ranges.IntRange
             public val </*0*/ T> kotlin.Array<T>.lastIndex: kotlin.Int
             public fun iarray(/*0*/ vararg a: kotlin.String /*kotlin.Array<out kotlin.String>*/): kotlin.Array<out kotlin.String>
             public fun main(): kotlin.Unit
diff --git a/compiler/testData/diagnostics/tests/regressions/kt860.txt b/compiler/testData/diagnostics/tests/regressions/kt860.txt
index 5b06014742a..81eec0a534c 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt860.txt
+++ b/compiler/testData/diagnostics/tests/regressions/kt860.txt
@@ -3,7 +3,7 @@ package
 package std {
 
     package std.util {
-        public fun </*0*/ T, /*1*/ U : kotlin.MutableCollection<in T>> kotlin.Iterator<T>.to(/*0*/ container: U): U
-        public fun </*0*/ T> kotlin.Iterator<T>.toArrayList(): java.util.ArrayList<T>
+        public fun </*0*/ T, /*1*/ U : kotlin.collections.MutableCollection<in T>> kotlin.collections.Iterator<T>.to(/*0*/ container: U): U
+        public fun </*0*/ T> kotlin.collections.Iterator<T>.toArrayList(): java.util.ArrayList<T>
     }
 }
diff --git a/compiler/testData/diagnostics/tests/resolve/inferenceInLinkedLambdasDependentOnExpectedType.txt b/compiler/testData/diagnostics/tests/resolve/inferenceInLinkedLambdasDependentOnExpectedType.txt
index 02a7fdebf6f..3fd9d518ecf 100644
--- a/compiler/testData/diagnostics/tests/resolve/inferenceInLinkedLambdasDependentOnExpectedType.txt
+++ b/compiler/testData/diagnostics/tests/resolve/inferenceInLinkedLambdasDependentOnExpectedType.txt
@@ -1,5 +1,5 @@
 package
 
-public fun </*0*/ T> emptyList(): kotlin.List<T>
-public fun </*0*/ T> foo(/*0*/ f: () -> kotlin.Collection<T>, /*1*/ p: (T) -> kotlin.Boolean): kotlin.Collection<T>
-public fun test(): kotlin.Collection<kotlin.Int>
+public fun </*0*/ T> emptyList(): kotlin.collections.List<T>
+public fun </*0*/ T> foo(/*0*/ f: () -> kotlin.collections.Collection<T>, /*1*/ p: (T) -> kotlin.Boolean): kotlin.collections.Collection<T>
+public fun test(): kotlin.collections.Collection<kotlin.Int>
diff --git a/compiler/testData/diagnostics/tests/resolve/nestedCalls/completeTypeInferenceForNestedInNoneApplicable.txt b/compiler/testData/diagnostics/tests/resolve/nestedCalls/completeTypeInferenceForNestedInNoneApplicable.txt
index e2fe21c6b60..5d3e7925ba8 100644
--- a/compiler/testData/diagnostics/tests/resolve/nestedCalls/completeTypeInferenceForNestedInNoneApplicable.txt
+++ b/compiler/testData/diagnostics/tests/resolve/nestedCalls/completeTypeInferenceForNestedInNoneApplicable.txt
@@ -1,7 +1,7 @@
 package
 
 package h {
-    public fun </*0*/ T> emptyList(): kotlin.List<T>
+    public fun </*0*/ T> emptyList(): kotlin.collections.List<T>
     public fun foo(/*0*/ i: kotlin.Int): kotlin.Int
     public fun foo(/*0*/ s: kotlin.String): kotlin.String
     public fun test(): kotlin.Unit
diff --git a/compiler/testData/diagnostics/tests/resolve/nestedCalls/twoTypeParameters.txt b/compiler/testData/diagnostics/tests/resolve/nestedCalls/twoTypeParameters.txt
index 5542df2ffc2..2804fba42d7 100644
--- a/compiler/testData/diagnostics/tests/resolve/nestedCalls/twoTypeParameters.txt
+++ b/compiler/testData/diagnostics/tests/resolve/nestedCalls/twoTypeParameters.txt
@@ -1,6 +1,6 @@
 package
 
-public fun </*0*/ D, /*1*/ E : D> kotlin.List<ResolutionTask<D, E>>.bar(/*0*/ t: ResolutionTask<D, E>): ResolutionTask<D, E>
+public fun </*0*/ D, /*1*/ E : D> kotlin.collections.List<ResolutionTask<D, E>>.bar(/*0*/ t: ResolutionTask<D, E>): ResolutionTask<D, E>
 
 public final class ResolutionCandidate</*0*/ A> {
     public constructor ResolutionCandidate</*0*/ A>()
@@ -21,6 +21,6 @@ public final class ResolutionTaskHolder</*0*/ F, /*1*/ G : F> {
     public constructor ResolutionTaskHolder</*0*/ F, /*1*/ G : F>()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public final fun test(/*0*/ candidate: ResolutionCandidate<F>, /*1*/ tasks: kotlin.MutableList<ResolutionTask<F, G>>): kotlin.Unit
+    public final fun test(/*0*/ candidate: ResolutionCandidate<F>, /*1*/ tasks: kotlin.collections.MutableList<ResolutionTask<F, G>>): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
diff --git a/compiler/testData/diagnostics/tests/resolve/specialConstructions/elvisAsCall.txt b/compiler/testData/diagnostics/tests/resolve/specialConstructions/elvisAsCall.txt
index 7baa58842a6..fe1569e9414 100644
--- a/compiler/testData/diagnostics/tests/resolve/specialConstructions/elvisAsCall.txt
+++ b/compiler/testData/diagnostics/tests/resolve/specialConstructions/elvisAsCall.txt
@@ -2,10 +2,10 @@ package
 
 package a {
     public fun doInt(/*0*/ i: kotlin.Int): kotlin.Int
-    public fun doList(/*0*/ l: kotlin.List<kotlin.Int>): kotlin.List<kotlin.Int>
-    public fun </*0*/ T : a.A> emptyListOfA(): kotlin.List<T>
-    public fun getList(): kotlin.List<kotlin.Int>?
-    public fun </*0*/ T> strangeList(/*0*/ f: (T) -> kotlin.Unit): kotlin.List<T>
+    public fun doList(/*0*/ l: kotlin.collections.List<kotlin.Int>): kotlin.collections.List<kotlin.Int>
+    public fun </*0*/ T : a.A> emptyListOfA(): kotlin.collections.List<T>
+    public fun getList(): kotlin.collections.List<kotlin.Int>?
+    public fun </*0*/ T> strangeList(/*0*/ f: (T) -> kotlin.Unit): kotlin.collections.List<T>
     public fun testDataFlowInfo1(/*0*/ a: kotlin.Int?, /*1*/ b: kotlin.Int?): kotlin.Unit
     public fun testDataFlowInfo2(/*0*/ a: kotlin.Int?, /*1*/ b: kotlin.Int?): kotlin.Unit
     public fun testElvis(/*0*/ a: kotlin.Int?, /*1*/ b: kotlin.Int?): kotlin.Unit
diff --git a/compiler/testData/diagnostics/tests/resolve/specialConstructions/exclExclAsCall.txt b/compiler/testData/diagnostics/tests/resolve/specialConstructions/exclExclAsCall.txt
index c74f75fc30c..09bf92a238a 100644
--- a/compiler/testData/diagnostics/tests/resolve/specialConstructions/exclExclAsCall.txt
+++ b/compiler/testData/diagnostics/tests/resolve/specialConstructions/exclExclAsCall.txt
@@ -2,10 +2,10 @@ package
 
 package a {
     public fun doInt(/*0*/ i: kotlin.Int): kotlin.Int
-    public fun doList(/*0*/ l: kotlin.List<kotlin.Int>): kotlin.List<kotlin.Int>
-    public fun </*0*/ T : a.A> emptyNullableListOfA(): kotlin.List<T>?
+    public fun doList(/*0*/ l: kotlin.collections.List<kotlin.Int>): kotlin.collections.List<kotlin.Int>
+    public fun </*0*/ T : a.A> emptyNullableListOfA(): kotlin.collections.List<T>?
     public fun </*0*/ T> id(/*0*/ t: T): T
-    public fun </*0*/ T> strangeNullableList(/*0*/ f: (T) -> kotlin.Unit): kotlin.List<T>?
+    public fun </*0*/ T> strangeNullableList(/*0*/ f: (T) -> kotlin.Unit): kotlin.collections.List<T>?
     public fun testDataFlowInfoAfterExclExcl(/*0*/ a: kotlin.Int?): kotlin.Unit
     public fun testExclExcl(): kotlin.Unit
     public fun testUnnecessaryExclExcl(/*0*/ a: kotlin.Int): kotlin.Unit
diff --git a/compiler/testData/diagnostics/tests/scopes/initializerScopeOfExtensionProperty.txt b/compiler/testData/diagnostics/tests/scopes/initializerScopeOfExtensionProperty.txt
index 4ef872f222f..15f5eef9160 100644
--- a/compiler/testData/diagnostics/tests/scopes/initializerScopeOfExtensionProperty.txt
+++ b/compiler/testData/diagnostics/tests/scopes/initializerScopeOfExtensionProperty.txt
@@ -8,8 +8,8 @@ package i {
     public val i.C.foo: i.C.D
     public val i.A.foo1: kotlin.Int
     public val i.C.foo1: i.C.D
-    public val </*0*/ T> kotlin.List<T>.length: [ERROR : Type for size]
-    public val </*0*/ T> kotlin.List<T>.length1: kotlin.Int
+    public val </*0*/ T> kotlin.collections.List<T>.length: [ERROR : Type for size]
+    public val </*0*/ T> kotlin.collections.List<T>.length1: kotlin.Int
 
     public final class A {
         public constructor A()
diff --git a/compiler/testData/diagnostics/tests/scopes/kt1579_map_entry.kt b/compiler/testData/diagnostics/tests/scopes/kt1579_map_entry.kt
index 6e257ae974a..f9bb0d33c84 100644
--- a/compiler/testData/diagnostics/tests/scopes/kt1579_map_entry.kt
+++ b/compiler/testData/diagnostics/tests/scopes/kt1579_map_entry.kt
@@ -1,7 +1,7 @@
 //FILE:a.kt
 //+JDK
 package a
-import kotlin.Map.*
+import kotlin.collections.Map.*
 
 fun foo(b : Entry<String, String>) = b
 
@@ -9,7 +9,7 @@ fun foo(b : Entry<String, String>) = b
 //+JDK
 package b
 
-import kotlin.Map.Entry
+import kotlin.collections.Map.Entry
 fun bar(b : Entry<String, String>) = b
 
 //FILE:c.kt
diff --git a/compiler/testData/diagnostics/tests/scopes/kt1579_map_entry.txt b/compiler/testData/diagnostics/tests/scopes/kt1579_map_entry.txt
index ce25a9e406e..4e4b0a86acc 100644
--- a/compiler/testData/diagnostics/tests/scopes/kt1579_map_entry.txt
+++ b/compiler/testData/diagnostics/tests/scopes/kt1579_map_entry.txt
@@ -1,13 +1,13 @@
 package
 
 package a {
-    public fun foo(/*0*/ b: kotlin.Map.Entry<kotlin.String, kotlin.String>): kotlin.Map.Entry<kotlin.String, kotlin.String>
+    public fun foo(/*0*/ b: kotlin.collections.Map.Entry<kotlin.String, kotlin.String>): kotlin.collections.Map.Entry<kotlin.String, kotlin.String>
 }
 
 package b {
-    public fun bar(/*0*/ b: kotlin.Map.Entry<kotlin.String, kotlin.String>): kotlin.Map.Entry<kotlin.String, kotlin.String>
+    public fun bar(/*0*/ b: kotlin.collections.Map.Entry<kotlin.String, kotlin.String>): kotlin.collections.Map.Entry<kotlin.String, kotlin.String>
 }
 
 package c {
-    public fun fff(/*0*/ b: kotlin.Map.Entry<kotlin.String, kotlin.String>): kotlin.Map.Entry<kotlin.String, kotlin.String>
+    public fun fff(/*0*/ b: kotlin.collections.Map.Entry<kotlin.String, kotlin.String>): kotlin.collections.Map.Entry<kotlin.String, kotlin.String>
 }
diff --git a/compiler/testData/diagnostics/tests/scopes/visibility2.txt b/compiler/testData/diagnostics/tests/scopes/visibility2.txt
index a62da10822a..b5a690f5838 100644
--- a/compiler/testData/diagnostics/tests/scopes/visibility2.txt
+++ b/compiler/testData/diagnostics/tests/scopes/visibility2.txt
@@ -39,13 +39,13 @@ package b {
         public open override /*1*/ /*fake_override*/ val size: kotlin.Int
         public open override /*1*/ /*fake_override*/ fun add(/*0*/ element: java.lang.Integer): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: java.lang.Integer): kotlin.Unit
-        public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.Collection<java.lang.Integer>): kotlin.Boolean
-        public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.Collection<java.lang.Integer>): kotlin.Boolean
-        invisible_fake open override /*1*/ /*fake_override*/ fun batchRemove(/*0*/ p0: kotlin.(Mutable)Collection<*>!, /*1*/ p1: kotlin.Boolean): kotlin.Boolean
+        public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.collections.Collection<java.lang.Integer>): kotlin.Boolean
+        public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.collections.Collection<java.lang.Integer>): kotlin.Boolean
+        invisible_fake open override /*1*/ /*fake_override*/ fun batchRemove(/*0*/ p0: kotlin.collections.(Mutable)Collection<*>!, /*1*/ p1: kotlin.Boolean): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit
         public open override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
         public open override /*1*/ /*fake_override*/ fun contains(/*0*/ element: java.lang.Integer): kotlin.Boolean
-        public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.Collection<java.lang.Integer>): kotlin.Boolean
+        public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection<java.lang.Integer>): kotlin.Boolean
         invisible_fake open override /*1*/ /*fake_override*/ fun elementData(/*0*/ p0: kotlin.Int): java.lang.Integer!
         public open override /*1*/ /*fake_override*/ fun ensureCapacity(/*0*/ p0: kotlin.Int): kotlin.Unit
         invisible_fake open override /*1*/ /*fake_override*/ fun ensureCapacityInternal(/*0*/ p0: kotlin.Int): kotlin.Unit
@@ -56,21 +56,21 @@ package b {
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ element: java.lang.Integer): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
-        public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator<java.lang.Integer>
+        public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.collections.MutableIterator<java.lang.Integer>
         public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ element: java.lang.Integer): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.MutableListIterator<java.lang.Integer>
-        public open override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.MutableListIterator<java.lang.Integer>
+        public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.collections.MutableListIterator<java.lang.Integer>
+        public open override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.collections.MutableListIterator<java.lang.Integer>
         invisible_fake open override /*1*/ /*fake_override*/ fun outOfBoundsMsg(/*0*/ p0: kotlin.Int): kotlin.String!
         invisible_fake open override /*1*/ /*fake_override*/ fun rangeCheck(/*0*/ p0: kotlin.Int): kotlin.Unit
         invisible_fake open override /*1*/ /*fake_override*/ fun rangeCheckForAdd(/*0*/ p0: kotlin.Int): kotlin.Unit
         invisible_fake open override /*1*/ /*fake_override*/ fun readObject(/*0*/ p0: java.io.ObjectInputStream!): kotlin.Unit
         public open override /*1*/ /*fake_override*/ fun remove(/*0*/ element: java.lang.Integer): kotlin.Boolean
-        public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.Collection<java.lang.Integer>): kotlin.Boolean
+        public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.collections.Collection<java.lang.Integer>): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun removeAt(/*0*/ p0: kotlin.Int): java.lang.Integer
         protected/*protected and package*/ open override /*1*/ /*fake_override*/ fun removeRange(/*0*/ p0: kotlin.Int, /*1*/ p1: kotlin.Int): kotlin.Unit
-        public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.Collection<java.lang.Integer>): kotlin.Boolean
+        public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.collections.Collection<java.lang.Integer>): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun set(/*0*/ index: kotlin.Int, /*1*/ element: java.lang.Integer): java.lang.Integer
-        public open override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.MutableList<java.lang.Integer>
+        public open override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.collections.MutableList<java.lang.Integer>
         public open override /*1*/ /*fake_override*/ fun toArray(): kotlin.Array<(out) kotlin.Any!>!
         public open override /*1*/ /*fake_override*/ fun </*0*/ T : kotlin.Any!> toArray(/*0*/ p0: kotlin.Array<(out) T!>!): kotlin.Array<(out) T!>!
         public open override /*1*/ fun toString(): kotlin.String
diff --git a/compiler/testData/diagnostics/tests/smartCasts/inference/intersectionTypes.txt b/compiler/testData/diagnostics/tests/smartCasts/inference/intersectionTypes.txt
index a65f16cf767..953fa3775f5 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/inference/intersectionTypes.txt
+++ b/compiler/testData/diagnostics/tests/smartCasts/inference/intersectionTypes.txt
@@ -1,12 +1,12 @@
 package
 
 package a {
-    public fun </*0*/ T> arrayListOf(/*0*/ vararg values: T /*kotlin.Array<out T>*/): kotlin.MutableList<T>
-    public fun </*0*/ T> foo(/*0*/ t: T, /*1*/ l: kotlin.MutableList<T>): T
+    public fun </*0*/ T> arrayListOf(/*0*/ vararg values: T /*kotlin.Array<out T>*/): kotlin.collections.MutableList<T>
+    public fun </*0*/ T> foo(/*0*/ t: T, /*1*/ l: kotlin.collections.MutableList<T>): T
     public fun </*0*/ T> id(/*0*/ t: T): T
     public fun rr(/*0*/ s: kotlin.String?): kotlin.Unit
     public fun test(/*0*/ a: a.A, /*1*/ b: a.B, /*2*/ c: a.C): kotlin.Unit
-    public fun testErrorMessages(/*0*/ a: a.A, /*1*/ ml: kotlin.MutableList<kotlin.String>): kotlin.Unit
+    public fun testErrorMessages(/*0*/ a: a.A, /*1*/ ml: kotlin.collections.MutableList<kotlin.String>): kotlin.Unit
     public fun </*0*/ T> three(/*0*/ a: T, /*1*/ b: T, /*2*/ c: T): T
     public fun </*0*/ T> two(/*0*/ u: T, /*1*/ v: T): T
     public fun use(/*0*/ vararg a: kotlin.Any /*kotlin.Array<out kotlin.Any>*/): kotlin.Array<out kotlin.Any>
diff --git a/compiler/testData/diagnostics/tests/smartCasts/inference/kt1355.txt b/compiler/testData/diagnostics/tests/smartCasts/inference/kt1355.txt
index 2585099e57b..8b7ad241291 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/inference/kt1355.txt
+++ b/compiler/testData/diagnostics/tests/smartCasts/inference/kt1355.txt
@@ -1,14 +1,14 @@
 package
 
 package a {
-    public fun </*0*/ T> arrayListOf(/*0*/ vararg values: T /*kotlin.Array<out T>*/): kotlin.MutableList<T>
-    public fun foo(/*0*/ map: kotlin.MutableMap<kotlin.Int, kotlin.String>, /*1*/ value: kotlin.String?): kotlin.Unit
-    public operator fun </*0*/ K, /*1*/ V> kotlin.MutableMap<K, V>.set(/*0*/ key: K, /*1*/ value: V): V?
+    public fun </*0*/ T> arrayListOf(/*0*/ vararg values: T /*kotlin.Array<out T>*/): kotlin.collections.MutableList<T>
+    public fun foo(/*0*/ map: kotlin.collections.MutableMap<kotlin.Int, kotlin.String>, /*1*/ value: kotlin.String?): kotlin.Unit
+    public operator fun </*0*/ K, /*1*/ V> kotlin.collections.MutableMap<K, V>.set(/*0*/ key: K, /*1*/ value: V): V?
 
     public final data class Tag {
         public constructor Tag(/*0*/ tagName: kotlin.String)
-        public final val attributes: kotlin.MutableMap<kotlin.String, kotlin.String>
-        public final val contents: kotlin.MutableList<a.Tag>
+        public final val attributes: kotlin.collections.MutableMap<kotlin.String, kotlin.String>
+        public final val contents: kotlin.collections.MutableList<a.Tag>
         public final var id: kotlin.String?
         public final var tagName: kotlin.String
         public final operator /*synthesized*/ fun component1(): kotlin.String
diff --git a/compiler/testData/diagnostics/tests/smartCasts/inference/smartCastOnReceiver.txt b/compiler/testData/diagnostics/tests/smartCasts/inference/smartCastOnReceiver.txt
index 53a25fbd224..973959f5d25 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/inference/smartCastOnReceiver.txt
+++ b/compiler/testData/diagnostics/tests/smartCasts/inference/smartCastOnReceiver.txt
@@ -27,6 +27,6 @@ public final class Test {
     public constructor Test()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public final fun test(/*0*/ a: A?, /*1*/ b: B, /*2*/ list: kotlin.MutableList<Pair<A, B>>): kotlin.Unit
+    public final fun test(/*0*/ a: A?, /*1*/ b: B, /*2*/ list: kotlin.collections.MutableList<Pair<A, B>>): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
diff --git a/compiler/testData/diagnostics/tests/smartCasts/kt2865.txt b/compiler/testData/diagnostics/tests/smartCasts/kt2865.txt
index a7485cad132..a467992ea13 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/kt2865.txt
+++ b/compiler/testData/diagnostics/tests/smartCasts/kt2865.txt
@@ -1,5 +1,5 @@
 package
 
-public fun foo(/*0*/ a: kotlin.MutableMap<kotlin.String, kotlin.String>, /*1*/ x: kotlin.String?): kotlin.Unit
-public fun foo1(/*0*/ a: kotlin.MutableMap<kotlin.String, kotlin.String>, /*1*/ x: kotlin.String?): kotlin.Unit
-public operator fun </*0*/ K, /*1*/ V> kotlin.MutableMap<K, V>.set(/*0*/ k: K, /*1*/ v: V): kotlin.Unit
+public fun foo(/*0*/ a: kotlin.collections.MutableMap<kotlin.String, kotlin.String>, /*1*/ x: kotlin.String?): kotlin.Unit
+public fun foo1(/*0*/ a: kotlin.collections.MutableMap<kotlin.String, kotlin.String>, /*1*/ x: kotlin.String?): kotlin.Unit
+public operator fun </*0*/ K, /*1*/ V> kotlin.collections.MutableMap<K, V>.set(/*0*/ k: K, /*1*/ v: V): kotlin.Unit
diff --git a/compiler/testData/diagnostics/tests/smartCasts/kt3899.txt b/compiler/testData/diagnostics/tests/smartCasts/kt3899.txt
index f33c273f045..0cd20d22b3e 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/kt3899.txt
+++ b/compiler/testData/diagnostics/tests/smartCasts/kt3899.txt
@@ -1,7 +1,7 @@
 package
 
-public fun F(): kotlin.MutableMap<kotlin.String, kotlin.String>
-public fun hashMapOf(/*0*/ pair: StringPair): kotlin.MutableMap<kotlin.String, kotlin.String>
+public fun F(): kotlin.collections.MutableMap<kotlin.String, kotlin.String>
+public fun hashMapOf(/*0*/ pair: StringPair): kotlin.collections.MutableMap<kotlin.String, kotlin.String>
 public infix fun kotlin.String.to(/*0*/ second: kotlin.String): StringPair
 
 public final data class StringPair {
diff --git a/compiler/testData/diagnostics/tests/smartCasts/safecalls/anotherVal.txt b/compiler/testData/diagnostics/tests/smartCasts/safecalls/anotherVal.txt
index 999ad328fe1..6f1b03dfb28 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/safecalls/anotherVal.txt
+++ b/compiler/testData/diagnostics/tests/smartCasts/safecalls/anotherVal.txt
@@ -1,3 +1,3 @@
 package
 
-public fun calc(/*0*/ x: kotlin.List<kotlin.String>?, /*1*/ y: kotlin.Int?): kotlin.Int
+public fun calc(/*0*/ x: kotlin.collections.List<kotlin.String>?, /*1*/ y: kotlin.Int?): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/smartCasts/safecalls/argument.txt b/compiler/testData/diagnostics/tests/smartCasts/safecalls/argument.txt
index 1eb6f9a791c..f5fe01c3d47 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/safecalls/argument.txt
+++ b/compiler/testData/diagnostics/tests/smartCasts/safecalls/argument.txt
@@ -1,3 +1,3 @@
 package
 
-public fun calc(/*0*/ x: kotlin.List<kotlin.String>?): kotlin.Int
+public fun calc(/*0*/ x: kotlin.collections.List<kotlin.String>?): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/smartCasts/safecalls/chainAndUse.txt b/compiler/testData/diagnostics/tests/smartCasts/safecalls/chainAndUse.txt
index 1eb6f9a791c..f5fe01c3d47 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/safecalls/chainAndUse.txt
+++ b/compiler/testData/diagnostics/tests/smartCasts/safecalls/chainAndUse.txt
@@ -1,3 +1,3 @@
 package
 
-public fun calc(/*0*/ x: kotlin.List<kotlin.String>?): kotlin.Int
+public fun calc(/*0*/ x: kotlin.collections.List<kotlin.String>?): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/smartCasts/safecalls/chainInChain.txt b/compiler/testData/diagnostics/tests/smartCasts/safecalls/chainInChain.txt
index f082fc7f734..589c9ae0970 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/safecalls/chainInChain.txt
+++ b/compiler/testData/diagnostics/tests/smartCasts/safecalls/chainInChain.txt
@@ -1,3 +1,3 @@
 package
 
-public fun calc(/*0*/ x: kotlin.List<kotlin.String>?, /*1*/ y: kotlin.List<kotlin.Int>?): kotlin.Unit
+public fun calc(/*0*/ x: kotlin.collections.List<kotlin.String>?, /*1*/ y: kotlin.collections.List<kotlin.Int>?): kotlin.Unit
diff --git a/compiler/testData/diagnostics/tests/smartCasts/safecalls/chainMixedUnsafe.txt b/compiler/testData/diagnostics/tests/smartCasts/safecalls/chainMixedUnsafe.txt
index 1eb6f9a791c..f5fe01c3d47 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/safecalls/chainMixedUnsafe.txt
+++ b/compiler/testData/diagnostics/tests/smartCasts/safecalls/chainMixedUnsafe.txt
@@ -1,3 +1,3 @@
 package
 
-public fun calc(/*0*/ x: kotlin.List<kotlin.String>?): kotlin.Int
+public fun calc(/*0*/ x: kotlin.collections.List<kotlin.String>?): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/smartCasts/safecalls/doubleCall.txt b/compiler/testData/diagnostics/tests/smartCasts/safecalls/doubleCall.txt
index 1eb6f9a791c..f5fe01c3d47 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/safecalls/doubleCall.txt
+++ b/compiler/testData/diagnostics/tests/smartCasts/safecalls/doubleCall.txt
@@ -1,3 +1,3 @@
 package
 
-public fun calc(/*0*/ x: kotlin.List<kotlin.String>?): kotlin.Int
+public fun calc(/*0*/ x: kotlin.collections.List<kotlin.String>?): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/smartCasts/safecalls/falseArgument.txt b/compiler/testData/diagnostics/tests/smartCasts/safecalls/falseArgument.txt
index 7b189fab9f1..103d163e9af 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/safecalls/falseArgument.txt
+++ b/compiler/testData/diagnostics/tests/smartCasts/safecalls/falseArgument.txt
@@ -1,4 +1,4 @@
 package
 
-public fun calc(/*0*/ x: kotlin.List<kotlin.String>?): kotlin.Int
+public fun calc(/*0*/ x: kotlin.collections.List<kotlin.String>?): kotlin.Int
 public fun foo(/*0*/ y: kotlin.Int): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/smartCasts/safecalls/falseChain.txt b/compiler/testData/diagnostics/tests/smartCasts/safecalls/falseChain.txt
index 1be2cdee83e..8ee9c029af2 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/safecalls/falseChain.txt
+++ b/compiler/testData/diagnostics/tests/smartCasts/safecalls/falseChain.txt
@@ -1,3 +1,3 @@
 package
 
-public fun calc(/*0*/ x: kotlin.List<kotlin.String>?, /*1*/ y: kotlin.Int?): kotlin.Unit
+public fun calc(/*0*/ x: kotlin.collections.List<kotlin.String>?, /*1*/ y: kotlin.Int?): kotlin.Unit
diff --git a/compiler/testData/diagnostics/tests/smartCasts/safecalls/falseExtension.txt b/compiler/testData/diagnostics/tests/smartCasts/safecalls/falseExtension.txt
index b971752ca91..7ed0e62ffe3 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/safecalls/falseExtension.txt
+++ b/compiler/testData/diagnostics/tests/smartCasts/safecalls/falseExtension.txt
@@ -1,4 +1,4 @@
 package
 
-public fun calc(/*0*/ x: kotlin.List<kotlin.String>?): kotlin.Int
+public fun calc(/*0*/ x: kotlin.collections.List<kotlin.String>?): kotlin.Int
 public fun kotlin.String.foo(/*0*/ y: kotlin.Int): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/smartCasts/safecalls/falseSecondArgument.txt b/compiler/testData/diagnostics/tests/smartCasts/safecalls/falseSecondArgument.txt
index 999ad328fe1..6f1b03dfb28 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/safecalls/falseSecondArgument.txt
+++ b/compiler/testData/diagnostics/tests/smartCasts/safecalls/falseSecondArgument.txt
@@ -1,3 +1,3 @@
 package
 
-public fun calc(/*0*/ x: kotlin.List<kotlin.String>?, /*1*/ y: kotlin.Int?): kotlin.Int
+public fun calc(/*0*/ x: kotlin.collections.List<kotlin.String>?, /*1*/ y: kotlin.Int?): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/smartCasts/safecalls/insideCall.txt b/compiler/testData/diagnostics/tests/smartCasts/safecalls/insideCall.txt
index 7b189fab9f1..103d163e9af 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/safecalls/insideCall.txt
+++ b/compiler/testData/diagnostics/tests/smartCasts/safecalls/insideCall.txt
@@ -1,4 +1,4 @@
 package
 
-public fun calc(/*0*/ x: kotlin.List<kotlin.String>?): kotlin.Int
+public fun calc(/*0*/ x: kotlin.collections.List<kotlin.String>?): kotlin.Int
 public fun foo(/*0*/ y: kotlin.Int): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/smartCasts/safecalls/longChain.txt b/compiler/testData/diagnostics/tests/smartCasts/safecalls/longChain.txt
index 43ed5879d0d..28907104a71 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/safecalls/longChain.txt
+++ b/compiler/testData/diagnostics/tests/smartCasts/safecalls/longChain.txt
@@ -1,3 +1,3 @@
 package
 
-public fun calc(/*0*/ x: kotlin.List<kotlin.String>?): kotlin.Unit
+public fun calc(/*0*/ x: kotlin.collections.List<kotlin.String>?): kotlin.Unit
diff --git a/compiler/testData/diagnostics/tests/smartCasts/safecalls/simple.txt b/compiler/testData/diagnostics/tests/smartCasts/safecalls/simple.txt
index 1eb6f9a791c..f5fe01c3d47 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/safecalls/simple.txt
+++ b/compiler/testData/diagnostics/tests/smartCasts/safecalls/simple.txt
@@ -1,3 +1,3 @@
 package
 
-public fun calc(/*0*/ x: kotlin.List<kotlin.String>?): kotlin.Int
+public fun calc(/*0*/ x: kotlin.collections.List<kotlin.String>?): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/smartCasts/safecalls/twoArgs.txt b/compiler/testData/diagnostics/tests/smartCasts/safecalls/twoArgs.txt
index 1eb6f9a791c..f5fe01c3d47 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/safecalls/twoArgs.txt
+++ b/compiler/testData/diagnostics/tests/smartCasts/safecalls/twoArgs.txt
@@ -1,3 +1,3 @@
 package
 
-public fun calc(/*0*/ x: kotlin.List<kotlin.String>?): kotlin.Int
+public fun calc(/*0*/ x: kotlin.collections.List<kotlin.String>?): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/unnecessaryWithMap.txt b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/unnecessaryWithMap.txt
index 638d2e7ecb0..8d5f4170423 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/unnecessaryWithMap.txt
+++ b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/unnecessaryWithMap.txt
@@ -1,13 +1,13 @@
 package
 
-public fun create(): kotlin.Map<kotlin.String, kotlin.String>
-public operator fun </*0*/ K, /*1*/ V> kotlin.Map.Entry<K, V>.component1(): K
-public operator fun </*0*/ K, /*1*/ V> kotlin.Map.Entry<K, V>.component2(): V
-public operator fun </*0*/ K, /*1*/ V> kotlin.Map<K, V>.iterator(): kotlin.Iterator<kotlin.Map.Entry<K, V>>
+public fun create(): kotlin.collections.Map<kotlin.String, kotlin.String>
+public operator fun </*0*/ K, /*1*/ V> kotlin.collections.Map.Entry<K, V>.component1(): K
+public operator fun </*0*/ K, /*1*/ V> kotlin.collections.Map.Entry<K, V>.component2(): V
+public operator fun </*0*/ K, /*1*/ V> kotlin.collections.Map<K, V>.iterator(): kotlin.collections.Iterator<kotlin.collections.Map.Entry<K, V>>
 
 public final class MyClass {
     public constructor MyClass()
-    private final var m: kotlin.Map<kotlin.String, kotlin.String>?
+    private final var m: kotlin.collections.Map<kotlin.String, kotlin.String>?
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final fun foo(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
diff --git a/compiler/testData/diagnostics/tests/substitutions/kt1558-short.txt b/compiler/testData/diagnostics/tests/substitutions/kt1558-short.txt
index 73638c70c9e..e9501509d24 100644
--- a/compiler/testData/diagnostics/tests/substitutions/kt1558-short.txt
+++ b/compiler/testData/diagnostics/tests/substitutions/kt1558-short.txt
@@ -1,4 +1,4 @@
 package
 
-public fun testArrays(/*0*/ ci: kotlin.List<kotlin.Int>): kotlin.Unit
-public fun </*0*/ E> kotlin.List<*>.toArray(/*0*/ ar: kotlin.Array<E>): kotlin.Array<E>
+public fun testArrays(/*0*/ ci: kotlin.collections.List<kotlin.Int>): kotlin.Unit
+public fun </*0*/ E> kotlin.collections.List<*>.toArray(/*0*/ ar: kotlin.Array<E>): kotlin.Array<E>
diff --git a/compiler/testData/diagnostics/tests/substitutions/starProjections.txt b/compiler/testData/diagnostics/tests/substitutions/starProjections.txt
index d25087ea61b..ae828b07109 100644
--- a/compiler/testData/diagnostics/tests/substitutions/starProjections.txt
+++ b/compiler/testData/diagnostics/tests/substitutions/starProjections.txt
@@ -11,7 +11,7 @@ public interface A</*0*/ R, /*1*/ T : A<R, T>> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-public interface B</*0*/ R, /*1*/ T : B<kotlin.List<R>, T>> {
+public interface B</*0*/ R, /*1*/ T : B<kotlin.collections.List<R>, T>> {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public abstract fun r(): R
diff --git a/compiler/testData/diagnostics/tests/substitutions/upperBoundsSubstitutionForOverloadResolutionWithAmbiguity.txt b/compiler/testData/diagnostics/tests/substitutions/upperBoundsSubstitutionForOverloadResolutionWithAmbiguity.txt
index 53d6c5b63ec..a47442584de 100644
--- a/compiler/testData/diagnostics/tests/substitutions/upperBoundsSubstitutionForOverloadResolutionWithAmbiguity.txt
+++ b/compiler/testData/diagnostics/tests/substitutions/upperBoundsSubstitutionForOverloadResolutionWithAmbiguity.txt
@@ -1,11 +1,11 @@
 package
 
-public fun </*0*/ T> test(/*0*/ l: kotlin.List<T>): kotlin.Unit
+public fun </*0*/ T> test(/*0*/ l: kotlin.collections.List<T>): kotlin.Unit
 
 package bar {
-    public fun </*0*/ T> f(/*0*/ l: kotlin.List<T>): kotlin.Unit
+    public fun </*0*/ T> f(/*0*/ l: kotlin.collections.List<T>): kotlin.Unit
 }
 
 package foo {
-    public fun </*0*/ T> f(/*0*/ l: kotlin.List<T>): kotlin.Unit
+    public fun </*0*/ T> f(/*0*/ l: kotlin.collections.List<T>): kotlin.Unit
 }
diff --git a/compiler/testData/diagnostics/tests/substitutions/upperBoundsSubstitutionForOverloadResolutionWithErrorTypes.txt b/compiler/testData/diagnostics/tests/substitutions/upperBoundsSubstitutionForOverloadResolutionWithErrorTypes.txt
index d7ed12a8ec7..a9d3f99f532 100644
--- a/compiler/testData/diagnostics/tests/substitutions/upperBoundsSubstitutionForOverloadResolutionWithErrorTypes.txt
+++ b/compiler/testData/diagnostics/tests/substitutions/upperBoundsSubstitutionForOverloadResolutionWithErrorTypes.txt
@@ -2,5 +2,5 @@ package
 
 public fun </*0*/ T> f1(/*0*/ l: [ERROR : List1<T>]<T>): T
 public fun </*0*/ T> f1(/*0*/ l: [ERROR : List2<T>]<T>): T
-public fun </*0*/ T> f1(/*0*/ c: kotlin.Collection<T>): T
-public fun </*0*/ T> test(/*0*/ l: kotlin.List<T>): kotlin.Unit
+public fun </*0*/ T> f1(/*0*/ c: kotlin.collections.Collection<T>): T
+public fun </*0*/ T> test(/*0*/ l: kotlin.collections.List<T>): kotlin.Unit
diff --git a/compiler/testData/diagnostics/tests/subtyping/kt-1457.txt b/compiler/testData/diagnostics/tests/subtyping/kt-1457.txt
index 22921dc72a6..da66f8fb711 100644
--- a/compiler/testData/diagnostics/tests/subtyping/kt-1457.txt
+++ b/compiler/testData/diagnostics/tests/subtyping/kt-1457.txt
@@ -10,13 +10,13 @@ public final class MyListOfPairs</*0*/ T> : java.util.ArrayList<Pair<T, T>> {
     public open override /*1*/ /*fake_override*/ val size: kotlin.Int
     public open override /*1*/ /*fake_override*/ fun add(/*0*/ element: Pair<T, T>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: Pair<T, T>): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.Collection<Pair<T, T>>): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.Collection<Pair<T, T>>): kotlin.Boolean
-    invisible_fake open override /*1*/ /*fake_override*/ fun batchRemove(/*0*/ p0: kotlin.(Mutable)Collection<*>!, /*1*/ p1: kotlin.Boolean): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.collections.Collection<Pair<T, T>>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.collections.Collection<Pair<T, T>>): kotlin.Boolean
+    invisible_fake open override /*1*/ /*fake_override*/ fun batchRemove(/*0*/ p0: kotlin.collections.(Mutable)Collection<*>!, /*1*/ p1: kotlin.Boolean): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public open override /*1*/ /*fake_override*/ fun contains(/*0*/ element: Pair<T, T>): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.Collection<Pair<T, T>>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection<Pair<T, T>>): kotlin.Boolean
     invisible_fake open override /*1*/ /*fake_override*/ fun elementData(/*0*/ p0: kotlin.Int): Pair<T, T>!
     public open override /*1*/ /*fake_override*/ fun ensureCapacity(/*0*/ p0: kotlin.Int): kotlin.Unit
     invisible_fake open override /*1*/ /*fake_override*/ fun ensureCapacityInternal(/*0*/ p0: kotlin.Int): kotlin.Unit
@@ -27,21 +27,21 @@ public final class MyListOfPairs</*0*/ T> : java.util.ArrayList<Pair<T, T>> {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ element: Pair<T, T>): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator<Pair<T, T>>
+    public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.collections.MutableIterator<Pair<T, T>>
     public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ element: Pair<T, T>): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.MutableListIterator<Pair<T, T>>
-    public open override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.MutableListIterator<Pair<T, T>>
+    public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.collections.MutableListIterator<Pair<T, T>>
+    public open override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.collections.MutableListIterator<Pair<T, T>>
     invisible_fake open override /*1*/ /*fake_override*/ fun outOfBoundsMsg(/*0*/ p0: kotlin.Int): kotlin.String!
     invisible_fake open override /*1*/ /*fake_override*/ fun rangeCheck(/*0*/ p0: kotlin.Int): kotlin.Unit
     invisible_fake open override /*1*/ /*fake_override*/ fun rangeCheckForAdd(/*0*/ p0: kotlin.Int): kotlin.Unit
     invisible_fake open override /*1*/ /*fake_override*/ fun readObject(/*0*/ p0: java.io.ObjectInputStream!): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun remove(/*0*/ element: Pair<T, T>): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.Collection<Pair<T, T>>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.collections.Collection<Pair<T, T>>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun removeAt(/*0*/ p0: kotlin.Int): Pair<T, T>
     protected/*protected and package*/ open override /*1*/ /*fake_override*/ fun removeRange(/*0*/ p0: kotlin.Int, /*1*/ p1: kotlin.Int): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.Collection<Pair<T, T>>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.collections.Collection<Pair<T, T>>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun set(/*0*/ index: kotlin.Int, /*1*/ element: Pair<T, T>): Pair<T, T>
-    public open override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.MutableList<Pair<T, T>>
+    public open override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.collections.MutableList<Pair<T, T>>
     public open override /*1*/ /*fake_override*/ fun toArray(): kotlin.Array<(out) kotlin.Any!>!
     public open override /*1*/ /*fake_override*/ fun </*0*/ T : kotlin.Any!> toArray(/*0*/ p0: kotlin.Array<(out) T!>!): kotlin.Array<(out) T!>!
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
diff --git a/compiler/testData/diagnostics/tests/subtyping/kt2744.txt b/compiler/testData/diagnostics/tests/subtyping/kt2744.txt
index ef2b4c530b7..18daf51c63a 100644
--- a/compiler/testData/diagnostics/tests/subtyping/kt2744.txt
+++ b/compiler/testData/diagnostics/tests/subtyping/kt2744.txt
@@ -1,6 +1,6 @@
 package
 
-public fun f(/*0*/ l: kotlin.List<X>): kotlin.Unit
+public fun f(/*0*/ l: kotlin.collections.List<X>): kotlin.Unit
 
 public final class X {
     public constructor X()
diff --git a/compiler/testData/diagnostics/tests/typeParameters/propertyTypeParameters.txt b/compiler/testData/diagnostics/tests/typeParameters/propertyTypeParameters.txt
index e1edf0d1bf3..db253fc2e6b 100644
--- a/compiler/testData/diagnostics/tests/typeParameters/propertyTypeParameters.txt
+++ b/compiler/testData/diagnostics/tests/typeParameters/propertyTypeParameters.txt
@@ -2,22 +2,22 @@ package
 
 public var </*0*/ T1, /*1*/ T2, /*2*/ T3, /*3*/ T4> p: kotlin.Int
 public val </*0*/ T> T.a: kotlin.Int
-public val </*0*/ T1, /*1*/ T2> kotlin.Map<T1, T2>.b: kotlin.String
+public val </*0*/ T1, /*1*/ T2> kotlin.collections.Map<T1, T2>.b: kotlin.String
 public val </*0*/ T : G> G.c: kotlin.Int
-public val </*0*/ T1, /*1*/ T2, /*2*/ T3> kotlin.List<kotlin.Map<T2, T3>>.d: kotlin.Int
+public val </*0*/ T1, /*1*/ T2, /*2*/ T3> kotlin.collections.List<kotlin.collections.Map<T2, T3>>.d: kotlin.Int
 public val </*0*/ T : kotlin.Any> G.e: T?
-public val </*0*/ T> kotlin.List<kotlin.Map<kotlin.Int, kotlin.Map<kotlin.String, T>>>.f: kotlin.Int
-public val </*0*/ T> kotlin.List<kotlin.Map<kotlin.Int, kotlin.Map<kotlin.String, out T>>>.g: kotlin.Int
-public val </*0*/ T> kotlin.List<kotlin.Map<kotlin.Int, kotlin.Map<kotlin.String, in T>>>.h: kotlin.Int
-public val </*0*/ T> kotlin.List<kotlin.Map<T, kotlin.Map<T, T>>>.i: kotlin.Int
+public val </*0*/ T> kotlin.collections.List<kotlin.collections.Map<kotlin.Int, kotlin.collections.Map<kotlin.String, T>>>.f: kotlin.Int
+public val </*0*/ T> kotlin.collections.List<kotlin.collections.Map<kotlin.Int, kotlin.collections.Map<kotlin.String, out T>>>.g: kotlin.Int
+public val </*0*/ T> kotlin.collections.List<kotlin.collections.Map<kotlin.Int, kotlin.collections.Map<kotlin.String, in T>>>.h: kotlin.Int
+public val </*0*/ T> kotlin.collections.List<kotlin.collections.Map<T, kotlin.collections.Map<T, T>>>.i: kotlin.Int
 
 public final class C</*0*/ T1, /*1*/ T2> {
     public constructor C</*0*/ T1, /*1*/ T2>()
     public final val </*0*/ E> T1.a: kotlin.Int
     public final val </*0*/ E> T2.b: kotlin.Int
     public final val </*0*/ E> E.c: kotlin.Int
-    public final val </*0*/ E> kotlin.Map<T1, T2>.d: kotlin.Int
-    public final val </*0*/ E> kotlin.Map<T1, E>.e: kotlin.Int
+    public final val </*0*/ E> kotlin.collections.Map<T1, T2>.d: kotlin.Int
+    public final val </*0*/ E> kotlin.collections.Map<T1, E>.e: kotlin.Int
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
diff --git a/compiler/testData/diagnostics/tests/varargs/varargIterator.txt b/compiler/testData/diagnostics/tests/varargs/varargIterator.txt
index cfe4efeaadb..df56c2f1a99 100644
--- a/compiler/testData/diagnostics/tests/varargs/varargIterator.txt
+++ b/compiler/testData/diagnostics/tests/varargs/varargIterator.txt
@@ -4,7 +4,7 @@ package test {
 
     public final class CompositeIterator</*0*/ T> {
         public constructor CompositeIterator</*0*/ T>(/*0*/ vararg iterators: java.util.Iterator<T> /*kotlin.Array<out java.util.Iterator<T>>*/)
-        public final val iteratorsIter: kotlin.Iterator<java.util.Iterator<T>>
+        public final val iteratorsIter: kotlin.collections.Iterator<java.util.Iterator<T>>
         public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/Serializable.txt b/compiler/testData/diagnostics/testsWithJsStdLib/Serializable.txt
index b475b3f63d2..df6db7f740a 100644
--- a/compiler/testData/diagnostics/testsWithJsStdLib/Serializable.txt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/Serializable.txt
@@ -2,12 +2,12 @@ package
 
 public fun testArrays(/*0*/ ia: kotlin.IntArray, /*1*/ ai: kotlin.Array<kotlin.Int>, /*2*/ an: kotlin.Array<N>, /*3*/ a: kotlin.Array<S>): kotlin.Unit
 public fun testEnums(/*0*/ a: kotlin.Enum<*>): kotlin.Unit
-public fun testLists(/*0*/ a: kotlin.List<kotlin.Int>): kotlin.Unit
+public fun testLists(/*0*/ a: kotlin.collections.List<kotlin.Int>): kotlin.Unit
 public fun testLiterals(): kotlin.Unit
-public fun testNotSerializable(/*0*/ l: kotlin.List<kotlin.Int>): kotlin.Unit
+public fun testNotSerializable(/*0*/ l: kotlin.collections.List<kotlin.Int>): kotlin.Unit
 public fun testPrimitives(/*0*/ b: kotlin.Byte, /*1*/ ss: kotlin.Short, /*2*/ i: kotlin.Int, /*3*/ l: kotlin.Long, /*4*/ d: kotlin.Double, /*5*/ s: kotlin.String, /*6*/ f: kotlin.Float, /*7*/ bool: kotlin.Boolean): kotlin.Unit
 public fun use(/*0*/ s: java.io.Serializable): kotlin.Unit
-public fun useList(/*0*/ s: kotlin.List<java.io.Serializable>): kotlin.Unit
+public fun useList(/*0*/ s: kotlin.collections.List<java.io.Serializable>): kotlin.Unit
 
 public final enum class C : kotlin.Enum<C> {
     enum entry E
diff --git a/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/dynamicCastTarget.txt b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/dynamicCastTarget.txt
index 005a0039e0f..4207afbc136 100644
--- a/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/dynamicCastTarget.txt
+++ b/compiler/testData/diagnostics/testsWithJsStdLib/dynamicTypes/dynamicCastTarget.txt
@@ -1,3 +1,3 @@
 package
 
-public fun test(/*0*/ d: kotlin.Any, /*1*/ dl: kotlin.Collection<dynamic>): kotlin.Unit
+public fun test(/*0*/ d: kotlin.Any, /*1*/ dl: kotlin.collections.Collection<dynamic>): kotlin.Unit
diff --git a/compiler/testData/diagnostics/testsWithStdLib/addAllProjection.txt b/compiler/testData/diagnostics/testsWithStdLib/addAllProjection.txt
index 5ea8d2e45c8..8da330eaf27 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/addAllProjection.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/addAllProjection.txt
@@ -1,3 +1,3 @@
 package
 
-public fun test(/*0*/ mc: kotlin.MutableCollection<out kotlin.CharSequence>): kotlin.Unit
+public fun test(/*0*/ mc: kotlin.collections.MutableCollection<out kotlin.CharSequence>): kotlin.Unit
diff --git a/compiler/testData/diagnostics/testsWithStdLib/cast/AsInsideIn.txt b/compiler/testData/diagnostics/testsWithStdLib/cast/AsInsideIn.txt
index 40c95db45b7..ff96151a93e 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/cast/AsInsideIn.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/cast/AsInsideIn.txt
@@ -1,9 +1,9 @@
 package
 
-public fun foo1(/*0*/ list: kotlin.List<A>, /*1*/ arg: B?): kotlin.Boolean
-public fun foo2(/*0*/ list: kotlin.List<A>, /*1*/ arg: B?): kotlin.Boolean
-public fun foo3(/*0*/ list: kotlin.List<A>, /*1*/ arg: B?): kotlin.Boolean
-public fun foo4(/*0*/ list: kotlin.List<A>, /*1*/ arg: B): kotlin.Boolean
+public fun foo1(/*0*/ list: kotlin.collections.List<A>, /*1*/ arg: B?): kotlin.Boolean
+public fun foo2(/*0*/ list: kotlin.collections.List<A>, /*1*/ arg: B?): kotlin.Boolean
+public fun foo3(/*0*/ list: kotlin.collections.List<A>, /*1*/ arg: B?): kotlin.Boolean
+public fun foo4(/*0*/ list: kotlin.collections.List<A>, /*1*/ arg: B): kotlin.Boolean
 
 public interface A {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
diff --git a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformNames.txt b/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformNames.txt
index 90b56fc038b..87550b42470 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformNames.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformNames.txt
@@ -1,7 +1,7 @@
 package
 
-@kotlin.jvm.JvmName(name = "barInt") public fun bar(/*0*/ x: kotlin.List<kotlin.Int>): kotlin.Unit
-@kotlin.jvm.JvmName(name = "barStr") public fun bar(/*0*/ x: kotlin.List<kotlin.String>): kotlin.Unit
+@kotlin.jvm.JvmName(name = "barInt") public fun bar(/*0*/ x: kotlin.collections.List<kotlin.Int>): kotlin.Unit
+@kotlin.jvm.JvmName(name = "barStr") public fun bar(/*0*/ x: kotlin.collections.List<kotlin.String>): kotlin.Unit
 @kotlin.jvm.JvmName(name = "bar") public fun foo(/*0*/ a: kotlin.Any): kotlin.Unit
 public fun kotlin.Any.foo(): kotlin.Unit
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformNamesDuplicate.txt b/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformNamesDuplicate.txt
index 8e34404b21f..51e8a2d7b91 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformNamesDuplicate.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformNamesDuplicate.txt
@@ -56,8 +56,8 @@ public open class B3 : A3 {
 public final class C {
     public constructor C()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    @kotlin.jvm.JvmName(name = "foo1") public final fun foo(/*0*/ list: kotlin.List<kotlin.Int>): kotlin.Unit
-    @kotlin.jvm.JvmName(name = "foo1") public final fun foo(/*0*/ list: kotlin.List<kotlin.String>): kotlin.Unit
+    @kotlin.jvm.JvmName(name = "foo1") public final fun foo(/*0*/ list: kotlin.collections.List<kotlin.Int>): kotlin.Unit
+    @kotlin.jvm.JvmName(name = "foo1") public final fun foo(/*0*/ list: kotlin.collections.List<kotlin.String>): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/exactAnnotation.txt b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/exactAnnotation.txt
index afbd811f459..cb7e5b26cd9 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/exactAnnotation.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/exactAnnotation.txt
@@ -1,4 +1,4 @@
 package
 
-public fun test1(/*0*/ l: kotlin.List<kotlin.Number>): kotlin.Unit
-@kotlin.Suppress(names = {"INVISIBLE_MEMBER", "INVISIBLE_REFERENCE"}) public fun </*0*/ T, /*1*/ U : T> kotlin.List<T>.firstTyped(): U
+public fun test1(/*0*/ l: kotlin.collections.List<kotlin.Number>): kotlin.Unit
+@kotlin.Suppress(names = {"INVISIBLE_MEMBER", "INVISIBLE_REFERENCE"}) public fun </*0*/ T, /*1*/ U : T> kotlin.collections.List<T>.firstTyped(): U
diff --git a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/internalAnnotationsOnTypes.txt b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/internalAnnotationsOnTypes.txt
index b2f3a015d90..2eaa327c248 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/internalAnnotationsOnTypes.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/internalAnnotationsOnTypes.txt
@@ -1,10 +1,10 @@
 package
 
 @kotlin.Suppress(names = {"INVISIBLE_MEMBER", "INVISIBLE_REFERENCE"}) public fun </*0*/ R> bar(/*0*/ r: R, /*1*/ f: (R) -> kotlin.Unit): kotlin.Nothing
-@kotlin.Suppress(names = {"INVISIBLE_MEMBER", "INVISIBLE_REFERENCE"}) public fun </*0*/ R> foo(/*0*/ t: R): kotlin.List<R>
+@kotlin.Suppress(names = {"INVISIBLE_MEMBER", "INVISIBLE_REFERENCE"}) public fun </*0*/ R> foo(/*0*/ t: R): kotlin.collections.List<R>
 public fun test(): kotlin.Unit
-public fun test(/*0*/ list: kotlin.List<kotlin.Int>): kotlin.Unit
+public fun test(/*0*/ list: kotlin.collections.List<kotlin.Int>): kotlin.Unit
 public fun test1(): kotlin.Unit
-@kotlin.Suppress(names = {"INVISIBLE_MEMBER", "INVISIBLE_REFERENCE"}) public fun </*0*/ R> kotlin.Iterable<*>.filterIsInstance1(): kotlin.List<R>
-@kotlin.Suppress(names = {"INVISIBLE_MEMBER", "INVISIBLE_REFERENCE"}) public fun </*0*/ R> kotlin.List<*>.filterIsInstance2(): kotlin.List<R>
-@kotlin.Suppress(names = {"INVISIBLE_MEMBER", "INVISIBLE_REFERENCE"}) public fun </*0*/ R> kotlin.List<R>.foo(): R
+@kotlin.Suppress(names = {"INVISIBLE_MEMBER", "INVISIBLE_REFERENCE"}) public fun </*0*/ R> kotlin.collections.Iterable<*>.filterIsInstance1(): kotlin.collections.List<R>
+@kotlin.Suppress(names = {"INVISIBLE_MEMBER", "INVISIBLE_REFERENCE"}) public fun </*0*/ R> kotlin.collections.List<*>.filterIsInstance2(): kotlin.collections.List<R>
+@kotlin.Suppress(names = {"INVISIBLE_MEMBER", "INVISIBLE_REFERENCE"}) public fun </*0*/ R> kotlin.collections.List<R>.foo(): R
diff --git a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/noInferAndLowPriority.txt b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/noInferAndLowPriority.txt
index ee9ab940340..45d3fc80180 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/noInferAndLowPriority.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/noInferAndLowPriority.txt
@@ -1,5 +1,5 @@
 package
 
 public fun test(): kotlin.Unit
-@kotlin.Suppress(names = {"INVISIBLE_MEMBER", "INVISIBLE_REFERENCE"}) @kotlin.jvm.JvmName(name = "containsAny") @kotlin.internal.LowPriorityInOverloadResolution() public fun </*0*/ T> kotlin.Iterable<T>.contains1(/*0*/ element: T): kotlin.Int
-@kotlin.Suppress(names = {"INVISIBLE_MEMBER", "INVISIBLE_REFERENCE"}) public fun </*0*/ T> kotlin.Iterable<T>.contains1(/*0*/ element: T): kotlin.Boolean
+@kotlin.Suppress(names = {"INVISIBLE_MEMBER", "INVISIBLE_REFERENCE"}) @kotlin.jvm.JvmName(name = "containsAny") @kotlin.internal.LowPriorityInOverloadResolution() public fun </*0*/ T> kotlin.collections.Iterable<T>.contains1(/*0*/ element: T): kotlin.Int
+@kotlin.Suppress(names = {"INVISIBLE_MEMBER", "INVISIBLE_REFERENCE"}) public fun </*0*/ T> kotlin.collections.Iterable<T>.contains1(/*0*/ element: T): kotlin.Boolean
diff --git a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/noInferAnnotation.txt b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/noInferAnnotation.txt
index bb9cc6bd390..e6716461cae 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/noInferAnnotation.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/noInferAnnotation.txt
@@ -1,10 +1,10 @@
 package
 
 @kotlin.Suppress(names = {"INVISIBLE_MEMBER", "INVISIBLE_REFERENCE"}) public fun </*0*/ T> assertEquals1(/*0*/ e1: T, /*1*/ e2: T): kotlin.Boolean
-public fun test(/*0*/ i: kotlin.Int?, /*1*/ a: kotlin.Any, /*2*/ l: kotlin.List<kotlin.Int>): kotlin.Unit
+public fun test(/*0*/ i: kotlin.Int?, /*1*/ a: kotlin.Any, /*2*/ l: kotlin.collections.List<kotlin.Int>): kotlin.Unit
 public fun test(/*0*/ s: kotlin.String): kotlin.Unit
 @kotlin.Suppress(names = {"INVISIBLE_MEMBER", "INVISIBLE_REFERENCE"}) public fun </*0*/ T> test1(/*0*/ t1: T, /*1*/ t2: T): T
 @kotlin.Suppress(names = {"INVISIBLE_MEMBER", "INVISIBLE_REFERENCE"}) public fun </*0*/ T> test3(/*0*/ t1: T): T
 public fun usage(): kotlin.Unit
-@kotlin.Suppress(names = {"INVISIBLE_MEMBER", "INVISIBLE_REFERENCE"}) public fun </*0*/ T> kotlin.List<T>.contains1(/*0*/ e: T): kotlin.Boolean
+@kotlin.Suppress(names = {"INVISIBLE_MEMBER", "INVISIBLE_REFERENCE"}) public fun </*0*/ T> kotlin.collections.List<T>.contains1(/*0*/ e: T): kotlin.Boolean
 @kotlin.Suppress(names = {"INVISIBLE_MEMBER", "INVISIBLE_REFERENCE"}) public fun </*0*/ T> T.test2(/*0*/ t1: T): T
diff --git a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/onlyInputTypesAndLowPriority.txt b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/onlyInputTypesAndLowPriority.txt
index c5a1c0acecf..3fb1589551b 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/onlyInputTypesAndLowPriority.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/onlyInputTypesAndLowPriority.txt
@@ -1,7 +1,7 @@
 package
 
-public fun test(/*0*/ map: kotlin.Map<kotlin.Int, kotlin.String>): kotlin.Unit
-@kotlin.Suppress(names = {"INVISIBLE_MEMBER", "INVISIBLE_REFERENCE"}) @kotlin.jvm.JvmName(name = "containsAny") @kotlin.internal.LowPriorityInOverloadResolution() public fun </*0*/ T> kotlin.Iterable<T>.contains1(/*0*/ element: T): kotlin.Int
-@kotlin.Suppress(names = {"INVISIBLE_MEMBER", "INVISIBLE_REFERENCE"}) public fun </*0*/ T> kotlin.Iterable<T>.contains1(/*0*/ element: T): kotlin.Boolean
-@kotlin.Suppress(names = {"INVISIBLE_MEMBER", "INVISIBLE_REFERENCE"}) @kotlin.jvm.JvmName(name = "getAny") @kotlin.internal.LowPriorityInOverloadResolution() public fun </*0*/ K, /*1*/ V> kotlin.Map<K, V>.get1(/*0*/ key: kotlin.Any?): kotlin.Int
-@kotlin.Suppress(names = {"INVISIBLE_MEMBER", "INVISIBLE_REFERENCE"}) public fun </*0*/ K, /*1*/ V> kotlin.Map<out K, V>.get1(/*0*/ key: K): V?
+public fun test(/*0*/ map: kotlin.collections.Map<kotlin.Int, kotlin.String>): kotlin.Unit
+@kotlin.Suppress(names = {"INVISIBLE_MEMBER", "INVISIBLE_REFERENCE"}) @kotlin.jvm.JvmName(name = "containsAny") @kotlin.internal.LowPriorityInOverloadResolution() public fun </*0*/ T> kotlin.collections.Iterable<T>.contains1(/*0*/ element: T): kotlin.Int
+@kotlin.Suppress(names = {"INVISIBLE_MEMBER", "INVISIBLE_REFERENCE"}) public fun </*0*/ T> kotlin.collections.Iterable<T>.contains1(/*0*/ element: T): kotlin.Boolean
+@kotlin.Suppress(names = {"INVISIBLE_MEMBER", "INVISIBLE_REFERENCE"}) @kotlin.jvm.JvmName(name = "getAny") @kotlin.internal.LowPriorityInOverloadResolution() public fun </*0*/ K, /*1*/ V> kotlin.collections.Map<K, V>.get1(/*0*/ key: kotlin.Any?): kotlin.Int
+@kotlin.Suppress(names = {"INVISIBLE_MEMBER", "INVISIBLE_REFERENCE"}) public fun </*0*/ K, /*1*/ V> kotlin.collections.Map<out K, V>.get1(/*0*/ key: K): V?
diff --git a/compiler/testData/diagnostics/testsWithStdLib/inference/kt1558.txt b/compiler/testData/diagnostics/testsWithStdLib/inference/kt1558.txt
index 4abcb29a861..4f4156223c8 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/inference/kt1558.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/inference/kt1558.txt
@@ -1,7 +1,7 @@
 package
 
 package j {
-    public fun testArrays(/*0*/ ci: kotlin.List<kotlin.Int?>, /*1*/ cii: kotlin.List<kotlin.Int?>?): kotlin.Unit
+    public fun testArrays(/*0*/ ci: kotlin.collections.List<kotlin.Int?>, /*1*/ cii: kotlin.collections.List<kotlin.Int?>?): kotlin.Unit
     public fun </*0*/ T : kotlin.Any> T?.sure(): T
-    public fun </*0*/ E> kotlin.List<*>.toArray(/*0*/ ar: kotlin.Array<E>): kotlin.Array<E>
+    public fun </*0*/ E> kotlin.collections.List<*>.toArray(/*0*/ ar: kotlin.Array<E>): kotlin.Array<E>
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/inference/kt4975.txt b/compiler/testData/diagnostics/testsWithStdLib/inference/kt4975.txt
index c0bf65636a7..dd0788385ad 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/inference/kt4975.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/inference/kt4975.txt
@@ -1,4 +1,4 @@
 package
 
 public fun </*0*/ T> bar(/*0*/ f: () -> T): T
-public fun test(/*0*/ map: kotlin.MutableMap<kotlin.Int, kotlin.Int>): kotlin.Unit
+public fun test(/*0*/ map: kotlin.collections.MutableMap<kotlin.Int, kotlin.Int>): kotlin.Unit
diff --git a/compiler/testData/diagnostics/testsWithStdLib/instar.txt b/compiler/testData/diagnostics/testsWithStdLib/instar.txt
index 2808864c063..9a7a9dd21c2 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/instar.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/instar.txt
@@ -4,7 +4,7 @@ public abstract class J {
     public constructor J()
     public final fun bar(): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public abstract fun </*0*/ T : kotlin.Collection<S>, /*1*/ S : kotlin.List<*>> foo(/*0*/ x: T): kotlin.Unit
+    public abstract fun </*0*/ T : kotlin.collections.Collection<S>, /*1*/ S : kotlin.collections.List<*>> foo(/*0*/ x: T): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/kt9078.txt b/compiler/testData/diagnostics/testsWithStdLib/kt9078.txt
index b32c862c382..256b7a7bf4b 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/kt9078.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/kt9078.txt
@@ -3,14 +3,14 @@ package
 public abstract class KFunctionKt9005WorkAround</*0*/ out R> : kotlin.reflect.KCallable<R> {
     public constructor KFunctionKt9005WorkAround</*0*/ out R>(/*0*/ _functionInstance: kotlin.Function<R>)
     private final val _functionInstance: kotlin.Function<R>
-    private final val _parameters: kotlin.List<kotlin.reflect.KParameter>
+    private final val _parameters: kotlin.collections.List<kotlin.reflect.KParameter>
     private final val _reflectedFunction: kotlin.reflect.KFunction<R>
-    public abstract override /*1*/ /*fake_override*/ val annotations: kotlin.List<kotlin.Annotation>
+    public abstract override /*1*/ /*fake_override*/ val annotations: kotlin.collections.List<kotlin.Annotation>
     public abstract override /*1*/ /*fake_override*/ val name: kotlin.String
-    public abstract override /*1*/ /*fake_override*/ val parameters: kotlin.List<kotlin.reflect.KParameter>
+    public abstract override /*1*/ /*fake_override*/ val parameters: kotlin.collections.List<kotlin.reflect.KParameter>
     public abstract override /*1*/ /*fake_override*/ val returnType: kotlin.reflect.KType
     public abstract override /*1*/ /*fake_override*/ fun call(/*0*/ vararg args: kotlin.Any? /*kotlin.Array<out kotlin.Any?>*/): R
-    public abstract override /*1*/ /*fake_override*/ fun callBy(/*0*/ args: kotlin.Map<kotlin.reflect.KParameter, kotlin.Any?>): R
+    public abstract override /*1*/ /*fake_override*/ fun callBy(/*0*/ args: kotlin.collections.Map<kotlin.reflect.KParameter, kotlin.Any?>): R
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
diff --git a/compiler/testData/diagnostics/testsWithStdLib/outstar.txt b/compiler/testData/diagnostics/testsWithStdLib/outstar.txt
index 2808864c063..9a7a9dd21c2 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/outstar.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/outstar.txt
@@ -4,7 +4,7 @@ public abstract class J {
     public constructor J()
     public final fun bar(): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public abstract fun </*0*/ T : kotlin.Collection<S>, /*1*/ S : kotlin.List<*>> foo(/*0*/ x: T): kotlin.Unit
+    public abstract fun </*0*/ T : kotlin.collections.Collection<S>, /*1*/ S : kotlin.collections.List<*>> foo(/*0*/ x: T): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/customClassMutableCollection.kt b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/customClassMutableCollection.kt
index b67883babd4..ca656c91e23 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/customClassMutableCollection.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/customClassMutableCollection.kt
@@ -3,7 +3,7 @@
 import java.util.*
 
 // FILE: A.java
-@kotlin.jvm.PurelyImplements("kotlin.MutableCollection")
+@kotlin.jvm.PurelyImplements("kotlin.collections.MutableCollection")
 class A<T> extends AbstractCollection<T> {
     @Override
     public Iterator<T> iterator() {
diff --git a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/customClassMutableCollection.txt b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/customClassMutableCollection.txt
index 7099f354e74..51ae2c3017c 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/customClassMutableCollection.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/customClassMutableCollection.txt
@@ -3,27 +3,27 @@ package
 public fun bar(): kotlin.String?
 public fun foo(): kotlin.Unit
 
-@kotlin.jvm.PurelyImplements(value = "kotlin.MutableCollection") public/*package*/ open class A</*0*/ T : kotlin.Any!> : java.util.AbstractCollection<T!>, kotlin.MutableCollection<T> {
+@kotlin.jvm.PurelyImplements(value = "kotlin.collections.MutableCollection") public/*package*/ open class A</*0*/ T : kotlin.Any!> : java.util.AbstractCollection<T!>, kotlin.collections.MutableCollection<T> {
     public/*package*/ constructor A</*0*/ T : kotlin.Any!>()
     public open override /*2*/ val size: kotlin.Int
     public open override /*2*/ /*fake_override*/ fun add(/*0*/ element: T): kotlin.Boolean
-    public open override /*2*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.Collection<T>): kotlin.Boolean
+    public open override /*2*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.collections.Collection<T>): kotlin.Boolean
     public open override /*2*/ /*fake_override*/ fun clear(): kotlin.Unit
     public open override /*2*/ /*fake_override*/ fun contains(/*0*/ element: T): kotlin.Boolean
-    public open override /*2*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.Collection<T>): kotlin.Boolean
+    public open override /*2*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection<T>): kotlin.Boolean
     public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*2*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
-    @java.lang.Override() public open override /*2*/ fun iterator(): kotlin.MutableIterator<T>
+    @java.lang.Override() public open override /*2*/ fun iterator(): kotlin.collections.MutableIterator<T>
     public open override /*2*/ /*fake_override*/ fun remove(/*0*/ element: T): kotlin.Boolean
-    public open override /*2*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.Collection<T>): kotlin.Boolean
-    public open override /*2*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.Collection<T>): kotlin.Boolean
+    public open override /*2*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.collections.Collection<T>): kotlin.Boolean
+    public open override /*2*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.collections.Collection<T>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun toArray(): kotlin.Array<(out) kotlin.Any!>!
     public open override /*1*/ /*fake_override*/ fun </*0*/ T : kotlin.Any!> toArray(/*0*/ p0: kotlin.Array<(out) T!>!): kotlin.Array<(out) T!>!
     public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
     invisible_fake const final override /*1*/ /*fake_override*/ val MAX_ARRAY_SIZE: kotlin.Int
-    invisible_fake open override /*1*/ /*fake_override*/ fun </*0*/ T : kotlin.Any!> finishToArray(/*0*/ p0: kotlin.Array<(out) T!>!, /*1*/ p1: kotlin.(Mutable)Iterator<*>!): kotlin.Array<(out) T!>!
+    invisible_fake open override /*1*/ /*fake_override*/ fun </*0*/ T : kotlin.Any!> finishToArray(/*0*/ p0: kotlin.Array<(out) T!>!, /*1*/ p1: kotlin.collections.(Mutable)Iterator<*>!): kotlin.Array<(out) T!>!
     invisible_fake open override /*1*/ /*fake_override*/ fun hugeCapacity(/*0*/ p0: kotlin.Int): kotlin.Int
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/customClassMutableList.kt b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/customClassMutableList.kt
index 776a7a7a8bc..1ecbbf61e94 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/customClassMutableList.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/customClassMutableList.kt
@@ -3,7 +3,7 @@
 import java.util.*
 
 // FILE: A.java
-@kotlin.jvm.PurelyImplements("kotlin.MutableList")
+@kotlin.jvm.PurelyImplements("kotlin.collections.MutableList")
 class A<T> extends AbstractList<T> {
     @Override
     public T get(int index) {
diff --git a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/customClassMutableList.txt b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/customClassMutableList.txt
index c3c200d064a..54d94f1ea44 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/customClassMutableList.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/customClassMutableList.txt
@@ -3,41 +3,41 @@ package
 public fun bar(): kotlin.String?
 public fun foo(): kotlin.Unit
 
-@kotlin.jvm.PurelyImplements(value = "kotlin.MutableList") public/*package*/ open class A</*0*/ T : kotlin.Any!> : java.util.AbstractList<T!>, kotlin.MutableList<T> {
+@kotlin.jvm.PurelyImplements(value = "kotlin.collections.MutableList") public/*package*/ open class A</*0*/ T : kotlin.Any!> : java.util.AbstractList<T!>, kotlin.collections.MutableList<T> {
     public/*package*/ constructor A</*0*/ T : kotlin.Any!>()
     protected/*protected and package*/ final override /*1*/ /*fake_override*/ var modCount: kotlin.Int
     public open override /*2*/ val size: kotlin.Int
     public open override /*2*/ /*fake_override*/ fun add(/*0*/ element: T): kotlin.Boolean
     public open override /*2*/ /*fake_override*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: T): kotlin.Unit
-    public open override /*2*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.Collection<T>): kotlin.Boolean
-    public open override /*2*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.Collection<T>): kotlin.Boolean
+    public open override /*2*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.collections.Collection<T>): kotlin.Boolean
+    public open override /*2*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.collections.Collection<T>): kotlin.Boolean
     public open override /*2*/ /*fake_override*/ fun clear(): kotlin.Unit
     public open override /*2*/ /*fake_override*/ fun contains(/*0*/ element: T): kotlin.Boolean
-    public open override /*2*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.Collection<T>): kotlin.Boolean
+    public open override /*2*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection<T>): kotlin.Boolean
     public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     @java.lang.Override() public open override /*2*/ fun get(/*0*/ index: kotlin.Int): T
     public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*2*/ /*fake_override*/ fun indexOf(/*0*/ element: T): kotlin.Int
     public open override /*2*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
-    public open override /*2*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator<T>
+    public open override /*2*/ /*fake_override*/ fun iterator(): kotlin.collections.MutableIterator<T>
     public open override /*2*/ /*fake_override*/ fun lastIndexOf(/*0*/ element: T): kotlin.Int
-    public open override /*2*/ /*fake_override*/ fun listIterator(): kotlin.MutableListIterator<T>
-    public open override /*2*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.MutableListIterator<T>
+    public open override /*2*/ /*fake_override*/ fun listIterator(): kotlin.collections.MutableListIterator<T>
+    public open override /*2*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.collections.MutableListIterator<T>
     invisible_fake open override /*1*/ /*fake_override*/ fun outOfBoundsMsg(/*0*/ p0: kotlin.Int): kotlin.String!
     invisible_fake open override /*1*/ /*fake_override*/ fun rangeCheckForAdd(/*0*/ p0: kotlin.Int): kotlin.Unit
     public open override /*2*/ /*fake_override*/ fun remove(/*0*/ element: T): kotlin.Boolean
-    public open override /*2*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.Collection<T>): kotlin.Boolean
+    public open override /*2*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.collections.Collection<T>): kotlin.Boolean
     public open override /*2*/ /*fake_override*/ fun removeAt(/*0*/ index: kotlin.Int): T
     protected/*protected and package*/ open override /*1*/ /*fake_override*/ fun removeRange(/*0*/ p0: kotlin.Int, /*1*/ p1: kotlin.Int): kotlin.Unit
-    public open override /*2*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.Collection<T>): kotlin.Boolean
+    public open override /*2*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.collections.Collection<T>): kotlin.Boolean
     public open override /*2*/ /*fake_override*/ fun set(/*0*/ index: kotlin.Int, /*1*/ element: T): T
-    public open override /*2*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.MutableList<T>
+    public open override /*2*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.collections.MutableList<T>
     public open override /*1*/ /*fake_override*/ fun toArray(): kotlin.Array<(out) kotlin.Any!>!
     public open override /*1*/ /*fake_override*/ fun </*0*/ T : kotlin.Any!> toArray(/*0*/ p0: kotlin.Array<(out) T!>!): kotlin.Array<(out) T!>!
     public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
     invisible_fake const final override /*1*/ /*fake_override*/ val MAX_ARRAY_SIZE: kotlin.Int
-    invisible_fake open override /*1*/ /*fake_override*/ fun </*0*/ T : kotlin.Any!> finishToArray(/*0*/ p0: kotlin.Array<(out) T!>!, /*1*/ p1: kotlin.(Mutable)Iterator<*>!): kotlin.Array<(out) T!>!
+    invisible_fake open override /*1*/ /*fake_override*/ fun </*0*/ T : kotlin.Any!> finishToArray(/*0*/ p0: kotlin.Array<(out) T!>!, /*1*/ p1: kotlin.collections.(Mutable)Iterator<*>!): kotlin.Array<(out) T!>!
     invisible_fake open override /*1*/ /*fake_override*/ fun hugeCapacity(/*0*/ p0: kotlin.Int): kotlin.Int
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/invalidFqName.txt b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/invalidFqName.txt
index 905a85a6d56..0a0cca70fec 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/invalidFqName.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/invalidFqName.txt
@@ -9,36 +9,36 @@ public val y: B<kotlin.String>
     public open override /*1*/ val size: kotlin.Int
     public open override /*1*/ /*fake_override*/ fun add(/*0*/ element: T!): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: T!): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.Collection<T!>): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.Collection<T!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.collections.Collection<T!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.collections.Collection<T!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun contains(/*0*/ element: T!): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.Collection<T!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection<T!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     @java.lang.Override() public open override /*1*/ fun get(/*0*/ index: kotlin.Int): T!
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ element: T!): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator<T!>
+    public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.collections.MutableIterator<T!>
     public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ element: T!): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.MutableListIterator<T!>
-    public open override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.MutableListIterator<T!>
+    public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.collections.MutableListIterator<T!>
+    public open override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.collections.MutableListIterator<T!>
     invisible_fake open override /*1*/ /*fake_override*/ fun outOfBoundsMsg(/*0*/ p0: kotlin.Int): kotlin.String!
     invisible_fake open override /*1*/ /*fake_override*/ fun rangeCheckForAdd(/*0*/ p0: kotlin.Int): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun remove(/*0*/ element: T!): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.Collection<T!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.collections.Collection<T!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun removeAt(/*0*/ p0: kotlin.Int): T!
     protected/*protected and package*/ open override /*1*/ /*fake_override*/ fun removeRange(/*0*/ p0: kotlin.Int, /*1*/ p1: kotlin.Int): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.Collection<T!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.collections.Collection<T!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun set(/*0*/ index: kotlin.Int, /*1*/ element: T!): T!
-    public open override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.MutableList<T!>
+    public open override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.collections.MutableList<T!>
     public open override /*1*/ /*fake_override*/ fun toArray(): kotlin.Array<(out) kotlin.Any!>!
     public open override /*1*/ /*fake_override*/ fun </*0*/ T : kotlin.Any!> toArray(/*0*/ p0: kotlin.Array<(out) T!>!): kotlin.Array<(out) T!>!
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
     invisible_fake const final override /*1*/ /*fake_override*/ val MAX_ARRAY_SIZE: kotlin.Int
-    invisible_fake open override /*1*/ /*fake_override*/ fun </*0*/ T : kotlin.Any!> finishToArray(/*0*/ p0: kotlin.Array<(out) T!>!, /*1*/ p1: kotlin.(Mutable)Iterator<*>!): kotlin.Array<(out) T!>!
+    invisible_fake open override /*1*/ /*fake_override*/ fun </*0*/ T : kotlin.Any!> finishToArray(/*0*/ p0: kotlin.Array<(out) T!>!, /*1*/ p1: kotlin.collections.(Mutable)Iterator<*>!): kotlin.Array<(out) T!>!
     invisible_fake open override /*1*/ /*fake_override*/ fun hugeCapacity(/*0*/ p0: kotlin.Int): kotlin.Int
 }
 
@@ -48,35 +48,35 @@ public val y: B<kotlin.String>
     public abstract override /*1*/ /*fake_override*/ val size: kotlin.Int
     public open override /*1*/ /*fake_override*/ fun add(/*0*/ element: T!): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: T!): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.Collection<T!>): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.Collection<T!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.collections.Collection<T!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.collections.Collection<T!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun contains(/*0*/ element: T!): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.Collection<T!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection<T!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public abstract override /*1*/ /*fake_override*/ fun get(/*0*/ index: kotlin.Int): T!
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ element: T!): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator<T!>
+    public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.collections.MutableIterator<T!>
     public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ element: T!): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.MutableListIterator<T!>
-    public open override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.MutableListIterator<T!>
+    public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.collections.MutableListIterator<T!>
+    public open override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.collections.MutableListIterator<T!>
     invisible_fake open override /*1*/ /*fake_override*/ fun outOfBoundsMsg(/*0*/ p0: kotlin.Int): kotlin.String!
     invisible_fake open override /*1*/ /*fake_override*/ fun rangeCheckForAdd(/*0*/ p0: kotlin.Int): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun remove(/*0*/ element: T!): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.Collection<T!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.collections.Collection<T!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun removeAt(/*0*/ p0: kotlin.Int): T!
     protected/*protected and package*/ open override /*1*/ /*fake_override*/ fun removeRange(/*0*/ p0: kotlin.Int, /*1*/ p1: kotlin.Int): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.Collection<T!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.collections.Collection<T!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun set(/*0*/ index: kotlin.Int, /*1*/ element: T!): T!
-    public open override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.MutableList<T!>
+    public open override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.collections.MutableList<T!>
     public open override /*1*/ /*fake_override*/ fun toArray(): kotlin.Array<(out) kotlin.Any!>!
     public open override /*1*/ /*fake_override*/ fun </*0*/ T : kotlin.Any!> toArray(/*0*/ p0: kotlin.Array<(out) T!>!): kotlin.Array<(out) T!>!
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
     invisible_fake const final override /*1*/ /*fake_override*/ val MAX_ARRAY_SIZE: kotlin.Int
-    invisible_fake open override /*1*/ /*fake_override*/ fun </*0*/ T : kotlin.Any!> finishToArray(/*0*/ p0: kotlin.Array<(out) T!>!, /*1*/ p1: kotlin.(Mutable)Iterator<*>!): kotlin.Array<(out) T!>!
+    invisible_fake open override /*1*/ /*fake_override*/ fun </*0*/ T : kotlin.Any!> finishToArray(/*0*/ p0: kotlin.Array<(out) T!>!, /*1*/ p1: kotlin.collections.(Mutable)Iterator<*>!): kotlin.Array<(out) T!>!
     invisible_fake open override /*1*/ /*fake_override*/ fun hugeCapacity(/*0*/ p0: kotlin.Int): kotlin.Int
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/wrongTypeParametersCount.kt b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/wrongTypeParametersCount.kt
index 63d95658bdb..b57b94d8432 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/wrongTypeParametersCount.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/wrongTypeParametersCount.kt
@@ -3,7 +3,7 @@
 import java.util.*
 
 // FILE: A.java
-@kotlin.jvm.PurelyImplements("kotlin.MutableList")
+@kotlin.jvm.PurelyImplements("kotlin.collections.MutableList")
 class A<T, V> extends AbstractList<T> {
     @Override
     public T get(int index) {
diff --git a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/wrongTypeParametersCount.txt b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/wrongTypeParametersCount.txt
index f316372a15d..b0d2f2e8262 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/wrongTypeParametersCount.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/wrongTypeParametersCount.txt
@@ -3,41 +3,41 @@ package
 public fun bar(): kotlin.String?
 public fun foo(): kotlin.Unit
 
-@kotlin.jvm.PurelyImplements(value = "kotlin.MutableList") public/*package*/ open class A</*0*/ T : kotlin.Any!, /*1*/ V : kotlin.Any!> : java.util.AbstractList<T!> {
+@kotlin.jvm.PurelyImplements(value = "kotlin.collections.MutableList") public/*package*/ open class A</*0*/ T : kotlin.Any!, /*1*/ V : kotlin.Any!> : java.util.AbstractList<T!> {
     public/*package*/ constructor A</*0*/ T : kotlin.Any!, /*1*/ V : kotlin.Any!>()
     protected/*protected and package*/ final override /*1*/ /*fake_override*/ var modCount: kotlin.Int
     public open override /*1*/ val size: kotlin.Int
     public open override /*1*/ /*fake_override*/ fun add(/*0*/ element: T!): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: T!): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.Collection<T!>): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.Collection<T!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.collections.Collection<T!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.collections.Collection<T!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun contains(/*0*/ element: T!): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.Collection<T!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection<T!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     @java.lang.Override() public open override /*1*/ fun get(/*0*/ index: kotlin.Int): T!
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ element: T!): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator<T!>
+    public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.collections.MutableIterator<T!>
     public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ element: T!): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.MutableListIterator<T!>
-    public open override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.MutableListIterator<T!>
+    public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.collections.MutableListIterator<T!>
+    public open override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.collections.MutableListIterator<T!>
     invisible_fake open override /*1*/ /*fake_override*/ fun outOfBoundsMsg(/*0*/ p0: kotlin.Int): kotlin.String!
     invisible_fake open override /*1*/ /*fake_override*/ fun rangeCheckForAdd(/*0*/ p0: kotlin.Int): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun remove(/*0*/ element: T!): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.Collection<T!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.collections.Collection<T!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun removeAt(/*0*/ p0: kotlin.Int): T!
     protected/*protected and package*/ open override /*1*/ /*fake_override*/ fun removeRange(/*0*/ p0: kotlin.Int, /*1*/ p1: kotlin.Int): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.Collection<T!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.collections.Collection<T!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun set(/*0*/ index: kotlin.Int, /*1*/ element: T!): T!
-    public open override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.MutableList<T!>
+    public open override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.collections.MutableList<T!>
     public open override /*1*/ /*fake_override*/ fun toArray(): kotlin.Array<(out) kotlin.Any!>!
     public open override /*1*/ /*fake_override*/ fun </*0*/ T : kotlin.Any!> toArray(/*0*/ p0: kotlin.Array<(out) T!>!): kotlin.Array<(out) T!>!
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
     // Static members
     invisible_fake const final override /*1*/ /*fake_override*/ val MAX_ARRAY_SIZE: kotlin.Int
-    invisible_fake open override /*1*/ /*fake_override*/ fun </*0*/ T : kotlin.Any!> finishToArray(/*0*/ p0: kotlin.Array<(out) T!>!, /*1*/ p1: kotlin.(Mutable)Iterator<*>!): kotlin.Array<(out) T!>!
+    invisible_fake open override /*1*/ /*fake_override*/ fun </*0*/ T : kotlin.Any!> finishToArray(/*0*/ p0: kotlin.Array<(out) T!>!, /*1*/ p1: kotlin.collections.(Mutable)Iterator<*>!): kotlin.Array<(out) T!>!
     invisible_fake open override /*1*/ /*fake_override*/ fun hugeCapacity(/*0*/ p0: kotlin.Int): kotlin.Int
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/regression/ea63992.txt b/compiler/testData/diagnostics/testsWithStdLib/regression/ea63992.txt
index 9c98484b033..7aaa6938084 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/regression/ea63992.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/regression/ea63992.txt
@@ -5,8 +5,8 @@ public fun add(/*0*/ a: kotlin.Int, /*1*/ b: kotlin.Int): kotlin.Int
 public interface A {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open fun f(): (kotlin.Int, kotlin.Int) -> kotlin.Int
-    public abstract fun </*0*/ T> foo(/*0*/ f: (kotlin.List<T>) -> kotlin.List<T>, /*1*/ x: kotlin.List<T>): kotlin.Unit
+    public abstract fun </*0*/ T> foo(/*0*/ f: (kotlin.collections.List<T>) -> kotlin.collections.List<T>, /*1*/ x: kotlin.collections.List<T>): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public abstract fun </*0*/ T> shuffle(/*0*/ x: kotlin.List<T>): kotlin.List<T>
+    public abstract fun </*0*/ T> shuffle(/*0*/ x: kotlin.collections.List<T>): kotlin.collections.List<T>
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/regression/ea66827_dataClassWrongToString.txt b/compiler/testData/diagnostics/testsWithStdLib/regression/ea66827_dataClassWrongToString.txt
index 13973ae6dc5..5e0d49e1e35 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/regression/ea66827_dataClassWrongToString.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/regression/ea66827_dataClassWrongToString.txt
@@ -8,5 +8,5 @@ public final data class A {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public final fun toArray(): kotlin.IntArray
-    public open override /*1*/ fun toString(): kotlin.List<kotlin.Int>
+    public open override /*1*/ fun toString(): kotlin.collections.List<kotlin.Int>
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/regression/kt2082.txt b/compiler/testData/diagnostics/testsWithStdLib/regression/kt2082.txt
index ea7bfe60012..8de700cd9a8 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/regression/kt2082.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/regression/kt2082.txt
@@ -1,5 +1,5 @@
 package
 
 public fun bar(): kotlin.String?
-public fun foo(/*0*/ c: kotlin.Collection<kotlin.String>): () -> kotlin.List<kotlin.String>
+public fun foo(/*0*/ c: kotlin.collections.Collection<kotlin.String>): () -> kotlin.collections.List<kotlin.String>
 public fun zoo(/*0*/ s: kotlin.String): kotlin.Boolean
diff --git a/compiler/testData/loadJava/compiledJava/ClassWithTypePExtendsIterableP.txt b/compiler/testData/loadJava/compiledJava/ClassWithTypePExtendsIterableP.txt
index fa9fe07e7c3..ba56d49df5a 100644
--- a/compiler/testData/loadJava/compiledJava/ClassWithTypePExtendsIterableP.txt
+++ b/compiler/testData/loadJava/compiledJava/ClassWithTypePExtendsIterableP.txt
@@ -1,6 +1,6 @@
 package test
 
-public abstract class ClassWithTypePExtendsIterableP</*0*/ P : kotlin.Any!> : kotlin.MutableIterable<P!> {
+public abstract class ClassWithTypePExtendsIterableP</*0*/ P : kotlin.Any!> : kotlin.collections.MutableIterable<P!> {
     public constructor ClassWithTypePExtendsIterableP</*0*/ P : kotlin.Any!>()
-    public abstract override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator<P!>
+    public abstract override /*1*/ /*fake_override*/ fun iterator(): kotlin.collections.MutableIterator<P!>
 }
diff --git a/compiler/testData/loadJava/compiledJava/ClassWithTypePRefNext.txt b/compiler/testData/loadJava/compiledJava/ClassWithTypePRefNext.txt
index 529274b2f21..c7ab7abbb8d 100644
--- a/compiler/testData/loadJava/compiledJava/ClassWithTypePRefNext.txt
+++ b/compiler/testData/loadJava/compiledJava/ClassWithTypePRefNext.txt
@@ -1,5 +1,5 @@
 package test
 
-public open class ClassWithTypePRefNext</*0*/ R : kotlin.(Mutable)Iterable<P!>!, /*1*/ P : kotlin.Any!> {
-    public constructor ClassWithTypePRefNext</*0*/ R : kotlin.(Mutable)Iterable<P!>!, /*1*/ P : kotlin.Any!>()
+public open class ClassWithTypePRefNext</*0*/ R : kotlin.collections.(Mutable)Iterable<P!>!, /*1*/ P : kotlin.Any!> {
+    public constructor ClassWithTypePRefNext</*0*/ R : kotlin.collections.(Mutable)Iterable<P!>!, /*1*/ P : kotlin.Any!>()
 }
diff --git a/compiler/testData/loadJava/compiledJava/InnerClassesInGeneric.runtime.txt b/compiler/testData/loadJava/compiledJava/InnerClassesInGeneric.runtime.txt
index 79090827d25..258511ee456 100644
--- a/compiler/testData/loadJava/compiledJava/InnerClassesInGeneric.runtime.txt
+++ b/compiler/testData/loadJava/compiledJava/InnerClassesInGeneric.runtime.txt
@@ -9,6 +9,6 @@ public open class InnerClassesInGeneric</*0*/ P : kotlin.Any!, /*1*/ Q : kotlin.
 
     public open inner class Inner2 /*captured type parameters: /*0*/ P : kotlin.Any!, /*1*/ Q : kotlin.Any!*/ : test.InnerClassesInGeneric<kotlin.Any!, kotlin.Any!>.Inner {
         public constructor Inner2()
-        public open operator fun iterator(): kotlin.(Mutable)Iterator<P!>!
+        public open operator fun iterator(): kotlin.collections.(Mutable)Iterator<P!>!
     }
 }
diff --git a/compiler/testData/loadJava/compiledJava/InnerClassesInGeneric.txt b/compiler/testData/loadJava/compiledJava/InnerClassesInGeneric.txt
index aa7e1ab9176..80d0ee7142c 100644
--- a/compiler/testData/loadJava/compiledJava/InnerClassesInGeneric.txt
+++ b/compiler/testData/loadJava/compiledJava/InnerClassesInGeneric.txt
@@ -9,6 +9,6 @@ public open class InnerClassesInGeneric</*0*/ P : kotlin.Any!, /*1*/ Q : kotlin.
 
     public open inner class Inner2 /*captured type parameters: /*0*/ P : kotlin.Any!, /*1*/ Q : kotlin.Any!*/ : test.InnerClassesInGeneric<P!, Q!>.Inner {
         public constructor Inner2()
-        public open operator fun iterator(): kotlin.(Mutable)Iterator<P!>!
+        public open operator fun iterator(): kotlin.collections.(Mutable)Iterator<P!>!
     }
 }
diff --git a/compiler/testData/loadJava/compiledJava/InnerOfGeneric.runtime.txt b/compiler/testData/loadJava/compiledJava/InnerOfGeneric.runtime.txt
index 364234eccb7..b85e01b5102 100644
--- a/compiler/testData/loadJava/compiledJava/InnerOfGeneric.runtime.txt
+++ b/compiler/testData/loadJava/compiledJava/InnerOfGeneric.runtime.txt
@@ -8,7 +8,7 @@ public open class InnerOfGeneric {
 
         public abstract inner class Inner /*captured type parameters: /*0*/ K : kotlin.Any!*/ : test.InnerOfGeneric.S<K!> {
             public constructor Inner()
-            public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.(Mutable)Iterator<K!>!
+            public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.collections.(Mutable)Iterator<K!>!
         }
     }
 
@@ -17,12 +17,12 @@ public open class InnerOfGeneric {
 
         public open inner class SubInner /*captured type parameters: /*0*/ L : kotlin.Any!*/ : test.InnerOfGeneric.A<kotlin.Any!>.Inner {
             public constructor SubInner()
-            public open override /*1*/ fun iterator(): kotlin.(Mutable)Iterator<L!>!
+            public open override /*1*/ fun iterator(): kotlin.collections.(Mutable)Iterator<L!>!
         }
     }
 
     public open inner class S</*0*/ E : kotlin.Any!> {
         public constructor S</*0*/ E : kotlin.Any!>()
-        public open operator fun iterator(): kotlin.(Mutable)Iterator<E!>!
+        public open operator fun iterator(): kotlin.collections.(Mutable)Iterator<E!>!
     }
 }
diff --git a/compiler/testData/loadJava/compiledJava/InnerOfGeneric.txt b/compiler/testData/loadJava/compiledJava/InnerOfGeneric.txt
index fdf6044b1c9..31e20b25b34 100644
--- a/compiler/testData/loadJava/compiledJava/InnerOfGeneric.txt
+++ b/compiler/testData/loadJava/compiledJava/InnerOfGeneric.txt
@@ -8,7 +8,7 @@ public open class InnerOfGeneric {
 
         public abstract inner class Inner /*captured type parameters: /*0*/ K : kotlin.Any!*/ : test.InnerOfGeneric.S<K!> {
             public constructor Inner()
-            public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.(Mutable)Iterator<K!>!
+            public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.collections.(Mutable)Iterator<K!>!
         }
     }
 
@@ -17,12 +17,12 @@ public open class InnerOfGeneric {
 
         public open inner class SubInner /*captured type parameters: /*0*/ L : kotlin.Any!*/ : test.InnerOfGeneric.A<L!>.Inner {
             public constructor SubInner()
-            public open override /*1*/ fun iterator(): kotlin.(Mutable)Iterator<L!>!
+            public open override /*1*/ fun iterator(): kotlin.collections.(Mutable)Iterator<L!>!
         }
     }
 
     public open inner class S</*0*/ E : kotlin.Any!> {
         public constructor S</*0*/ E : kotlin.Any!>()
-        public open operator fun iterator(): kotlin.(Mutable)Iterator<E!>!
+        public open operator fun iterator(): kotlin.collections.(Mutable)Iterator<E!>!
     }
 }
diff --git a/compiler/testData/loadJava/compiledJava/RawOverrides.txt b/compiler/testData/loadJava/compiledJava/RawOverrides.txt
index 0ac23aa5baf..225e96e07f7 100644
--- a/compiler/testData/loadJava/compiledJava/RawOverrides.txt
+++ b/compiler/testData/loadJava/compiledJava/RawOverrides.txt
@@ -4,21 +4,21 @@ public open class RawOverrides {
     public constructor RawOverrides()
 
     public interface A</*0*/ T : kotlin.Any!> {
-        public abstract fun </*0*/ E : kotlin.CharSequence!> foo(/*0*/ p0: T!, /*1*/ p1: (kotlin.MutableList<out T!>..kotlin.List<T!>?)): E!
+        public abstract fun </*0*/ E : kotlin.CharSequence!> foo(/*0*/ p0: T!, /*1*/ p1: (kotlin.collections.MutableList<out T!>..kotlin.collections.List<T!>?)): E!
     }
 
     public open inner class B : test.RawOverrides.A<kotlin.Any!> {
         public constructor B()
-        public open override /*1*/ fun foo(/*0*/ p0: kotlin.Any!, /*1*/ p1: kotlin.(Mutable)List<(raw) kotlin.Any?>!): kotlin.String!
+        public open override /*1*/ fun foo(/*0*/ p0: kotlin.Any!, /*1*/ p1: kotlin.collections.(Mutable)List<(raw) kotlin.Any?>!): kotlin.String!
     }
 
     public open inner class C {
         public constructor C()
-        public/*package*/ open fun </*0*/ E : kotlin.CharSequence!, /*1*/ F : E!> bar(/*0*/ p0: F!, /*1*/ p1: kotlin.(Mutable)List<kotlin.(Mutable)Map<E!, F!>!>!): E!
+        public/*package*/ open fun </*0*/ E : kotlin.CharSequence!, /*1*/ F : E!> bar(/*0*/ p0: F!, /*1*/ p1: kotlin.collections.(Mutable)List<kotlin.collections.(Mutable)Map<E!, F!>!>!): E!
     }
 
     public open inner class D : test.RawOverrides.C {
         public constructor D()
-        public open override /*1*/ fun bar(/*0*/ p0: kotlin.CharSequence!, /*1*/ p1: kotlin.(Mutable)List<(raw) kotlin.Any?>!): kotlin.String!
+        public open override /*1*/ fun bar(/*0*/ p0: kotlin.CharSequence!, /*1*/ p1: kotlin.collections.(Mutable)List<(raw) kotlin.Any?>!): kotlin.String!
     }
 }
diff --git a/compiler/testData/loadJava/compiledJava/RawTypeWithUpperBound.txt b/compiler/testData/loadJava/compiledJava/RawTypeWithUpperBound.txt
index 73cf12bb01a..e223e2c24dd 100644
--- a/compiler/testData/loadJava/compiledJava/RawTypeWithUpperBound.txt
+++ b/compiler/testData/loadJava/compiledJava/RawTypeWithUpperBound.txt
@@ -4,7 +4,7 @@ public interface RawTypeWithUpperBound {
 
     public interface Bar {
         public abstract fun f(/*0*/ p0: test.RawTypeWithUpperBound.Foo<(raw) kotlin.CharSequence!>!): kotlin.Unit
-        public abstract fun g(/*0*/ p0: kotlin.(Mutable)List<test.RawTypeWithUpperBound.Foo<(raw) kotlin.CharSequence!>!>!): kotlin.Unit
+        public abstract fun g(/*0*/ p0: kotlin.collections.(Mutable)List<test.RawTypeWithUpperBound.Foo<(raw) kotlin.CharSequence!>!>!): kotlin.Unit
     }
 
     public interface Foo</*0*/ T : kotlin.CharSequence!> {
diff --git a/compiler/testData/loadJava/compiledJava/RemoveRedundantProjectionKind.txt b/compiler/testData/loadJava/compiledJava/RemoveRedundantProjectionKind.txt
index e458e5d84e9..2f70ebcf18e 100644
--- a/compiler/testData/loadJava/compiledJava/RemoveRedundantProjectionKind.txt
+++ b/compiler/testData/loadJava/compiledJava/RemoveRedundantProjectionKind.txt
@@ -1,6 +1,6 @@
 package test
 
 public interface RemoveRedundantProjectionKind {
-    public abstract fun f(/*0*/ p0: (kotlin.MutableCollection<out kotlin.CharSequence!>..kotlin.Collection<kotlin.CharSequence!>?)): kotlin.Unit
+    public abstract fun f(/*0*/ p0: (kotlin.collections.MutableCollection<out kotlin.CharSequence!>..kotlin.collections.Collection<kotlin.CharSequence!>?)): kotlin.Unit
     public abstract fun f(/*0*/ p0: kotlin.Comparable<kotlin.CharSequence!>!): kotlin.Unit
 }
diff --git a/compiler/testData/loadJava/compiledJava/UnboundWildcard.txt b/compiler/testData/loadJava/compiledJava/UnboundWildcard.txt
index 0a2d629ebae..ce43951688a 100644
--- a/compiler/testData/loadJava/compiledJava/UnboundWildcard.txt
+++ b/compiler/testData/loadJava/compiledJava/UnboundWildcard.txt
@@ -2,7 +2,7 @@ package test
 
 public final class UnboundWildcard {
     public constructor UnboundWildcard()
-    public final fun collection(): kotlin.(Mutable)Collection<*>!
+    public final fun collection(): kotlin.collections.(Mutable)Collection<*>!
     public final fun foo(): test.UnboundWildcard.MyClass<*>!
 
     public interface MyClass</*0*/ T : kotlin.CharSequence!> {
diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedValueParameter.txt b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedValueParameter.txt
index c51425416b0..59c103682fd 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedValueParameter.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedValueParameter.txt
@@ -2,7 +2,7 @@ package test
 
 public open class AnnotatedValueParameter {
     public constructor AnnotatedValueParameter()
-    public open fun f(/*0*/ @test.AnnotatedValueParameter.Anno(value = "non-empty") p0: kotlin.(Mutable)List<kotlin.String!>!): kotlin.Unit
+    public open fun f(/*0*/ @test.AnnotatedValueParameter.Anno(value = "non-empty") p0: kotlin.collections.(Mutable)List<kotlin.String!>!): kotlin.Unit
 
     public final annotation class Anno : kotlin.Annotation {
         public constructor Anno(/*0*/ value: kotlin.String)
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/CustomProjectionKind.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/CustomProjectionKind.txt
index 676b276ddd5..fdc83abf6d1 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/CustomProjectionKind.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/CustomProjectionKind.txt
@@ -2,5 +2,5 @@ package test
 
 public open class CustomProjectionKind {
     public constructor CustomProjectionKind()
-    public open fun foo(): kotlin.(Mutable)List<kotlin.Number!>!
+    public open fun foo(): kotlin.collections.(Mutable)List<kotlin.Number!>!
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithGenerics.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithGenerics.txt
index 0a50f6aae55..83de580ad68 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithGenerics.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithGenerics.txt
@@ -2,5 +2,5 @@ package test
 
 public open class MethodWithGenerics {
     public constructor MethodWithGenerics()
-    public open fun foo(/*0*/ p0: kotlin.String!, /*1*/ p1: kotlin.(Mutable)List<kotlin.(Mutable)Map.(Mutable)Entry<kotlin.String!, kotlin.String!>!>!): kotlin.String!
+    public open fun foo(/*0*/ p0: kotlin.String!, /*1*/ p1: kotlin.collections.(Mutable)List<kotlin.collections.(Mutable)Map.(Mutable)Entry<kotlin.String!, kotlin.String!>!>!): kotlin.String!
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithMappedClasses.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithMappedClasses.txt
index 5577d3dd9cb..c10437a77b1 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithMappedClasses.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithMappedClasses.txt
@@ -2,5 +2,5 @@ package test
 
 public open class MethodWithMappedClasses {
     public constructor MethodWithMappedClasses()
-    public open fun </*0*/ T : kotlin.Any!> copy(/*0*/ p0: (kotlin.MutableList<in T!>..kotlin.List<*>?), /*1*/ p1: kotlin.(Mutable)List<T!>!): kotlin.Unit
+    public open fun </*0*/ T : kotlin.Any!> copy(/*0*/ p0: (kotlin.collections.MutableList<in T!>..kotlin.collections.List<*>?), /*1*/ p1: kotlin.collections.(Mutable)List<T!>!): kotlin.Unit
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithTypeParameters.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithTypeParameters.txt
index 7c25351dacb..b278d2b2acf 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithTypeParameters.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithTypeParameters.txt
@@ -2,5 +2,5 @@ package test
 
 public open class MethodWithTypeParameters {
     public constructor MethodWithTypeParameters()
-    public open fun </*0*/ A : kotlin.Any!, /*1*/ B : java.lang.Runnable!> foo(/*0*/ p0: A!, /*1*/ p1: (kotlin.MutableList<out B!>..kotlin.List<B!>?), /*2*/ p2: (kotlin.MutableList<in kotlin.String!>..kotlin.List<*>?)): kotlin.Unit where B : kotlin.(Mutable)List<kotlin.Cloneable!>!
+    public open fun </*0*/ A : kotlin.Any!, /*1*/ B : java.lang.Runnable!> foo(/*0*/ p0: A!, /*1*/ p1: (kotlin.collections.MutableList<out B!>..kotlin.collections.List<B!>?), /*2*/ p2: (kotlin.collections.MutableList<in kotlin.String!>..kotlin.collections.List<*>?)): kotlin.Unit where B : kotlin.collections.(Mutable)List<kotlin.Cloneable!>!
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongProjectionKind.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongProjectionKind.txt
index 76b7669b797..b36ffa02830 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongProjectionKind.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongProjectionKind.txt
@@ -2,5 +2,5 @@ package test
 
 public open class WrongProjectionKind {
     public constructor WrongProjectionKind()
-    public open fun copy(/*0*/ p0: kotlin.Array<(out) kotlin.Number!>!, /*1*/ p1: kotlin.Array<(out) kotlin.Number!>!): kotlin.(Mutable)List<kotlin.Number!>!
+    public open fun copy(/*0*/ p0: kotlin.Array<(out) kotlin.Number!>!, /*1*/ p1: kotlin.Array<(out) kotlin.Number!>!): kotlin.collections.(Mutable)List<kotlin.Number!>!
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongReturnTypeStructure.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongReturnTypeStructure.txt
index 4424bc5f450..3be3c38e4ec 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongReturnTypeStructure.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongReturnTypeStructure.txt
@@ -2,5 +2,5 @@ package test
 
 public open class WrongReturnTypeStructure {
     public constructor WrongReturnTypeStructure()
-    public open fun foo(/*0*/ p0: kotlin.String!, /*1*/ p1: kotlin.(Mutable)List<kotlin.(Mutable)Map.(Mutable)Entry<kotlin.String!, kotlin.String!>!>!): kotlin.String!
+    public open fun foo(/*0*/ p0: kotlin.String!, /*1*/ p1: kotlin.collections.(Mutable)List<kotlin.collections.(Mutable)Map.(Mutable)Entry<kotlin.String!, kotlin.String!>!>!): kotlin.String!
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.txt
index 19b84a949ed..17cee2f469c 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.txt
@@ -2,5 +2,5 @@ package test
 
 public open class WrongTypeParameterBoundStructure1 {
     public constructor WrongTypeParameterBoundStructure1()
-    public open fun </*0*/ A : kotlin.Any!, /*1*/ B : java.lang.Runnable!> foo(/*0*/ p0: A!, /*1*/ p1: (kotlin.MutableList<out B!>..kotlin.List<B!>?)): kotlin.Unit where B : kotlin.(Mutable)List<kotlin.Cloneable!>!
+    public open fun </*0*/ A : kotlin.Any!, /*1*/ B : java.lang.Runnable!> foo(/*0*/ p0: A!, /*1*/ p1: (kotlin.collections.MutableList<out B!>..kotlin.collections.List<B!>?)): kotlin.Unit where B : kotlin.collections.(Mutable)List<kotlin.Cloneable!>!
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure1.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure1.txt
index 86c09012e96..9086cd8380d 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure1.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure1.txt
@@ -2,5 +2,5 @@ package test
 
 public open class WrongValueParameterStructure1 {
     public constructor WrongValueParameterStructure1()
-    public open fun foo(/*0*/ p0: kotlin.String!, /*1*/ p1: kotlin.(Mutable)List<kotlin.(Mutable)Map.(Mutable)Entry<kotlin.String!, kotlin.String!>!>!): kotlin.String!
+    public open fun foo(/*0*/ p0: kotlin.String!, /*1*/ p1: kotlin.collections.(Mutable)List<kotlin.collections.(Mutable)Map.(Mutable)Entry<kotlin.String!, kotlin.String!>!>!): kotlin.String!
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/PropagateTypeArgumentNullable.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/PropagateTypeArgumentNullable.txt
index a77d93cf76d..24bd07c852d 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/PropagateTypeArgumentNullable.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/PropagateTypeArgumentNullable.txt
@@ -3,20 +3,20 @@ package test
 public interface PropagateTypeArgumentNullable {
 
     public interface Sub : test.PropagateTypeArgumentNullable.Super {
-        public abstract override /*1*/ fun invOutR(): kotlin.(Mutable)List<kotlin.(Mutable)List<kotlin.String!>!>!
-        public abstract override /*1*/ fun invOutS(/*0*/ p0: kotlin.(Mutable)List<kotlin.(Mutable)List<kotlin.String!>!>!): kotlin.Unit
-        public abstract override /*1*/ fun invR(): kotlin.(Mutable)List<kotlin.String!>!
-        public abstract override /*1*/ fun outOutS(/*0*/ p0: kotlin.(Mutable)List<kotlin.(Mutable)List<kotlin.String!>!>!): kotlin.Unit
-        public abstract override /*1*/ fun outR(): kotlin.(Mutable)List<kotlin.String!>!
-        public abstract override /*1*/ fun outS(/*0*/ p0: kotlin.(Mutable)List<kotlin.String!>!): kotlin.Unit
+        public abstract override /*1*/ fun invOutR(): kotlin.collections.(Mutable)List<kotlin.collections.(Mutable)List<kotlin.String!>!>!
+        public abstract override /*1*/ fun invOutS(/*0*/ p0: kotlin.collections.(Mutable)List<kotlin.collections.(Mutable)List<kotlin.String!>!>!): kotlin.Unit
+        public abstract override /*1*/ fun invR(): kotlin.collections.(Mutable)List<kotlin.String!>!
+        public abstract override /*1*/ fun outOutS(/*0*/ p0: kotlin.collections.(Mutable)List<kotlin.collections.(Mutable)List<kotlin.String!>!>!): kotlin.Unit
+        public abstract override /*1*/ fun outR(): kotlin.collections.(Mutable)List<kotlin.String!>!
+        public abstract override /*1*/ fun outS(/*0*/ p0: kotlin.collections.(Mutable)List<kotlin.String!>!): kotlin.Unit
     }
 
     public interface Super {
-        public abstract fun invOutR(): kotlin.(Mutable)List<kotlin.(Mutable)List<kotlin.String!>!>!
-        public abstract fun invOutS(/*0*/ p0: kotlin.(Mutable)List<kotlin.(Mutable)List<kotlin.String!>!>!): kotlin.Unit
-        public abstract fun invR(): kotlin.(Mutable)List<kotlin.String!>!
-        public abstract fun outOutS(/*0*/ p0: kotlin.(Mutable)List<kotlin.(Mutable)List<kotlin.String!>!>!): kotlin.Unit
-        public abstract fun outR(): kotlin.(Mutable)List<kotlin.String!>!
-        public abstract fun outS(/*0*/ p0: kotlin.(Mutable)List<kotlin.String!>!): kotlin.Unit
+        public abstract fun invOutR(): kotlin.collections.(Mutable)List<kotlin.collections.(Mutable)List<kotlin.String!>!>!
+        public abstract fun invOutS(/*0*/ p0: kotlin.collections.(Mutable)List<kotlin.collections.(Mutable)List<kotlin.String!>!>!): kotlin.Unit
+        public abstract fun invR(): kotlin.collections.(Mutable)List<kotlin.String!>!
+        public abstract fun outOutS(/*0*/ p0: kotlin.collections.(Mutable)List<kotlin.collections.(Mutable)List<kotlin.String!>!>!): kotlin.Unit
+        public abstract fun outR(): kotlin.collections.(Mutable)List<kotlin.String!>!
+        public abstract fun outS(/*0*/ p0: kotlin.collections.(Mutable)List<kotlin.String!>!): kotlin.Unit
     }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ChangeProjectionKind1.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ChangeProjectionKind1.txt
index 607737f7b1e..9c8030bdc15 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ChangeProjectionKind1.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ChangeProjectionKind1.txt
@@ -4,11 +4,11 @@ public interface ChangeProjectionKind1 {
 
     public interface Sub : test.ChangeProjectionKind1.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*1*/ fun foo(/*0*/ p0: kotlin.(Mutable)List<kotlin.String!>!): kotlin.Unit
+        public abstract override /*1*/ fun foo(/*0*/ p0: kotlin.collections.(Mutable)List<kotlin.String!>!): kotlin.Unit
     }
 
     public interface Super {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(/*0*/ p0: kotlin.(Mutable)List<kotlin.String!>!): kotlin.Unit
+        public abstract fun foo(/*0*/ p0: kotlin.collections.(Mutable)List<kotlin.String!>!): kotlin.Unit
     }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/MutableToReadOnly.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/MutableToReadOnly.txt
index 4b60cfa8258..0b3eb0b3555 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/MutableToReadOnly.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/MutableToReadOnly.txt
@@ -4,11 +4,11 @@ public interface MutableToReadOnly {
 
     public interface Sub : test.MutableToReadOnly.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*1*/ fun foo(/*0*/ p0: kotlin.(Mutable)List<kotlin.String!>!): kotlin.Unit
+        public abstract override /*1*/ fun foo(/*0*/ p0: kotlin.collections.(Mutable)List<kotlin.String!>!): kotlin.Unit
     }
 
     public interface Super {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(/*0*/ p0: kotlin.(Mutable)List<kotlin.String!>!): kotlin.Unit
+        public abstract fun foo(/*0*/ p0: kotlin.collections.(Mutable)List<kotlin.String!>!): kotlin.Unit
     }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ReadOnlyToMutable.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ReadOnlyToMutable.txt
index 1ce87ad53e6..b70a5461be0 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ReadOnlyToMutable.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ReadOnlyToMutable.txt
@@ -4,11 +4,11 @@ public interface ReadOnlyToMutable {
 
     public interface Sub : test.ReadOnlyToMutable.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*1*/ fun foo(/*0*/ p0: kotlin.(Mutable)List<kotlin.String!>!): kotlin.Unit
+        public abstract override /*1*/ fun foo(/*0*/ p0: kotlin.collections.(Mutable)List<kotlin.String!>!): kotlin.Unit
     }
 
     public interface Super {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(/*0*/ p0: kotlin.(Mutable)List<kotlin.String!>!): kotlin.Unit
+        public abstract fun foo(/*0*/ p0: kotlin.collections.(Mutable)List<kotlin.String!>!): kotlin.Unit
     }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType1.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType1.txt
index 709e2bc70c6..c8a5cdb5bec 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType1.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType1.txt
@@ -4,11 +4,11 @@ public interface AddNullabilitySameGenericType1 {
 
     public interface Sub : test.AddNullabilitySameGenericType1.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*1*/ fun foo(): kotlin.(Mutable)List<kotlin.String!>!
+        public abstract override /*1*/ fun foo(): kotlin.collections.(Mutable)List<kotlin.String!>!
     }
 
     public interface Super {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(): kotlin.(Mutable)List<kotlin.String!>!
+        public abstract fun foo(): kotlin.collections.(Mutable)List<kotlin.String!>!
     }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType2.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType2.txt
index d09cf6521c2..b86615393f8 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType2.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType2.txt
@@ -4,11 +4,11 @@ public interface AddNullabilitySameGenericType2 {
 
     public interface Sub : test.AddNullabilitySameGenericType2.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*1*/ fun foo(): kotlin.(Mutable)List<kotlin.String!>!
+        public abstract override /*1*/ fun foo(): kotlin.collections.(Mutable)List<kotlin.String!>!
     }
 
     public interface Super {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(): kotlin.(Mutable)List<kotlin.String!>!
+        public abstract fun foo(): kotlin.collections.(Mutable)List<kotlin.String!>!
     }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/CantMakeImmutableInSubclass.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/CantMakeImmutableInSubclass.txt
index 3914f7d3877..709b0b48a38 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/CantMakeImmutableInSubclass.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/CantMakeImmutableInSubclass.txt
@@ -4,11 +4,11 @@ public interface CantMakeImmutableInSubclass {
 
     public interface Sub : test.CantMakeImmutableInSubclass.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*1*/ fun foo(): kotlin.(Mutable)List<kotlin.String!>!
+        public abstract override /*1*/ fun foo(): kotlin.collections.(Mutable)List<kotlin.String!>!
     }
 
     public interface Super {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(): kotlin.(Mutable)Collection<kotlin.String!>!
+        public abstract fun foo(): kotlin.collections.(Mutable)Collection<kotlin.String!>!
     }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.txt
index 83a13bd5447..26528aeace1 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.txt
@@ -9,30 +9,30 @@ public interface HalfSubstitutedTypeParameters {
 
     public interface Super {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(): kotlin.(Mutable)List<kotlin.String!>!
+        public abstract fun foo(): kotlin.collections.(Mutable)List<kotlin.String!>!
     }
 
-    public interface TrickyList</*0*/ X : kotlin.Any!, /*1*/ E : kotlin.Any!> : kotlin.MutableList<E!> {
+    public interface TrickyList</*0*/ X : kotlin.Any!, /*1*/ E : kotlin.Any!> : kotlin.collections.MutableList<E!> {
         public abstract override /*1*/ /*fake_override*/ val size: kotlin.Int
         public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ element: E!): kotlin.Boolean
         public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: E!): kotlin.Unit
-        public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.Collection<E!>): kotlin.Boolean
-        public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.Collection<E!>): kotlin.Boolean
+        public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.collections.Collection<E!>): kotlin.Boolean
+        public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.collections.Collection<E!>): kotlin.Boolean
         public abstract override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit
         public abstract override /*1*/ /*fake_override*/ fun contains(/*0*/ element: E!): kotlin.Boolean
-        public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.Collection<E!>): kotlin.Boolean
+        public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection<E!>): kotlin.Boolean
         public abstract override /*1*/ /*fake_override*/ fun get(/*0*/ index: kotlin.Int): E!
         public abstract override /*1*/ /*fake_override*/ fun indexOf(/*0*/ element: E!): kotlin.Int
         public abstract override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
-        public abstract override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator<E!>
+        public abstract override /*1*/ /*fake_override*/ fun iterator(): kotlin.collections.MutableIterator<E!>
         public abstract override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ element: E!): kotlin.Int
-        public abstract override /*1*/ /*fake_override*/ fun listIterator(): kotlin.MutableListIterator<E!>
-        public abstract override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.MutableListIterator<E!>
+        public abstract override /*1*/ /*fake_override*/ fun listIterator(): kotlin.collections.MutableListIterator<E!>
+        public abstract override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.collections.MutableListIterator<E!>
         public abstract override /*1*/ /*fake_override*/ fun remove(/*0*/ element: E!): kotlin.Boolean
-        public abstract override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.Collection<E!>): kotlin.Boolean
+        public abstract override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.collections.Collection<E!>): kotlin.Boolean
         public abstract override /*1*/ /*fake_override*/ fun removeAt(/*0*/ index: kotlin.Int): E!
-        public abstract override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.Collection<E!>): kotlin.Boolean
+        public abstract override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.collections.Collection<E!>): kotlin.Boolean
         public abstract override /*1*/ /*fake_override*/ fun set(/*0*/ index: kotlin.Int, /*1*/ element: E!): E!
-        public abstract override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.MutableList<E!>
+        public abstract override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.collections.MutableList<E!>
     }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilityGenericSubclassSimple.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilityGenericSubclassSimple.txt
index 906b447dc9a..741889ab7bb 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilityGenericSubclassSimple.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilityGenericSubclassSimple.txt
@@ -4,11 +4,11 @@ public interface InheritNullabilityGenericSubclassSimple {
 
     public interface Sub : test.InheritNullabilityGenericSubclassSimple.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*1*/ fun foo(): kotlin.(Mutable)List<kotlin.String!>!
+        public abstract override /*1*/ fun foo(): kotlin.collections.(Mutable)List<kotlin.String!>!
     }
 
     public interface Super {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(): kotlin.(Mutable)Collection<kotlin.String!>!
+        public abstract fun foo(): kotlin.collections.(Mutable)Collection<kotlin.String!>!
     }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilitySameGenericType.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilitySameGenericType.txt
index cff7231ce65..eeac45694c6 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilitySameGenericType.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilitySameGenericType.txt
@@ -4,11 +4,11 @@ public interface InheritNullabilitySameGenericType {
 
     public interface Sub : test.InheritNullabilitySameGenericType.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*1*/ fun foo(): kotlin.(Mutable)List<kotlin.String!>!
+        public abstract override /*1*/ fun foo(): kotlin.collections.(Mutable)List<kotlin.String!>!
     }
 
     public interface Super {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(): kotlin.(Mutable)List<kotlin.String!>!
+        public abstract fun foo(): kotlin.collections.(Mutable)List<kotlin.String!>!
     }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritProjectionKind.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritProjectionKind.txt
index 0ee30efac20..766d5df77eb 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritProjectionKind.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritProjectionKind.txt
@@ -4,11 +4,11 @@ public interface InheritProjectionKind {
 
     public interface Sub : test.InheritProjectionKind.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*1*/ fun foo(): kotlin.(Mutable)List<kotlin.Number!>!
+        public abstract override /*1*/ fun foo(): kotlin.collections.(Mutable)List<kotlin.Number!>!
     }
 
     public interface Super {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(): kotlin.(Mutable)Collection<kotlin.Number!>!
+        public abstract fun foo(): kotlin.collections.(Mutable)Collection<kotlin.Number!>!
     }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritReadOnlinessOfArgument.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritReadOnlinessOfArgument.txt
index 3ab125a456b..e2c195f9a2e 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritReadOnlinessOfArgument.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritReadOnlinessOfArgument.txt
@@ -4,11 +4,11 @@ public interface InheritReadOnlinessOfArgument {
 
     public interface Sub : test.InheritReadOnlinessOfArgument.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*1*/ fun foo(): kotlin.(Mutable)List<kotlin.(Mutable)List<kotlin.String!>!>!
+        public abstract override /*1*/ fun foo(): kotlin.collections.(Mutable)List<kotlin.collections.(Mutable)List<kotlin.String!>!>!
     }
 
     public interface Super {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(): kotlin.(Mutable)List<kotlin.(Mutable)List<kotlin.String!>!>!
+        public abstract fun foo(): kotlin.collections.(Mutable)List<kotlin.collections.(Mutable)List<kotlin.String!>!>!
     }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritReadOnlinessSameClass.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritReadOnlinessSameClass.txt
index 3180699abf7..77a64037f45 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritReadOnlinessSameClass.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritReadOnlinessSameClass.txt
@@ -4,11 +4,11 @@ public interface InheritReadOnlinessSameClass {
 
     public interface Sub : test.InheritReadOnlinessSameClass.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*1*/ fun foo(): kotlin.(Mutable)List<kotlin.String!>!
+        public abstract override /*1*/ fun foo(): kotlin.collections.(Mutable)List<kotlin.String!>!
     }
 
     public interface Super {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(): kotlin.(Mutable)List<kotlin.String!>!
+        public abstract fun foo(): kotlin.collections.(Mutable)List<kotlin.String!>!
     }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritReadOnlinessSubclass.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritReadOnlinessSubclass.txt
index 9be8034126f..0e4c1c8ff60 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritReadOnlinessSubclass.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritReadOnlinessSubclass.txt
@@ -4,11 +4,11 @@ public interface InheritReadOnlinessSubclass {
 
     public interface Sub : test.InheritReadOnlinessSubclass.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*1*/ fun foo(): kotlin.(Mutable)List<kotlin.String!>!
+        public abstract override /*1*/ fun foo(): kotlin.collections.(Mutable)List<kotlin.String!>!
     }
 
     public interface Super {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(): kotlin.(Mutable)Collection<kotlin.String!>!
+        public abstract fun foo(): kotlin.collections.(Mutable)Collection<kotlin.String!>!
     }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SameProjectionKind.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SameProjectionKind.txt
index 836f09c2661..3a9b68f1935 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SameProjectionKind.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SameProjectionKind.txt
@@ -4,11 +4,11 @@ public interface SameProjectionKind {
 
     public interface Sub : test.SameProjectionKind.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*1*/ fun foo(): (kotlin.MutableCollection<out kotlin.Number!>..kotlin.Collection<kotlin.Number!>?)
+        public abstract override /*1*/ fun foo(): (kotlin.collections.MutableCollection<out kotlin.Number!>..kotlin.collections.Collection<kotlin.Number!>?)
     }
 
     public interface Super {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(): (kotlin.MutableCollection<out kotlin.Number!>..kotlin.Collection<kotlin.Number!>?)
+        public abstract fun foo(): (kotlin.collections.MutableCollection<out kotlin.Number!>..kotlin.collections.Collection<kotlin.Number!>?)
     }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfCollection.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfCollection.txt
index 26757dddc3d..c1bf1a5d10e 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfCollection.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfCollection.txt
@@ -1,15 +1,15 @@
 package test
 
-public interface SubclassOfCollection</*0*/ E : kotlin.Any!> : kotlin.MutableCollection<E!> {
+public interface SubclassOfCollection</*0*/ E : kotlin.Any!> : kotlin.collections.MutableCollection<E!> {
     public abstract override /*1*/ /*fake_override*/ val size: kotlin.Int
     public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ element: E!): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.Collection<E!>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.collections.Collection<E!>): kotlin.Boolean
     public abstract override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit
     public abstract override /*1*/ /*fake_override*/ fun contains(/*0*/ element: E!): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.Collection<E!>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection<E!>): kotlin.Boolean
     public abstract override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
-    public abstract override /*1*/ fun iterator(): kotlin.MutableIterator<E!>
+    public abstract override /*1*/ fun iterator(): kotlin.collections.MutableIterator<E!>
     public abstract override /*1*/ /*fake_override*/ fun remove(/*0*/ element: E!): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.Collection<E!>): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.Collection<E!>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.collections.Collection<E!>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.collections.Collection<E!>): kotlin.Boolean
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfMapEntry.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfMapEntry.txt
index 6392e3ec085..9dc8fe0959d 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfMapEntry.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfMapEntry.txt
@@ -1,6 +1,6 @@
 package test
 
-public interface SubclassOfMapEntry</*0*/ K : kotlin.Any!, /*1*/ V : kotlin.Any!> : kotlin.MutableMap.MutableEntry<K!, V!> {
+public interface SubclassOfMapEntry</*0*/ K : kotlin.Any!, /*1*/ V : kotlin.Any!> : kotlin.collections.MutableMap.MutableEntry<K!, V!> {
     public abstract override /*1*/ /*fake_override*/ val key: K!
     public abstract override /*1*/ /*fake_override*/ val value: V!
     public abstract override /*1*/ fun setValue(/*0*/ newValue: V!): V!
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesConflictingProjectionKinds.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesConflictingProjectionKinds.txt
index 59880afc5a7..8f5f6ff2426 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesConflictingProjectionKinds.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesConflictingProjectionKinds.txt
@@ -4,16 +4,16 @@ public interface TwoSuperclassesConflictingProjectionKinds {
 
     public interface Sub : test.TwoSuperclassesConflictingProjectionKinds.Super1, test.TwoSuperclassesConflictingProjectionKinds.Super2 {
         public abstract override /*2*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*2*/ fun foo(): kotlin.(Mutable)Collection<kotlin.CharSequence!>!
+        public abstract override /*2*/ fun foo(): kotlin.collections.(Mutable)Collection<kotlin.CharSequence!>!
     }
 
     public interface Super1 {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(): kotlin.(Mutable)Collection<kotlin.CharSequence!>!
+        public abstract fun foo(): kotlin.collections.(Mutable)Collection<kotlin.CharSequence!>!
     }
 
     public interface Super2 {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(): kotlin.(Mutable)Collection<kotlin.CharSequence!>!
+        public abstract fun foo(): kotlin.collections.(Mutable)Collection<kotlin.CharSequence!>!
     }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferMutability.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferMutability.txt
index af3f3d3c2ef..3089e256859 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferMutability.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferMutability.txt
@@ -4,16 +4,16 @@ public interface TwoSuperclassesInvariantAndCovariantInferMutability {
 
     public interface Sub : test.TwoSuperclassesInvariantAndCovariantInferMutability.Super1, test.TwoSuperclassesInvariantAndCovariantInferMutability.Super2 {
         public abstract override /*2*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*2*/ fun foo(): kotlin.(Mutable)List<kotlin.(Mutable)List<kotlin.String!>!>!
+        public abstract override /*2*/ fun foo(): kotlin.collections.(Mutable)List<kotlin.collections.(Mutable)List<kotlin.String!>!>!
     }
 
     public interface Super1 {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(): kotlin.(Mutable)List<kotlin.(Mutable)List<kotlin.String!>!>!
+        public abstract fun foo(): kotlin.collections.(Mutable)List<kotlin.collections.(Mutable)List<kotlin.String!>!>!
     }
 
     public interface Super2 {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(): kotlin.(Mutable)List<kotlin.(Mutable)List<kotlin.String!>!>!
+        public abstract fun foo(): kotlin.collections.(Mutable)List<kotlin.collections.(Mutable)List<kotlin.String!>!>!
     }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferNullability.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferNullability.txt
index 6330f9decd5..379ece780de 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferNullability.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferNullability.txt
@@ -4,16 +4,16 @@ public interface TwoSuperclassesInvariantAndCovariantInferNullability {
 
     public interface Sub : test.TwoSuperclassesInvariantAndCovariantInferNullability.Super1, test.TwoSuperclassesInvariantAndCovariantInferNullability.Super2 {
         public abstract override /*2*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*2*/ fun foo(): kotlin.(Mutable)List<kotlin.String!>!
+        public abstract override /*2*/ fun foo(): kotlin.collections.(Mutable)List<kotlin.String!>!
     }
 
     public interface Super1 {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(): kotlin.(Mutable)List<kotlin.String!>!
+        public abstract fun foo(): kotlin.collections.(Mutable)List<kotlin.String!>!
     }
 
     public interface Super2 {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(): kotlin.(Mutable)List<kotlin.String!>!
+        public abstract fun foo(): kotlin.collections.(Mutable)List<kotlin.String!>!
     }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesMutableAndNot.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesMutableAndNot.txt
index 35d958a1f74..cdae3bdc22d 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesMutableAndNot.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesMutableAndNot.txt
@@ -4,16 +4,16 @@ public interface TwoSuperclassesMutableAndNot {
 
     public interface Sub : test.TwoSuperclassesMutableAndNot.Super1, test.TwoSuperclassesMutableAndNot.Super2 {
         public abstract override /*2*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*2*/ fun foo(): kotlin.(Mutable)List<kotlin.String!>!
+        public abstract override /*2*/ fun foo(): kotlin.collections.(Mutable)List<kotlin.String!>!
     }
 
     public interface Super1 {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(): kotlin.(Mutable)Collection<kotlin.String!>!
+        public abstract fun foo(): kotlin.collections.(Mutable)Collection<kotlin.String!>!
     }
 
     public interface Super2 {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(): kotlin.(Mutable)List<kotlin.String!>!
+        public abstract fun foo(): kotlin.collections.(Mutable)List<kotlin.String!>!
     }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesSupplementNotNull.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesSupplementNotNull.txt
index 52dcf636f7a..4ca7da918c1 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesSupplementNotNull.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesSupplementNotNull.txt
@@ -4,16 +4,16 @@ public interface TwoSuperclassesSupplementNotNull {
 
     public interface Sub : test.TwoSuperclassesSupplementNotNull.Super1, test.TwoSuperclassesSupplementNotNull.Super2 {
         public abstract override /*2*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*2*/ fun foo(): kotlin.(Mutable)List<kotlin.String!>!
+        public abstract override /*2*/ fun foo(): kotlin.collections.(Mutable)List<kotlin.String!>!
     }
 
     public interface Super1 {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(): kotlin.(Mutable)List<kotlin.String!>!
+        public abstract fun foo(): kotlin.collections.(Mutable)List<kotlin.String!>!
     }
 
     public interface Super2 {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(): kotlin.(Mutable)List<kotlin.String!>!
+        public abstract fun foo(): kotlin.collections.(Mutable)List<kotlin.String!>!
     }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBound.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBound.txt
index d1d9e33f689..30aa6df207a 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBound.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBound.txt
@@ -3,10 +3,10 @@ package test
 public interface UseParameterInUpperBound {
 
     public interface Sub : test.UseParameterInUpperBound.Super {
-        public abstract override /*1*/ fun </*0*/ B : kotlin.Any!, /*1*/ A : kotlin.(Mutable)List<B!>!> foo(/*0*/ p0: B!, /*1*/ p1: A!): kotlin.Unit
+        public abstract override /*1*/ fun </*0*/ B : kotlin.Any!, /*1*/ A : kotlin.collections.(Mutable)List<B!>!> foo(/*0*/ p0: B!, /*1*/ p1: A!): kotlin.Unit
     }
 
     public interface Super {
-        public abstract fun </*0*/ A : kotlin.Any!, /*1*/ B : kotlin.(Mutable)List<A!>!> foo(/*0*/ p0: A!, /*1*/ p1: B!): kotlin.Unit
+        public abstract fun </*0*/ A : kotlin.Any!, /*1*/ B : kotlin.collections.(Mutable)List<A!>!> foo(/*0*/ p0: A!, /*1*/ p1: B!): kotlin.Unit
     }
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBoundWithKotlinSignature.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBoundWithKotlinSignature.txt
index 39db3171a06..2853393d8b2 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBoundWithKotlinSignature.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBoundWithKotlinSignature.txt
@@ -3,10 +3,10 @@ package test
 public interface UseParameterInUpperBoundWithKotlinSignature {
 
     public interface Sub : test.UseParameterInUpperBoundWithKotlinSignature.Super {
-        public abstract override /*1*/ fun </*0*/ B : kotlin.Any!, /*1*/ A : kotlin.(Mutable)List<B!>!> foo(/*0*/ p0: B!, /*1*/ p1: A!): kotlin.Unit
+        public abstract override /*1*/ fun </*0*/ B : kotlin.Any!, /*1*/ A : kotlin.collections.(Mutable)List<B!>!> foo(/*0*/ p0: B!, /*1*/ p1: A!): kotlin.Unit
     }
 
     public interface Super {
-        public abstract fun </*0*/ A : kotlin.Any!, /*1*/ B : kotlin.(Mutable)List<A!>!> foo(/*0*/ p0: A!, /*1*/ p1: B!): kotlin.Unit
+        public abstract fun </*0*/ A : kotlin.Any!, /*1*/ B : kotlin.collections.(Mutable)List<A!>!> foo(/*0*/ p0: A!, /*1*/ p1: B!): kotlin.Unit
     }
 }
diff --git a/compiler/testData/loadJava/compiledJava/library/LoadIterable.txt b/compiler/testData/loadJava/compiledJava/library/LoadIterable.txt
index 9efcfee7f76..e175a9392f3 100644
--- a/compiler/testData/loadJava/compiledJava/library/LoadIterable.txt
+++ b/compiler/testData/loadJava/compiledJava/library/LoadIterable.txt
@@ -1,6 +1,6 @@
 package test
 
 public interface LoadIterable</*0*/ T : kotlin.Any!> {
-    public abstract fun getIterable(): kotlin.(Mutable)Iterable<T!>!
-    public abstract fun setIterable(/*0*/ p0: kotlin.(Mutable)Iterable<T!>!): kotlin.Unit
+    public abstract fun getIterable(): kotlin.collections.(Mutable)Iterable<T!>!
+    public abstract fun setIterable(/*0*/ p0: kotlin.collections.(Mutable)Iterable<T!>!): kotlin.Unit
 }
diff --git a/compiler/testData/loadJava/compiledJava/library/LoadIterator.txt b/compiler/testData/loadJava/compiledJava/library/LoadIterator.txt
index 2a505d12b57..046be0c909c 100644
--- a/compiler/testData/loadJava/compiledJava/library/LoadIterator.txt
+++ b/compiler/testData/loadJava/compiledJava/library/LoadIterator.txt
@@ -1,6 +1,6 @@
 package test
 
 public interface LoadIterator</*0*/ T : kotlin.Any!> {
-    public abstract fun getIterator(): kotlin.(Mutable)Iterator<T!>!
-    public abstract fun setIterator(/*0*/ p0: kotlin.(Mutable)Iterator<T!>!): kotlin.Unit
+    public abstract fun getIterator(): kotlin.collections.(Mutable)Iterator<T!>!
+    public abstract fun setIterator(/*0*/ p0: kotlin.collections.(Mutable)Iterator<T!>!): kotlin.Unit
 }
diff --git a/compiler/testData/loadJava/compiledJava/library/Max.txt b/compiler/testData/loadJava/compiledJava/library/Max.txt
index 5f6467ee76a..3f383b0a14b 100644
--- a/compiler/testData/loadJava/compiledJava/library/Max.txt
+++ b/compiler/testData/loadJava/compiledJava/library/Max.txt
@@ -2,5 +2,5 @@ package test
 
 public open class Max {
     public constructor Max()
-    public open fun </*0*/ T : kotlin.Any!> max(/*0*/ p0: (kotlin.MutableCollection<out T!>..kotlin.Collection<T!>?)): T! where T : kotlin.Comparable<T!>!
+    public open fun </*0*/ T : kotlin.Any!> max(/*0*/ p0: (kotlin.collections.MutableCollection<out T!>..kotlin.collections.Collection<T!>?)): T! where T : kotlin.Comparable<T!>!
 }
diff --git a/compiler/testData/loadJava/compiledJava/modality/ModalityOfFakeOverrides.txt b/compiler/testData/loadJava/compiledJava/modality/ModalityOfFakeOverrides.txt
index 439285532a1..97a43f030f0 100644
--- a/compiler/testData/loadJava/compiledJava/modality/ModalityOfFakeOverrides.txt
+++ b/compiler/testData/loadJava/compiledJava/modality/ModalityOfFakeOverrides.txt
@@ -6,32 +6,32 @@ public open class ModalityOfFakeOverrides : java.util.AbstractList<kotlin.String
     public open override /*1*/ val size: kotlin.Int
     public open override /*1*/ /*fake_override*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String!): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun add(/*0*/ element: kotlin.String!): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun contains(/*0*/ element: kotlin.String!): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
     @org.jetbrains.annotations.NotNull() public open override /*1*/ fun get(/*0*/ index: kotlin.Int): kotlin.String
     public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ element: kotlin.String!): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator<kotlin.String!>
+    public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.collections.MutableIterator<kotlin.String!>
     public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ element: kotlin.String!): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.MutableListIterator<kotlin.String!>
-    public open override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.MutableListIterator<kotlin.String!>
+    public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.collections.MutableListIterator<kotlin.String!>
+    public open override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.collections.MutableListIterator<kotlin.String!>
     invisible_fake open override /*1*/ /*fake_override*/ fun outOfBoundsMsg(/*0*/ p0: kotlin.Int): kotlin.String!
     invisible_fake open override /*1*/ /*fake_override*/ fun rangeCheckForAdd(/*0*/ p0: kotlin.Int): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun remove(/*0*/ element: kotlin.String!): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun removeAt(/*0*/ p0: kotlin.Int): kotlin.String!
     protected/*protected and package*/ open override /*1*/ /*fake_override*/ fun removeRange(/*0*/ p0: kotlin.Int, /*1*/ p1: kotlin.Int): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun set(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String!): kotlin.String!
-    public open override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.MutableList<kotlin.String!>
+    public open override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.collections.MutableList<kotlin.String!>
     public open override /*1*/ /*fake_override*/ fun toArray(): kotlin.Array<(out) kotlin.Any!>!
     public open override /*1*/ /*fake_override*/ fun </*0*/ T : kotlin.Any!> toArray(/*0*/ p0: kotlin.Array<(out) T!>!): kotlin.Array<(out) T!>!
 
     // Static members
     invisible_fake const final override /*1*/ /*fake_override*/ val MAX_ARRAY_SIZE: kotlin.Int
-    invisible_fake open override /*1*/ /*fake_override*/ fun </*0*/ T : kotlin.Any!> finishToArray(/*0*/ p0: kotlin.Array<(out) T!>!, /*1*/ p1: kotlin.(Mutable)Iterator<*>!): kotlin.Array<(out) T!>!
+    invisible_fake open override /*1*/ /*fake_override*/ fun </*0*/ T : kotlin.Any!> finishToArray(/*0*/ p0: kotlin.Array<(out) T!>!, /*1*/ p1: kotlin.collections.(Mutable)Iterator<*>!): kotlin.Array<(out) T!>!
     invisible_fake open override /*1*/ /*fake_override*/ fun hugeCapacity(/*0*/ p0: kotlin.Int): kotlin.Int
 }
diff --git a/compiler/testData/loadJava/compiledJava/mutability/LoadIterable.txt b/compiler/testData/loadJava/compiledJava/mutability/LoadIterable.txt
index 995e39581f2..f92237fdf0e 100644
--- a/compiler/testData/loadJava/compiledJava/mutability/LoadIterable.txt
+++ b/compiler/testData/loadJava/compiledJava/mutability/LoadIterable.txt
@@ -1,8 +1,8 @@
 package test
 
 public interface LoadIterable</*0*/ T : kotlin.Any!> {
-    @org.jetbrains.annotations.Mutable() public abstract fun getIterable(): kotlin.MutableIterable<T!>!
-    @org.jetbrains.annotations.ReadOnly() public abstract fun getReadOnlyIterable(): kotlin.Iterable<T!>!
-    public abstract fun setIterable(/*0*/ @org.jetbrains.annotations.Mutable() p0: kotlin.MutableIterable<T!>!): kotlin.Unit
-    public abstract fun setReadOnlyIterable(/*0*/ @org.jetbrains.annotations.ReadOnly() p0: kotlin.Iterable<T!>!): kotlin.Unit
+    @org.jetbrains.annotations.Mutable() public abstract fun getIterable(): kotlin.collections.MutableIterable<T!>!
+    @org.jetbrains.annotations.ReadOnly() public abstract fun getReadOnlyIterable(): kotlin.collections.Iterable<T!>!
+    public abstract fun setIterable(/*0*/ @org.jetbrains.annotations.Mutable() p0: kotlin.collections.MutableIterable<T!>!): kotlin.Unit
+    public abstract fun setReadOnlyIterable(/*0*/ @org.jetbrains.annotations.ReadOnly() p0: kotlin.collections.Iterable<T!>!): kotlin.Unit
 }
diff --git a/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithConflict.txt b/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithConflict.txt
index dcc148d05fc..c86346acf9f 100644
--- a/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithConflict.txt
+++ b/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithConflict.txt
@@ -1,6 +1,6 @@
 package test
 
 public interface LoadIterableWithConflict</*0*/ T : kotlin.Any!> {
-    @org.jetbrains.annotations.ReadOnly() @org.jetbrains.annotations.Mutable() public abstract fun getIterable(): kotlin.(Mutable)Iterable<T!>!
-    public abstract fun setIterable(/*0*/ @org.jetbrains.annotations.ReadOnly() @org.jetbrains.annotations.Mutable() p0: kotlin.(Mutable)Iterable<T!>!): kotlin.Unit
+    @org.jetbrains.annotations.ReadOnly() @org.jetbrains.annotations.Mutable() public abstract fun getIterable(): kotlin.collections.(Mutable)Iterable<T!>!
+    public abstract fun setIterable(/*0*/ @org.jetbrains.annotations.ReadOnly() @org.jetbrains.annotations.Mutable() p0: kotlin.collections.(Mutable)Iterable<T!>!): kotlin.Unit
 }
diff --git a/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithNullability.txt b/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithNullability.txt
index a68a58e7ad3..60eb5f63f3b 100644
--- a/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithNullability.txt
+++ b/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithNullability.txt
@@ -1,8 +1,8 @@
 package test
 
 public interface LoadIterableWithNullability</*0*/ T : kotlin.Any!> {
-    @org.jetbrains.annotations.NotNull() @org.jetbrains.annotations.Mutable() public abstract fun getIterable(): kotlin.MutableIterable<T!>
-    @org.jetbrains.annotations.NotNull() @org.jetbrains.annotations.ReadOnly() public abstract fun getReadOnlyIterable(): kotlin.Iterable<T!>
-    public abstract fun setIterable(/*0*/ @org.jetbrains.annotations.Mutable() @org.jetbrains.annotations.NotNull() p0: kotlin.MutableIterable<T!>): kotlin.Unit
-    public abstract fun setReadOnlyIterable(/*0*/ @org.jetbrains.annotations.ReadOnly() @org.jetbrains.annotations.NotNull() p0: kotlin.Iterable<T!>): kotlin.Unit
+    @org.jetbrains.annotations.NotNull() @org.jetbrains.annotations.Mutable() public abstract fun getIterable(): kotlin.collections.MutableIterable<T!>
+    @org.jetbrains.annotations.NotNull() @org.jetbrains.annotations.ReadOnly() public abstract fun getReadOnlyIterable(): kotlin.collections.Iterable<T!>
+    public abstract fun setIterable(/*0*/ @org.jetbrains.annotations.Mutable() @org.jetbrains.annotations.NotNull() p0: kotlin.collections.MutableIterable<T!>): kotlin.Unit
+    public abstract fun setReadOnlyIterable(/*0*/ @org.jetbrains.annotations.ReadOnly() @org.jetbrains.annotations.NotNull() p0: kotlin.collections.Iterable<T!>): kotlin.Unit
 }
diff --git a/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithPropagation.txt b/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithPropagation.txt
index 13c8cc22dc9..f26f9f95638 100644
--- a/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithPropagation.txt
+++ b/compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithPropagation.txt
@@ -3,17 +3,17 @@ package test
 public interface LoadIterableWithPropagation {
 
     public interface LoadIterable</*0*/ T : kotlin.Any!> {
-        @org.jetbrains.annotations.Mutable() public abstract fun getIterable(): kotlin.MutableIterable<T!>!
-        @org.jetbrains.annotations.ReadOnly() public abstract fun getReadOnlyIterable(): kotlin.Iterable<T!>!
-        public abstract fun setIterable(/*0*/ @org.jetbrains.annotations.Mutable() p0: kotlin.MutableIterable<T!>!): kotlin.Unit
-        public abstract fun setReadOnlyIterable(/*0*/ @org.jetbrains.annotations.ReadOnly() p0: kotlin.Iterable<T!>!): kotlin.Unit
+        @org.jetbrains.annotations.Mutable() public abstract fun getIterable(): kotlin.collections.MutableIterable<T!>!
+        @org.jetbrains.annotations.ReadOnly() public abstract fun getReadOnlyIterable(): kotlin.collections.Iterable<T!>!
+        public abstract fun setIterable(/*0*/ @org.jetbrains.annotations.Mutable() p0: kotlin.collections.MutableIterable<T!>!): kotlin.Unit
+        public abstract fun setReadOnlyIterable(/*0*/ @org.jetbrains.annotations.ReadOnly() p0: kotlin.collections.Iterable<T!>!): kotlin.Unit
     }
 
     public open class LoadIterableImpl</*0*/ T : kotlin.Any!> : test.LoadIterableWithPropagation.LoadIterable<T!> {
         public constructor LoadIterableImpl</*0*/ T : kotlin.Any!>()
-        public open override /*1*/ fun getIterable(): kotlin.MutableIterable<T!>!
-        public open override /*1*/ fun getReadOnlyIterable(): kotlin.Iterable<T!>!
-        public open override /*1*/ fun setIterable(/*0*/ p0: kotlin.MutableIterable<T!>!): kotlin.Unit
-        public open override /*1*/ fun setReadOnlyIterable(/*0*/ p0: kotlin.Iterable<T!>!): kotlin.Unit
+        public open override /*1*/ fun getIterable(): kotlin.collections.MutableIterable<T!>!
+        public open override /*1*/ fun getReadOnlyIterable(): kotlin.collections.Iterable<T!>!
+        public open override /*1*/ fun setIterable(/*0*/ p0: kotlin.collections.MutableIterable<T!>!): kotlin.Unit
+        public open override /*1*/ fun setReadOnlyIterable(/*0*/ p0: kotlin.collections.Iterable<T!>!): kotlin.Unit
     }
 }
diff --git a/compiler/testData/loadJava/compiledJava/mutability/ReadOnlyExtendsWildcard.txt b/compiler/testData/loadJava/compiledJava/mutability/ReadOnlyExtendsWildcard.txt
index 7eed6df0d73..1e753cd2451 100644
--- a/compiler/testData/loadJava/compiledJava/mutability/ReadOnlyExtendsWildcard.txt
+++ b/compiler/testData/loadJava/compiledJava/mutability/ReadOnlyExtendsWildcard.txt
@@ -2,5 +2,5 @@ package test
 
 public interface ReadOnlyExtendsWildcard {
     public abstract fun bar(): kotlin.Unit
-    public abstract fun foo(/*0*/ @org.jetbrains.annotations.ReadOnly() p0: kotlin.List<kotlin.CharSequence!>!, /*1*/ @org.jetbrains.annotations.NotNull() p1: kotlin.Comparable<kotlin.String!>): kotlin.Unit
+    public abstract fun foo(/*0*/ @org.jetbrains.annotations.ReadOnly() p0: kotlin.collections.List<kotlin.CharSequence!>!, /*1*/ @org.jetbrains.annotations.NotNull() p1: kotlin.Comparable<kotlin.String!>): kotlin.Unit
 }
diff --git a/compiler/testData/loadJava/compiledJava/rendering/Rendering.txt b/compiler/testData/loadJava/compiledJava/rendering/Rendering.txt
index 62ef3aff68f..560da5ea607 100644
--- a/compiler/testData/loadJava/compiledJava/rendering/Rendering.txt
+++ b/compiler/testData/loadJava/compiledJava/rendering/Rendering.txt
@@ -25,31 +25,31 @@ public open class Rendering {
 
     public/*package*/ interface F_Array {
         public abstract fun foo1(/*0*/ p0: kotlin.Array<(out) kotlin.String!>!): kotlin.Unit
-        public abstract fun foo2(/*0*/ p0: kotlin.Array<(out) kotlin.(Mutable)List<kotlin.String!>!>!): kotlin.Unit
+        public abstract fun foo2(/*0*/ p0: kotlin.Array<(out) kotlin.collections.(Mutable)List<kotlin.String!>!>!): kotlin.Unit
         public abstract fun foo3(/*0*/ vararg p0: kotlin.Int! /*kotlin.Array<(out) kotlin.Int!>!*/): kotlin.Unit
         public abstract fun foo4(/*0*/ vararg p0: kotlin.String! /*kotlin.Array<(out) kotlin.String!>!*/): kotlin.Unit
-        public abstract fun foo5(/*0*/ vararg p0: kotlin.(Mutable)List<kotlin.String!>! /*kotlin.Array<(out) kotlin.(Mutable)List<kotlin.String!>!>!*/): kotlin.Unit
+        public abstract fun foo5(/*0*/ vararg p0: kotlin.collections.(Mutable)List<kotlin.String!>! /*kotlin.Array<(out) kotlin.collections.(Mutable)List<kotlin.String!>!>!*/): kotlin.Unit
     }
 
     public/*package*/ interface G_Collections {
-        public abstract fun foo1(/*0*/ p0: kotlin.(Mutable)Iterator<kotlin.String!>!): kotlin.Unit
-        public abstract fun foo2(/*0*/ p0: kotlin.(Mutable)Iterable<kotlin.String!>!): kotlin.Unit
-        public abstract fun foo3(/*0*/ p0: kotlin.(Mutable)Collection<kotlin.String!>!): kotlin.Unit
-        public abstract fun foo4(/*0*/ p0: kotlin.(Mutable)List<kotlin.String!>!): kotlin.Unit
-        public abstract fun foo5(/*0*/ p0: kotlin.(Mutable)Set<kotlin.String!>!): kotlin.Unit
-        public abstract fun foo6(/*0*/ p0: kotlin.(Mutable)Map<kotlin.String!, kotlin.String!>!): kotlin.Unit
-        public abstract fun foo7(/*0*/ p0: kotlin.(Mutable)Map.(Mutable)Entry<kotlin.String!, kotlin.String!>!): kotlin.Unit
+        public abstract fun foo1(/*0*/ p0: kotlin.collections.(Mutable)Iterator<kotlin.String!>!): kotlin.Unit
+        public abstract fun foo2(/*0*/ p0: kotlin.collections.(Mutable)Iterable<kotlin.String!>!): kotlin.Unit
+        public abstract fun foo3(/*0*/ p0: kotlin.collections.(Mutable)Collection<kotlin.String!>!): kotlin.Unit
+        public abstract fun foo4(/*0*/ p0: kotlin.collections.(Mutable)List<kotlin.String!>!): kotlin.Unit
+        public abstract fun foo5(/*0*/ p0: kotlin.collections.(Mutable)Set<kotlin.String!>!): kotlin.Unit
+        public abstract fun foo6(/*0*/ p0: kotlin.collections.(Mutable)Map<kotlin.String!, kotlin.String!>!): kotlin.Unit
+        public abstract fun foo7(/*0*/ p0: kotlin.collections.(Mutable)Map.(Mutable)Entry<kotlin.String!, kotlin.String!>!): kotlin.Unit
     }
 
     public/*package*/ interface H_Raw {
-        public abstract fun foo1(/*0*/ p0: kotlin.(Mutable)List<(raw) kotlin.Any?>!): kotlin.Unit
+        public abstract fun foo1(/*0*/ p0: kotlin.collections.(Mutable)List<(raw) kotlin.Any?>!): kotlin.Unit
         public abstract fun foo2(/*0*/ p0: test.Rendering.D_SuperG<(raw) kotlin.Any!>!): kotlin.Unit
     }
 
     public/*package*/ interface I_Wildcard {
-        public abstract fun foo1(/*0*/ p0: (kotlin.MutableList<out kotlin.String!>..kotlin.List<kotlin.String!>?)): kotlin.Unit
-        public abstract fun foo2(/*0*/ p0: kotlin.(Mutable)List<in kotlin.String!>!): kotlin.Unit
-        public abstract fun foo3(/*0*/ p0: kotlin.(Mutable)List<*>!): kotlin.Unit
+        public abstract fun foo1(/*0*/ p0: (kotlin.collections.MutableList<out kotlin.String!>..kotlin.collections.List<kotlin.String!>?)): kotlin.Unit
+        public abstract fun foo2(/*0*/ p0: kotlin.collections.(Mutable)List<in kotlin.String!>!): kotlin.Unit
+        public abstract fun foo3(/*0*/ p0: kotlin.collections.(Mutable)List<*>!): kotlin.Unit
         public abstract fun foo4(/*0*/ p0: test.Rendering.D_SuperG<out kotlin.String!>!): kotlin.Unit
         public abstract fun foo5(/*0*/ p0: test.Rendering.D_SuperG<in kotlin.String!>!): kotlin.Unit
         public abstract fun foo6(/*0*/ p0: test.Rendering.D_SuperG<*>!): kotlin.Unit
diff --git a/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParametersWithBounds.txt b/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParametersWithBounds.txt
index 21a1b8812a9..57e5655039f 100644
--- a/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParametersWithBounds.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParametersWithBounds.txt
@@ -1,7 +1,7 @@
 package test
 
-public /*synthesized*/ fun </*0*/ A : kotlin.Comparable<A!>!, /*1*/ B : kotlin.(Mutable)List<A!>!> GenericInterfaceParametersWithBounds(/*0*/ function: (kotlin.Array<(out) A!>!, B!) -> kotlin.Unit): test.GenericInterfaceParametersWithBounds<A, B> where A : kotlin.Cloneable!
+public /*synthesized*/ fun </*0*/ A : kotlin.Comparable<A!>!, /*1*/ B : kotlin.collections.(Mutable)List<A!>!> GenericInterfaceParametersWithBounds(/*0*/ function: (kotlin.Array<(out) A!>!, B!) -> kotlin.Unit): test.GenericInterfaceParametersWithBounds<A, B> where A : kotlin.Cloneable!
 
-public interface GenericInterfaceParametersWithBounds</*0*/ A : kotlin.Comparable<A!>!, /*1*/ B : kotlin.(Mutable)List<A!>!> where A : kotlin.Cloneable! {
+public interface GenericInterfaceParametersWithBounds</*0*/ A : kotlin.Comparable<A!>!, /*1*/ B : kotlin.collections.(Mutable)List<A!>!> where A : kotlin.Cloneable! {
     public abstract fun method(/*0*/ p0: kotlin.Array<(out) A!>!, /*1*/ p1: B!): kotlin.Unit
 }
diff --git a/compiler/testData/loadJava/compiledJava/sam/GenericMethodParameters.txt b/compiler/testData/loadJava/compiledJava/sam/GenericMethodParameters.txt
index ab948f42844..1d839154e1f 100644
--- a/compiler/testData/loadJava/compiledJava/sam/GenericMethodParameters.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/GenericMethodParameters.txt
@@ -1,5 +1,5 @@
 package test
 
 public interface GenericMethodParameters {
-    public abstract fun </*0*/ A : kotlin.CharSequence!, /*1*/ B : kotlin.(Mutable)List<A!>!> method(/*0*/ p0: kotlin.Array<(out) A!>!, /*1*/ p1: B!): kotlin.Unit
+    public abstract fun </*0*/ A : kotlin.CharSequence!, /*1*/ B : kotlin.collections.(Mutable)List<A!>!> method(/*0*/ p0: kotlin.Array<(out) A!>!, /*1*/ p1: B!): kotlin.Unit
 }
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfMethod.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfMethod.txt
index bdf375312e0..167804499ed 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfMethod.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfMethod.txt
@@ -8,6 +8,6 @@ public open class TypeParameterOfMethod {
     public open fun </*0*/ T : kotlin.Any!> max(/*0*/ p0: java.util.Comparator<T!>!, /*1*/ p1: T!, /*2*/ p2: T!): T!
     public final /*synthesized*/ fun </*0*/ T : kotlin.CharSequence!> max2(/*0*/ p0: ((T!, T!) -> kotlin.Int)!, /*1*/ p1: T!, /*2*/ p2: T!): T!
     public open fun </*0*/ T : kotlin.CharSequence!> max2(/*0*/ p0: java.util.Comparator<T!>!, /*1*/ p1: T!, /*2*/ p2: T!): T!
-    public final /*synthesized*/ fun </*0*/ A : kotlin.CharSequence!, /*1*/ B : kotlin.(Mutable)List<A!>!> method(/*0*/ p0: ((A!, A!) -> kotlin.Int)!, /*1*/ p1: B!): kotlin.Unit
-    public open fun </*0*/ A : kotlin.CharSequence!, /*1*/ B : kotlin.(Mutable)List<A!>!> method(/*0*/ p0: java.util.Comparator<A!>!, /*1*/ p1: B!): kotlin.Unit
+    public final /*synthesized*/ fun </*0*/ A : kotlin.CharSequence!, /*1*/ B : kotlin.collections.(Mutable)List<A!>!> method(/*0*/ p0: ((A!, A!) -> kotlin.Int)!, /*1*/ p1: B!): kotlin.Unit
+    public open fun </*0*/ A : kotlin.CharSequence!, /*1*/ B : kotlin.collections.(Mutable)List<A!>!> method(/*0*/ p0: java.util.Comparator<A!>!, /*1*/ p1: B!): kotlin.Unit
 }
diff --git a/compiler/testData/loadJava/compiledJava/signaturePropagation/ArraysInSubtypes.txt b/compiler/testData/loadJava/compiledJava/signaturePropagation/ArraysInSubtypes.txt
index 5a00f92277b..f5f08e2ab13 100644
--- a/compiler/testData/loadJava/compiledJava/signaturePropagation/ArraysInSubtypes.txt
+++ b/compiler/testData/loadJava/compiledJava/signaturePropagation/ArraysInSubtypes.txt
@@ -4,13 +4,13 @@ public interface ArraysInSubtypes {
 
     public interface Sub</*0*/ T : kotlin.Any!> : test.ArraysInSubtypes.Super {
         public abstract override /*1*/ fun array(): kotlin.Array<(out) kotlin.String!>!
-        public abstract override /*1*/ fun listOfArray(): (kotlin.MutableList<out kotlin.Array<(out) kotlin.String!>!>..kotlin.List<kotlin.Array<(out) kotlin.String!>!>?)
+        public abstract override /*1*/ fun listOfArray(): (kotlin.collections.MutableList<out kotlin.Array<(out) kotlin.String!>!>..kotlin.collections.List<kotlin.Array<(out) kotlin.String!>!>?)
         public abstract override /*1*/ fun objArray(): kotlin.Array<(out) T!>!
     }
 
     public interface Super {
         public abstract fun array(): kotlin.Array<(out) kotlin.CharSequence!>!
-        public abstract fun listOfArray(): (kotlin.MutableList<out kotlin.Array<(out) kotlin.CharSequence!>!>..kotlin.List<kotlin.Array<(out) kotlin.CharSequence!>!>?)
+        public abstract fun listOfArray(): (kotlin.collections.MutableList<out kotlin.Array<(out) kotlin.CharSequence!>!>..kotlin.collections.List<kotlin.Array<(out) kotlin.CharSequence!>!>?)
         public abstract fun objArray(): kotlin.Array<(out) kotlin.Any!>!
     }
 }
diff --git a/compiler/testData/loadJava/compiledJava/signaturePropagation/SubclassWithRawType.txt b/compiler/testData/loadJava/compiledJava/signaturePropagation/SubclassWithRawType.txt
index 40b22b7afd5..41842bde905 100644
--- a/compiler/testData/loadJava/compiledJava/signaturePropagation/SubclassWithRawType.txt
+++ b/compiler/testData/loadJava/compiledJava/signaturePropagation/SubclassWithRawType.txt
@@ -3,24 +3,24 @@ package test
 public interface SubclassWithRawType {
 
     public interface Sub : test.SubclassWithRawType.Super {
-        public abstract override /*1*/ fun array1(): kotlin.Array<(out) kotlin.(Mutable)List<kotlin.String!>!>!
-        public abstract override /*1*/ fun array2(): kotlin.Array<(out) kotlin.(Mutable)List<(raw) kotlin.Any?>!>!
-        public abstract override /*1*/ fun boundWildcard1(): (kotlin.MutableList<out kotlin.(Mutable)List<kotlin.String!>!>..kotlin.List<kotlin.(Mutable)List<kotlin.String!>!>?)
-        public abstract override /*1*/ fun boundWildcard2(): kotlin.(Mutable)List<in kotlin.(Mutable)List<(raw) kotlin.Any?>!>!
-        public abstract override /*1*/ fun simple1(): kotlin.(Mutable)List<kotlin.String!>!
-        public abstract override /*1*/ fun simple2(): kotlin.(Mutable)List<kotlin.(Mutable)List<kotlin.String!>!>!
-        public abstract override /*1*/ fun simple3(): kotlin.(Mutable)List<(raw) kotlin.Any?>!
-        public abstract override /*1*/ fun wildcard(): kotlin.(Mutable)List<(raw) kotlin.Any?>!
+        public abstract override /*1*/ fun array1(): kotlin.Array<(out) kotlin.collections.(Mutable)List<kotlin.String!>!>!
+        public abstract override /*1*/ fun array2(): kotlin.Array<(out) kotlin.collections.(Mutable)List<(raw) kotlin.Any?>!>!
+        public abstract override /*1*/ fun boundWildcard1(): (kotlin.collections.MutableList<out kotlin.collections.(Mutable)List<kotlin.String!>!>..kotlin.collections.List<kotlin.collections.(Mutable)List<kotlin.String!>!>?)
+        public abstract override /*1*/ fun boundWildcard2(): kotlin.collections.(Mutable)List<in kotlin.collections.(Mutable)List<(raw) kotlin.Any?>!>!
+        public abstract override /*1*/ fun simple1(): kotlin.collections.(Mutable)List<kotlin.String!>!
+        public abstract override /*1*/ fun simple2(): kotlin.collections.(Mutable)List<kotlin.collections.(Mutable)List<kotlin.String!>!>!
+        public abstract override /*1*/ fun simple3(): kotlin.collections.(Mutable)List<(raw) kotlin.Any?>!
+        public abstract override /*1*/ fun wildcard(): kotlin.collections.(Mutable)List<(raw) kotlin.Any?>!
     }
 
     public interface Super {
-        public abstract fun array1(): kotlin.Array<(out) kotlin.(Mutable)List<(raw) kotlin.Any?>!>!
-        public abstract fun array2(): kotlin.Array<(out) kotlin.(Mutable)List<kotlin.String!>!>!
-        public abstract fun boundWildcard1(): (kotlin.MutableList<out kotlin.(Mutable)List<(raw) kotlin.Any?>!>..kotlin.List<kotlin.(Mutable)List<(raw) kotlin.Any?>!>?)
-        public abstract fun boundWildcard2(): kotlin.(Mutable)List<in kotlin.(Mutable)List<kotlin.String!>!>!
-        public abstract fun simple1(): kotlin.(Mutable)List<(raw) kotlin.Any?>!
-        public abstract fun simple2(): kotlin.(Mutable)List<(raw) kotlin.Any?>!
-        public abstract fun simple3(): kotlin.(Mutable)List<kotlin.String!>!
-        public abstract fun wildcard(): kotlin.(Mutable)List<*>!
+        public abstract fun array1(): kotlin.Array<(out) kotlin.collections.(Mutable)List<(raw) kotlin.Any?>!>!
+        public abstract fun array2(): kotlin.Array<(out) kotlin.collections.(Mutable)List<kotlin.String!>!>!
+        public abstract fun boundWildcard1(): (kotlin.collections.MutableList<out kotlin.collections.(Mutable)List<(raw) kotlin.Any?>!>..kotlin.collections.List<kotlin.collections.(Mutable)List<(raw) kotlin.Any?>!>?)
+        public abstract fun boundWildcard2(): kotlin.collections.(Mutable)List<in kotlin.collections.(Mutable)List<kotlin.String!>!>!
+        public abstract fun simple1(): kotlin.collections.(Mutable)List<(raw) kotlin.Any?>!
+        public abstract fun simple2(): kotlin.collections.(Mutable)List<(raw) kotlin.Any?>!
+        public abstract fun simple3(): kotlin.collections.(Mutable)List<kotlin.String!>!
+        public abstract fun wildcard(): kotlin.collections.(Mutable)List<*>!
     }
 }
diff --git a/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesInconsistentGenericTypes.txt b/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesInconsistentGenericTypes.txt
index 245e00db8b1..94cdc32c14d 100644
--- a/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesInconsistentGenericTypes.txt
+++ b/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesInconsistentGenericTypes.txt
@@ -2,16 +2,16 @@ package test
 
 public interface TwoSuperclassesInconsistentGenericTypes {
     public abstract fun dummy(): kotlin.Unit
-    public abstract fun foo(): kotlin.(Mutable)List<kotlin.String!>!
+    public abstract fun foo(): kotlin.collections.(Mutable)List<kotlin.String!>!
 
     public interface Other {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(): kotlin.(Mutable)List<kotlin.String!>!
+        public abstract fun foo(): kotlin.collections.(Mutable)List<kotlin.String!>!
     }
 
     public open class Sub : test.TwoSuperclassesInconsistentGenericTypes, test.TwoSuperclassesInconsistentGenericTypes.Other {
         public constructor Sub()
         public open override /*2*/ fun dummy(): kotlin.Unit
-        public open override /*2*/ fun foo(): kotlin.(Mutable)List<kotlin.String!>!
+        public open override /*2*/ fun foo(): kotlin.collections.(Mutable)List<kotlin.String!>!
     }
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/types/SimpleTypeAnnotation.txt b/compiler/testData/loadJava/compiledKotlin/annotations/types/SimpleTypeAnnotation.txt
index 5c758dfcb9a..5af1053830f 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/types/SimpleTypeAnnotation.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/types/SimpleTypeAnnotation.txt
@@ -6,5 +6,5 @@ package test
 
 public final class SimpleTypeAnnotation {
     /*primary*/ public constructor SimpleTypeAnnotation()
-    public final fun foo(/*0*/ x: @test.A() kotlin.IntRange): @test.A() kotlin.Int
+    public final fun foo(/*0*/ x: @test.A() kotlin.ranges.IntRange): @test.A() kotlin.Int
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/types/TypeAnnotationWithArguments.txt b/compiler/testData/loadJava/compiledKotlin/annotations/types/TypeAnnotationWithArguments.txt
index e920c01e936..1db7bc09ca9 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/types/TypeAnnotationWithArguments.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/types/TypeAnnotationWithArguments.txt
@@ -10,5 +10,5 @@ package test
 
 public final class TypeAnnotationWithArguments {
     /*primary*/ public constructor TypeAnnotationWithArguments()
-    public final fun foo(/*0*/ param: @test.Ann(x = "param", y = 3.14.toDouble()) kotlin.IntRange): @test.Ann(x = "fun", y = 2.72.toDouble()) kotlin.Unit
+    public final fun foo(/*0*/ param: @test.Ann(x = "param", y = 3.14.toDouble()) kotlin.ranges.IntRange): @test.Ann(x = "fun", y = 2.72.toDouble()) kotlin.Unit
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/annotations/types/TypeArgument.txt b/compiler/testData/loadJava/compiledKotlin/annotations/types/TypeArgument.txt
index 3093bc1dbd5..8599ee152bc 100644
--- a/compiler/testData/loadJava/compiledKotlin/annotations/types/TypeArgument.txt
+++ b/compiler/testData/loadJava/compiledKotlin/annotations/types/TypeArgument.txt
@@ -1,6 +1,6 @@
 package test
 
-public fun foo(/*0*/ bar: kotlin.Map<@test.A() kotlin.String, kotlin.List<@test.A() kotlin.Int>>): kotlin.Unit
+public fun foo(/*0*/ bar: kotlin.collections.Map<@test.A() kotlin.String, kotlin.collections.List<@test.A() kotlin.Int>>): kotlin.Unit
 
 @kotlin.annotation.Target(allowedTargets = {AnnotationTarget.TYPE}) public final annotation class A : kotlin.Annotation {
     /*primary*/ public constructor A()
diff --git a/compiler/testData/loadJava/compiledKotlin/class/EnumWithGenericConstructorParameter.txt b/compiler/testData/loadJava/compiledKotlin/class/EnumWithGenericConstructorParameter.txt
index 75b2be10a46..3fde444e217 100644
--- a/compiler/testData/loadJava/compiledKotlin/class/EnumWithGenericConstructorParameter.txt
+++ b/compiler/testData/loadJava/compiledKotlin/class/EnumWithGenericConstructorParameter.txt
@@ -1,7 +1,7 @@
 package test
 
 public final enum class EnumWithGenericConstructorParameter : kotlin.Enum<test.EnumWithGenericConstructorParameter> {
-    /*primary*/ private constructor EnumWithGenericConstructorParameter(/*0*/ list: kotlin.List<kotlin.String>?)
+    /*primary*/ private constructor EnumWithGenericConstructorParameter(/*0*/ list: kotlin.collections.List<kotlin.String>?)
     public final override /*1*/ /*fake_override*/ val name: kotlin.String
         public final override /*1*/ /*fake_override*/ fun <get-name>(): kotlin.String
     public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int
diff --git a/compiler/testData/loadJava/compiledKotlin/constructor/ConstructorCollectionParameter.txt b/compiler/testData/loadJava/compiledKotlin/constructor/ConstructorCollectionParameter.txt
index 1bb439196b9..939d721a41f 100644
--- a/compiler/testData/loadJava/compiledKotlin/constructor/ConstructorCollectionParameter.txt
+++ b/compiler/testData/loadJava/compiledKotlin/constructor/ConstructorCollectionParameter.txt
@@ -1,7 +1,7 @@
 package test
 
 public final class TestingKotlinCollections {
-    /*primary*/ public constructor TestingKotlinCollections(/*0*/ arguments: kotlin.Collection<kotlin.String>)
-    public final val arguments: kotlin.Collection<kotlin.String>
-        public final fun <get-arguments>(): kotlin.Collection<kotlin.String>
+    /*primary*/ public constructor TestingKotlinCollections(/*0*/ arguments: kotlin.collections.Collection<kotlin.String>)
+    public final val arguments: kotlin.collections.Collection<kotlin.String>
+        public final fun <get-arguments>(): kotlin.collections.Collection<kotlin.String>
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePExtendsIterableP.kt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePExtendsIterableP.kt
index 3169bd99d9e..c0adfb71eb4 100644
--- a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePExtendsIterableP.kt
+++ b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePExtendsIterableP.kt
@@ -1,4 +1,4 @@
 package test
 
-public abstract class ClassWithTypePExtendsIterableP<P>() : kotlin.MutableIterable<P> {
+public abstract class ClassWithTypePExtendsIterableP<P>() : kotlin.collections.MutableIterable<P> {
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePExtendsIterableP.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePExtendsIterableP.txt
index f2432aa09e8..dc09b324d53 100644
--- a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePExtendsIterableP.txt
+++ b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePExtendsIterableP.txt
@@ -1,6 +1,6 @@
 package test
 
-public abstract class ClassWithTypePExtendsIterableP</*0*/ P> : kotlin.MutableIterable<P> {
+public abstract class ClassWithTypePExtendsIterableP</*0*/ P> : kotlin.collections.MutableIterable<P> {
     /*primary*/ public constructor ClassWithTypePExtendsIterableP</*0*/ P>()
-    public abstract override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator<P>
+    public abstract override /*1*/ /*fake_override*/ fun iterator(): kotlin.collections.MutableIterator<P>
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePRefNext.kt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePRefNext.kt
index 0fbab33c036..508531e284b 100644
--- a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePRefNext.kt
+++ b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePRefNext.kt
@@ -1,3 +1,3 @@
 package test
 
-public open class ClassWithTypePRefNext<R : kotlin.Iterable<P>?, P>()
+public open class ClassWithTypePRefNext<R : kotlin.collections.Iterable<P>?, P>()
diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePRefNext.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePRefNext.txt
index ec4453cb1e1..8bff8540d11 100644
--- a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePRefNext.txt
+++ b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePRefNext.txt
@@ -1,5 +1,5 @@
 package test
 
-public open class ClassWithTypePRefNext</*0*/ R : kotlin.Iterable<P>?, /*1*/ P> {
-    /*primary*/ public constructor ClassWithTypePRefNext</*0*/ R : kotlin.Iterable<P>?, /*1*/ P>()
+public open class ClassWithTypePRefNext</*0*/ R : kotlin.collections.Iterable<P>?, /*1*/ P> {
+    /*primary*/ public constructor ClassWithTypePRefNext</*0*/ R : kotlin.collections.Iterable<P>?, /*1*/ P>()
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/RemoveRedundantProjectionKind.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/RemoveRedundantProjectionKind.txt
index d29e36e02fc..07a355c83cb 100644
--- a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/RemoveRedundantProjectionKind.txt
+++ b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/RemoveRedundantProjectionKind.txt
@@ -1,6 +1,6 @@
 package test
 
 public interface RemoveRedundantProjectionKind {
-    public abstract fun f(/*0*/ p0: kotlin.Collection<kotlin.CharSequence?>?): kotlin.Unit
     public abstract fun f(/*0*/ p0: kotlin.Comparable<kotlin.CharSequence?>?): kotlin.Unit
+    public abstract fun f(/*0*/ p0: kotlin.collections.Collection<kotlin.CharSequence?>?): kotlin.Unit
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/CustomProjectionKind.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/CustomProjectionKind.txt
index e4136d783a5..ce27050b235 100644
--- a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/CustomProjectionKind.txt
+++ b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/CustomProjectionKind.txt
@@ -2,5 +2,5 @@ package test
 
 public open class CustomProjectionKind {
     /*primary*/ public constructor CustomProjectionKind()
-    public open fun foo(): kotlin.MutableList<out kotlin.Number>
+    public open fun foo(): kotlin.collections.MutableList<out kotlin.Number>
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/MethodWithGenerics.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/MethodWithGenerics.txt
index 520d5d82a39..1779874f412 100644
--- a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/MethodWithGenerics.txt
+++ b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/MethodWithGenerics.txt
@@ -2,5 +2,5 @@ package test
 
 public open class MethodWithGenerics {
     /*primary*/ public constructor MethodWithGenerics()
-    public open fun foo(/*0*/ a: kotlin.String, /*1*/ b: kotlin.List<kotlin.Map.Entry<kotlin.String?, kotlin.String>?>): kotlin.String
+    public open fun foo(/*0*/ a: kotlin.String, /*1*/ b: kotlin.collections.List<kotlin.collections.Map.Entry<kotlin.String?, kotlin.String>?>): kotlin.String
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/MethodWithMappedClasses.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/MethodWithMappedClasses.txt
index ae675a4bb38..505d0077ec2 100644
--- a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/MethodWithMappedClasses.txt
+++ b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/MethodWithMappedClasses.txt
@@ -2,5 +2,5 @@ package test
 
 public open class MethodWithMappedClasses {
     /*primary*/ public constructor MethodWithMappedClasses()
-    public open fun </*0*/ T> copy(/*0*/ dest: kotlin.MutableList<in T>, /*1*/ src: kotlin.List<T>): kotlin.Unit
+    public open fun </*0*/ T> copy(/*0*/ dest: kotlin.collections.MutableList<in T>, /*1*/ src: kotlin.collections.List<T>): kotlin.Unit
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/MethodWithTypeParameters.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/MethodWithTypeParameters.txt
index ee5ec264733..844971b240a 100644
--- a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/MethodWithTypeParameters.txt
+++ b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/MethodWithTypeParameters.txt
@@ -2,5 +2,5 @@ package test
 
 public open class MethodWithTypeParameters {
     /*primary*/ public constructor MethodWithTypeParameters()
-    public open fun </*0*/ A, /*1*/ B : java.lang.Runnable> foo(/*0*/ a: A, /*1*/ b: kotlin.List<B>, /*2*/ c: kotlin.MutableList<in kotlin.String?>): kotlin.Unit where B : kotlin.List<kotlin.Cloneable>
+    public open fun </*0*/ A, /*1*/ B : java.lang.Runnable> foo(/*0*/ a: A, /*1*/ b: kotlin.collections.List<B>, /*2*/ c: kotlin.collections.MutableList<in kotlin.String?>): kotlin.Unit where B : kotlin.collections.List<kotlin.Cloneable>
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/ConflictingProjectionKind.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/ConflictingProjectionKind.txt
index be5cd9a7426..60226d295f0 100644
--- a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/ConflictingProjectionKind.txt
+++ b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/ConflictingProjectionKind.txt
@@ -2,5 +2,5 @@ package test
 
 public open class ConflictingProjectionKind {
     /*primary*/ public constructor ConflictingProjectionKind()
-    public open fun foo(/*0*/ p0: kotlin.List<kotlin.Number>?): kotlin.Unit
+    public open fun foo(/*0*/ p0: kotlin.collections.List<kotlin.Number>?): kotlin.Unit
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/RedundantProjectionKind.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/RedundantProjectionKind.txt
index d1fa39e42c4..bcc66358f3e 100644
--- a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/RedundantProjectionKind.txt
+++ b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/RedundantProjectionKind.txt
@@ -2,5 +2,5 @@ package test
 
 public open class RedundantProjectionKind {
     /*primary*/ public constructor RedundantProjectionKind()
-    public open fun foo(/*0*/ list: kotlin.List<kotlin.Number>): kotlin.Unit
+    public open fun foo(/*0*/ list: kotlin.collections.List<kotlin.Number>): kotlin.Unit
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongProjectionKind.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongProjectionKind.txt
index 07b7646308a..d132b966bee 100644
--- a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongProjectionKind.txt
+++ b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongProjectionKind.txt
@@ -2,5 +2,5 @@ package test
 
 public open class WrongProjectionKind {
     /*primary*/ public constructor WrongProjectionKind()
-    public open fun copy(/*0*/ p0: kotlin.Array<out kotlin.Number>?, /*1*/ p1: kotlin.Array<out kotlin.Number>?): kotlin.MutableList<kotlin.Number>?
+    public open fun copy(/*0*/ p0: kotlin.Array<out kotlin.Number>?, /*1*/ p1: kotlin.Array<out kotlin.Number>?): kotlin.collections.MutableList<kotlin.Number>?
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongReturnTypeStructure.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongReturnTypeStructure.txt
index fe7eefeb2ff..1ec0a15eff6 100644
--- a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongReturnTypeStructure.txt
+++ b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongReturnTypeStructure.txt
@@ -2,5 +2,5 @@ package test
 
 public open class WrongReturnTypeStructure {
     /*primary*/ public constructor WrongReturnTypeStructure()
-    public open fun foo(/*0*/ p0: kotlin.String?, /*1*/ p1: kotlin.List<kotlin.Map.Entry<kotlin.String, kotlin.String>>?): kotlin.String?
+    public open fun foo(/*0*/ p0: kotlin.String?, /*1*/ p1: kotlin.collections.List<kotlin.collections.Map.Entry<kotlin.String, kotlin.String>>?): kotlin.String?
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.txt
index 940a4132fbc..59554c8da2a 100644
--- a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.txt
+++ b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.txt
@@ -2,5 +2,5 @@ package test
 
 public open class WrongTypeParameterBoundStructure1 {
     /*primary*/ public constructor WrongTypeParameterBoundStructure1()
-    public open fun </*0*/ A, /*1*/ B : java.lang.Runnable?> foo(/*0*/ p0: A?, /*1*/ p1: kotlin.List<B>?): kotlin.Unit where B : kotlin.List<kotlin.Cloneable>?
+    public open fun </*0*/ A, /*1*/ B : java.lang.Runnable?> foo(/*0*/ p0: A?, /*1*/ p1: kotlin.collections.List<B>?): kotlin.Unit where B : kotlin.collections.List<kotlin.Cloneable>?
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParameterBoundStructure2.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParameterBoundStructure2.txt
index 2c9d4abc775..e97f4fa6320 100644
--- a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParameterBoundStructure2.txt
+++ b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParameterBoundStructure2.txt
@@ -2,5 +2,5 @@ package test
 
 public open class WrongTypeParameterBoundStructure2 {
     /*primary*/ public constructor WrongTypeParameterBoundStructure2()
-    public open fun </*0*/ A, /*1*/ B : java.lang.Runnable?> foo(/*0*/ p0: A?, /*1*/ p1: kotlin.List<B>?): kotlin.Unit where B : kotlin.List<kotlin.Cloneable>?
+    public open fun </*0*/ A, /*1*/ B : java.lang.Runnable?> foo(/*0*/ p0: A?, /*1*/ p1: kotlin.collections.List<B>?): kotlin.Unit where B : kotlin.collections.List<kotlin.Cloneable>?
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParametersCount.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParametersCount.txt
index 08395025007..0e357001c91 100644
--- a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParametersCount.txt
+++ b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParametersCount.txt
@@ -2,5 +2,5 @@ package test
 
 public open class WrongTypeParametersCount {
     /*primary*/ public constructor WrongTypeParametersCount()
-    public open fun </*0*/ A, /*1*/ B> foo(/*0*/ p0: A?, /*1*/ p1: kotlin.List<B>?): kotlin.Unit
+    public open fun </*0*/ A, /*1*/ B> foo(/*0*/ p0: A?, /*1*/ p1: kotlin.collections.List<B>?): kotlin.Unit
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParameterStructure1.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParameterStructure1.txt
index 6c0062059cc..db8c5e5a888 100644
--- a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParameterStructure1.txt
+++ b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParameterStructure1.txt
@@ -2,5 +2,5 @@ package test
 
 public open class WrongValueParameterStructure1 {
     /*primary*/ public constructor WrongValueParameterStructure1()
-    public open fun foo(/*0*/ p0: kotlin.String?, /*1*/ p1: kotlin.List<kotlin.Map.Entry<kotlin.String, kotlin.String>>?): kotlin.String?
+    public open fun foo(/*0*/ p0: kotlin.String?, /*1*/ p1: kotlin.collections.List<kotlin.collections.Map.Entry<kotlin.String, kotlin.String>>?): kotlin.String?
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParameterStructure2.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParameterStructure2.txt
index e7c4b8c28de..cb1a4410455 100644
--- a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParameterStructure2.txt
+++ b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParameterStructure2.txt
@@ -2,5 +2,5 @@ package test
 
 public open class WrongValueParameterStructure2 {
     /*primary*/ public constructor WrongValueParameterStructure2()
-    public open fun foo(/*0*/ p0: kotlin.String?, /*1*/ p1: kotlin.List<kotlin.Map.Entry<kotlin.String, kotlin.String>>?): kotlin.String?
+    public open fun foo(/*0*/ p0: kotlin.String?, /*1*/ p1: kotlin.collections.List<kotlin.collections.Map.Entry<kotlin.String, kotlin.String>>?): kotlin.String?
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/PropagateTypeArgumentNullable.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/PropagateTypeArgumentNullable.txt
index f96ff4cf80e..0fb9609fa0f 100644
--- a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/PropagateTypeArgumentNullable.txt
+++ b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/PropagateTypeArgumentNullable.txt
@@ -3,20 +3,20 @@ package test
 public interface PropagateTypeArgumentNullable {
 
     public interface Sub : test.PropagateTypeArgumentNullable.Super {
-        public abstract override /*1*/ fun invOutR(): kotlin.MutableList<kotlin.List<kotlin.String?>>
-        public abstract override /*1*/ fun invOutS(/*0*/ p: kotlin.MutableList<kotlin.List<kotlin.String?>>): kotlin.Unit
-        public abstract override /*1*/ fun invR(): kotlin.MutableList<kotlin.String?>
-        public abstract override /*1*/ fun outOutS(/*0*/ p: kotlin.List<kotlin.List<kotlin.String?>>): kotlin.Unit
-        public abstract override /*1*/ fun outR(): kotlin.List<kotlin.String?>
-        public abstract override /*1*/ fun outS(/*0*/ p: kotlin.List<kotlin.String?>): kotlin.Unit
+        public abstract override /*1*/ fun invOutR(): kotlin.collections.MutableList<kotlin.collections.List<kotlin.String?>>
+        public abstract override /*1*/ fun invOutS(/*0*/ p: kotlin.collections.MutableList<kotlin.collections.List<kotlin.String?>>): kotlin.Unit
+        public abstract override /*1*/ fun invR(): kotlin.collections.MutableList<kotlin.String?>
+        public abstract override /*1*/ fun outOutS(/*0*/ p: kotlin.collections.List<kotlin.collections.List<kotlin.String?>>): kotlin.Unit
+        public abstract override /*1*/ fun outR(): kotlin.collections.List<kotlin.String?>
+        public abstract override /*1*/ fun outS(/*0*/ p: kotlin.collections.List<kotlin.String?>): kotlin.Unit
     }
 
     public interface Super {
-        public abstract fun invOutR(): kotlin.MutableList<kotlin.List<kotlin.String?>>
-        public abstract fun invOutS(/*0*/ p: kotlin.MutableList<kotlin.List<kotlin.String?>>): kotlin.Unit
-        public abstract fun invR(): kotlin.MutableList<kotlin.String?>
-        public abstract fun outOutS(/*0*/ p: kotlin.List<kotlin.List<kotlin.String?>>): kotlin.Unit
-        public abstract fun outR(): kotlin.List<kotlin.String?>
-        public abstract fun outS(/*0*/ p: kotlin.List<kotlin.String?>): kotlin.Unit
+        public abstract fun invOutR(): kotlin.collections.MutableList<kotlin.collections.List<kotlin.String?>>
+        public abstract fun invOutS(/*0*/ p: kotlin.collections.MutableList<kotlin.collections.List<kotlin.String?>>): kotlin.Unit
+        public abstract fun invR(): kotlin.collections.MutableList<kotlin.String?>
+        public abstract fun outOutS(/*0*/ p: kotlin.collections.List<kotlin.collections.List<kotlin.String?>>): kotlin.Unit
+        public abstract fun outR(): kotlin.collections.List<kotlin.String?>
+        public abstract fun outS(/*0*/ p: kotlin.collections.List<kotlin.String?>): kotlin.Unit
     }
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/ChangeProjectionKind1.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/ChangeProjectionKind1.txt
index bfb1400b4c9..2a5e170e811 100644
--- a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/ChangeProjectionKind1.txt
+++ b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/ChangeProjectionKind1.txt
@@ -4,11 +4,11 @@ public interface ChangeProjectionKind1 {
 
     public interface Sub : test.ChangeProjectionKind1.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*1*/ fun foo(/*0*/ p: kotlin.MutableList<in kotlin.String>): kotlin.Unit
+        public abstract override /*1*/ fun foo(/*0*/ p: kotlin.collections.MutableList<in kotlin.String>): kotlin.Unit
     }
 
     public interface Super {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(/*0*/ p: kotlin.MutableList<in kotlin.String>): kotlin.Unit
+        public abstract fun foo(/*0*/ p: kotlin.collections.MutableList<in kotlin.String>): kotlin.Unit
     }
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/ChangeProjectionKind2.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/ChangeProjectionKind2.txt
index 47a192d4bfb..ec90963aaff 100644
--- a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/ChangeProjectionKind2.txt
+++ b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/ChangeProjectionKind2.txt
@@ -4,11 +4,11 @@ public interface ChangeProjectionKind2 {
 
     public interface Sub : test.ChangeProjectionKind2.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*1*/ fun foo(/*0*/ p: kotlin.MutableList<kotlin.String>): kotlin.Unit
+        public abstract override /*1*/ fun foo(/*0*/ p: kotlin.collections.MutableList<kotlin.String>): kotlin.Unit
     }
 
     public interface Super {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(/*0*/ p: kotlin.MutableList<kotlin.String>): kotlin.Unit
+        public abstract fun foo(/*0*/ p: kotlin.collections.MutableList<kotlin.String>): kotlin.Unit
     }
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritMutability.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritMutability.txt
index 3bbfc18414d..ec01ed923c5 100644
--- a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritMutability.txt
+++ b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritMutability.txt
@@ -4,11 +4,11 @@ public interface InheritMutability {
 
     public interface Sub : test.InheritMutability.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*1*/ fun foo(/*0*/ p: kotlin.MutableList<kotlin.String>): kotlin.Unit
+        public abstract override /*1*/ fun foo(/*0*/ p: kotlin.collections.MutableList<kotlin.String>): kotlin.Unit
     }
 
     public interface Super {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(/*0*/ p: kotlin.MutableList<kotlin.String>): kotlin.Unit
+        public abstract fun foo(/*0*/ p: kotlin.collections.MutableList<kotlin.String>): kotlin.Unit
     }
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritProjectionKind.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritProjectionKind.txt
index 3dd54c470f5..cb7b43eb4e9 100644
--- a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritProjectionKind.txt
+++ b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritProjectionKind.txt
@@ -4,11 +4,11 @@ public interface InheritProjectionKind {
 
     public interface Sub : test.InheritProjectionKind.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*1*/ fun foo(/*0*/ p: kotlin.MutableList<in kotlin.String>): kotlin.Unit
+        public abstract override /*1*/ fun foo(/*0*/ p: kotlin.collections.MutableList<in kotlin.String>): kotlin.Unit
     }
 
     public interface Super {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(/*0*/ p: kotlin.MutableList<in kotlin.String>): kotlin.Unit
+        public abstract fun foo(/*0*/ p: kotlin.collections.MutableList<in kotlin.String>): kotlin.Unit
     }
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritReadOnliness.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritReadOnliness.txt
index cb9f02c2532..6115225a108 100644
--- a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritReadOnliness.txt
+++ b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritReadOnliness.txt
@@ -4,11 +4,11 @@ public interface InheritReadOnliness {
 
     public interface Sub : test.InheritReadOnliness.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*1*/ fun foo(/*0*/ p: kotlin.List<kotlin.String>): kotlin.Unit
+        public abstract override /*1*/ fun foo(/*0*/ p: kotlin.collections.List<kotlin.String>): kotlin.Unit
     }
 
     public interface Super {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(/*0*/ p: kotlin.List<kotlin.String>): kotlin.Unit
+        public abstract fun foo(/*0*/ p: kotlin.collections.List<kotlin.String>): kotlin.Unit
     }
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/MutableToReadOnly.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/MutableToReadOnly.txt
index ab9d2a2e766..2ce810b09af 100644
--- a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/MutableToReadOnly.txt
+++ b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/MutableToReadOnly.txt
@@ -4,11 +4,11 @@ public interface MutableToReadOnly {
 
     public interface Sub : test.MutableToReadOnly.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*1*/ fun foo(/*0*/ p: kotlin.MutableList<kotlin.String>): kotlin.Unit
+        public abstract override /*1*/ fun foo(/*0*/ p: kotlin.collections.MutableList<kotlin.String>): kotlin.Unit
     }
 
     public interface Super {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(/*0*/ p: kotlin.MutableList<kotlin.String>): kotlin.Unit
+        public abstract fun foo(/*0*/ p: kotlin.collections.MutableList<kotlin.String>): kotlin.Unit
     }
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/ReadOnlyToMutable.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/ReadOnlyToMutable.txt
index c7196641374..6127c7280d1 100644
--- a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/ReadOnlyToMutable.txt
+++ b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/ReadOnlyToMutable.txt
@@ -4,11 +4,11 @@ public interface ReadOnlyToMutable {
 
     public interface Sub : test.ReadOnlyToMutable.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*1*/ fun foo(/*0*/ p: kotlin.List<kotlin.String>): kotlin.Unit
+        public abstract override /*1*/ fun foo(/*0*/ p: kotlin.collections.List<kotlin.String>): kotlin.Unit
     }
 
     public interface Super {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(/*0*/ p: kotlin.List<kotlin.String>): kotlin.Unit
+        public abstract fun foo(/*0*/ p: kotlin.collections.List<kotlin.String>): kotlin.Unit
     }
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType1.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType1.txt
index 26d34a209d8..c4bb5afc64e 100644
--- a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType1.txt
+++ b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType1.txt
@@ -4,11 +4,11 @@ public interface AddNullabilitySameGenericType1 {
 
     public interface Sub : test.AddNullabilitySameGenericType1.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*1*/ fun foo(): kotlin.MutableList<kotlin.String>
+        public abstract override /*1*/ fun foo(): kotlin.collections.MutableList<kotlin.String>
     }
 
     public interface Super {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(): kotlin.MutableList<kotlin.String>
+        public abstract fun foo(): kotlin.collections.MutableList<kotlin.String>
     }
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType2.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType2.txt
index a48044ba58d..5d147e34c45 100644
--- a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType2.txt
+++ b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType2.txt
@@ -4,11 +4,11 @@ public interface AddNullabilitySameGenericType2 {
 
     public interface Sub : test.AddNullabilitySameGenericType2.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*1*/ fun foo(): kotlin.MutableList<kotlin.String>
+        public abstract override /*1*/ fun foo(): kotlin.collections.MutableList<kotlin.String>
     }
 
     public interface Super {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(): kotlin.MutableList<kotlin.String>
+        public abstract fun foo(): kotlin.collections.MutableList<kotlin.String>
     }
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/CantMakeImmutableInSubclass.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/CantMakeImmutableInSubclass.txt
index 150515b5581..05c48337c3d 100644
--- a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/CantMakeImmutableInSubclass.txt
+++ b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/CantMakeImmutableInSubclass.txt
@@ -4,11 +4,11 @@ public interface CantMakeImmutableInSubclass {
 
     public interface Sub : test.CantMakeImmutableInSubclass.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*1*/ fun foo(): kotlin.MutableList<kotlin.String>
+        public abstract override /*1*/ fun foo(): kotlin.collections.MutableList<kotlin.String>
     }
 
     public interface Super {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(): kotlin.MutableCollection<kotlin.String>
+        public abstract fun foo(): kotlin.collections.MutableCollection<kotlin.String>
     }
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.txt
index 8231c7bdceb..4a8b46105cb 100644
--- a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.txt
+++ b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.txt
@@ -9,31 +9,31 @@ public interface HalfSubstitutedTypeParameters {
 
     public interface Super {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(): kotlin.MutableList<kotlin.String?>
+        public abstract fun foo(): kotlin.collections.MutableList<kotlin.String?>
     }
 
-    public interface TrickyList</*0*/ X, /*1*/ E> : kotlin.MutableList<E> {
+    public interface TrickyList</*0*/ X, /*1*/ E> : kotlin.collections.MutableList<E> {
         public abstract override /*1*/ /*fake_override*/ val size: kotlin.Int
             public abstract override /*1*/ /*fake_override*/ fun <get-size>(): kotlin.Int
         public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ element: E): kotlin.Boolean
         public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: E): kotlin.Unit
-        public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.Collection<E>): kotlin.Boolean
-        public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.Collection<E>): kotlin.Boolean
+        public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.collections.Collection<E>): kotlin.Boolean
+        public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.collections.Collection<E>): kotlin.Boolean
         public abstract override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit
         public abstract override /*1*/ /*fake_override*/ fun contains(/*0*/ element: E): kotlin.Boolean
-        public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.Collection<E>): kotlin.Boolean
+        public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection<E>): kotlin.Boolean
         public abstract override /*1*/ /*fake_override*/ fun get(/*0*/ index: kotlin.Int): E
         public abstract override /*1*/ /*fake_override*/ fun indexOf(/*0*/ element: E): kotlin.Int
         public abstract override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
-        public abstract override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator<E>
+        public abstract override /*1*/ /*fake_override*/ fun iterator(): kotlin.collections.MutableIterator<E>
         public abstract override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ element: E): kotlin.Int
-        public abstract override /*1*/ /*fake_override*/ fun listIterator(): kotlin.MutableListIterator<E>
-        public abstract override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.MutableListIterator<E>
+        public abstract override /*1*/ /*fake_override*/ fun listIterator(): kotlin.collections.MutableListIterator<E>
+        public abstract override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.collections.MutableListIterator<E>
         public abstract override /*1*/ /*fake_override*/ fun remove(/*0*/ element: E): kotlin.Boolean
-        public abstract override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.Collection<E>): kotlin.Boolean
+        public abstract override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.collections.Collection<E>): kotlin.Boolean
         public abstract override /*1*/ /*fake_override*/ fun removeAt(/*0*/ index: kotlin.Int): E
-        public abstract override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.Collection<E>): kotlin.Boolean
+        public abstract override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.collections.Collection<E>): kotlin.Boolean
         public abstract override /*1*/ /*fake_override*/ fun set(/*0*/ index: kotlin.Int, /*1*/ element: E): E
-        public abstract override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.MutableList<E>
+        public abstract override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.collections.MutableList<E>
     }
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritNullabilityGenericSubclassSimple.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritNullabilityGenericSubclassSimple.txt
index b51d2bf4696..dad305c5695 100644
--- a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritNullabilityGenericSubclassSimple.txt
+++ b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritNullabilityGenericSubclassSimple.txt
@@ -4,11 +4,11 @@ public interface InheritNullabilityGenericSubclassSimple {
 
     public interface Sub : test.InheritNullabilityGenericSubclassSimple.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*1*/ fun foo(): kotlin.MutableList<kotlin.String>
+        public abstract override /*1*/ fun foo(): kotlin.collections.MutableList<kotlin.String>
     }
 
     public interface Super {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(): kotlin.MutableCollection<kotlin.String>
+        public abstract fun foo(): kotlin.collections.MutableCollection<kotlin.String>
     }
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritNullabilitySameGenericType.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritNullabilitySameGenericType.txt
index b2dbdc4e78f..8345248c814 100644
--- a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritNullabilitySameGenericType.txt
+++ b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritNullabilitySameGenericType.txt
@@ -4,11 +4,11 @@ public interface InheritNullabilitySameGenericType {
 
     public interface Sub : test.InheritNullabilitySameGenericType.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*1*/ fun foo(): kotlin.MutableList<kotlin.String>
+        public abstract override /*1*/ fun foo(): kotlin.collections.MutableList<kotlin.String>
     }
 
     public interface Super {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(): kotlin.MutableList<kotlin.String>
+        public abstract fun foo(): kotlin.collections.MutableList<kotlin.String>
     }
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritProjectionKind.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritProjectionKind.txt
index a937d0410a1..2ccef91df94 100644
--- a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritProjectionKind.txt
+++ b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritProjectionKind.txt
@@ -4,11 +4,11 @@ public interface InheritProjectionKind {
 
     public interface Sub : test.InheritProjectionKind.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*1*/ fun foo(): kotlin.MutableList<out kotlin.Number>
+        public abstract override /*1*/ fun foo(): kotlin.collections.MutableList<out kotlin.Number>
     }
 
     public interface Super {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(): kotlin.MutableCollection<out kotlin.Number>
+        public abstract fun foo(): kotlin.collections.MutableCollection<out kotlin.Number>
     }
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritReadOnlinessOfArgument.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritReadOnlinessOfArgument.txt
index c4959fc938a..9d70d142840 100644
--- a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritReadOnlinessOfArgument.txt
+++ b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritReadOnlinessOfArgument.txt
@@ -4,11 +4,11 @@ public interface InheritReadOnlinessOfArgument {
 
     public interface Sub : test.InheritReadOnlinessOfArgument.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*1*/ fun foo(): kotlin.List<kotlin.List<kotlin.String>>
+        public abstract override /*1*/ fun foo(): kotlin.collections.List<kotlin.collections.List<kotlin.String>>
     }
 
     public interface Super {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(): kotlin.List<kotlin.List<kotlin.String>>
+        public abstract fun foo(): kotlin.collections.List<kotlin.collections.List<kotlin.String>>
     }
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritReadOnlinessSameClass.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritReadOnlinessSameClass.txt
index 493d19b9ba0..15f8e0530da 100644
--- a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritReadOnlinessSameClass.txt
+++ b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritReadOnlinessSameClass.txt
@@ -4,11 +4,11 @@ public interface InheritReadOnlinessSameClass {
 
     public interface Sub : test.InheritReadOnlinessSameClass.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*1*/ fun foo(): kotlin.List<kotlin.String>
+        public abstract override /*1*/ fun foo(): kotlin.collections.List<kotlin.String>
     }
 
     public interface Super {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(): kotlin.List<kotlin.String>
+        public abstract fun foo(): kotlin.collections.List<kotlin.String>
     }
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritReadOnlinessSubclass.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritReadOnlinessSubclass.txt
index 56ace366700..6d2f8f2f4ab 100644
--- a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritReadOnlinessSubclass.txt
+++ b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritReadOnlinessSubclass.txt
@@ -4,11 +4,11 @@ public interface InheritReadOnlinessSubclass {
 
     public interface Sub : test.InheritReadOnlinessSubclass.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*1*/ fun foo(): kotlin.List<kotlin.String>
+        public abstract override /*1*/ fun foo(): kotlin.collections.List<kotlin.String>
     }
 
     public interface Super {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(): kotlin.Collection<kotlin.String>
+        public abstract fun foo(): kotlin.collections.Collection<kotlin.String>
     }
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SameProjectionKind.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SameProjectionKind.txt
index ad9579318a4..f100d4b5bc2 100644
--- a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SameProjectionKind.txt
+++ b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SameProjectionKind.txt
@@ -4,11 +4,11 @@ public interface SameProjectionKind {
 
     public interface Sub : test.SameProjectionKind.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*1*/ fun foo(): kotlin.MutableCollection<out kotlin.Number?>?
+        public abstract override /*1*/ fun foo(): kotlin.collections.MutableCollection<out kotlin.Number?>?
     }
 
     public interface Super {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(): kotlin.MutableCollection<out kotlin.Number?>?
+        public abstract fun foo(): kotlin.collections.MutableCollection<out kotlin.Number?>?
     }
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassOfCollection.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassOfCollection.txt
index fa5a87d6b8f..fe56ba7037a 100644
--- a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassOfCollection.txt
+++ b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassOfCollection.txt
@@ -1,16 +1,16 @@
 package test
 
-public interface SubclassOfCollection</*0*/ E> : kotlin.MutableCollection<E> {
+public interface SubclassOfCollection</*0*/ E> : kotlin.collections.MutableCollection<E> {
     public abstract override /*1*/ /*fake_override*/ val size: kotlin.Int
         public abstract override /*1*/ /*fake_override*/ fun <get-size>(): kotlin.Int
     public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ element: E): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.Collection<E>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.collections.Collection<E>): kotlin.Boolean
     public abstract override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit
     public abstract override /*1*/ /*fake_override*/ fun contains(/*0*/ element: E): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.Collection<E>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection<E>): kotlin.Boolean
     public abstract override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
-    public abstract override /*1*/ fun iterator(): kotlin.MutableIterator<E>
+    public abstract override /*1*/ fun iterator(): kotlin.collections.MutableIterator<E>
     public abstract override /*1*/ /*fake_override*/ fun remove(/*0*/ element: E): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.Collection<E>): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.Collection<E>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.collections.Collection<E>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.collections.Collection<E>): kotlin.Boolean
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassOfMapEntry.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassOfMapEntry.txt
index 44564cbcea8..796edc8fc5f 100644
--- a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassOfMapEntry.txt
+++ b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassOfMapEntry.txt
@@ -1,6 +1,6 @@
 package test
 
-public interface SubclassOfMapEntry</*0*/ K, /*1*/ V> : kotlin.MutableMap.MutableEntry<K, V> {
+public interface SubclassOfMapEntry</*0*/ K, /*1*/ V> : kotlin.collections.MutableMap.MutableEntry<K, V> {
     public abstract override /*1*/ /*fake_override*/ val key: K
         public abstract override /*1*/ /*fake_override*/ fun <get-key>(): K
     public abstract override /*1*/ val value: V
diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesConflictingProjectionKinds.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesConflictingProjectionKinds.txt
index 2dddbd4050f..4d4fa88cefc 100644
--- a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesConflictingProjectionKinds.txt
+++ b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesConflictingProjectionKinds.txt
@@ -4,16 +4,16 @@ public interface TwoSuperclassesConflictingProjectionKinds {
 
     public interface Sub : test.TwoSuperclassesConflictingProjectionKinds.Super1, test.TwoSuperclassesConflictingProjectionKinds.Super2 {
         public abstract override /*2*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*2*/ fun foo(): kotlin.MutableCollection<kotlin.CharSequence>
+        public abstract override /*2*/ fun foo(): kotlin.collections.MutableCollection<kotlin.CharSequence>
     }
 
     public interface Super1 {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(): kotlin.MutableCollection<kotlin.CharSequence>
+        public abstract fun foo(): kotlin.collections.MutableCollection<kotlin.CharSequence>
     }
 
     public interface Super2 {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(): kotlin.MutableCollection<out kotlin.CharSequence>
+        public abstract fun foo(): kotlin.collections.MutableCollection<out kotlin.CharSequence>
     }
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferMutability.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferMutability.txt
index 1b1916d8faf..a1b46b6f2a6 100644
--- a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferMutability.txt
+++ b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferMutability.txt
@@ -4,16 +4,16 @@ public interface TwoSuperclassesInvariantAndCovariantInferMutability {
 
     public interface Sub : test.TwoSuperclassesInvariantAndCovariantInferMutability.Super1, test.TwoSuperclassesInvariantAndCovariantInferMutability.Super2 {
         public abstract override /*2*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*2*/ fun foo(): kotlin.MutableList<kotlin.MutableList<kotlin.String>>
+        public abstract override /*2*/ fun foo(): kotlin.collections.MutableList<kotlin.collections.MutableList<kotlin.String>>
     }
 
     public interface Super1 {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(): kotlin.List<kotlin.List<kotlin.String>>
+        public abstract fun foo(): kotlin.collections.List<kotlin.collections.List<kotlin.String>>
     }
 
     public interface Super2 {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(): kotlin.MutableList<kotlin.MutableList<kotlin.String>>
+        public abstract fun foo(): kotlin.collections.MutableList<kotlin.collections.MutableList<kotlin.String>>
     }
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferNullability.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferNullability.txt
index 64523aeb761..b0664a0f844 100644
--- a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferNullability.txt
+++ b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferNullability.txt
@@ -4,16 +4,16 @@ public interface TwoSuperclassesInvariantAndCovariantInferNullability {
 
     public interface Sub : test.TwoSuperclassesInvariantAndCovariantInferNullability.Super1, test.TwoSuperclassesInvariantAndCovariantInferNullability.Super2 {
         public abstract override /*2*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*2*/ fun foo(): kotlin.MutableList<kotlin.String>
+        public abstract override /*2*/ fun foo(): kotlin.collections.MutableList<kotlin.String>
     }
 
     public interface Super1 {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(): kotlin.List<kotlin.String?>
+        public abstract fun foo(): kotlin.collections.List<kotlin.String?>
     }
 
     public interface Super2 {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(): kotlin.MutableList<kotlin.String>
+        public abstract fun foo(): kotlin.collections.MutableList<kotlin.String>
     }
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesMutableAndNot.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesMutableAndNot.txt
index 48e38ab63a2..0162bdeb7a2 100644
--- a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesMutableAndNot.txt
+++ b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesMutableAndNot.txt
@@ -4,16 +4,16 @@ public interface TwoSuperclassesMutableAndNot {
 
     public interface Sub : test.TwoSuperclassesMutableAndNot.Super1, test.TwoSuperclassesMutableAndNot.Super2 {
         public abstract override /*2*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*2*/ fun foo(): kotlin.MutableList<kotlin.String>
+        public abstract override /*2*/ fun foo(): kotlin.collections.MutableList<kotlin.String>
     }
 
     public interface Super1 {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(): kotlin.MutableCollection<kotlin.String>
+        public abstract fun foo(): kotlin.collections.MutableCollection<kotlin.String>
     }
 
     public interface Super2 {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(): kotlin.List<kotlin.String>
+        public abstract fun foo(): kotlin.collections.List<kotlin.String>
     }
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesSupplementNotNull.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesSupplementNotNull.txt
index 757d3c347c8..599bdeb15a4 100644
--- a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesSupplementNotNull.txt
+++ b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesSupplementNotNull.txt
@@ -4,16 +4,16 @@ public interface TwoSuperclassesSupplementNotNull {
 
     public interface Sub : test.TwoSuperclassesSupplementNotNull.Super1, test.TwoSuperclassesSupplementNotNull.Super2 {
         public abstract override /*2*/ /*fake_override*/ fun dummy(): kotlin.Unit
-        public abstract override /*2*/ fun foo(): kotlin.List<kotlin.String>
+        public abstract override /*2*/ fun foo(): kotlin.collections.List<kotlin.String>
     }
 
     public interface Super1 {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(): kotlin.List<kotlin.String?>
+        public abstract fun foo(): kotlin.collections.List<kotlin.String?>
     }
 
     public interface Super2 {
         public abstract fun dummy(): kotlin.Unit
-        public abstract fun foo(): kotlin.List<kotlin.String>?
+        public abstract fun foo(): kotlin.collections.List<kotlin.String>?
     }
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/InheritMutability.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/InheritMutability.txt
index 0fcaea04162..5c6663a1d8a 100644
--- a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/InheritMutability.txt
+++ b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/InheritMutability.txt
@@ -3,10 +3,10 @@ package test
 public interface InheritMutability {
 
     public interface Sub : test.InheritMutability.Super {
-        public abstract override /*1*/ fun </*0*/ B : kotlin.MutableList<kotlin.String>> foo(/*0*/ a: B): kotlin.Unit
+        public abstract override /*1*/ fun </*0*/ B : kotlin.collections.MutableList<kotlin.String>> foo(/*0*/ a: B): kotlin.Unit
     }
 
     public interface Super {
-        public abstract fun </*0*/ A : kotlin.MutableList<kotlin.String>> foo(/*0*/ a: A): kotlin.Unit
+        public abstract fun </*0*/ A : kotlin.collections.MutableList<kotlin.String>> foo(/*0*/ a: A): kotlin.Unit
     }
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/InheritReadOnliness.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/InheritReadOnliness.txt
index b8d5636f63a..9bb45695cfc 100644
--- a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/InheritReadOnliness.txt
+++ b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/InheritReadOnliness.txt
@@ -3,10 +3,10 @@ package test
 public interface InheritReadOnliness {
 
     public interface Sub : test.InheritReadOnliness.Super {
-        public abstract override /*1*/ fun </*0*/ B : kotlin.List<kotlin.String>> foo(/*0*/ a: B): kotlin.Unit
+        public abstract override /*1*/ fun </*0*/ B : kotlin.collections.List<kotlin.String>> foo(/*0*/ a: B): kotlin.Unit
     }
 
     public interface Super {
-        public abstract fun </*0*/ A : kotlin.List<kotlin.String>> foo(/*0*/ a: A): kotlin.Unit
+        public abstract fun </*0*/ A : kotlin.collections.List<kotlin.String>> foo(/*0*/ a: A): kotlin.Unit
     }
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBound.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBound.txt
index 0da4e5bbc11..4cbf67f667d 100644
--- a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBound.txt
+++ b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBound.txt
@@ -3,10 +3,10 @@ package test
 public interface UseParameterInUpperBound {
 
     public interface Sub : test.UseParameterInUpperBound.Super {
-        public abstract override /*1*/ fun </*0*/ B, /*1*/ A : kotlin.List<B>> foo(/*0*/ a: B, /*1*/ b: A): kotlin.Unit
+        public abstract override /*1*/ fun </*0*/ B, /*1*/ A : kotlin.collections.List<B>> foo(/*0*/ a: B, /*1*/ b: A): kotlin.Unit
     }
 
     public interface Super {
-        public abstract fun </*0*/ A, /*1*/ B : kotlin.List<A>> foo(/*0*/ a: A, /*1*/ b: B): kotlin.Unit
+        public abstract fun </*0*/ A, /*1*/ B : kotlin.collections.List<A>> foo(/*0*/ a: A, /*1*/ b: B): kotlin.Unit
     }
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBoundWithKotlinSignature.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBoundWithKotlinSignature.txt
index ee849d01570..5800041e9fc 100644
--- a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBoundWithKotlinSignature.txt
+++ b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBoundWithKotlinSignature.txt
@@ -3,10 +3,10 @@ package test
 public interface UseParameterInUpperBoundWithKotlinSignature {
 
     public interface Sub : test.UseParameterInUpperBoundWithKotlinSignature.Super {
-        public abstract override /*1*/ fun </*0*/ B, /*1*/ A : kotlin.List<B>> foo(/*0*/ b: B, /*1*/ a: A): kotlin.Unit
+        public abstract override /*1*/ fun </*0*/ B, /*1*/ A : kotlin.collections.List<B>> foo(/*0*/ b: B, /*1*/ a: A): kotlin.Unit
     }
 
     public interface Super {
-        public abstract fun </*0*/ A, /*1*/ B : kotlin.List<A>> foo(/*0*/ a: A, /*1*/ b: B): kotlin.Unit
+        public abstract fun </*0*/ A, /*1*/ B : kotlin.collections.List<A>> foo(/*0*/ a: A, /*1*/ b: B): kotlin.Unit
     }
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/library/LoadIterable.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/library/LoadIterable.txt
index 79a60866ea5..1914cf14c14 100644
--- a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/library/LoadIterable.txt
+++ b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/library/LoadIterable.txt
@@ -1,6 +1,6 @@
 package test
 
 public interface LoadIterable</*0*/ T> {
-    public abstract fun getIterable(): kotlin.MutableIterable<T>?
-    public abstract fun setIterable(/*0*/ p0: kotlin.Iterable<T>?): kotlin.Unit
+    public abstract fun getIterable(): kotlin.collections.MutableIterable<T>?
+    public abstract fun setIterable(/*0*/ p0: kotlin.collections.Iterable<T>?): kotlin.Unit
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/library/LoadIterator.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/library/LoadIterator.txt
index 23b2d683568..7baed35fcfb 100644
--- a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/library/LoadIterator.txt
+++ b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/library/LoadIterator.txt
@@ -1,6 +1,6 @@
 package test
 
 public interface LoadIterator</*0*/ T> {
-    public abstract fun getIterator(): kotlin.MutableIterator<T>?
-    public abstract fun setIterator(/*0*/ p0: kotlin.Iterator<T>?): kotlin.Unit
+    public abstract fun getIterator(): kotlin.collections.MutableIterator<T>?
+    public abstract fun setIterator(/*0*/ p0: kotlin.collections.Iterator<T>?): kotlin.Unit
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/library/Max.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/library/Max.txt
index e06091d90e2..8e8e31862b3 100644
--- a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/library/Max.txt
+++ b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/library/Max.txt
@@ -2,5 +2,5 @@ package test
 
 public open class Max {
     /*primary*/ public constructor Max()
-    public open fun </*0*/ T> max(/*0*/ p0: kotlin.Collection<T>?): T? where T : kotlin.Comparable<T>?
+    public open fun </*0*/ T> max(/*0*/ p0: kotlin.collections.Collection<T>?): T? where T : kotlin.Comparable<T>?
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/modality/ModalityOfFakeOverrides.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/modality/ModalityOfFakeOverrides.txt
index 296fa944b0d..620f0f8ec8c 100644
--- a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/modality/ModalityOfFakeOverrides.txt
+++ b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/modality/ModalityOfFakeOverrides.txt
@@ -7,27 +7,27 @@ public open class ModalityOfFakeOverrides : java.util.AbstractList<kotlin.String
         public open override /*1*/ fun <get-size>(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String!): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun add(/*0*/ element: kotlin.String!): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun contains(/*0*/ element: kotlin.String!): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
     public open override /*1*/ fun get(/*0*/ index: kotlin.Int): kotlin.String
     public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ element: kotlin.String!): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator<kotlin.String!>
+    public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.collections.MutableIterator<kotlin.String!>
     public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ element: kotlin.String!): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.MutableListIterator<kotlin.String!>
-    public open override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.MutableListIterator<kotlin.String!>
+    public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.collections.MutableListIterator<kotlin.String!>
+    public open override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.collections.MutableListIterator<kotlin.String!>
     invisible_fake open override /*1*/ /*fake_override*/ fun outOfBoundsMsg(/*0*/ p0: kotlin.Int): kotlin.String!
     invisible_fake open override /*1*/ /*fake_override*/ fun rangeCheckForAdd(/*0*/ p0: kotlin.Int): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun remove(/*0*/ element: kotlin.String!): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun removeAt(/*0*/ p0: kotlin.Int): kotlin.String!
     protected/*protected and package*/ open override /*1*/ /*fake_override*/ fun removeRange(/*0*/ p0: kotlin.Int, /*1*/ p1: kotlin.Int): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun set(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String!): kotlin.String!
-    public open override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.MutableList<kotlin.String!>
+    public open override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.collections.MutableList<kotlin.String!>
     public open override /*1*/ /*fake_override*/ fun toArray(): kotlin.Array<(out) kotlin.Any!>!
     public open override /*1*/ /*fake_override*/ fun </*0*/ T : kotlin.Any!> toArray(/*0*/ p0: kotlin.Array<(out) T!>!): kotlin.Array<(out) T!>!
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/FunClassParamNotNull.txt b/compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/FunClassParamNotNull.txt
index 1b663657319..0f77579b027 100644
--- a/compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/FunClassParamNotNull.txt
+++ b/compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/FunClassParamNotNull.txt
@@ -1,3 +1,3 @@
 package test
 
-public fun ff(/*0*/ p: kotlin.List<kotlin.CharSequence>): kotlin.Int
+public fun ff(/*0*/ p: kotlin.collections.List<kotlin.CharSequence>): kotlin.Int
diff --git a/compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/FunClassParamNullable.txt b/compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/FunClassParamNullable.txt
index ecbd9b8214a..e7cd613f99d 100644
--- a/compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/FunClassParamNullable.txt
+++ b/compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/FunClassParamNullable.txt
@@ -1,3 +1,3 @@
 package test
 
-public fun ff(/*0*/ p: kotlin.List<java.lang.CharSequence?>): kotlin.Int
+public fun ff(/*0*/ p: kotlin.collections.List<java.lang.CharSequence?>): kotlin.Int
diff --git a/compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/ReturnTypeClassParamNotNull.txt b/compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/ReturnTypeClassParamNotNull.txt
index ab9e9710873..b00a7f7b6d3 100644
--- a/compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/ReturnTypeClassParamNotNull.txt
+++ b/compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/ReturnTypeClassParamNotNull.txt
@@ -1,3 +1,3 @@
 package test
 
-public fun ffgg(): kotlin.List<kotlin.CharSequence>
+public fun ffgg(): kotlin.collections.List<kotlin.CharSequence>
diff --git a/compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/ReturnTypeClassParamNullable.txt b/compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/ReturnTypeClassParamNullable.txt
index 484e08433b6..387d9accb71 100644
--- a/compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/ReturnTypeClassParamNullable.txt
+++ b/compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/ReturnTypeClassParamNullable.txt
@@ -1,3 +1,3 @@
 package test
 
-public fun ffgg(): kotlin.List<kotlin.CharSequence?>
+public fun ffgg(): kotlin.collections.List<kotlin.CharSequence?>
diff --git a/compiler/testData/loadJava/compiledKotlin/platformTypes/notnullTypeArgument.txt b/compiler/testData/loadJava/compiledKotlin/platformTypes/notnullTypeArgument.txt
index b43b334c850..37d1a3622d9 100644
--- a/compiler/testData/loadJava/compiledKotlin/platformTypes/notnullTypeArgument.txt
+++ b/compiler/testData/loadJava/compiledKotlin/platformTypes/notnullTypeArgument.txt
@@ -9,13 +9,13 @@ public final class C : java.util.ArrayList<kotlin.String> {
         public open override /*1*/ /*fake_override*/ fun <get-size>(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun add(/*0*/ element: kotlin.String): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.Collection<kotlin.String>): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.Collection<kotlin.String>): kotlin.Boolean
-    invisible_fake open override /*1*/ /*fake_override*/ fun batchRemove(/*0*/ p0: kotlin.(Mutable)Collection<*>!, /*1*/ p1: kotlin.Boolean): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.collections.Collection<kotlin.String>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String>): kotlin.Boolean
+    invisible_fake open override /*1*/ /*fake_override*/ fun batchRemove(/*0*/ p0: kotlin.collections.(Mutable)Collection<*>!, /*1*/ p1: kotlin.Boolean): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public open override /*1*/ /*fake_override*/ fun contains(/*0*/ element: kotlin.String): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.Collection<kotlin.String>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String>): kotlin.Boolean
     invisible_fake open override /*1*/ /*fake_override*/ fun elementData(/*0*/ p0: kotlin.Int): kotlin.String!
     public open override /*1*/ /*fake_override*/ fun ensureCapacity(/*0*/ p0: kotlin.Int): kotlin.Unit
     invisible_fake open override /*1*/ /*fake_override*/ fun ensureCapacityInternal(/*0*/ p0: kotlin.Int): kotlin.Unit
@@ -24,21 +24,21 @@ public final class C : java.util.ArrayList<kotlin.String> {
     invisible_fake open override /*1*/ /*fake_override*/ fun grow(/*0*/ p0: kotlin.Int): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ element: kotlin.String): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator<kotlin.String>
+    public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.collections.MutableIterator<kotlin.String>
     public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ element: kotlin.String): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.MutableListIterator<kotlin.String>
-    public open override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.MutableListIterator<kotlin.String>
+    public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.collections.MutableListIterator<kotlin.String>
+    public open override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.collections.MutableListIterator<kotlin.String>
     invisible_fake open override /*1*/ /*fake_override*/ fun outOfBoundsMsg(/*0*/ p0: kotlin.Int): kotlin.String!
     invisible_fake open override /*1*/ /*fake_override*/ fun rangeCheck(/*0*/ p0: kotlin.Int): kotlin.Unit
     invisible_fake open override /*1*/ /*fake_override*/ fun rangeCheckForAdd(/*0*/ p0: kotlin.Int): kotlin.Unit
     invisible_fake open override /*1*/ /*fake_override*/ fun readObject(/*0*/ p0: java.io.ObjectInputStream!): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun remove(/*0*/ element: kotlin.String): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.Collection<kotlin.String>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun removeAt(/*0*/ p0: kotlin.Int): kotlin.String
     protected/*protected and package*/ open override /*1*/ /*fake_override*/ fun removeRange(/*0*/ p0: kotlin.Int, /*1*/ p1: kotlin.Int): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.Collection<kotlin.String>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun set(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String): kotlin.String
-    public open override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.MutableList<kotlin.String>
+    public open override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.collections.MutableList<kotlin.String>
     public open override /*1*/ /*fake_override*/ fun toArray(): kotlin.Array<(out) kotlin.Any!>!
     public open override /*1*/ /*fake_override*/ fun </*0*/ T : kotlin.Any!> toArray(/*0*/ p0: kotlin.Array<(out) T!>!): kotlin.Array<(out) T!>!
     public open override /*1*/ /*fake_override*/ fun trimToSize(): kotlin.Unit
diff --git a/compiler/testData/loadJava/compiledKotlin/platformTypes/nullableTypeArgument.txt b/compiler/testData/loadJava/compiledKotlin/platformTypes/nullableTypeArgument.txt
index 11bcdedc8d5..4b5376d8303 100644
--- a/compiler/testData/loadJava/compiledKotlin/platformTypes/nullableTypeArgument.txt
+++ b/compiler/testData/loadJava/compiledKotlin/platformTypes/nullableTypeArgument.txt
@@ -9,13 +9,13 @@ public final class C : java.util.ArrayList<kotlin.String?> {
         public open override /*1*/ /*fake_override*/ fun <get-size>(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String?): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun add(/*0*/ element: kotlin.String?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.Collection<kotlin.String?>): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.Collection<kotlin.String?>): kotlin.Boolean
-    invisible_fake open override /*1*/ /*fake_override*/ fun batchRemove(/*0*/ p0: kotlin.(Mutable)Collection<*>!, /*1*/ p1: kotlin.Boolean): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.collections.Collection<kotlin.String?>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String?>): kotlin.Boolean
+    invisible_fake open override /*1*/ /*fake_override*/ fun batchRemove(/*0*/ p0: kotlin.collections.(Mutable)Collection<*>!, /*1*/ p1: kotlin.Boolean): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
     public open override /*1*/ /*fake_override*/ fun contains(/*0*/ element: kotlin.String?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.Collection<kotlin.String?>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String?>): kotlin.Boolean
     invisible_fake open override /*1*/ /*fake_override*/ fun elementData(/*0*/ p0: kotlin.Int): kotlin.String?
     public open override /*1*/ /*fake_override*/ fun ensureCapacity(/*0*/ p0: kotlin.Int): kotlin.Unit
     invisible_fake open override /*1*/ /*fake_override*/ fun ensureCapacityInternal(/*0*/ p0: kotlin.Int): kotlin.Unit
@@ -24,21 +24,21 @@ public final class C : java.util.ArrayList<kotlin.String?> {
     invisible_fake open override /*1*/ /*fake_override*/ fun grow(/*0*/ p0: kotlin.Int): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ element: kotlin.String?): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator<kotlin.String?>
+    public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.collections.MutableIterator<kotlin.String?>
     public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ element: kotlin.String?): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.MutableListIterator<kotlin.String?>
-    public open override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.MutableListIterator<kotlin.String?>
+    public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.collections.MutableListIterator<kotlin.String?>
+    public open override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.collections.MutableListIterator<kotlin.String?>
     invisible_fake open override /*1*/ /*fake_override*/ fun outOfBoundsMsg(/*0*/ p0: kotlin.Int): kotlin.String!
     invisible_fake open override /*1*/ /*fake_override*/ fun rangeCheck(/*0*/ p0: kotlin.Int): kotlin.Unit
     invisible_fake open override /*1*/ /*fake_override*/ fun rangeCheckForAdd(/*0*/ p0: kotlin.Int): kotlin.Unit
     invisible_fake open override /*1*/ /*fake_override*/ fun readObject(/*0*/ p0: java.io.ObjectInputStream!): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun remove(/*0*/ element: kotlin.String?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.Collection<kotlin.String?>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String?>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun removeAt(/*0*/ p0: kotlin.Int): kotlin.String?
     protected/*protected and package*/ open override /*1*/ /*fake_override*/ fun removeRange(/*0*/ p0: kotlin.Int, /*1*/ p1: kotlin.Int): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.Collection<kotlin.String?>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.collections.Collection<kotlin.String?>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun set(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String?): kotlin.String?
-    public open override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.MutableList<kotlin.String?>
+    public open override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.collections.MutableList<kotlin.String?>
     public open override /*1*/ /*fake_override*/ fun toArray(): kotlin.Array<(out) kotlin.Any!>!
     public open override /*1*/ /*fake_override*/ fun </*0*/ T : kotlin.Any!> toArray(/*0*/ p0: kotlin.Array<(out) T!>!): kotlin.Array<(out) T!>!
     public open override /*1*/ /*fake_override*/ fun trimToSize(): kotlin.Unit
diff --git a/compiler/testData/loadJava/compiledKotlin/prop/CollectionSize.txt b/compiler/testData/loadJava/compiledKotlin/prop/CollectionSize.txt
index 677804d2275..160a842cf84 100644
--- a/compiler/testData/loadJava/compiledKotlin/prop/CollectionSize.txt
+++ b/compiler/testData/loadJava/compiledKotlin/prop/CollectionSize.txt
@@ -1,4 +1,4 @@
 package test
 
-public val kotlin.Collection<*>.anotherSize: kotlin.Int
-    public fun kotlin.Collection<*>.<get-anotherSize>(): kotlin.Int
+public val kotlin.collections.Collection<*>.anotherSize: kotlin.Int
+    public fun kotlin.collections.Collection<*>.<get-anotherSize>(): kotlin.Int
diff --git a/compiler/testData/loadJava/compiledKotlin/prop/ExtVarMapPQInt.txt b/compiler/testData/loadJava/compiledKotlin/prop/ExtVarMapPQInt.txt
index 63d8bd66f9d..4975fc77c65 100644
--- a/compiler/testData/loadJava/compiledKotlin/prop/ExtVarMapPQInt.txt
+++ b/compiler/testData/loadJava/compiledKotlin/prop/ExtVarMapPQInt.txt
@@ -1,5 +1,5 @@
 package test
 
-public var </*0*/ P, /*1*/ Q> kotlin.Map<P, Q>.asas: kotlin.Int
-    public fun kotlin.Map<P, Q>.<get-asas>(): kotlin.Int
-    public fun kotlin.Map<P, Q>.<set-asas>(/*0*/ i: kotlin.Int): kotlin.Unit
+public var </*0*/ P, /*1*/ Q> kotlin.collections.Map<P, Q>.asas: kotlin.Int
+    public fun kotlin.collections.Map<P, Q>.<get-asas>(): kotlin.Int
+    public fun kotlin.collections.Map<P, Q>.<set-asas>(/*0*/ i: kotlin.Int): kotlin.Unit
diff --git a/compiler/testData/loadJava/compiledKotlin/type/ListOfAny.txt b/compiler/testData/loadJava/compiledKotlin/type/ListOfAny.txt
index 51bcd78c1fa..c7200ffb4ce 100644
--- a/compiler/testData/loadJava/compiledKotlin/type/ListOfAny.txt
+++ b/compiler/testData/loadJava/compiledKotlin/type/ListOfAny.txt
@@ -1,3 +1,3 @@
 package test
 
-public fun listOfAny(): kotlin.List<kotlin.Any>
+public fun listOfAny(): kotlin.collections.List<kotlin.Any>
diff --git a/compiler/testData/loadJava/compiledKotlin/type/ListOfAnyQ.txt b/compiler/testData/loadJava/compiledKotlin/type/ListOfAnyQ.txt
index 49003fef55d..d5c41642cf2 100644
--- a/compiler/testData/loadJava/compiledKotlin/type/ListOfAnyQ.txt
+++ b/compiler/testData/loadJava/compiledKotlin/type/ListOfAnyQ.txt
@@ -1,3 +1,3 @@
 package test
 
-public fun listOfAnyQ(): kotlin.List<kotlin.Any?>
+public fun listOfAnyQ(): kotlin.collections.List<kotlin.Any?>
diff --git a/compiler/testData/loadJava/compiledKotlin/type/ListOfStar.txt b/compiler/testData/loadJava/compiledKotlin/type/ListOfStar.txt
index fc4f154f5df..fb1cd3f2b83 100644
--- a/compiler/testData/loadJava/compiledKotlin/type/ListOfStar.txt
+++ b/compiler/testData/loadJava/compiledKotlin/type/ListOfStar.txt
@@ -1,3 +1,3 @@
 package test
 
-public fun listOfStar(): kotlin.List<*>
+public fun listOfStar(): kotlin.collections.List<*>
diff --git a/compiler/testData/loadJava/compiledKotlin/type/platform.txt b/compiler/testData/loadJava/compiledKotlin/type/platform.txt
index ca96d598fdc..1e3cc0b49be 100644
--- a/compiler/testData/loadJava/compiledKotlin/type/platform.txt
+++ b/compiler/testData/loadJava/compiledKotlin/type/platform.txt
@@ -1,5 +1,5 @@
 package test
 
 public fun array(/*0*/ a: kotlin.Array<kotlin.Int>): kotlin.Array<(out) kotlin.Int!>!
-public fun list(): kotlin.(Mutable)List<kotlin.String!>!
+public fun list(): kotlin.collections.(Mutable)List<kotlin.String!>!
 public fun printStream(): java.io.PrintStream!
diff --git a/compiler/testData/loadJava/compiledKotlinWithStdlib/mutability/LoadIterable.txt b/compiler/testData/loadJava/compiledKotlinWithStdlib/mutability/LoadIterable.txt
index 420395156e2..67983d0b703 100644
--- a/compiler/testData/loadJava/compiledKotlinWithStdlib/mutability/LoadIterable.txt
+++ b/compiler/testData/loadJava/compiledKotlinWithStdlib/mutability/LoadIterable.txt
@@ -1,8 +1,8 @@
 package test
 
 public interface LoadIterable</*0*/ T> {
-    @org.jetbrains.annotations.Mutable() public abstract fun getIterable(): kotlin.MutableIterable<T>?
-    @org.jetbrains.annotations.ReadOnly() public abstract fun getReadOnlyIterable(): kotlin.Iterable<T>?
-    public abstract fun setIterable(/*0*/ @org.jetbrains.annotations.Mutable() p0: kotlin.MutableIterable<T>?): kotlin.Unit
-    public abstract fun setReadOnlyIterable(/*0*/ @org.jetbrains.annotations.ReadOnly() p0: kotlin.Iterable<T>?): kotlin.Unit
+    @org.jetbrains.annotations.Mutable() public abstract fun getIterable(): kotlin.collections.MutableIterable<T>?
+    @org.jetbrains.annotations.ReadOnly() public abstract fun getReadOnlyIterable(): kotlin.collections.Iterable<T>?
+    public abstract fun setIterable(/*0*/ @org.jetbrains.annotations.Mutable() p0: kotlin.collections.MutableIterable<T>?): kotlin.Unit
+    public abstract fun setReadOnlyIterable(/*0*/ @org.jetbrains.annotations.ReadOnly() p0: kotlin.collections.Iterable<T>?): kotlin.Unit
 }
diff --git a/compiler/testData/loadJava/compiledKotlinWithStdlib/mutability/LoadIterableWithConflict.txt b/compiler/testData/loadJava/compiledKotlinWithStdlib/mutability/LoadIterableWithConflict.txt
index 4bccc4c0fa8..21802d8aef6 100644
--- a/compiler/testData/loadJava/compiledKotlinWithStdlib/mutability/LoadIterableWithConflict.txt
+++ b/compiler/testData/loadJava/compiledKotlinWithStdlib/mutability/LoadIterableWithConflict.txt
@@ -1,6 +1,6 @@
 package test
 
 public interface LoadIterableWithConflict</*0*/ T> {
-    @org.jetbrains.annotations.ReadOnly() @org.jetbrains.annotations.Mutable() public abstract fun getIterable(): kotlin.MutableIterable<T>?
-    public abstract fun setIterable(/*0*/ @org.jetbrains.annotations.ReadOnly() @org.jetbrains.annotations.Mutable() p0: kotlin.MutableIterable<T>?): kotlin.Unit
+    @org.jetbrains.annotations.ReadOnly() @org.jetbrains.annotations.Mutable() public abstract fun getIterable(): kotlin.collections.MutableIterable<T>?
+    public abstract fun setIterable(/*0*/ @org.jetbrains.annotations.ReadOnly() @org.jetbrains.annotations.Mutable() p0: kotlin.collections.MutableIterable<T>?): kotlin.Unit
 }
diff --git a/compiler/testData/loadJava/compiledKotlinWithStdlib/mutability/LoadIterableWithNullability.txt b/compiler/testData/loadJava/compiledKotlinWithStdlib/mutability/LoadIterableWithNullability.txt
index 54624630ab2..85e8f1ba35c 100644
--- a/compiler/testData/loadJava/compiledKotlinWithStdlib/mutability/LoadIterableWithNullability.txt
+++ b/compiler/testData/loadJava/compiledKotlinWithStdlib/mutability/LoadIterableWithNullability.txt
@@ -1,8 +1,8 @@
 package test
 
 public interface LoadIterableWithNullability</*0*/ T> {
-    @org.jetbrains.annotations.Mutable() public abstract fun getIterable(): kotlin.MutableIterable<T>
-    @org.jetbrains.annotations.ReadOnly() public abstract fun getReadOnlyIterable(): kotlin.Iterable<T>
-    public abstract fun setIterable(/*0*/ @org.jetbrains.annotations.Mutable() p0: kotlin.MutableIterable<T>): kotlin.Unit
-    public abstract fun setReadOnlyIterable(/*0*/ @org.jetbrains.annotations.ReadOnly() p0: kotlin.Iterable<T>): kotlin.Unit
+    @org.jetbrains.annotations.Mutable() public abstract fun getIterable(): kotlin.collections.MutableIterable<T>
+    @org.jetbrains.annotations.ReadOnly() public abstract fun getReadOnlyIterable(): kotlin.collections.Iterable<T>
+    public abstract fun setIterable(/*0*/ @org.jetbrains.annotations.Mutable() p0: kotlin.collections.MutableIterable<T>): kotlin.Unit
+    public abstract fun setReadOnlyIterable(/*0*/ @org.jetbrains.annotations.ReadOnly() p0: kotlin.collections.Iterable<T>): kotlin.Unit
 }
diff --git a/compiler/testData/loadJava/compiledKotlinWithStdlib/mutability/LoadIterableWithPropagation.txt b/compiler/testData/loadJava/compiledKotlinWithStdlib/mutability/LoadIterableWithPropagation.txt
index 0c0e79c97c8..3f6d83ef80b 100644
--- a/compiler/testData/loadJava/compiledKotlinWithStdlib/mutability/LoadIterableWithPropagation.txt
+++ b/compiler/testData/loadJava/compiledKotlinWithStdlib/mutability/LoadIterableWithPropagation.txt
@@ -3,17 +3,17 @@ package test
 public interface LoadIterableWithPropagation {
 
     public interface LoadIterable</*0*/ T> {
-        @org.jetbrains.annotations.Mutable() public abstract fun getIterable(): kotlin.MutableIterable<T>?
-        @org.jetbrains.annotations.ReadOnly() public abstract fun getReadOnlyIterable(): kotlin.Iterable<T>?
-        public abstract fun setIterable(/*0*/ @org.jetbrains.annotations.Mutable() p0: kotlin.MutableIterable<T>?): kotlin.Unit
-        public abstract fun setReadOnlyIterable(/*0*/ @org.jetbrains.annotations.ReadOnly() p0: kotlin.Iterable<T>?): kotlin.Unit
+        @org.jetbrains.annotations.Mutable() public abstract fun getIterable(): kotlin.collections.MutableIterable<T>?
+        @org.jetbrains.annotations.ReadOnly() public abstract fun getReadOnlyIterable(): kotlin.collections.Iterable<T>?
+        public abstract fun setIterable(/*0*/ @org.jetbrains.annotations.Mutable() p0: kotlin.collections.MutableIterable<T>?): kotlin.Unit
+        public abstract fun setReadOnlyIterable(/*0*/ @org.jetbrains.annotations.ReadOnly() p0: kotlin.collections.Iterable<T>?): kotlin.Unit
     }
 
     public open class LoadIterableImpl</*0*/ T> : test.LoadIterableWithPropagation.LoadIterable<T> {
         /*primary*/ public constructor LoadIterableImpl</*0*/ T>()
-        public open override /*1*/ fun getIterable(): kotlin.MutableIterable<T>?
-        public open override /*1*/ fun getReadOnlyIterable(): kotlin.Iterable<T>?
-        public open override /*1*/ fun setIterable(/*0*/ p0: kotlin.MutableIterable<T>?): kotlin.Unit
-        public open override /*1*/ fun setReadOnlyIterable(/*0*/ p0: kotlin.Iterable<T>?): kotlin.Unit
+        public open override /*1*/ fun getIterable(): kotlin.collections.MutableIterable<T>?
+        public open override /*1*/ fun getReadOnlyIterable(): kotlin.collections.Iterable<T>?
+        public open override /*1*/ fun setIterable(/*0*/ p0: kotlin.collections.MutableIterable<T>?): kotlin.Unit
+        public open override /*1*/ fun setReadOnlyIterable(/*0*/ p0: kotlin.collections.Iterable<T>?): kotlin.Unit
     }
 }
diff --git a/compiler/testData/loadJava/kotlinAgainstCompiledJavaWithKotlin/propagationAgainstDeserializedSuperclass.txt b/compiler/testData/loadJava/kotlinAgainstCompiledJavaWithKotlin/propagationAgainstDeserializedSuperclass.txt
index 54bd40eb230..63f05e9204c 100644
--- a/compiler/testData/loadJava/kotlinAgainstCompiledJavaWithKotlin/propagationAgainstDeserializedSuperclass.txt
+++ b/compiler/testData/loadJava/kotlinAgainstCompiledJavaWithKotlin/propagationAgainstDeserializedSuperclass.txt
@@ -2,14 +2,14 @@ package test
 
 public open class J : test.K {
     public constructor J()
-    public open override /*1*/ fun foo(/*0*/ l: kotlin.MutableList<kotlin.String>): kotlin.String
+    public open override /*1*/ fun foo(/*0*/ l: kotlin.collections.MutableList<kotlin.String>): kotlin.String
 }
 
 public interface K {
-    public abstract fun foo(/*0*/ l: kotlin.MutableList<kotlin.String>): kotlin.String
+    public abstract fun foo(/*0*/ l: kotlin.collections.MutableList<kotlin.String>): kotlin.String
 }
 
 public final class K1 : test.J {
     public constructor K1()
-    public open override /*1*/ fun foo(/*0*/ l: kotlin.MutableList<kotlin.String>): kotlin.String
+    public open override /*1*/ fun foo(/*0*/ l: kotlin.collections.MutableList<kotlin.String>): kotlin.String
 }
diff --git a/compiler/testData/loadJava/sourceJava/ErrorTypes.txt b/compiler/testData/loadJava/sourceJava/ErrorTypes.txt
index edcf853c392..8175c98a461 100644
--- a/compiler/testData/loadJava/sourceJava/ErrorTypes.txt
+++ b/compiler/testData/loadJava/sourceJava/ErrorTypes.txt
@@ -3,12 +3,12 @@ package test
 public interface ErrorTypes {
 
     public interface Sub : test.ErrorTypes.Super {
-        public abstract override /*1*/ fun errorTypeInParameter(/*0*/ list: kotlin.(Mutable)List<kotlin.Array<(out) [ERROR : Unresolved java classifier: T]!>!>!): kotlin.Unit
+        public abstract override /*1*/ fun errorTypeInParameter(/*0*/ list: kotlin.collections.(Mutable)List<kotlin.Array<(out) [ERROR : Unresolved java classifier: T]!>!>!): kotlin.Unit
         public abstract override /*1*/ fun returnErrorType(): [ERROR : Unresolved java classifier: T]!
     }
 
     public interface Super {
-        public abstract fun errorTypeInParameter(/*0*/ list: kotlin.(Mutable)List<kotlin.Array<(out) [ERROR : Unresolved java classifier: T]!>!>!): kotlin.Unit
+        public abstract fun errorTypeInParameter(/*0*/ list: kotlin.collections.(Mutable)List<kotlin.Array<(out) [ERROR : Unresolved java classifier: T]!>!>!): kotlin.Unit
         public abstract fun returnErrorType(): [ERROR : Unresolved java classifier: T]!
     }
 }
diff --git a/compiler/testData/loadJava/sourceJava/ReturnNotSubtype.txt b/compiler/testData/loadJava/sourceJava/ReturnNotSubtype.txt
index 8b08ddee8e2..210e29c5d60 100644
--- a/compiler/testData/loadJava/sourceJava/ReturnNotSubtype.txt
+++ b/compiler/testData/loadJava/sourceJava/ReturnNotSubtype.txt
@@ -7,7 +7,7 @@ public interface ReturnNotSubtype {
         public abstract override /*1*/ fun array(): kotlin.Array<(out) java.lang.Void!>!
         public abstract override /*1*/ fun klass(): java.lang.Class<*>!
         public abstract override /*1*/ fun string1(): kotlin.Unit
-        public abstract override /*1*/ fun string2(): kotlin.(Mutable)List<kotlin.Boolean!>!
+        public abstract override /*1*/ fun string2(): kotlin.collections.(Mutable)List<kotlin.Boolean!>!
         public abstract override /*1*/ fun t(): java.lang.Void!
     }
 
diff --git a/compiler/testData/resolve/imports/ImportConflictsWithMappedToJava.resolve b/compiler/testData/resolve/imports/ImportConflictsWithMappedToJava.resolve
index c5f64b731e7..b38791f1fdf 100644
--- a/compiler/testData/resolve/imports/ImportConflictsWithMappedToJava.resolve
+++ b/compiler/testData/resolve/imports/ImportConflictsWithMappedToJava.resolve
@@ -5,7 +5,7 @@ package test
 import testing.custom.*
 
 // Companion import has priority over on-demand ones. No conflicts are expected.
-val a1: `kotlin::List`List<Int>? = null
+val a1: `kotlin::kotlin.collections.List`List<Int>? = null
 
 //FILE:javaUtilImport.kt
 //----------------------------------------------------------------------------------
@@ -15,7 +15,7 @@ import java.util.*
 
 // Companion imports take over import-on-demand
 // TODO: Fix for lazy resolve test
-// val a2: 'kotlin::List'List<Int>? = null
+// val a2: 'kotlin::kotlin.collections.List'List<Int>? = null
 
 //FILE:allPackageWithJavaUtilImport.kt
 //----------------------------------------------------------------------------------
@@ -25,7 +25,7 @@ import testing.custom.*
 import java.util.*
 
 // Companion import has priority over on-demand ones. No conflicts are expected.
-val a3: `kotlin::List`List<Int>? = null
+val a3: `kotlin::kotlin.collections.List`List<Int>? = null
 
 //FILE:singleClassImportFromJavaUtil.kt
 //----------------------------------------------------------------------------------
diff --git a/compiler/testData/resolvedCalls/objectsAndClassObjects/kt5308IntRangeConstant.txt b/compiler/testData/resolvedCalls/objectsAndClassObjects/kt5308IntRangeConstant.txt
index 54a07a6cad6..d6642abd129 100644
--- a/compiler/testData/resolvedCalls/objectsAndClassObjects/kt5308IntRangeConstant.txt
+++ b/compiler/testData/resolvedCalls/objectsAndClassObjects/kt5308IntRangeConstant.txt
@@ -6,7 +6,7 @@ fun test() {
 
 Resolved call:
 
-Resulting descriptor: val EMPTY: IntRange defined in kotlin.IntRange.Companion
+Resulting descriptor: val EMPTY: IntRange defined in kotlin.ranges.IntRange.Companion
 
 Explicit receiver kind = DISPATCH_RECEIVER
 Dispatch receiver = IntRange {Companion}
diff --git a/compiler/testData/type/binding/explicit/conflictingProjection.kt b/compiler/testData/type/binding/explicit/conflictingProjection.kt
index 8e800710b93..11cae726a06 100644
--- a/compiler/testData/type/binding/explicit/conflictingProjection.kt
+++ b/compiler/testData/type/binding/explicit/conflictingProjection.kt
@@ -2,7 +2,7 @@ val foo: List<in Int> = null!!
 /*
 psi: List<in Int>
 type: List<in Int>
-    typeParameter: <out E> defined in kotlin.List
+    typeParameter: <out E> defined in kotlin.collections.List
     typeProjection: in Int
     psi: Int
     type: Int
diff --git a/compiler/testData/type/binding/explicit/conflictingProjection2.kt b/compiler/testData/type/binding/explicit/conflictingProjection2.kt
index af1a5efce51..bcae7e06731 100644
--- a/compiler/testData/type/binding/explicit/conflictingProjection2.kt
+++ b/compiler/testData/type/binding/explicit/conflictingProjection2.kt
@@ -2,11 +2,11 @@ val foo: List<in List<Int>> = null!!
 /*
 psi: List<in List<Int>>
 type: List<in List<Int>>
-    typeParameter: <out E> defined in kotlin.List
+    typeParameter: <out E> defined in kotlin.collections.List
     typeProjection: in List<Int>
     psi: List<Int>
     type: List<Int>
-        typeParameter: <out E> defined in kotlin.List
+        typeParameter: <out E> defined in kotlin.collections.List
         typeProjection: Int
         psi: Int
         type: Int
diff --git a/compiler/testData/type/binding/explicit/errorPair.kt b/compiler/testData/type/binding/explicit/errorPair.kt
index 85d755d370b..87b295376aa 100644
--- a/compiler/testData/type/binding/explicit/errorPair.kt
+++ b/compiler/testData/type/binding/explicit/errorPair.kt
@@ -10,7 +10,7 @@ type: Pair<[ERROR : Pair]<List<Int>>, String>
         typeProjection: List<Int>
         psi: List<Int>
         type: List<Int>
-            typeParameter: <out E> defined in kotlin.List
+            typeParameter: <out E> defined in kotlin.collections.List
             typeProjection: Int
             psi: Int
             type: Int
diff --git a/compiler/testData/type/binding/explicit/functionType.kt b/compiler/testData/type/binding/explicit/functionType.kt
index 413e74c556e..8804934f5a1 100644
--- a/compiler/testData/type/binding/explicit/functionType.kt
+++ b/compiler/testData/type/binding/explicit/functionType.kt
@@ -2,7 +2,7 @@ val foo: List<(Pair<Int, Float>) -> List<Int>> = null!!
 /*
 psi: List<(Pair<Int, Float>) -> List<Int>>
 type: List<(Pair<Int, Float>) -> List<Int>>
-    typeParameter: <out E> defined in kotlin.List
+    typeParameter: <out E> defined in kotlin.collections.List
     typeProjection: (Pair<Int, Float>) -> List<Int>
     psi: (Pair<Int, Float>) -> List<Int>
     type: (Pair<Int, Float>) -> List<Int>
@@ -24,7 +24,7 @@ type: List<(Pair<Int, Float>) -> List<Int>>
         typeProjection: List<Int>
         psi: List<Int>
         type: List<Int>
-            typeParameter: <out E> defined in kotlin.List
+            typeParameter: <out E> defined in kotlin.collections.List
             typeProjection: Int
             psi: Int
             type: Int
diff --git a/compiler/testData/type/binding/explicit/functionType2.kt b/compiler/testData/type/binding/explicit/functionType2.kt
index 1bc1745b5fa..734704e0e70 100644
--- a/compiler/testData/type/binding/explicit/functionType2.kt
+++ b/compiler/testData/type/binding/explicit/functionType2.kt
@@ -20,7 +20,7 @@ type: (Pair<Int, Float>) -> List<Int>
     typeProjection: List<Int>
     psi: List<Int>
     type: List<Int>
-        typeParameter: <out E> defined in kotlin.List
+        typeParameter: <out E> defined in kotlin.collections.List
         typeProjection: Int
         psi: Int
         type: Int
diff --git a/compiler/testData/type/binding/explicit/functionType3.kt b/compiler/testData/type/binding/explicit/functionType3.kt
index d249d3f380c..e03fc498313 100644
--- a/compiler/testData/type/binding/explicit/functionType3.kt
+++ b/compiler/testData/type/binding/explicit/functionType3.kt
@@ -6,7 +6,7 @@ type: () -> List<Int>
     typeProjection: List<Int>
     psi: List<Int>
     type: List<Int>
-        typeParameter: <out E> defined in kotlin.List
+        typeParameter: <out E> defined in kotlin.collections.List
         typeProjection: Int
         psi: Int
         type: Int
diff --git a/compiler/testData/type/binding/explicit/list2.kt b/compiler/testData/type/binding/explicit/list2.kt
index 87e22e48cab..0485fc1e87d 100644
--- a/compiler/testData/type/binding/explicit/list2.kt
+++ b/compiler/testData/type/binding/explicit/list2.kt
@@ -11,7 +11,7 @@ type: [ERROR : List]<String, List<Int>>
     typeProjection: List<Int>
     psi: List<Int>
     type: List<Int>
-        typeParameter: <out E> defined in kotlin.List
+        typeParameter: <out E> defined in kotlin.collections.List
         typeProjection: Int
         psi: Int
         type: Int
diff --git a/compiler/testData/type/binding/explicit/nullableType.kt b/compiler/testData/type/binding/explicit/nullableType.kt
index a5448d1ae7e..f4bfbd581a5 100644
--- a/compiler/testData/type/binding/explicit/nullableType.kt
+++ b/compiler/testData/type/binding/explicit/nullableType.kt
@@ -6,7 +6,7 @@ type: Pair<List<Int?>, Pair<List<Int?>?, List<Int>?>>
     typeProjection: List<Int?>
     psi: List<Int?>
     type: List<Int?>
-        typeParameter: <out E> defined in kotlin.List
+        typeParameter: <out E> defined in kotlin.collections.List
         typeProjection: Int?
         psi: Int?
         type: Int?
@@ -19,7 +19,7 @@ type: Pair<List<Int?>, Pair<List<Int?>?, List<Int>?>>
         typeProjection: List<Int?>?
         psi: List<Int?>?
         type: List<Int?>?
-            typeParameter: <out E> defined in kotlin.List
+            typeParameter: <out E> defined in kotlin.collections.List
             typeProjection: Int?
             psi: Int?
             type: Int?
@@ -28,7 +28,7 @@ type: Pair<List<Int?>, Pair<List<Int?>?, List<Int>?>>
         typeProjection: List<Int>?
         psi: List<Int>?
         type: List<Int>?
-            typeParameter: <out E> defined in kotlin.List
+            typeParameter: <out E> defined in kotlin.collections.List
             typeProjection: Int
             psi: Int
             type: Int
diff --git a/compiler/testData/type/binding/explicit/pair.kt b/compiler/testData/type/binding/explicit/pair.kt
index 7237785ad73..41754a253b0 100644
--- a/compiler/testData/type/binding/explicit/pair.kt
+++ b/compiler/testData/type/binding/explicit/pair.kt
@@ -8,7 +8,7 @@ type: Pair<List<Int>, String>
     typeProjection: List<Int>
     psi: List<Int>
     type: List<Int>
-        typeParameter: <out E> defined in kotlin.List
+        typeParameter: <out E> defined in kotlin.collections.List
         typeProjection: Int
         psi: Int
         type: Int
diff --git a/compiler/testData/type/binding/explicit/simple.kt b/compiler/testData/type/binding/explicit/simple.kt
index 675542dc428..2a9b3f62936 100644
--- a/compiler/testData/type/binding/explicit/simple.kt
+++ b/compiler/testData/type/binding/explicit/simple.kt
@@ -3,7 +3,7 @@ val foo: List<Int> = null!!
 /*
 psi: List<Int>
 type: List<Int>
-    typeParameter: <out E> defined in kotlin.List
+    typeParameter: <out E> defined in kotlin.collections.List
     typeProjection: Int
     psi: Int
     type: Int
diff --git a/compiler/testData/type/binding/explicit/unresolvedType.kt b/compiler/testData/type/binding/explicit/unresolvedType.kt
index b9a9e1200b0..16d754ba5b3 100644
--- a/compiler/testData/type/binding/explicit/unresolvedType.kt
+++ b/compiler/testData/type/binding/explicit/unresolvedType.kt
@@ -2,7 +2,7 @@ val foo: List<adad<List<dd>>> = null!!
 /*
 psi: List<adad<List<dd>>>
 type: List<[ERROR : adad<List<dd>>]<List<[ERROR : dd]>>>
-    typeParameter: <out E> defined in kotlin.List
+    typeParameter: <out E> defined in kotlin.collections.List
     typeProjection: [ERROR : adad<List<dd>>]<List<[ERROR : dd]>>
     psi: adad<List<dd>>
     type: [ERROR : adad<List<dd>>]<List<[ERROR : dd]>>
@@ -10,7 +10,7 @@ type: List<[ERROR : adad<List<dd>>]<List<[ERROR : dd]>>>
         typeProjection: List<[ERROR : dd]>
         psi: List<dd>
         type: List<[ERROR : dd]>
-            typeParameter: <out E> defined in kotlin.List
+            typeParameter: <out E> defined in kotlin.collections.List
             typeProjection: [ERROR : dd]
             psi: dd
             type: [ERROR : dd]
diff --git a/compiler/testData/type/binding/implicit/conflictingProjection.kt b/compiler/testData/type/binding/implicit/conflictingProjection.kt
index 2183c8d21f7..e4cb90f4e84 100644
--- a/compiler/testData/type/binding/implicit/conflictingProjection.kt
+++ b/compiler/testData/type/binding/implicit/conflictingProjection.kt
@@ -4,7 +4,7 @@ val foo = getT<List<in Int>>()
 /*
 psi: val foo = getT<List<in Int>>()
 type: List<in Int>
-    typeParameter: <out E> defined in kotlin.List
+    typeParameter: <out E> defined in kotlin.collections.List
     typeProjection: in Int
     psi: val foo = getT<List<in Int>>()
     type: Int
diff --git a/compiler/testData/type/binding/implicit/conflictingProjection2.kt b/compiler/testData/type/binding/implicit/conflictingProjection2.kt
index d1c454b0025..237926519af 100644
--- a/compiler/testData/type/binding/implicit/conflictingProjection2.kt
+++ b/compiler/testData/type/binding/implicit/conflictingProjection2.kt
@@ -4,11 +4,11 @@ val foo = getT<List<in List<Int>>>()
 /*
 psi: val foo = getT<List<in List<Int>>>()
 type: List<in List<Int>>
-    typeParameter: <out E> defined in kotlin.List
+    typeParameter: <out E> defined in kotlin.collections.List
     typeProjection: in List<Int>
     psi: val foo = getT<List<in List<Int>>>()
     type: List<Int>
-        typeParameter: <out E> defined in kotlin.List
+        typeParameter: <out E> defined in kotlin.collections.List
         typeProjection: Int
         psi: val foo = getT<List<in List<Int>>>()
         type: Int
diff --git a/compiler/testData/type/binding/implicit/errorPair.kt b/compiler/testData/type/binding/implicit/errorPair.kt
index c4e82dc5eff..ba812818a51 100644
--- a/compiler/testData/type/binding/implicit/errorPair.kt
+++ b/compiler/testData/type/binding/implicit/errorPair.kt
@@ -12,7 +12,7 @@ type: Pair<[ERROR : Pair]<List<Int>>, String>
         typeProjection: List<Int>
         psi: val foo = getT<Pair<Pair<List<Int>>, String>>()
         type: List<Int>
-            typeParameter: <out E> defined in kotlin.List
+            typeParameter: <out E> defined in kotlin.collections.List
             typeProjection: Int
             psi: val foo = getT<Pair<Pair<List<Int>>, String>>()
             type: Int
diff --git a/compiler/testData/type/binding/implicit/functionType.kt b/compiler/testData/type/binding/implicit/functionType.kt
index 64894784e4b..1bc9ef8a7d8 100644
--- a/compiler/testData/type/binding/implicit/functionType.kt
+++ b/compiler/testData/type/binding/implicit/functionType.kt
@@ -4,7 +4,7 @@ val foo = getT<List<(Pair<Int, Float>) -> List<Int>>>()
 /*
 psi: val foo = getT<List<(Pair<Int, Float>) -> List<Int>>>()
 type: List<(Pair<Int, Float>) -> List<Int>>
-    typeParameter: <out E> defined in kotlin.List
+    typeParameter: <out E> defined in kotlin.collections.List
     typeProjection: (Pair<Int, Float>) -> List<Int>
     psi: val foo = getT<List<(Pair<Int, Float>) -> List<Int>>>()
     type: (Pair<Int, Float>) -> List<Int>
@@ -26,7 +26,7 @@ type: List<(Pair<Int, Float>) -> List<Int>>
         typeProjection: List<Int>
         psi: val foo = getT<List<(Pair<Int, Float>) -> List<Int>>>()
         type: List<Int>
-            typeParameter: <out E> defined in kotlin.List
+            typeParameter: <out E> defined in kotlin.collections.List
             typeProjection: Int
             psi: val foo = getT<List<(Pair<Int, Float>) -> List<Int>>>()
             type: Int
diff --git a/compiler/testData/type/binding/implicit/functionType2.kt b/compiler/testData/type/binding/implicit/functionType2.kt
index 8cfdedb4727..314909bef22 100644
--- a/compiler/testData/type/binding/implicit/functionType2.kt
+++ b/compiler/testData/type/binding/implicit/functionType2.kt
@@ -22,7 +22,7 @@ type: (Pair<Int, Float>) -> List<Int>
     typeProjection: List<Int>
     psi: val foo = getT<(Pair<Int, Float>) -> List<Int>>()
     type: List<Int>
-        typeParameter: <out E> defined in kotlin.List
+        typeParameter: <out E> defined in kotlin.collections.List
         typeProjection: Int
         psi: val foo = getT<(Pair<Int, Float>) -> List<Int>>()
         type: Int
diff --git a/compiler/testData/type/binding/implicit/functionType3.kt b/compiler/testData/type/binding/implicit/functionType3.kt
index 3054cba2585..4ffc54fccf1 100644
--- a/compiler/testData/type/binding/implicit/functionType3.kt
+++ b/compiler/testData/type/binding/implicit/functionType3.kt
@@ -8,7 +8,7 @@ type: () -> List<Int>
     typeProjection: List<Int>
     psi: val foo = getT<() -> List<Int>>()
     type: List<Int>
-        typeParameter: <out E> defined in kotlin.List
+        typeParameter: <out E> defined in kotlin.collections.List
         typeProjection: Int
         psi: val foo = getT<() -> List<Int>>()
         type: Int
diff --git a/compiler/testData/type/binding/implicit/list2.kt b/compiler/testData/type/binding/implicit/list2.kt
index 627aa137aa1..fb4b05fb7cf 100644
--- a/compiler/testData/type/binding/implicit/list2.kt
+++ b/compiler/testData/type/binding/implicit/list2.kt
@@ -13,7 +13,7 @@ type: [ERROR : List]<String, List<Int>>
     typeProjection: List<Int>
     psi: val foo = getT<List<String, List<Int>>>()
     type: List<Int>
-        typeParameter: <out E> defined in kotlin.List
+        typeParameter: <out E> defined in kotlin.collections.List
         typeProjection: Int
         psi: val foo = getT<List<String, List<Int>>>()
         type: Int
diff --git a/compiler/testData/type/binding/implicit/nullableType.kt b/compiler/testData/type/binding/implicit/nullableType.kt
index 92319a380d8..a91a5db9f8d 100644
--- a/compiler/testData/type/binding/implicit/nullableType.kt
+++ b/compiler/testData/type/binding/implicit/nullableType.kt
@@ -8,7 +8,7 @@ type: Pair<List<Int?>, Pair<List<Int?>?, List<Int>?>>
     typeProjection: List<Int?>
     psi: val foo = getT<Pair<List<Int?>, Pair<List<Int?>?, List<Int>?>>>()
     type: List<Int?>
-        typeParameter: <out E> defined in kotlin.List
+        typeParameter: <out E> defined in kotlin.collections.List
         typeProjection: Int?
         psi: val foo = getT<Pair<List<Int?>, Pair<List<Int?>?, List<Int>?>>>()
         type: Int?
@@ -21,7 +21,7 @@ type: Pair<List<Int?>, Pair<List<Int?>?, List<Int>?>>
         typeProjection: List<Int?>?
         psi: val foo = getT<Pair<List<Int?>, Pair<List<Int?>?, List<Int>?>>>()
         type: List<Int?>?
-            typeParameter: <out E> defined in kotlin.List
+            typeParameter: <out E> defined in kotlin.collections.List
             typeProjection: Int?
             psi: val foo = getT<Pair<List<Int?>, Pair<List<Int?>?, List<Int>?>>>()
             type: Int?
@@ -30,7 +30,7 @@ type: Pair<List<Int?>, Pair<List<Int?>?, List<Int>?>>
         typeProjection: List<Int>?
         psi: val foo = getT<Pair<List<Int?>, Pair<List<Int?>?, List<Int>?>>>()
         type: List<Int>?
-            typeParameter: <out E> defined in kotlin.List
+            typeParameter: <out E> defined in kotlin.collections.List
             typeProjection: Int
             psi: val foo = getT<Pair<List<Int?>, Pair<List<Int?>?, List<Int>?>>>()
             type: Int
diff --git a/compiler/testData/type/binding/implicit/pair.kt b/compiler/testData/type/binding/implicit/pair.kt
index 802979e5174..7f114e0b360 100644
--- a/compiler/testData/type/binding/implicit/pair.kt
+++ b/compiler/testData/type/binding/implicit/pair.kt
@@ -8,7 +8,7 @@ type: Pair<List<Int>, String>
     typeProjection: List<Int>
     psi: val foo = getT<Pair<List<Int>, String>>()
     type: List<Int>
-        typeParameter: <out E> defined in kotlin.List
+        typeParameter: <out E> defined in kotlin.collections.List
         typeProjection: Int
         psi: val foo = getT<Pair<List<Int>, String>>()
         type: Int
diff --git a/compiler/testData/type/binding/implicit/simple.kt b/compiler/testData/type/binding/implicit/simple.kt
index 93e8fd89370..ee53bbf31ae 100644
--- a/compiler/testData/type/binding/implicit/simple.kt
+++ b/compiler/testData/type/binding/implicit/simple.kt
@@ -4,7 +4,7 @@ val foo = getT<List<Int>>()
 /*
 psi: val foo = getT<List<Int>>()
 type: List<Int>
-    typeParameter: <out E> defined in kotlin.List
+    typeParameter: <out E> defined in kotlin.collections.List
     typeProjection: Int
     psi: val foo = getT<List<Int>>()
     type: Int
diff --git a/compiler/testData/type/binding/implicit/star.kt b/compiler/testData/type/binding/implicit/star.kt
index 5f37e3cdb56..060e350916c 100644
--- a/compiler/testData/type/binding/implicit/star.kt
+++ b/compiler/testData/type/binding/implicit/star.kt
@@ -4,7 +4,7 @@ val foo = getT<List<*>>()
 /*
 psi: val foo = getT<List<*>>()
 type: List<*>
-    typeParameter: <out E> defined in kotlin.List
+    typeParameter: <out E> defined in kotlin.collections.List
     typeProjection: *
     psi: val foo = getT<List<*>>()
     type: Any?
diff --git a/compiler/tests/org/jetbrains/kotlin/types/BoundsSubstitutorTest.java b/compiler/tests/org/jetbrains/kotlin/types/BoundsSubstitutorTest.java
index 8ac2a6083ae..a7b907c9883 100644
--- a/compiler/tests/org/jetbrains/kotlin/types/BoundsSubstitutorTest.java
+++ b/compiler/tests/org/jetbrains/kotlin/types/BoundsSubstitutorTest.java
@@ -41,27 +41,27 @@ public class BoundsSubstitutorTest extends KotlinTestWithEnvironment {
 
     public void testSimpleSubstitution() throws Exception {
         doTest("fun <T> f(l: List<T>): T",
-               "fun <T> f(l: kotlin.List<kotlin.Any?>): kotlin.Any?");
+               "fun <T> f(l: kotlin.collections.List<kotlin.Any?>): kotlin.Any?");
     }
 
     public void testParameterInBound() throws Exception {
         doTest("fun <T, R : List<T>> f(l: List<R>): R",
-               "fun <T, R : kotlin.List<kotlin.Any?>> f(l: kotlin.List<kotlin.List<kotlin.Any?>>): kotlin.List<kotlin.Any?>");
+               "fun <T, R : kotlin.collections.List<kotlin.Any?>> f(l: kotlin.collections.List<kotlin.collections.List<kotlin.Any?>>): kotlin.collections.List<kotlin.Any?>");
     }
 
     public void testWithWhere() throws Exception {
         doTest("fun <T> f(l: List<T>): T where T : Any",
-               "fun <T : kotlin.Any> f(l: kotlin.List<kotlin.Any>): kotlin.Any");
+               "fun <T : kotlin.Any> f(l: kotlin.collections.List<kotlin.Any>): kotlin.Any");
     }
 
     public void testWithWhereTwoBounds() throws Exception {
         doTest("fun <T, R> f(l: List<R>): R where T : List<R>, R : Any",
-               "fun <T : kotlin.List<kotlin.Any>, R : kotlin.Any> f(l: kotlin.List<kotlin.Any>): kotlin.Any");
+               "fun <T : kotlin.collections.List<kotlin.Any>, R : kotlin.Any> f(l: kotlin.collections.List<kotlin.Any>): kotlin.Any");
     }
 
     public void testWithWhereTwoBoundsReversed() throws Exception {
         doTest("fun <T, R> f(l: List<R>): R where T : Any, R : List<T>",
-               "fun <T : kotlin.Any, R : kotlin.List<kotlin.Any>> f(l: kotlin.List<kotlin.List<kotlin.Any>>): kotlin.List<kotlin.Any>");
+               "fun <T : kotlin.Any, R : kotlin.collections.List<kotlin.Any>> f(l: kotlin.collections.List<kotlin.collections.List<kotlin.Any>>): kotlin.collections.List<kotlin.Any>");
     }
 
     //public void testWithWhereTwoBoundsLoop() throws Exception {
diff --git a/idea/idea-completion/testData/basic/common/parameterNameAndType/ParametersInFile.kt b/idea/idea-completion/testData/basic/common/parameterNameAndType/ParametersInFile.kt
index 1b02a3ba958..14215fdd5b6 100644
--- a/idea/idea-completion/testData/basic/common/parameterNameAndType/ParametersInFile.kt
+++ b/idea/idea-completion/testData/basic/common/parameterNameAndType/ParametersInFile.kt
@@ -18,8 +18,8 @@ class C(val handler: () -> Unit) {
     }
 }
 
-// EXIST: { lookupString: "strings : List", itemText: "strings: List<String>", tailText: " (kotlin)" }
-// EXIST: { lookupString: "numbers : List", itemText: "numbers: List<Int>", tailText: " (kotlin)" }
+// EXIST: { lookupString: "strings : List", itemText: "strings: List<String>", tailText: " (kotlin.collections)" }
+// EXIST: { lookupString: "numbers : List", itemText: "numbers: List<Int>", tailText: " (kotlin.collections)" }
 // EXIST: { lookupString: "value : Any", itemText: "value: Any?", tailText: " (kotlin)" }
 // EXIST_JAVA_ONLY: { lookupString: "value : File", itemText: "value: File", tailText: " (java.io)" }
 // EXIST: { lookupString: "handler : (() -> String)?", itemText: "handler: (() -> String)?", tailText: null }
diff --git a/idea/idea-completion/testData/basic/common/parameterNameAndType/ParametersInFileInaccessibleType.kt b/idea/idea-completion/testData/basic/common/parameterNameAndType/ParametersInFileInaccessibleType.kt
index c6831dd8ac0..e3eb01695a9 100644
--- a/idea/idea-completion/testData/basic/common/parameterNameAndType/ParametersInFileInaccessibleType.kt
+++ b/idea/idea-completion/testData/basic/common/parameterNameAndType/ParametersInFileInaccessibleType.kt
@@ -15,5 +15,5 @@ class X {
 fun foo(neste<caret>)
 
 // EXIST: { itemText: "nested: X.PublicNested", tailText: " (ppp)" }
-// EXIST: { itemText: "nestedList: List<X.PublicNested>", tailText: " (kotlin)" }
+// EXIST: { itemText: "nestedList: List<X.PublicNested>", tailText: " (kotlin.collections)" }
 // NOTHING_ELSE
diff --git a/idea/idea-completion/testData/basic/common/parameterNameAndType/ParametersInFileInaccessibleType2.kt b/idea/idea-completion/testData/basic/common/parameterNameAndType/ParametersInFileInaccessibleType2.kt
index 7be342b9a9d..e4d3415e574 100644
--- a/idea/idea-completion/testData/basic/common/parameterNameAndType/ParametersInFileInaccessibleType2.kt
+++ b/idea/idea-completion/testData/basic/common/parameterNameAndType/ParametersInFileInaccessibleType2.kt
@@ -15,5 +15,5 @@ class X {
 class C(val neste<caret>)
 
 // EXIST: { itemText: "nested: X.PublicNested", tailText: " (ppp)" }
-// EXIST: { itemText: "nestedList: List<X.PublicNested>", tailText: " (kotlin)" }
+// EXIST: { itemText: "nestedList: List<X.PublicNested>", tailText: " (kotlin.collections)" }
 // NOTHING_ELSE
diff --git a/idea/idea-completion/testData/smart/afterAs/2.kt b/idea/idea-completion/testData/smart/afterAs/2.kt
index a732c71ab3b..8a6b2c62bb7 100644
--- a/idea/idea-completion/testData/smart/afterAs/2.kt
+++ b/idea/idea-completion/testData/smart/afterAs/2.kt
@@ -6,6 +6,6 @@ fun bar(o: Any) {
     foo(o as <caret>)
 }
 
-// EXIST: { lookupString:"List", itemText:"List<String>", tailText: " (kotlin)" }
-// EXIST: { lookupString:"Map", itemText:"Map<String, Int>", tailText: " (kotlin)" }
+// EXIST: { lookupString:"List", itemText:"List<String>", tailText: " (kotlin.collections)" }
+// EXIST: { lookupString:"Map", itemText:"Map<String, Int>", tailText: " (kotlin.collections)" }
 // NOTHING_ELSE
diff --git a/idea/idea-completion/testData/smart/afterAs/3.kt b/idea/idea-completion/testData/smart/afterAs/3.kt
index 8226e48444d..416793f9587 100644
--- a/idea/idea-completion/testData/smart/afterAs/3.kt
+++ b/idea/idea-completion/testData/smart/afterAs/3.kt
@@ -7,6 +7,6 @@ fun bar(o: Any) {
     foo(o as <caret>)
 }
 
-// EXIST: { lookupString:"List", itemText:"List<String>", tailText: " (kotlin)" }
+// EXIST: { lookupString:"List", itemText:"List<String>", tailText: " (kotlin.collections)" }
 // EXIST: { lookupString:"String", itemText:"String", tailText: " (kotlin)" }
 // NOTHING_ELSE
diff --git a/idea/testData/addImport/ImportNestedClass.kt b/idea/testData/addImport/ImportNestedClass.kt
index a8315a8b19a..ecfadddf567 100644
--- a/idea/testData/addImport/ImportNestedClass.kt
+++ b/idea/testData/addImport/ImportNestedClass.kt
@@ -1 +1 @@
-// IMPORT: kotlin.Map.Entry
+// IMPORT: kotlin.collections.Map.Entry
diff --git a/idea/testData/addImport/ImportNestedClass.kt.after b/idea/testData/addImport/ImportNestedClass.kt.after
index 817fce99a69..f6f9bb61e14 100644
--- a/idea/testData/addImport/ImportNestedClass.kt.after
+++ b/idea/testData/addImport/ImportNestedClass.kt.after
@@ -1,3 +1,3 @@
-import kotlin.Map.Entry
+import kotlin.collections.Map.Entry
 
-// IMPORT: kotlin.Map.Entry
+// IMPORT: kotlin.collections.Map.Entry
diff --git a/idea/testData/checker/duplicateJvmSignature/functionAndProperty/trait.kt b/idea/testData/checker/duplicateJvmSignature/functionAndProperty/trait.kt
index e8a5906af6e..ba4c2058747 100644
--- a/idea/testData/checker/duplicateJvmSignature/functionAndProperty/trait.kt
+++ b/idea/testData/checker/duplicateJvmSignature/functionAndProperty/trait.kt
@@ -1,8 +1,8 @@
 interface T {
     <error descr="[CONFLICTING_JVM_DECLARATIONS] Platform declaration clash: The following declarations have the same JVM signature (foo(Ljava/util/List;)V):
-    fun foo(l: kotlin.List<kotlin.Int>): kotlin.Unit
-    fun foo(l: kotlin.List<kotlin.String>): kotlin.Unit">fun foo(l: List<String>)</error> {}
+    fun foo(l: kotlin.collections.List<kotlin.Int>): kotlin.Unit
+    fun foo(l: kotlin.collections.List<kotlin.String>): kotlin.Unit">fun foo(l: List<String>)</error> {}
     <error descr="[CONFLICTING_JVM_DECLARATIONS] Platform declaration clash: The following declarations have the same JVM signature (foo(Ljava/util/List;)V):
-    fun foo(l: kotlin.List<kotlin.Int>): kotlin.Unit
-    fun foo(l: kotlin.List<kotlin.String>): kotlin.Unit">fun foo(l: List<Int>)</error> {}
+    fun foo(l: kotlin.collections.List<kotlin.Int>): kotlin.Unit
+    fun foo(l: kotlin.collections.List<kotlin.String>): kotlin.Unit">fun foo(l: List<Int>)</error> {}
 }
diff --git a/idea/testData/decompiler/builtIns/Int.stubs b/idea/testData/decompiler/builtIns/Int.stubs
index fa425ec9c00..b96578f2be3 100644
--- a/idea/testData/decompiler/builtIns/Int.stubs
+++ b/idea/testData/decompiler/builtIns/Int.stubs
@@ -529,7 +529,9 @@ PsiJetFileStubImpl[package=kotlin]
         TYPE_REFERENCE:
           USER_TYPE:[isAbsoluteInRootPackage=false]
             USER_TYPE:[isAbsoluteInRootPackage=false]
-              REFERENCE_EXPRESSION:[referencedName=kotlin]
+              USER_TYPE:[isAbsoluteInRootPackage=false]
+                REFERENCE_EXPRESSION:[referencedName=kotlin]
+              REFERENCE_EXPRESSION:[referencedName=ranges]
             REFERENCE_EXPRESSION:[referencedName=IntRange]
       FUN:[fqName=kotlin.Int.rangeTo, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=false, name=rangeTo]
         MODIFIER_LIST:[public final operator]
@@ -543,7 +545,9 @@ PsiJetFileStubImpl[package=kotlin]
         TYPE_REFERENCE:
           USER_TYPE:[isAbsoluteInRootPackage=false]
             USER_TYPE:[isAbsoluteInRootPackage=false]
-              REFERENCE_EXPRESSION:[referencedName=kotlin]
+              USER_TYPE:[isAbsoluteInRootPackage=false]
+                REFERENCE_EXPRESSION:[referencedName=kotlin]
+              REFERENCE_EXPRESSION:[referencedName=ranges]
             REFERENCE_EXPRESSION:[referencedName=IntRange]
       FUN:[fqName=kotlin.Int.rangeTo, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=false, name=rangeTo]
         MODIFIER_LIST:[public final operator]
@@ -557,7 +561,9 @@ PsiJetFileStubImpl[package=kotlin]
         TYPE_REFERENCE:
           USER_TYPE:[isAbsoluteInRootPackage=false]
             USER_TYPE:[isAbsoluteInRootPackage=false]
-              REFERENCE_EXPRESSION:[referencedName=kotlin]
+              USER_TYPE:[isAbsoluteInRootPackage=false]
+                REFERENCE_EXPRESSION:[referencedName=kotlin]
+              REFERENCE_EXPRESSION:[referencedName=ranges]
             REFERENCE_EXPRESSION:[referencedName=LongRange]
       FUN:[fqName=kotlin.Int.rangeTo, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=false, name=rangeTo]
         MODIFIER_LIST:[public final operator]
@@ -571,7 +577,9 @@ PsiJetFileStubImpl[package=kotlin]
         TYPE_REFERENCE:
           USER_TYPE:[isAbsoluteInRootPackage=false]
             USER_TYPE:[isAbsoluteInRootPackage=false]
-              REFERENCE_EXPRESSION:[referencedName=kotlin]
+              USER_TYPE:[isAbsoluteInRootPackage=false]
+                REFERENCE_EXPRESSION:[referencedName=kotlin]
+              REFERENCE_EXPRESSION:[referencedName=ranges]
             REFERENCE_EXPRESSION:[referencedName=IntRange]
       FUN:[fqName=kotlin.Int.shl, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=false, name=shl]
         MODIFIER_LIST:[public final infix]
diff --git a/idea/testData/decompiler/builtIns/Int.text b/idea/testData/decompiler/builtIns/Int.text
index e6d82b3524e..50a16001486 100644
--- a/idea/testData/decompiler/builtIns/Int.text
+++ b/idea/testData/decompiler/builtIns/Int.text
@@ -80,13 +80,13 @@ public final class Int private constructor() : kotlin.Number, kotlin.Comparable<
 
     public final operator fun plus(other: kotlin.Short): kotlin.Int { /* compiled code */ }
 
-    public final operator fun rangeTo(other: kotlin.Byte): kotlin.IntRange { /* compiled code */ }
+    public final operator fun rangeTo(other: kotlin.Byte): kotlin.ranges.IntRange { /* compiled code */ }
 
-    public final operator fun rangeTo(other: kotlin.Int): kotlin.IntRange { /* compiled code */ }
+    public final operator fun rangeTo(other: kotlin.Int): kotlin.ranges.IntRange { /* compiled code */ }
 
-    public final operator fun rangeTo(other: kotlin.Long): kotlin.LongRange { /* compiled code */ }
+    public final operator fun rangeTo(other: kotlin.Long): kotlin.ranges.LongRange { /* compiled code */ }
 
-    public final operator fun rangeTo(other: kotlin.Short): kotlin.IntRange { /* compiled code */ }
+    public final operator fun rangeTo(other: kotlin.Short): kotlin.ranges.IntRange { /* compiled code */ }
 
     public final infix fun shl(bitCount: kotlin.Int): kotlin.Int { /* compiled code */ }
 
diff --git a/idea/testData/decompiler/decompiledText/FlexibleTypes.expected.kt b/idea/testData/decompiler/decompiledText/FlexibleTypes.expected.kt
index d10a441b0f9..43021e5b712 100644
--- a/idea/testData/decompiler/decompiledText/FlexibleTypes.expected.kt
+++ b/idea/testData/decompiler/decompiledText/FlexibleTypes.expected.kt
@@ -6,7 +6,7 @@ package test
 public abstract class FlexibleTypes public constructor() {
     public abstract val p: kotlin.Int /* platform type */
 
-    public abstract fun collection(): kotlin.List<kotlin.Int> /* platform type */
+    public abstract fun collection(): kotlin.collections.List<kotlin.Int> /* platform type */
 
     public final fun withBody(): kotlin.Int /* platform type */ { /* compiled code */ }
 }
\ No newline at end of file
diff --git a/idea/testData/decompiler/decompiledText/FunctionTypes.expected.kt b/idea/testData/decompiler/decompiledText/FunctionTypes.expected.kt
index d6ff09810bf..71870d5e61f 100644
--- a/idea/testData/decompiler/decompiledText/FunctionTypes.expected.kt
+++ b/idea/testData/decompiler/decompiledText/FunctionTypes.expected.kt
@@ -10,7 +10,7 @@ public final class FunctionTypes public constructor() {
 
     public final fun f3(f: kotlin.Int.(kotlin.Int) -> kotlin.Unit): kotlin.Unit { /* compiled code */ }
 
-    public final fun f4(f: kotlin.List<@kotlin.ExtensionFunctionType kotlin.Function1<*, *>>): kotlin.Unit { /* compiled code */ }
+    public final fun f4(f: kotlin.collections.List<@kotlin.ExtensionFunctionType kotlin.Function1<*, *>>): kotlin.Unit { /* compiled code */ }
 
     public final fun <A> (A.(A) -> A)?.bar(): kotlin.Unit { /* compiled code */ }
 
diff --git a/idea/testData/decompiler/decompiledText/SimpleClass.expected.kt b/idea/testData/decompiler/decompiledText/SimpleClass.expected.kt
index 27696577878..321a6cccb4e 100644
--- a/idea/testData/decompiler/decompiledText/SimpleClass.expected.kt
+++ b/idea/testData/decompiler/decompiledText/SimpleClass.expected.kt
@@ -3,7 +3,7 @@
 
 package test
 
-public abstract class SimpleClass public constructor() : dependency.D<dependency.Tr, kotlin.Int>, dependency.Tr, kotlin.List<kotlin.String> {
+public abstract class SimpleClass public constructor() : dependency.D<dependency.Tr, kotlin.Int>, dependency.Tr, kotlin.collections.List<kotlin.String> {
     public final val a: dependency.A /* compiled code */
 
     public final var b: dependency.B /* compiled code */
@@ -14,7 +14,7 @@ public abstract class SimpleClass public constructor() : dependency.D<dependency
 
     public final fun f(): kotlin.Unit { /* compiled code */ }
 
-    public final fun g(d: dependency.D<kotlin.String, dependency.Tr>): kotlin.List<dependency.D<dependency.A, kotlin.Int>> { /* compiled code */ }
+    public final fun g(d: dependency.D<kotlin.String, dependency.Tr>): kotlin.collections.List<dependency.D<dependency.A, kotlin.Int>> { /* compiled code */ }
 
     private final fun privateFun(): kotlin.Unit { /* compiled code */ }
 
diff --git a/idea/testData/decompiler/stubBuilder/AnnotatedFlexibleTypes/AnnotatedFlexibleTypes.txt b/idea/testData/decompiler/stubBuilder/AnnotatedFlexibleTypes/AnnotatedFlexibleTypes.txt
index 51558c9c2cb..8ee032c017f 100644
--- a/idea/testData/decompiler/stubBuilder/AnnotatedFlexibleTypes/AnnotatedFlexibleTypes.txt
+++ b/idea/testData/decompiler/stubBuilder/AnnotatedFlexibleTypes/AnnotatedFlexibleTypes.txt
@@ -19,7 +19,9 @@ PsiJetFileStubImpl[package=test]
         TYPE_REFERENCE:
           USER_TYPE:[isAbsoluteInRootPackage=false]
             USER_TYPE:[isAbsoluteInRootPackage=false]
-              REFERENCE_EXPRESSION:[referencedName=kotlin]
+              USER_TYPE:[isAbsoluteInRootPackage=false]
+                REFERENCE_EXPRESSION:[referencedName=kotlin]
+              REFERENCE_EXPRESSION:[referencedName=collections]
             REFERENCE_EXPRESSION:[referencedName=MutableCollection]
             TYPE_ARGUMENT_LIST:
               TYPE_PROJECTION:[projectionKind=NONE]
diff --git a/idea/testData/decompiler/stubBuilder/Annotations/Annotations.txt b/idea/testData/decompiler/stubBuilder/Annotations/Annotations.txt
index 1e8e65b3ee0..ac82a704e80 100644
--- a/idea/testData/decompiler/stubBuilder/Annotations/Annotations.txt
+++ b/idea/testData/decompiler/stubBuilder/Annotations/Annotations.txt
@@ -168,7 +168,9 @@ PsiJetFileStubImpl[package=]
                       REFERENCE_EXPRESSION:[referencedName=b]
               USER_TYPE:[isAbsoluteInRootPackage=false]
                 USER_TYPE:[isAbsoluteInRootPackage=false]
-                  REFERENCE_EXPRESSION:[referencedName=kotlin]
+                  USER_TYPE:[isAbsoluteInRootPackage=false]
+                    REFERENCE_EXPRESSION:[referencedName=kotlin]
+                  REFERENCE_EXPRESSION:[referencedName=ranges]
                 REFERENCE_EXPRESSION:[referencedName=LongRange]
         TYPE_REFERENCE:
           ANNOTATION_ENTRY:[hasValueArguments=false, shortName=a]
diff --git a/idea/testData/decompiler/stubBuilder/FlexibleTypes/FlexibleTypes.txt b/idea/testData/decompiler/stubBuilder/FlexibleTypes/FlexibleTypes.txt
index cb2938db1ee..1c126abc1a4 100644
--- a/idea/testData/decompiler/stubBuilder/FlexibleTypes/FlexibleTypes.txt
+++ b/idea/testData/decompiler/stubBuilder/FlexibleTypes/FlexibleTypes.txt
@@ -21,7 +21,9 @@ PsiJetFileStubImpl[package=test]
         TYPE_REFERENCE:
           USER_TYPE:[isAbsoluteInRootPackage=false]
             USER_TYPE:[isAbsoluteInRootPackage=false]
-              REFERENCE_EXPRESSION:[referencedName=kotlin]
+              USER_TYPE:[isAbsoluteInRootPackage=false]
+                REFERENCE_EXPRESSION:[referencedName=kotlin]
+              REFERENCE_EXPRESSION:[referencedName=collections]
             REFERENCE_EXPRESSION:[referencedName=List]
             TYPE_ARGUMENT_LIST:
               TYPE_PROJECTION:[projectionKind=NONE]
diff --git a/idea/testData/decompiler/stubBuilder/TypeBoundsAndDelegationSpecifiers/TypeBoundsAndDelegationSpecifiers.txt b/idea/testData/decompiler/stubBuilder/TypeBoundsAndDelegationSpecifiers/TypeBoundsAndDelegationSpecifiers.txt
index 2b8e82ffd53..e502f29a5d4 100644
--- a/idea/testData/decompiler/stubBuilder/TypeBoundsAndDelegationSpecifiers/TypeBoundsAndDelegationSpecifiers.txt
+++ b/idea/testData/decompiler/stubBuilder/TypeBoundsAndDelegationSpecifiers/TypeBoundsAndDelegationSpecifiers.txt
@@ -40,7 +40,9 @@ PsiJetFileStubImpl[package=test]
         TYPE_REFERENCE:
           USER_TYPE:[isAbsoluteInRootPackage=false]
             USER_TYPE:[isAbsoluteInRootPackage=false]
-              REFERENCE_EXPRESSION:[referencedName=kotlin]
+              USER_TYPE:[isAbsoluteInRootPackage=false]
+                REFERENCE_EXPRESSION:[referencedName=kotlin]
+              REFERENCE_EXPRESSION:[referencedName=collections]
             REFERENCE_EXPRESSION:[referencedName=List]
             TYPE_ARGUMENT_LIST:
               TYPE_PROJECTION:[projectionKind=NONE]
diff --git a/idea/testData/decompiler/stubBuilder/TypeParams/TypeParams.txt b/idea/testData/decompiler/stubBuilder/TypeParams/TypeParams.txt
index e1a04269bc7..5d3c6056ce3 100644
--- a/idea/testData/decompiler/stubBuilder/TypeParams/TypeParams.txt
+++ b/idea/testData/decompiler/stubBuilder/TypeParams/TypeParams.txt
@@ -208,7 +208,9 @@ PsiJetFileStubImpl[package=test]
             TYPE_REFERENCE:
               USER_TYPE:[isAbsoluteInRootPackage=false]
                 USER_TYPE:[isAbsoluteInRootPackage=false]
-                  REFERENCE_EXPRESSION:[referencedName=kotlin]
+                  USER_TYPE:[isAbsoluteInRootPackage=false]
+                    REFERENCE_EXPRESSION:[referencedName=kotlin]
+                  REFERENCE_EXPRESSION:[referencedName=collections]
                 REFERENCE_EXPRESSION:[referencedName=List]
                 TYPE_ARGUMENT_LIST:
                   TYPE_PROJECTION:[projectionKind=NONE]
@@ -219,7 +221,9 @@ PsiJetFileStubImpl[package=test]
             TYPE_REFERENCE:
               USER_TYPE:[isAbsoluteInRootPackage=false]
                 USER_TYPE:[isAbsoluteInRootPackage=false]
-                  REFERENCE_EXPRESSION:[referencedName=kotlin]
+                  USER_TYPE:[isAbsoluteInRootPackage=false]
+                    REFERENCE_EXPRESSION:[referencedName=kotlin]
+                  REFERENCE_EXPRESSION:[referencedName=collections]
                 REFERENCE_EXPRESSION:[referencedName=Map]
                 TYPE_ARGUMENT_LIST:
                   TYPE_PROJECTION:[projectionKind=NONE]
diff --git a/idea/testData/decompiler/stubBuilder/Types/Types.txt b/idea/testData/decompiler/stubBuilder/Types/Types.txt
index 8fb79fb06a7..dcf6dfd7b20 100644
--- a/idea/testData/decompiler/stubBuilder/Types/Types.txt
+++ b/idea/testData/decompiler/stubBuilder/Types/Types.txt
@@ -45,7 +45,9 @@ PsiJetFileStubImpl[package=test]
               NULLABLE_TYPE:
                 USER_TYPE:[isAbsoluteInRootPackage=false]
                   USER_TYPE:[isAbsoluteInRootPackage=false]
-                    REFERENCE_EXPRESSION:[referencedName=kotlin]
+                    USER_TYPE:[isAbsoluteInRootPackage=false]
+                      REFERENCE_EXPRESSION:[referencedName=kotlin]
+                    REFERENCE_EXPRESSION:[referencedName=collections]
                   REFERENCE_EXPRESSION:[referencedName=List]
                   TYPE_ARGUMENT_LIST:
                     TYPE_PROJECTION:[projectionKind=NONE]
@@ -91,7 +93,9 @@ PsiJetFileStubImpl[package=test]
             TYPE_REFERENCE:
               USER_TYPE:[isAbsoluteInRootPackage=false]
                 USER_TYPE:[isAbsoluteInRootPackage=false]
-                  REFERENCE_EXPRESSION:[referencedName=kotlin]
+                  USER_TYPE:[isAbsoluteInRootPackage=false]
+                    REFERENCE_EXPRESSION:[referencedName=kotlin]
+                  REFERENCE_EXPRESSION:[referencedName=collections]
                 REFERENCE_EXPRESSION:[referencedName=List]
                 TYPE_ARGUMENT_LIST:
                   TYPE_PROJECTION:[projectionKind=NONE]
@@ -129,7 +133,9 @@ PsiJetFileStubImpl[package=test]
               NULLABLE_TYPE:
                 USER_TYPE:[isAbsoluteInRootPackage=false]
                   USER_TYPE:[isAbsoluteInRootPackage=false]
-                    REFERENCE_EXPRESSION:[referencedName=kotlin]
+                    USER_TYPE:[isAbsoluteInRootPackage=false]
+                      REFERENCE_EXPRESSION:[referencedName=kotlin]
+                    REFERENCE_EXPRESSION:[referencedName=collections]
                   REFERENCE_EXPRESSION:[referencedName=List]
                   TYPE_ARGUMENT_LIST:
                     TYPE_PROJECTION:[projectionKind=NONE]
@@ -165,7 +171,9 @@ PsiJetFileStubImpl[package=test]
             TYPE_REFERENCE:
               USER_TYPE:[isAbsoluteInRootPackage=false]
                 USER_TYPE:[isAbsoluteInRootPackage=false]
-                  REFERENCE_EXPRESSION:[referencedName=kotlin]
+                  USER_TYPE:[isAbsoluteInRootPackage=false]
+                    REFERENCE_EXPRESSION:[referencedName=kotlin]
+                  REFERENCE_EXPRESSION:[referencedName=collections]
                 REFERENCE_EXPRESSION:[referencedName=List]
                 TYPE_ARGUMENT_LIST:
                   TYPE_PROJECTION:[projectionKind=NONE]
@@ -219,7 +227,9 @@ PsiJetFileStubImpl[package=test]
             TYPE_REFERENCE:
               USER_TYPE:[isAbsoluteInRootPackage=false]
                 USER_TYPE:[isAbsoluteInRootPackage=false]
-                  REFERENCE_EXPRESSION:[referencedName=kotlin]
+                  USER_TYPE:[isAbsoluteInRootPackage=false]
+                    REFERENCE_EXPRESSION:[referencedName=kotlin]
+                  REFERENCE_EXPRESSION:[referencedName=collections]
                 REFERENCE_EXPRESSION:[referencedName=List]
                 TYPE_ARGUMENT_LIST:
                   TYPE_PROJECTION:[projectionKind=NONE]
@@ -233,7 +243,9 @@ PsiJetFileStubImpl[package=test]
         TYPE_REFERENCE:
           USER_TYPE:[isAbsoluteInRootPackage=false]
             USER_TYPE:[isAbsoluteInRootPackage=false]
-              REFERENCE_EXPRESSION:[referencedName=kotlin]
+              USER_TYPE:[isAbsoluteInRootPackage=false]
+                REFERENCE_EXPRESSION:[referencedName=kotlin]
+              REFERENCE_EXPRESSION:[referencedName=collections]
             REFERENCE_EXPRESSION:[referencedName=List]
             TYPE_ARGUMENT_LIST:
               TYPE_PROJECTION:[projectionKind=NONE]
@@ -247,7 +259,9 @@ PsiJetFileStubImpl[package=test]
         TYPE_REFERENCE:
           USER_TYPE:[isAbsoluteInRootPackage=false]
             USER_TYPE:[isAbsoluteInRootPackage=false]
-              REFERENCE_EXPRESSION:[referencedName=kotlin]
+              USER_TYPE:[isAbsoluteInRootPackage=false]
+                REFERENCE_EXPRESSION:[referencedName=kotlin]
+              REFERENCE_EXPRESSION:[referencedName=collections]
             REFERENCE_EXPRESSION:[referencedName=List]
             TYPE_ARGUMENT_LIST:
               TYPE_PROJECTION:[projectionKind=NONE]
@@ -271,7 +285,9 @@ PsiJetFileStubImpl[package=test]
         TYPE_REFERENCE:
           USER_TYPE:[isAbsoluteInRootPackage=false]
             USER_TYPE:[isAbsoluteInRootPackage=false]
-              REFERENCE_EXPRESSION:[referencedName=kotlin]
+              USER_TYPE:[isAbsoluteInRootPackage=false]
+                REFERENCE_EXPRESSION:[referencedName=kotlin]
+              REFERENCE_EXPRESSION:[referencedName=collections]
             REFERENCE_EXPRESSION:[referencedName=Map]
             TYPE_ARGUMENT_LIST:
               TYPE_PROJECTION:[projectionKind=NONE]
@@ -300,7 +316,9 @@ PsiJetFileStubImpl[package=test]
           NULLABLE_TYPE:
             USER_TYPE:[isAbsoluteInRootPackage=false]
               USER_TYPE:[isAbsoluteInRootPackage=false]
-                REFERENCE_EXPRESSION:[referencedName=kotlin]
+                USER_TYPE:[isAbsoluteInRootPackage=false]
+                  REFERENCE_EXPRESSION:[referencedName=kotlin]
+                REFERENCE_EXPRESSION:[referencedName=collections]
               REFERENCE_EXPRESSION:[referencedName=Map]
               TYPE_ARGUMENT_LIST:
                 TYPE_PROJECTION:[projectionKind=NONE]
@@ -322,7 +340,9 @@ PsiJetFileStubImpl[package=test]
         TYPE_REFERENCE:
           USER_TYPE:[isAbsoluteInRootPackage=false]
             USER_TYPE:[isAbsoluteInRootPackage=false]
-              REFERENCE_EXPRESSION:[referencedName=kotlin]
+              USER_TYPE:[isAbsoluteInRootPackage=false]
+                REFERENCE_EXPRESSION:[referencedName=kotlin]
+              REFERENCE_EXPRESSION:[referencedName=collections]
             REFERENCE_EXPRESSION:[referencedName=Map]
             TYPE_ARGUMENT_LIST:
               TYPE_PROJECTION:[projectionKind=IN]
@@ -354,7 +374,9 @@ PsiJetFileStubImpl[package=test]
         TYPE_REFERENCE:
           USER_TYPE:[isAbsoluteInRootPackage=false]
             USER_TYPE:[isAbsoluteInRootPackage=false]
-              REFERENCE_EXPRESSION:[referencedName=kotlin]
+              USER_TYPE:[isAbsoluteInRootPackage=false]
+                REFERENCE_EXPRESSION:[referencedName=kotlin]
+              REFERENCE_EXPRESSION:[referencedName=collections]
             REFERENCE_EXPRESSION:[referencedName=List]
             TYPE_ARGUMENT_LIST:
               TYPE_PROJECTION:[projectionKind=STAR]
diff --git a/idea/testData/diagnosticMessage/expectedNothingDueToProjections1.txt b/idea/testData/diagnosticMessage/expectedNothingDueToProjections1.txt
index 01e159a607f..219a36dd9eb 100644
--- a/idea/testData/diagnosticMessage/expectedNothingDueToProjections1.txt
+++ b/idea/testData/diagnosticMessage/expectedNothingDueToProjections1.txt
@@ -1,2 +1,2 @@
 <!-- expectedNothingDueToProjections1 -->
-Out-projected type 'kotlin.MutableCollection<out kotlin.CharSequence>' prohibits the use of 'public abstract fun add(element: E): kotlin.Boolean defined in kotlin.MutableCollection'
+Out-projected type 'kotlin.collections.MutableCollection<out kotlin.CharSequence>' prohibits the use of 'public abstract fun add(element: E): kotlin.Boolean defined in kotlin.collections.MutableCollection'
\ No newline at end of file
diff --git a/idea/testData/diagnosticMessage/numberValueTypes3.html b/idea/testData/diagnosticMessage/numberValueTypes3.html
index e547ad375cc..ecfb204e642 100644
--- a/idea/testData/diagnosticMessage/numberValueTypes3.html
+++ b/idea/testData/diagnosticMessage/numberValueTypes3.html
@@ -6,7 +6,7 @@ Type inference failed:
   <td width="10%"></td>
   <td align="right" colspan="2" style="white-space:nowrap;font-weight:bold;"><b>fun</b> <`T> foo</td>
   <td style="white-space:nowrap;font-weight:bold;">(</td>
-  <td align="right" style="white-space:nowrap;font-weight:bold;">l: kotlin.List<`T></td>
+  <td align="right" style="white-space:nowrap;font-weight:bold;">l: kotlin.collections.List<`T></td>
   <td style="white-space:nowrap;font-weight:bold;">)</td>
   <td style="white-space:nowrap;font-weight:bold;">: kotlin.Unit</td>
 </tr>
diff --git a/idea/testData/diagnosticMessage/numberValueTypes4.html b/idea/testData/diagnosticMessage/numberValueTypes4.html
index 873901302a3..9feec08ed74 100644
--- a/idea/testData/diagnosticMessage/numberValueTypes4.html
+++ b/idea/testData/diagnosticMessage/numberValueTypes4.html
@@ -7,7 +7,7 @@ Type inference failed: Cannot infer type parameter <b>T</b> in
   <td align="right" colspan="2" style="white-space:nowrap;font-weight:bold;"><b>fun</b> <`T> bar</td>
   <td style="white-space:nowrap;font-weight:bold;">(</td>
   <td align="right" style="white-space:nowrap;font-weight:bold;">t: T,</td>
-  <td align="right" style="white-space:nowrap;font-weight:bold;">l: kotlin.MutableList<`T></td>
+  <td align="right" style="white-space:nowrap;font-weight:bold;">l: kotlin.collections.MutableList<`T></td>
   <td style="white-space:nowrap;font-weight:bold;">)</td>
   <td style="white-space:nowrap;font-weight:bold;">: kotlin.Unit</td>
 </tr>
@@ -20,7 +20,7 @@ Type inference failed: Cannot infer type parameter <b>T</b> in
   <td style="white-space:nowrap;"></td>
   <td style="white-space:nowrap;"><b>(</b></td>
   <td align="right" style="white-space:nowrap;"><font color=red><b>kotlin.String</b></font><b>,</b></td>
-  <td align="right" style="white-space:nowrap;"><b>kotlin.MutableList<`kotlin.String></b></td>
+  <td align="right" style="white-space:nowrap;"><b>kotlin.collections.MutableList<`kotlin.String></b></td>
   <td style="white-space:nowrap;"><b>)</b></td>
 </tr>
 <tr>
@@ -29,7 +29,7 @@ Type inference failed: Cannot infer type parameter <b>T</b> in
   <td style="white-space:nowrap;"></td>
   <td style="white-space:nowrap;"><b>(</b></td>
   <td align="right" style="white-space:nowrap;"><b>kotlin.Int</b><b>,</b></td>
-  <td align="right" style="white-space:nowrap;"><font color=red><b>kotlin.MutableList<`kotlin.Int></b></font></td>
+  <td align="right" style="white-space:nowrap;"><font color=red><b>kotlin.collections.MutableList<`kotlin.Int></b></font></td>
   <td style="white-space:nowrap;"><b>)</b></td>
 </tr>
 <tr>
@@ -41,7 +41,7 @@ Type inference failed: Cannot infer type parameter <b>T</b> in
   <td style="white-space:nowrap;"></td>
   <td style="white-space:nowrap;"><b>(</b></td>
   <td align="right" style="white-space:nowrap;"><b>kotlin.Int</b><b>,</b></td>
-  <td align="right" style="white-space:nowrap;"><b>kotlin.MutableList<`kotlin.String></b></td>
+  <td align="right" style="white-space:nowrap;"><b>kotlin.collections.MutableList<`kotlin.String></b></td>
   <td style="white-space:nowrap;"><b>)</b></td>
 </tr>
 </table>
diff --git a/idea/testData/diagnosticMessage/renderCollectionOfTypes1.txt b/idea/testData/diagnosticMessage/renderCollectionOfTypes1.txt
index abf40d266a0..99ef6254720 100644
--- a/idea/testData/diagnosticMessage/renderCollectionOfTypes1.txt
+++ b/idea/testData/diagnosticMessage/renderCollectionOfTypes1.txt
@@ -1,2 +1,2 @@
 <!-- renderCollectionOfTypes1 -->
-Expected 2 parameters of types kotlin.List<kotlin.Int>, java.util.ArrayList<kotlin.String>
\ No newline at end of file
+Expected 2 parameters of types kotlin.collections.List<kotlin.Int>, java.util.ArrayList<kotlin.String>
\ No newline at end of file
diff --git a/idea/testData/diagnosticMessage/typeInferenceExpectedTypeMismatch2.html b/idea/testData/diagnosticMessage/typeInferenceExpectedTypeMismatch2.html
index 3f48824a878..f00aadf7b3b 100644
--- a/idea/testData/diagnosticMessage/typeInferenceExpectedTypeMismatch2.html
+++ b/idea/testData/diagnosticMessage/typeInferenceExpectedTypeMismatch2.html
@@ -4,11 +4,11 @@ Type inference failed. Expected type mismatch:
 <table>
 <tr>
   <td>required: </td>
-  <td><b>kotlin.List<`kotlin.Int></b></td>
+  <td><b>kotlin.collections.List<`kotlin.Int></b></td>
 </tr>
 <tr>
   <td>found: </td>
-  <td><font color=red><b>kotlin.Set<`kotlin.Int></b></font></td>
+  <td><font color=red><b>kotlin.collections.Set<`kotlin.Int></b></font></td>
 </tr>
 </table>
 </html>
\ No newline at end of file
diff --git a/idea/testData/diagnosticMessage/typeInferenceExpectedTypeMismatch3.html b/idea/testData/diagnosticMessage/typeInferenceExpectedTypeMismatch3.html
index 48218e74da1..2e6f413152c 100644
--- a/idea/testData/diagnosticMessage/typeInferenceExpectedTypeMismatch3.html
+++ b/idea/testData/diagnosticMessage/typeInferenceExpectedTypeMismatch3.html
@@ -4,11 +4,11 @@ Type inference failed. Expected type mismatch:
 <table>
 <tr>
   <td>required: </td>
-  <td><b>kotlin.Set<`kotlin.String></b></td>
+  <td><b>kotlin.collections.Set<`kotlin.String></b></td>
 </tr>
 <tr>
   <td>found: </td>
-  <td><font color=red><b>kotlin.Set<`kotlin.Int></b></font></td>
+  <td><font color=red><b>kotlin.collections.Set<`kotlin.Int></b></font></td>
 </tr>
 </table>
 </html>
\ No newline at end of file
diff --git a/idea/testData/diagnosticMessage/typeMismatchDueToProjections1.html b/idea/testData/diagnosticMessage/typeMismatchDueToProjections1.html
index e4e75d9cb32..2f0847b3cc9 100644
--- a/idea/testData/diagnosticMessage/typeMismatchDueToProjections1.html
+++ b/idea/testData/diagnosticMessage/typeMismatchDueToProjections1.html
@@ -4,14 +4,14 @@ Type mismatch.
 <table>
 <tr>
   <td>Required:</td>
-  <td>kotlin.Collection<`kotlin.Nothing></td>
+  <td>kotlin.collections.Collection<`kotlin.Nothing></td>
 </tr>
 <tr>
   <td>Found:</td>
-  <td>kotlin.MutableCollection<`kotlin.CharSequence></td>
+  <td>kotlin.collections.MutableCollection<`kotlin.CharSequence></td>
 </tr>
 </table>
 <br />
-Projected type kotlin.MutableCollection<`out kotlin.CharSequence> restricts use of <br />
-<b>public</b> <b>abstract</b> <b>fun</b> addAll(elements: kotlin.Collection<`E>): kotlin.Boolean <i>defined in</i> kotlin.MutableCollection
+Projected type kotlin.collections.MutableCollection<`out kotlin.CharSequence> restricts use of <br />
+<b>public</b> <b>abstract</b> <b>fun</b> addAll(elements: kotlin.collections.Collection<`E>): kotlin.Boolean <i>defined in</i> kotlin.collections.MutableCollection
 </html>
\ No newline at end of file
diff --git a/idea/testData/diagnosticMessage/typeMismatchDueToProjectionsTxt1.txt b/idea/testData/diagnosticMessage/typeMismatchDueToProjectionsTxt1.txt
index 2c686e98185..59c1186b914 100644
--- a/idea/testData/diagnosticMessage/typeMismatchDueToProjectionsTxt1.txt
+++ b/idea/testData/diagnosticMessage/typeMismatchDueToProjectionsTxt1.txt
@@ -1,2 +1,2 @@
 <!-- typeMismatchDueToProjectionsTxt1 -->
-Type mismatch: inferred type is kotlin.MutableCollection<kotlin.CharSequence> but kotlin.Collection<kotlin.Nothing> was expected. Projected type kotlin.MutableCollection<out kotlin.CharSequence> restricts use of public abstract fun addAll(elements: kotlin.Collection<E>): kotlin.Boolean defined in kotlin.MutableCollection
\ No newline at end of file
+Type mismatch: inferred type is kotlin.collections.MutableCollection<kotlin.CharSequence> but kotlin.collections.Collection<kotlin.Nothing> was expected. Projected type kotlin.collections.MutableCollection<out kotlin.CharSequence> restricts use of public abstract fun addAll(elements: kotlin.collections.Collection<E>): kotlin.Boolean defined in kotlin.collections.MutableCollection
\ No newline at end of file
diff --git a/idea/testData/diagnosticMessage/upperBoundViolated1.txt b/idea/testData/diagnosticMessage/upperBoundViolated1.txt
index 7f8a5e043d1..16d2d946901 100644
--- a/idea/testData/diagnosticMessage/upperBoundViolated1.txt
+++ b/idea/testData/diagnosticMessage/upperBoundViolated1.txt
@@ -1,3 +1,3 @@
 <!-- upperBoundViolated1 -->
-Type parameter bound for T in fun <R, T : kotlin.List<R>> foo(r: R, list: T): kotlin.Unit
- is not satisfied: inferred type kotlin.Collection<kotlin.Int> is not a subtype of kotlin.List<kotlin.Int>
\ No newline at end of file
+Type parameter bound for T in fun <R, T : kotlin.collections.List<R>> foo(r: R, list: T): kotlin.Unit
+ is not satisfied: inferred type kotlin.collections.Collection<kotlin.Int> is not a subtype of kotlin.collections.List<kotlin.Int>
\ No newline at end of file
diff --git a/idea/testData/diagnosticMessage/upperBoundViolated2.txt b/idea/testData/diagnosticMessage/upperBoundViolated2.txt
index 0fa0d306244..7dd5946ba0e 100644
--- a/idea/testData/diagnosticMessage/upperBoundViolated2.txt
+++ b/idea/testData/diagnosticMessage/upperBoundViolated2.txt
@@ -1,3 +1,3 @@
 <!-- upperBoundViolated2 -->
-Type parameter bound for V in fun <V : U, U> bar(v: V, u: kotlin.MutableSet<U>): kotlin.MutableSet<U>
+Type parameter bound for V in fun <V : U, U> bar(v: V, u: kotlin.collections.MutableSet<U>): kotlin.collections.MutableSet<U>
  is not satisfied: inferred type kotlin.Any is not a subtype of kotlin.String
\ No newline at end of file
diff --git a/idea/testData/quickfix/addStarProjections/qualifiedList.kt b/idea/testData/quickfix/addStarProjections/qualifiedList.kt
index 7bb347d14c7..1fa49853e07 100644
--- a/idea/testData/quickfix/addStarProjections/qualifiedList.kt
+++ b/idea/testData/quickfix/addStarProjections/qualifiedList.kt
@@ -1,4 +1,4 @@
 // "Add '<*>'" "true"
 public fun foo(a: Any) {
-    a is kotlin.List<caret>
+    a is kotlin.collections.List<caret>
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/addStarProjections/qualifiedList.kt.after b/idea/testData/quickfix/addStarProjections/qualifiedList.kt.after
index c8d41576e8c..736ab99ab5c 100644
--- a/idea/testData/quickfix/addStarProjections/qualifiedList.kt.after
+++ b/idea/testData/quickfix/addStarProjections/qualifiedList.kt.after
@@ -1,4 +1,4 @@
 // "Add '<*>'" "true"
 public fun foo(a: Any) {
-    a is kotlin.List<*>
+    a is kotlin.collections.List<*>
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/addStarProjections/qualifiedMap.kt b/idea/testData/quickfix/addStarProjections/qualifiedMap.kt
index df46bee188a..1a19e207152 100644
--- a/idea/testData/quickfix/addStarProjections/qualifiedMap.kt
+++ b/idea/testData/quickfix/addStarProjections/qualifiedMap.kt
@@ -1,4 +1,4 @@
 // "Add '<*, *>'" "true"
 public fun foo(a: Any) {
-    a is kotlin.Map<caret>
+    a is kotlin.collections.Map<caret>
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/addStarProjections/qualifiedMap.kt.after b/idea/testData/quickfix/addStarProjections/qualifiedMap.kt.after
index f5b1d983361..4b6d5d771f3 100644
--- a/idea/testData/quickfix/addStarProjections/qualifiedMap.kt.after
+++ b/idea/testData/quickfix/addStarProjections/qualifiedMap.kt.after
@@ -1,4 +1,4 @@
 // "Add '<*, *>'" "true"
 public fun foo(a: Any) {
-    a is kotlin.Map<*, *>
+    a is kotlin.collections.Map<*, *>
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/addStarProjections/when/qualifiedList.kt b/idea/testData/quickfix/addStarProjections/when/qualifiedList.kt
index 5231416ddfb..c5adf7497a8 100644
--- a/idea/testData/quickfix/addStarProjections/when/qualifiedList.kt
+++ b/idea/testData/quickfix/addStarProjections/when/qualifiedList.kt
@@ -1,7 +1,7 @@
 // "Add '<*>'" "true"
 public fun foo(a: Any) {
     when (a) {
-        is kotlin.List<caret> -> {}
+        is kotlin.collections.List<caret> -> {}
         else -> {}
     }
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/addStarProjections/when/qualifiedList.kt.after b/idea/testData/quickfix/addStarProjections/when/qualifiedList.kt.after
index 2a9c9f09328..a40312252a4 100644
--- a/idea/testData/quickfix/addStarProjections/when/qualifiedList.kt.after
+++ b/idea/testData/quickfix/addStarProjections/when/qualifiedList.kt.after
@@ -1,7 +1,7 @@
 // "Add '<*>'" "true"
 public fun foo(a: Any) {
     when (a) {
-        is kotlin.List<*> -> {}
+        is kotlin.collections.List<*> -> {}
         else -> {}
     }
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/addStarProjections/when/qualifiedMap.kt b/idea/testData/quickfix/addStarProjections/when/qualifiedMap.kt
index ad2d090a3ed..4b7276ae3b5 100644
--- a/idea/testData/quickfix/addStarProjections/when/qualifiedMap.kt
+++ b/idea/testData/quickfix/addStarProjections/when/qualifiedMap.kt
@@ -1,7 +1,7 @@
 // "Add '<*, *>'" "true"
 public fun foo(a: Any) {
     when (a) {
-        is kotlin.Map<caret> -> {}
+        is kotlin.collections.Map<caret> -> {}
         else -> {}
     }
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/addStarProjections/when/qualifiedMap.kt.after b/idea/testData/quickfix/addStarProjections/when/qualifiedMap.kt.after
index 5b7c0b15376..249a6c0f681 100644
--- a/idea/testData/quickfix/addStarProjections/when/qualifiedMap.kt.after
+++ b/idea/testData/quickfix/addStarProjections/when/qualifiedMap.kt.after
@@ -1,7 +1,7 @@
 // "Add '<*, *>'" "true"
 public fun foo(a: Any) {
     when (a) {
-        is kotlin.Map<*, *> -> {}
+        is kotlin.collections.Map<*, *> -> {}
         else -> {}
     }
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/typeMismatch/genericVarianceViolation/basicMultiple.after.kt b/idea/testData/quickfix/typeMismatch/genericVarianceViolation/basicMultiple.after.kt
index 3b70ca5371d..8d45a788ebf 100644
--- a/idea/testData/quickfix/typeMismatch/genericVarianceViolation/basicMultiple.after.kt
+++ b/idea/testData/quickfix/typeMismatch/genericVarianceViolation/basicMultiple.after.kt
@@ -1,5 +1,5 @@
 // "Cast expression 'x' to 'List<Any>?'" "true"
-// ERROR: Java type mismatch expected kotlin.(Mutable)List<kotlin.Any!>! but found kotlin.MutableList<kotlin.String>. Use explicit cast
+// ERROR: Java type mismatch expected kotlin.collections.(Mutable)List<kotlin.Any!>! but found kotlin.collections.MutableList<kotlin.String>. Use explicit cast
 
 fun main(x: MutableList<String>) {
     A.foo(x as List<Any>?)
diff --git a/idea/testData/quickfix/typeMismatch/genericVarianceViolation/basicMultiple.before.Main.kt b/idea/testData/quickfix/typeMismatch/genericVarianceViolation/basicMultiple.before.Main.kt
index 02ff97ccbb6..7fb864b7bd4 100644
--- a/idea/testData/quickfix/typeMismatch/genericVarianceViolation/basicMultiple.before.Main.kt
+++ b/idea/testData/quickfix/typeMismatch/genericVarianceViolation/basicMultiple.before.Main.kt
@@ -1,5 +1,5 @@
 // "Cast expression 'x' to 'List<Any>?'" "true"
-// ERROR: Java type mismatch expected kotlin.(Mutable)List<kotlin.Any!>! but found kotlin.MutableList<kotlin.String>. Use explicit cast
+// ERROR: Java type mismatch expected kotlin.collections.(Mutable)List<kotlin.Any!>! but found kotlin.collections.MutableList<kotlin.String>. Use explicit cast
 
 fun main(x: MutableList<String>) {
     A.foo(<caret>x)
diff --git a/idea/testData/refactoring/extractFunction/basic/callWithPlatformTypeReceiver.kt b/idea/testData/refactoring/extractFunction/basic/callWithPlatformTypeReceiver.kt
index d57a7d91694..fe3dff28c96 100644
--- a/idea/testData/refactoring/extractFunction/basic/callWithPlatformTypeReceiver.kt
+++ b/idea/testData/refactoring/extractFunction/basic/callWithPlatformTypeReceiver.kt
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // SUGGESTED_RETURN_TYPES: kotlin.Boolean?, kotlin.Boolean
-// PARAM_DESCRIPTOR: value-parameter val it: kotlin.Map.Entry<(kotlin.Boolean..kotlin.Boolean?), (kotlin.Boolean..kotlin.Boolean?)> defined in test.<anonymous>
-// PARAM_TYPES: kotlin.Map.Entry<(kotlin.Boolean..kotlin.Boolean?), (kotlin.Boolean..kotlin.Boolean?)>
+// PARAM_DESCRIPTOR: value-parameter val it: kotlin.collections.Map.Entry<(kotlin.Boolean..kotlin.Boolean?), (kotlin.Boolean..kotlin.Boolean?)> defined in test.<anonymous>
+// PARAM_TYPES: kotlin.collections.Map.Entry<(kotlin.Boolean..kotlin.Boolean?), (kotlin.Boolean..kotlin.Boolean?)>
 fun test() {
     J.getMap().filter { <selection>it.getKey()</selection> }
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/extractFunction/basic/callWithPlatformTypeReceiver.kt.after b/idea/testData/refactoring/extractFunction/basic/callWithPlatformTypeReceiver.kt.after
index 695749d0e0f..17ad7669be6 100644
--- a/idea/testData/refactoring/extractFunction/basic/callWithPlatformTypeReceiver.kt.after
+++ b/idea/testData/refactoring/extractFunction/basic/callWithPlatformTypeReceiver.kt.after
@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // SUGGESTED_RETURN_TYPES: kotlin.Boolean?, kotlin.Boolean
-// PARAM_DESCRIPTOR: value-parameter val it: kotlin.Map.Entry<(kotlin.Boolean..kotlin.Boolean?), (kotlin.Boolean..kotlin.Boolean?)> defined in test.<anonymous>
-// PARAM_TYPES: kotlin.Map.Entry<(kotlin.Boolean..kotlin.Boolean?), (kotlin.Boolean..kotlin.Boolean?)>
+// PARAM_DESCRIPTOR: value-parameter val it: kotlin.collections.Map.Entry<(kotlin.Boolean..kotlin.Boolean?), (kotlin.Boolean..kotlin.Boolean?)> defined in test.<anonymous>
+// PARAM_TYPES: kotlin.collections.Map.Entry<(kotlin.Boolean..kotlin.Boolean?), (kotlin.Boolean..kotlin.Boolean?)>
 fun test() {
     J.getMap().filter { b(it) }
 }
diff --git a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/mutablyFlexibleType.kt b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/mutablyFlexibleType.kt
index 2c1ef2084b2..be7801895a2 100644
--- a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/mutablyFlexibleType.kt
+++ b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/mutablyFlexibleType.kt
@@ -1,6 +1,6 @@
 // WITH_RUNTIME
-// PARAM_DESCRIPTOR: val data: (kotlin.MutableList<(kotlin.String..kotlin.String?)>..kotlin.List<(kotlin.String..kotlin.String?)>) defined in test
-// PARAM_TYPES: kotlin.List<(kotlin.String..kotlin.String?)>, kotlin.MutableList<(kotlin.String..kotlin.String?)>, kotlin.MutableCollection<(kotlin.String..kotlin.String?)>, kotlin.Collection<(kotlin.String..kotlin.String?)>
+// PARAM_DESCRIPTOR: val data: (kotlin.collections.MutableList<(kotlin.String..kotlin.String?)>..kotlin.collections.List<(kotlin.String..kotlin.String?)>) defined in test
+// PARAM_TYPES: kotlin.collections.List<(kotlin.String..kotlin.String?)>, kotlin.collections.MutableList<(kotlin.String..kotlin.String?)>, kotlin.collections.MutableCollection<(kotlin.String..kotlin.String?)>, kotlin.collections.Collection<(kotlin.String..kotlin.String?)>
 fun test(): Boolean {
     val j: J? = null
     val data = j?.getData() ?: return false
diff --git a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/mutablyFlexibleType.kt.after b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/mutablyFlexibleType.kt.after
index d4dc8ce0e3b..d7b603d4ef7 100644
--- a/idea/testData/refactoring/extractFunction/parameters/candidateTypes/mutablyFlexibleType.kt.after
+++ b/idea/testData/refactoring/extractFunction/parameters/candidateTypes/mutablyFlexibleType.kt.after
@@ -1,6 +1,6 @@
 // WITH_RUNTIME
-// PARAM_DESCRIPTOR: val data: (kotlin.MutableList<(kotlin.String..kotlin.String?)>..kotlin.List<(kotlin.String..kotlin.String?)>) defined in test
-// PARAM_TYPES: kotlin.List<(kotlin.String..kotlin.String?)>, kotlin.MutableList<(kotlin.String..kotlin.String?)>, kotlin.MutableCollection<(kotlin.String..kotlin.String?)>, kotlin.Collection<(kotlin.String..kotlin.String?)>
+// PARAM_DESCRIPTOR: val data: (kotlin.collections.MutableList<(kotlin.String..kotlin.String?)>..kotlin.collections.List<(kotlin.String..kotlin.String?)>) defined in test
+// PARAM_TYPES: kotlin.collections.List<(kotlin.String..kotlin.String?)>, kotlin.collections.MutableList<(kotlin.String..kotlin.String?)>, kotlin.collections.MutableCollection<(kotlin.String..kotlin.String?)>, kotlin.collections.Collection<(kotlin.String..kotlin.String?)>
 fun test(): Boolean {
     val j: J? = null
     val data = j?.getData() ?: return false
diff --git a/idea/testData/resolve/builtins/emptyRange.kt b/idea/testData/resolve/builtins/emptyRange.kt
index 36fd0bbd9e7..b9af433d36e 100644
--- a/idea/testData/resolve/builtins/emptyRange.kt
+++ b/idea/testData/resolve/builtins/emptyRange.kt
@@ -1,4 +1,4 @@
 val empty = IntRange.<caret>EMPTY
-// BINARY: kotlin/IntRange.class
+// BINARY: ranges/IntRange.class
 // SRC: kotlin/Ranges.kt
-// TARGET: (in kotlin.IntRange.Companion).EMPTY
\ No newline at end of file
+// TARGET: (in kotlin.ranges.IntRange.Companion).EMPTY
\ No newline at end of file
diff --git a/idea/testData/resolve/partialBodyResolve/LambdaInCurrentStatement.dump b/idea/testData/resolve/partialBodyResolve/LambdaInCurrentStatement.dump
index 3c926ab43e3..d0a8adebbc2 100644
--- a/idea/testData/resolve/partialBodyResolve/LambdaInCurrentStatement.dump
+++ b/idea/testData/resolve/partialBodyResolve/LambdaInCurrentStatement.dump
@@ -1,4 +1,4 @@
-Resolve target: value-parameter val c: kotlin.Collection<kotlin.String>
+Resolve target: value-parameter val c: kotlin.collections.Collection<kotlin.String>
 ----------------------------------------------
 fun foo(c: Collection<String>): Collection<String> {
     return <caret>c.filter {
diff --git a/idea/testData/resolve/referenceWithLib/multiDeclarationWithTypeParameters.kt b/idea/testData/resolve/referenceWithLib/multiDeclarationWithTypeParameters.kt
index 3b87ffecffe..84155f3048c 100644
--- a/idea/testData/resolve/referenceWithLib/multiDeclarationWithTypeParameters.kt
+++ b/idea/testData/resolve/referenceWithLib/multiDeclarationWithTypeParameters.kt
@@ -7,7 +7,7 @@ fun <Int> f(l: List<Int>) {
 }
 
 // MULTIRESOLVE
-// REF: (for kotlin.List<T> in dependency).component1()
-// REF: (for kotlin.List<T> in dependency).component2()
-// REF: (for kotlin.List<T> in dependency).component3()
+// REF: (for kotlin.collections.List<T> in dependency).component1()
+// REF: (for kotlin.collections.List<T> in dependency).component2()
+// REF: (for kotlin.collections.List<T> in dependency).component3()
 
diff --git a/idea/testData/resolve/referenceWithLib/setWithTypeParameters.kt b/idea/testData/resolve/referenceWithLib/setWithTypeParameters.kt
index 45a03143589..29361c679f3 100644
--- a/idea/testData/resolve/referenceWithLib/setWithTypeParameters.kt
+++ b/idea/testData/resolve/referenceWithLib/setWithTypeParameters.kt
@@ -6,4 +6,4 @@ fun foo(a: List<Int>) {
     a[<caret>"bar"] = 3
 }
 
-// REF: (for kotlin.List<T> in dependency).set(kotlin.String, T)
+// REF: (for kotlin.collections.List<T> in dependency).set(kotlin.String, T)
diff --git a/idea/testData/resolve/references/forLoopIn/inBuiltIns/extension.kt b/idea/testData/resolve/references/forLoopIn/inBuiltIns/extension.kt
index b3e8105ed54..118ddc85ebc 100644
--- a/idea/testData/resolve/references/forLoopIn/inBuiltIns/extension.kt
+++ b/idea/testData/resolve/references/forLoopIn/inBuiltIns/extension.kt
@@ -3,6 +3,6 @@ fun main(it: Iterator<Any>) {
 }
 
 // MULTIRESOLVE
-// REF: (for kotlin.Iterator<T> in kotlin.collections).iterator()
-// REF: (in kotlin.Iterator).hasNext()
-// REF: (in kotlin.Iterator).next()
+// REF: (for kotlin.collections.Iterator<T> in kotlin.collections).iterator()
+// REF: (in kotlin.collections.Iterator).hasNext()
+// REF: (in kotlin.collections.Iterator).next()
diff --git a/idea/testData/resolve/references/forLoopIn/inBuiltIns/member.kt b/idea/testData/resolve/references/forLoopIn/inBuiltIns/member.kt
index 449dea92d1d..81e50d0b7f0 100644
--- a/idea/testData/resolve/references/forLoopIn/inBuiltIns/member.kt
+++ b/idea/testData/resolve/references/forLoopIn/inBuiltIns/member.kt
@@ -3,6 +3,6 @@ fun main() {
 }
 
 // MULTIRESOLVE
-// REF: (in kotlin.IntIterator).next()
-// REF: (in kotlin.IntProgression).iterator()
-// REF: (in kotlin.Iterator).hasNext()
+// REF: (in kotlin.collections.IntIterator).next()
+// REF: (in kotlin.ranges.IntProgression).iterator()
+// REF: (in kotlin.collections.Iterator).hasNext()
diff --git a/idea/testData/resolve/references/forLoopIn/inLibrary/extension.kt b/idea/testData/resolve/references/forLoopIn/inLibrary/extension.kt
index 73f8de0eccd..d7a39268add 100644
--- a/idea/testData/resolve/references/forLoopIn/inLibrary/extension.kt
+++ b/idea/testData/resolve/references/forLoopIn/inLibrary/extension.kt
@@ -4,5 +4,5 @@ fun main() {
 
 // MULTIRESOLVE
 // REF: (for kotlin.CharSequence in kotlin.text).iterator()
-// REF: (in kotlin.CharIterator).next()
-// REF: (in kotlin.Iterator).hasNext()
+// REF: (in kotlin.collections.CharIterator).next()
+// REF: (in kotlin.collections.Iterator).hasNext()
diff --git a/idea/testData/shortenRefs/type/GenericType3.kt b/idea/testData/shortenRefs/type/GenericType3.kt
index dd553d784e8..74387a10c57 100644
--- a/idea/testData/shortenRefs/type/GenericType3.kt
+++ b/idea/testData/shortenRefs/type/GenericType3.kt
@@ -1 +1 @@
-val x: <selection>kotlin.Map.Entry<kotlin.Array<kotlin.String>, java.sql.Array></selection>
\ No newline at end of file
+val x: <selection>kotlin.collections.Map.Entry<kotlin.Array<kotlin.String>, java.sql.Array></selection>
\ No newline at end of file
diff --git a/idea/testData/unifier/equivalence/types/userTypeRuntime.kt b/idea/testData/unifier/equivalence/types/userTypeRuntime.kt
index 13295133591..ca9f96de0e7 100644
--- a/idea/testData/unifier/equivalence/types/userTypeRuntime.kt
+++ b/idea/testData/unifier/equivalence/types/userTypeRuntime.kt
@@ -5,4 +5,4 @@ val b: MutableMap<String, MutableList<Any>> = HashMap()
 val c: Map<Any, MutableList<Any>> = HashMap()
 val d: Map<String, List<Any>> = HashMap()
 val e: Map<String, MutableList<Any?>> = HashMap()
-val f: kotlin.Map<String, MutableList<kotlin.Any>> = HashMap()
\ No newline at end of file
+val f: kotlin.collections.Map<String, MutableList<kotlin.Any>> = HashMap()
\ No newline at end of file
diff --git a/idea/testData/unifier/equivalence/types/userTypeRuntime.kt.match b/idea/testData/unifier/equivalence/types/userTypeRuntime.kt.match
index b150a574ce5..88cea028b64 100644
--- a/idea/testData/unifier/equivalence/types/userTypeRuntime.kt.match
+++ b/idea/testData/unifier/equivalence/types/userTypeRuntime.kt.match
@@ -1,3 +1,3 @@
 Map<String, MutableList<Any>>
 
-kotlin.Map<String, MutableList<kotlin.Any>>
\ No newline at end of file
+kotlin.collections.Map<String, MutableList<kotlin.Any>>
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/function/java8MRKFunctionExpectedType.kt b/j2k/testData/fileOrElement/function/java8MRKFunctionExpectedType.kt
index d854457bbf9..c4d28abf35f 100644
--- a/j2k/testData/fileOrElement/function/java8MRKFunctionExpectedType.kt
+++ b/j2k/testData/fileOrElement/function/java8MRKFunctionExpectedType.kt
@@ -1,4 +1,4 @@
-// ERROR: Type inference failed: Not enough information to infer parameter T in fun <T : kotlin.Any!> emptyList(): kotlin.(Mutable)List<T!>! Please specify it explicitly.
+// ERROR: Type inference failed: Not enough information to infer parameter T in fun <T : kotlin.Any!> emptyList(): kotlin.collections.(Mutable)List<T!>! Please specify it explicitly.
 package test
 
 import java.util.Collections
diff --git a/j2k/testData/fileOrElement/toKotlinClasses/iterableAndIterator.kt b/j2k/testData/fileOrElement/toKotlinClasses/iterableAndIterator.kt
index f52515522ce..936759fa4d1 100644
--- a/j2k/testData/fileOrElement/toKotlinClasses/iterableAndIterator.kt
+++ b/j2k/testData/fileOrElement/toKotlinClasses/iterableAndIterator.kt
@@ -1,5 +1,5 @@
-// ERROR: Return type of 'iterator' is not a subtype of the return type of the overridden member 'public abstract operator fun iterator(): kotlin.Iterator<kotlin.String> defined in kotlin.Iterable'
-// ERROR: Return type of 'iterator' is not a subtype of the return type of the overridden member 'public abstract operator fun iterator(): kotlin.Iterator<kotlin.String> defined in kotlin.Iterable'
+// ERROR: Return type of 'iterator' is not a subtype of the return type of the overridden member 'public abstract operator fun iterator(): kotlin.collections.Iterator<kotlin.String> defined in kotlin.collections.Iterable'
+// ERROR: Return type of 'iterator' is not a subtype of the return type of the overridden member 'public abstract operator fun iterator(): kotlin.collections.Iterator<kotlin.String> defined in kotlin.collections.Iterable'
 package demo
 
 internal class Test : Iterable<String> {
diff --git a/j2k/testData/fileOrElement/toKotlinClasses/iterableAndIterator2.kt b/j2k/testData/fileOrElement/toKotlinClasses/iterableAndIterator2.kt
index 34f87e67323..812e6bd8431 100644
--- a/j2k/testData/fileOrElement/toKotlinClasses/iterableAndIterator2.kt
+++ b/j2k/testData/fileOrElement/toKotlinClasses/iterableAndIterator2.kt
@@ -1,5 +1,5 @@
-// ERROR: Return type of 'iterator' is not a subtype of the return type of the overridden member 'public abstract operator fun iterator(): kotlin.Iterator<kotlin.String> defined in kotlin.Iterable'
-// ERROR: Return type of 'iterator' is not a subtype of the return type of the overridden member 'public abstract operator fun iterator(): kotlin.Iterator<kotlin.String> defined in kotlin.Iterable'
+// ERROR: Return type of 'iterator' is not a subtype of the return type of the overridden member 'public abstract operator fun iterator(): kotlin.collections.Iterator<kotlin.String> defined in kotlin.collections.Iterable'
+// ERROR: Return type of 'iterator' is not a subtype of the return type of the overridden member 'public abstract operator fun iterator(): kotlin.collections.Iterator<kotlin.String> defined in kotlin.collections.Iterable'
 package demo
 
 import java.util.*
diff --git a/j2k/testData/fileOrElement/toKotlinClasses/iterableAndIterator3.kt b/j2k/testData/fileOrElement/toKotlinClasses/iterableAndIterator3.kt
index cc8253ced7e..a6d236eb3c1 100644
--- a/j2k/testData/fileOrElement/toKotlinClasses/iterableAndIterator3.kt
+++ b/j2k/testData/fileOrElement/toKotlinClasses/iterableAndIterator3.kt
@@ -1,4 +1,4 @@
-// ERROR: Return type of 'iterator' is not a subtype of the return type of the overridden member 'public abstract operator fun iterator(): kotlin.Iterator<kotlin.String> defined in kotlin.Iterable'
+// ERROR: Return type of 'iterator' is not a subtype of the return type of the overridden member 'public abstract operator fun iterator(): kotlin.collections.Iterator<kotlin.String> defined in kotlin.collections.Iterable'
 package demo
 
 internal class Test : Iterable<String> {
diff --git a/j2k/testData/fileOrElement/typeParameters/rawTypeCast.kt b/j2k/testData/fileOrElement/typeParameters/rawTypeCast.kt
index f2726387a4c..9c79a4408af 100644
--- a/j2k/testData/fileOrElement/typeParameters/rawTypeCast.kt
+++ b/j2k/testData/fileOrElement/typeParameters/rawTypeCast.kt
@@ -1,4 +1,4 @@
-// ERROR: Type inference failed. Expected type mismatch: inferred type is java.util.HashMap<kotlin.Any!, kotlin.Any!> but kotlin.Map<kotlin.String, kotlin.String> was expected
+// ERROR: Type inference failed. Expected type mismatch: inferred type is java.util.HashMap<kotlin.Any!, kotlin.Any!> but kotlin.collections.Map<kotlin.String, kotlin.String> was expected
 import java.util.*
 
 internal object A {
diff --git a/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/build.log b/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/build.log
index a52dc89f8cb..33f02d294ad 100644
--- a/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/build.log
+++ b/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/build.log
@@ -8,8 +8,8 @@ src/fun2.kt
 End of files
 COMPILATION FAILED
 Platform declaration clash: The following declarations have the same JVM signature (function(Ljava/util/List;)V):
-    fun function(list: kotlin.List<kotlin.Any>): kotlin.Unit
-    fun function(list: kotlin.List<kotlin.String>): kotlin.Unit
+    fun function(list: kotlin.collections.List<kotlin.Any>): kotlin.Unit
+    fun function(list: kotlin.collections.List<kotlin.String>): kotlin.Unit
 Platform declaration clash: The following declarations have the same JVM signature (function(Ljava/util/List;)V):
-    fun function(list: kotlin.List<kotlin.Any>): kotlin.Unit
-    fun function(list: kotlin.List<kotlin.String>): kotlin.Unit
\ No newline at end of file
+    fun function(list: kotlin.collections.List<kotlin.Any>): kotlin.Unit
+    fun function(list: kotlin.collections.List<kotlin.String>): kotlin.Unit
\ No newline at end of file